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

Merge pull request #1517 from pramodn02/MIFOSX-2228

Browse Source 
MIFOSX-2228 : changed the order of calculating outstanding for multidisburse loan
This commit is contained in:
Adi Narayana Raju
2015-10-12 12:27:18 +05:30
parent c35d4b8a9a 0f65d4dd27
commit 75178272b9
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/domain/AbstractLoanScheduleGenerator.java
+11 -10
View File
@@ -1836,16 +1836,6 @@ public abstract class AbstractLoanScheduleGenerator implements LoanScheduleGener
chargesDueAtTimeOfDisbursement); chargesDueAtTimeOfDisbursement);
final List<LoanRepaymentScheduleInstallment> newRepaymentScheduleInstallments = new ArrayList<>(); final List<LoanRepaymentScheduleInstallment> newRepaymentScheduleInstallments = new ArrayList<>();
MonetaryCurrency currency = outstandingBalance.getCurrency(); MonetaryCurrency currency = outstandingBalance.getCurrency();
final Map<LocalDate, Money> disburseDetailMap = new HashMap<>();
if (loanApplicationTerms.isMultiDisburseLoan()) {
// fetches the first tranche amount and also updates other
// tranche
// details to map
BigDecimal disburseAmt = getDisbursementAmount(loanApplicationTerms, loanApplicationTerms.getExpectedDisbursementDate(),
periods, chargesDueAtTimeOfDisbursement, disburseDetailMap, true);
outstandingBalance = outstandingBalance.zero().plus(disburseAmt);
outstandingBalanceAsPerRest = outstandingBalance;
}
// early payments will be added here and as per the selected // early payments will be added here and as per the selected
// strategy // strategy
@@ -1892,6 +1882,17 @@ public abstract class AbstractLoanScheduleGenerator implements LoanScheduleGener
// Set fixed Amortization Amounts(either EMI or Principal ) // Set fixed Amortization Amounts(either EMI or Principal )
updateAmortization(mc, loanApplicationTerms, actualRepaymentDate, periodNumber, outstandingBalance, holidayDetailDTO); updateAmortization(mc, loanApplicationTerms, actualRepaymentDate, periodNumber, outstandingBalance, holidayDetailDTO);
final Map<LocalDate, Money> disburseDetailMap = new HashMap<>();
if (loanApplicationTerms.isMultiDisburseLoan()) {
// fetches the first tranche amount and also updates other
// tranche
// details to map
BigDecimal disburseAmt = getDisbursementAmount(loanApplicationTerms, loanApplicationTerms.getExpectedDisbursementDate(),
periods, chargesDueAtTimeOfDisbursement, disburseDetailMap, true);
outstandingBalance = outstandingBalance.zero().plus(disburseAmt);
outstandingBalanceAsPerRest = outstandingBalance;
}
// Block process the installment and creates the period if it falls // Block process the installment and creates the period if it falls
// before reschedule from date // before reschedule from date
// This will create the recalculation details by applying the // This will create the recalculation details by applying the