From ca0dcba74f577eb485049d362681efffa202d0cd Mon Sep 17 00:00:00 2001 From: Chandrika Date: Tue, 3 Feb 2015 00:39:42 -0500 Subject: [PATCH] MIFOSX-1860 Second tranche loan can be disbursed if disbursed on date is after first repayment date --- .../org/mifosplatform/portfolio/loanaccount/domain/Loan.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java index 650d33012..c2d3015d9 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java @@ -2370,7 +2370,8 @@ public class Loan extends AbstractPersistable { getApprovedOnDate()); } - if (getExpectedFirstRepaymentOnDate() != null && disbursedOn.isAfter(getExpectedFirstRepaymentOnDate())) { + if (getExpectedFirstRepaymentOnDate() != null && disbursedOn.isAfter(getExpectedFirstRepaymentOnDate()) && + disbursedOn.toDate().equals(this.actualDisbursementDate)) { final String errorMessage = "submittedOnDate cannot be after the loans expectedFirstRepaymentOnDate: " + getExpectedFirstRepaymentOnDate().toString(); throw new InvalidLoanStateTransitionException("disbursal", "cannot.be.after.expected.first.repayment.date", errorMessage,