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

Merge pull request #1547 from rajuan/FRBug

Browse Source 
Consider disbursement date during floating rate read for a loan
This commit is contained in:
Shaik Nazeer Hussain
2015-11-18 14:47:04 +05:30
parent 7ba9545dd1 a8cf131ccf
commit f58bc239ab
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java
+4 -4
View File
@@ -1995,10 +1995,10 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService {
final Collection<InterestRatePeriodData> intRates = this.floatingRatesReadPlatformService.retrieveInterestRatePeriods(loan final Collection<InterestRatePeriodData> intRates = this.floatingRatesReadPlatformService.retrieveInterestRatePeriods(loan
.loanProduct().getFloatingRates().getFloatingRate().getId()); .loanProduct().getFloatingRates().getFloatingRate().getId());
for (final InterestRatePeriodData rate : intRates) { for (final InterestRatePeriodData rate : intRates) {
if (rate.getFromDate().compareTo(loan.getSubmittedOnDate().toDate()) > 0 && loan.getIsFloatingInterestRate()) { if (rate.getFromDate().compareTo(loan.getDisbursementDate().toDate()) > 0 && loan.getIsFloatingInterestRate()) {
updateInterestRatePeriodData(rate, loan); updateInterestRatePeriodData(rate, loan);
intRatePeriodData.add(rate); intRatePeriodData.add(rate);
} else if (rate.getFromDate().compareTo(loan.getSubmittedOnDate().toDate()) <= 0) { } else if (rate.getFromDate().compareTo(loan.getDisbursementDate().toDate()) <= 0) {
updateInterestRatePeriodData(rate, loan); updateInterestRatePeriodData(rate, loan);
intRatePeriodData.add(rate); intRatePeriodData.add(rate);
break; break;
@@ -2023,8 +2023,8 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService {
} }
rate.setEffectiveInterestRate(effectiveInterestRate); rate.setEffectiveInterestRate(effectiveInterestRate);
if (rate.getFromDate().compareTo(loan.getSubmittedOnDate().toDate()) < 0) { if (rate.getFromDate().compareTo(loan.getDisbursementDate().toDate()) < 0) {
rate.setFromDate(loan.getSubmittedOnDate().toDate()); rate.setFromDate(loan.getDisbursementDate().toDate());
} }
} }