From a8cf131ccf6445612c38be0489d85dc51aac02ea Mon Sep 17 00:00:00 2001 From: Adi Narayana Raju Date: Wed, 18 Nov 2015 14:41:25 +0530 Subject: [PATCH] Consider disbursement date during floating rate read for a loan --- .../loanaccount/service/LoanReadPlatformServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java index 8c011c1cf..e1d22134e 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java @@ -1995,10 +1995,10 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService { final Collection intRates = this.floatingRatesReadPlatformService.retrieveInterestRatePeriods(loan .loanProduct().getFloatingRates().getFloatingRate().getId()); 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); intRatePeriodData.add(rate); - } else if (rate.getFromDate().compareTo(loan.getSubmittedOnDate().toDate()) <= 0) { + } else if (rate.getFromDate().compareTo(loan.getDisbursementDate().toDate()) <= 0) { updateInterestRatePeriodData(rate, loan); intRatePeriodData.add(rate); break; @@ -2023,8 +2023,8 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService { } rate.setEffectiveInterestRate(effectiveInterestRate); - if (rate.getFromDate().compareTo(loan.getSubmittedOnDate().toDate()) < 0) { - rate.setFromDate(loan.getSubmittedOnDate().toDate()); + if (rate.getFromDate().compareTo(loan.getDisbursementDate().toDate()) < 0) { + rate.setFromDate(loan.getDisbursementDate().toDate()); } }