From ef223b346c3e05cb941c9c44536dfcc06ce8a4a7 Mon Sep 17 00:00:00 2001 From: Vishwas Babu AJ Date: Tue, 26 Mar 2013 00:12:42 +0530 Subject: [PATCH] fix for Repayment schedule not showing charges due at disbursement --- .../portfolio/loanaccount/data/LoanAccountData.java | 1 + .../loanaccount/service/LoanReadPlatformServiceImpl.java | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanAccountData.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanAccountData.java index d6b547fab..a6e12d1a1 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanAccountData.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanAccountData.java @@ -537,6 +537,7 @@ public class LoanAccountData { this.expectedFirstRepaymentOnDate = expectedFirstRepaymentOnDate; this.interestChargedFromDate = interestChargedFromDate; this.timeline = timeline; + this.feeChargesAtDisbursementCharged = feeChargesDueAtDisbursementCharged; // totals this.summary = summary; 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 c76083f43..edcdd99f6 100644 --- 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 @@ -553,6 +553,12 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService { Money totalRepayment = Money.zero(monCurrency); Money totalOutstanding = Money.zero(monCurrency); + // update totals with details of fees charged during disbursement + totalFeeChargesCharged = totalFeeChargesCharged.plus(disbursementPeriod.feeChargesDue()); + totalRepaymentExpected = totalRepaymentExpected.plus(disbursementPeriod.feeChargesDue()); + totalRepayment = totalRepayment.plus(disbursementPeriod.feeChargesPaid()); + totalOutstanding = totalOutstanding.plus(disbursementPeriod.feeChargesDue()).minus(disbursementPeriod.feeChargesPaid()); + Integer loanTermInDays = Integer.valueOf(0); while (rs.next()) {