Merge pull request #1044 from pramodn02/develop

MIFOSX-1421 : corrected remove installment charge and add a new installm...

mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/SchedulerJobsTestResults.java

@@ -214,7 +214,7 @@ public class SchedulerJobsTestResults {
         Assert.assertNotNull(specifiedDueDateChargeId);
 
         this.loanTransactionHelper.addChargesForLoan(loanID,
-                LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(specifiedDueDateChargeId.toString()));
+                LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(specifiedDueDateChargeId.toString(), "12 March 2013", "100"));
         ArrayList<HashMap> chargesPendingState = this.loanTransactionHelper.getLoanCharges(loanID);
         Assert.assertEquals(1, chargesPendingState.size());
 

mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java

@@ -622,7 +622,7 @@ public class Loan extends AbstractPersistable<Long> {
             final LocalDate lastRepaymentPeriodDueDate) {
         if (loanCharge.isSpecifiedDueDate()
                 && !loanCharge.isDueForCollectionFromAndUpToAndIncluding(disbursementDate, lastRepaymentPeriodDueDate)) {
-            final String defaultUserMessage = "This charge which is due at disbursement cannot be added as the loan is already disbursed.";
+            final String defaultUserMessage = "This charge with specified due date cannot be added as the it is not in schedule range.";
             throw new LoanChargeCannotBeAddedException("loanCharge", "specified.due.date.outside.range", defaultUserMessage,
                     getDisbursementDate(), getLastRepaymentPeriodDueDate(), loanCharge.name());
         }

mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanCharge.java

@@ -478,9 +478,9 @@ public class LoanCharge extends AbstractPersistable<Long> {
                 }
             }
             this.loanInstallmentCharge.removeAll(remove);
-            /*while (index < loanChargePerInstallmentArray.length - 1) {
+            while (index < loanChargePerInstallmentArray.length - 1) {
-                chargePerInstallments.add(loanChargePerInstallmentArray[index++]);
+                this.loanInstallmentCharge.add(loanChargePerInstallmentArray[index++]);
-            }*/
+            }
         }
     }
 
@@ -824,6 +824,7 @@ public class LoanCharge extends AbstractPersistable<Long> {
         this.active = active;
         if (!active) {
             this.overdueInstallmentCharge = null;
+            this.clearLoanInstallmentCharges();
         }
     }
 

mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/domain/AbstractLoanScheduleGenerator.java

@@ -315,7 +315,7 @@ public abstract class AbstractLoanScheduleGenerator implements LoanScheduleGener
         if (diffAmt != null && !diffAmt.isEmpty() && !periodStartDate.isAfter(LocalDate.now())) {
             Map<LocalDate, RecalculationDetail> processDetails = new TreeMap<>();
             for (RecalculationDetail detail : diffAmt) {
-                if (periodStartDate.isBefore(detail.getStartDate()) && detail.isLatePayment()) {
+                if (!periodStartDate.isAfter(detail.getStartDate()) && detail.isLatePayment()) {
                     if (processDetails.containsKey(detail.getToDate())) {
                         RecalculationDetail recalculationDetail = processDetails.get(detail.getToDate());
                         RecalculationDetail updatedDetail = new RecalculationDetail(recalculationDetail.isLatePayment(),
@@ -604,14 +604,18 @@ public abstract class AbstractLoanScheduleGenerator implements LoanScheduleGener
             if (installment.getDueDate().isBefore(LocalDate.now())) {
                 LocalDate startDate = installment.getDueDate();
                 Money totalOutstanding = installment.getTotalOutstanding(currency);
+                boolean reduceStartDate = false;
 
                 while (totalOutstanding.isGreaterThanZero() && startDate.isBefore(LocalDate.now())) {
                     LocalDate recalculateFrom = getNextRestScheduleDate(startDate.minusDays(1), loanApplicationTerms, isHolidayEnabled,
                             holidays, workingDays);
                     LocalDate recalcualteTill = getNextRestScheduleDate(recalculateFrom, loanApplicationTerms, isHolidayEnabled, holidays,
                             workingDays);
+                    if (reduceStartDate) {
+                        startDate = startDate.minusDays(1);
+                    }
                     applyRest(transactions, startDate, recalculateFrom, installment, loanRepaymentScheduleTransactionProcessor, currency,
-                            loanApplicationTerms, isHolidayEnabled, holidays, workingDays);
+                            loanApplicationTerms, isHolidayEnabled, holidays, workingDays, installments);
                     totalOutstanding = installment.getTotalOutstanding(currency);
                     if (totalOutstanding.isGreaterThanZero()) {
                         Money latepaymentoutstanding = installment.getPrincipalOutstanding(currency);
@@ -636,14 +640,15 @@ public abstract class AbstractLoanScheduleGenerator implements LoanScheduleGener
                                 latepaymentoutstanding);
                         diffAmt.add(recalculationDetail);
                     }
-                    startDate = recalcualteTill;
+                    startDate = recalculateFrom.plusDays(1);
+                    reduceStartDate = true;
                 }
             }
 
             if (!diffAmt.isEmpty()) {
                 processRecalculate = true;
-                break;
             }
+            break;
 
         }
         if (processRecalculate) {
@@ -658,7 +663,7 @@ public abstract class AbstractLoanScheduleGenerator implements LoanScheduleGener
             LoanRepaymentScheduleInstallment installment,
             final LoanRepaymentScheduleTransactionProcessor loanRepaymentScheduleTransactionProcessor, MonetaryCurrency currency,
             final LoanApplicationTerms loanApplicationTerms, final boolean isHolidayEnabled, final List<Holiday> holidays,
-            final WorkingDays workingDays) {
+            final WorkingDays workingDays, final List<LoanRepaymentScheduleInstallment> installments) {
         List<LoanTransaction> transactions = new ArrayList<>();
         Map<LocalDate, LocalDate> recalculationDates = new HashMap<>();
         for (LoanTransaction transaction : loanTransactions) {
@@ -671,8 +676,7 @@ public abstract class AbstractLoanScheduleGenerator implements LoanScheduleGener
                                 workingDays));
             }
         }
-        List<LoanRepaymentScheduleInstallment> installments = new ArrayList<>(1);
+
-        installments.add(installment);
         loanRepaymentScheduleTransactionProcessor.handleRepaymentSchedule(transactions, currency, installments, installment,
                 recalculationDates);
     }