Merge pull request #1264 from chandrikamohith/MIFOSX-1860

MIFOSX-1860 Second tranche loan can be disbursed if disbursed on date is...
This commit is contained in:
Vishwas Babu A J
2015-02-04 09:39:04 -08:00
@@ -2380,7 +2380,8 @@ public class Loan extends AbstractPersistable<Long> {
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,