From ae6877d4a0edabd86b2cce2305e2ffce9cc60f5d Mon Sep 17 00:00:00 2001
From: venkatconflux <venkata.conflux@confluxtechnologies.com>
Date: Wed, 24 Jun 2015 11:46:22 +0530
Subject: [PATCH] MIFOSX-2085:scond repayment computing more interest resolved

---
 .../loanschedule/domain/AbstractLoanScheduleGenerator.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/domain/AbstractLoanScheduleGenerator.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/domain/AbstractLoanScheduleGenerator.java
index e6ba38bbb..ec67c1192 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/domain/AbstractLoanScheduleGenerator.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/domain/AbstractLoanScheduleGenerator.java
@@ -1243,7 +1243,11 @@ public abstract class AbstractLoanScheduleGenerator implements LoanScheduleGener
             final LocalDate idealDisbursementDate, LocalDate periodStartDateApplicableForInterest) {
         if (periodStartDate.isBefore(idealDisbursementDate)) {
             if (loanApplicationTerms.getInterestChargedFromLocalDate() != null) {
-                periodStartDateApplicableForInterest = loanApplicationTerms.getInterestChargedFromLocalDate();
+                if (periodStartDate.isEqual(loanApplicationTerms.getExpectedDisbursementDate())
+                        || loanApplicationTerms.getCalculatedRepaymentsStartingFromLocalDate().isBefore(
+                                loanApplicationTerms.getInterestChargedFromLocalDate())) {
+                    periodStartDateApplicableForInterest = loanApplicationTerms.getInterestChargedFromLocalDate();
+                }
             } else {
                 periodStartDateApplicableForInterest = idealDisbursementDate;
             }