From cd42134257fdf6165a0309653d2c6eda12336707 Mon Sep 17 00:00:00 2001
From: Madhukar <madhukar@confluxtechnologies.com>
Date: Mon, 10 Feb 2014 19:25:38 +0530
Subject: [PATCH] MIFOSX-880 calculate interest from interestChargedFromDate

---
 .../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 15c3be22e..b9d41bdd0 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
@@ -84,7 +84,11 @@ public abstract class AbstractLoanScheduleGenerator implements LoanScheduleGener
             int daysInPeriodApplicableForInterest = daysInPeriod;
 
             if (periodStartDate.isBefore(idealDisbursementDate)) {
-                periodStartDateApplicableForInterest = idealDisbursementDate;
+                if (loanApplicationTerms.getInterestChargedFromLocalDate() != null) {
+                    periodStartDateApplicableForInterest = loanApplicationTerms.getInterestChargedFromLocalDate();
+                } else {
+                    periodStartDateApplicableForInterest = idealDisbursementDate;
+                }
                 daysInPeriodApplicableForInterest = Days.daysBetween(periodStartDateApplicableForInterest, scheduledDueDate).getDays();
             }