From 95c43200d6413e8d95f63aa53624a8707d14c514 Mon Sep 17 00:00:00 2001 From: pramod Date: Mon, 17 Aug 2015 13:27:22 +0530 Subject: [PATCH] cleaning up MIFOSX-1765 --- .../domain/DefaultScheduledDateGenerator.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/domain/DefaultScheduledDateGenerator.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/domain/DefaultScheduledDateGenerator.java index 5ab18d747..fbfc4ddce 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/domain/DefaultScheduledDateGenerator.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/domain/DefaultScheduledDateGenerator.java @@ -49,11 +49,11 @@ public class DefaultScheduledDateGenerator implements ScheduledDateGenerator { dueRepaymentPeriodDate = firstRepaymentPeriodDate; } else { Calendar currentCalendar = loanApplicationTerms.getLoanCalendar(); - - dueRepaymentPeriodDate = getRepaymentPeriodDate(loanApplicationTerms.getRepaymentPeriodFrequencyType(), - loanApplicationTerms.getRepaymentEvery(), lastRepaymentDate, loanApplicationTerms.getNthDay(), - loanApplicationTerms.getWeekDayType()); - if (currentCalendar != null) { + if (currentCalendar == null) { + dueRepaymentPeriodDate = getRepaymentPeriodDate(loanApplicationTerms.getRepaymentPeriodFrequencyType(), + loanApplicationTerms.getRepaymentEvery(), lastRepaymentDate, loanApplicationTerms.getNthDay(), + loanApplicationTerms.getWeekDayType()); + } else { // If we have currentCalendar object, this neans there is a // calendar associated with // the loan, and we should use it in order to calculate next