CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'PR393' into develop

Browse Source
This commit is contained in:
Nazeer Hussain Shaik
2017-07-24 17:24:27 +05:30
parent 1b4147409a 39d1f74cca
commit 0f98cbbed8
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/AbstractLoanScheduleGenerator.java
+11 -2
View File
@@ -2177,15 +2177,24 @@ public abstract class AbstractLoanScheduleGenerator implements LoanScheduleGener
// check for date changes // check for date changes
do {
actualRepaymentDate = this.scheduledDateGenerator.generateNextRepaymentDate(actualRepaymentDate,
loanApplicationTerms, isFirstRepayment);
isFirstRepayment = false;
lastInstallmentDate = this.scheduledDateGenerator.adjustRepaymentDate(actualRepaymentDate, loanApplicationTerms,
holidayDetailDTO).getChangedScheduleDate();
while (loanApplicationTerms.getLoanTermVariations().hasDueDateVariation(lastInstallmentDate)) { while (loanApplicationTerms.getLoanTermVariations().hasDueDateVariation(lastInstallmentDate)) {
LoanTermVariationsData variation = loanApplicationTerms.getLoanTermVariations().nextDueDateVariation(); LoanTermVariationsData variation = loanApplicationTerms.getLoanTermVariations().nextDueDateVariation();
if (!variation.isSpecificToInstallment()) { if (!variation.isSpecificToInstallment()) {
actualRepaymentDate = variation.getDateValue(); actualRepaymentDate = variation.getDateValue();
loanApplicationTerms.setSeedDate(actualRepaymentDate); lastInstallmentDate = actualRepaymentDate;
} }
lastInstallmentDate = variation.getDateValue();
dueDateVariationsDataList.add(variation); dueDateVariationsDataList.add(variation);
} }
loanTermVariationParams = applyExceptionLoanTermVariations(loanApplicationTerms, lastInstallmentDate,
exceptionDataListIterator, instalmentNumber, totalCumulativePrincipal, totalCumulativeInterest, mc);
} while (loanTermVariationParams != null && loanTermVariationParams.isSkipPeriod());
periodNumber++; periodNumber++;
for (LoanTermVariationsData dueDateVariation : dueDateVariationsDataList) { for (LoanTermVariationsData dueDateVariation : dueDateVariationsDataList) {