Merge branch 'PR393' into develop

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/AbstractLoanScheduleGenerator.java

@@ -2177,15 +2177,24 @@ public abstract class AbstractLoanScheduleGenerator implements LoanScheduleGener
 
                    // check for date changes
                     
-                    while (loanApplicationTerms.getLoanTermVariations().hasDueDateVariation(lastInstallmentDate)) {
+                    do {
-                        LoanTermVariationsData variation = loanApplicationTerms.getLoanTermVariations().nextDueDateVariation();
+                        actualRepaymentDate = this.scheduledDateGenerator.generateNextRepaymentDate(actualRepaymentDate,
-                        if (!variation.isSpecificToInstallment()) {
+                                loanApplicationTerms, isFirstRepayment);
-                            actualRepaymentDate = variation.getDateValue();
+                        isFirstRepayment = false;
-                            loanApplicationTerms.setSeedDate(actualRepaymentDate);
+                        lastInstallmentDate = this.scheduledDateGenerator.adjustRepaymentDate(actualRepaymentDate, loanApplicationTerms,
+                                holidayDetailDTO).getChangedScheduleDate();
+                        while (loanApplicationTerms.getLoanTermVariations().hasDueDateVariation(lastInstallmentDate)) {
+                            LoanTermVariationsData variation = loanApplicationTerms.getLoanTermVariations().nextDueDateVariation();
+                            if (!variation.isSpecificToInstallment()) {
+                                actualRepaymentDate = variation.getDateValue();
+                                lastInstallmentDate = actualRepaymentDate;
+                            }
+                            dueDateVariationsDataList.add(variation);
                         }
-                        lastInstallmentDate = variation.getDateValue();
+                        loanTermVariationParams = applyExceptionLoanTermVariations(loanApplicationTerms, lastInstallmentDate,
-                        dueDateVariationsDataList.add(variation);
+                                exceptionDataListIterator, instalmentNumber, totalCumulativePrincipal, totalCumulativeInterest, mc);
-                    }
+                    } while (loanTermVariationParams != null && loanTermVariationParams.isSkipPeriod());
+                   
                     periodNumber++;
 
                     for (LoanTermVariationsData dueDateVariation : dueDateVariationsDataList) {