From 2e5a5e8dc41a099d6d18c78b6026bc4f63375b70 Mon Sep 17 00:00:00 2001 From: Pramod Nuthakki Date: Fri, 27 Sep 2013 13:13:14 +0530 Subject: [PATCH] =?UTF-8?q?Added=20existing=20transaction=20id=E2=80=99s?= =?UTF-8?q?=20for=20accounting=20purpose?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/mifosplatform/portfolio/loanaccount/domain/Loan.java | 5 ++++- .../loanaccount/domain/LoanAccountDomainServiceJpa.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) 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 a64e72a30..f726df573 100644 --- 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 @@ -1493,7 +1493,10 @@ public class Loan extends AbstractPersistable { return disbursementTransaction; } - public LoanTransaction handlePayDisbursementTransaction(final Long chargeId, final LoanTransaction chargesPayment) { + public LoanTransaction handlePayDisbursementTransaction(final Long chargeId, final LoanTransaction chargesPayment, + final List existingTransactionIds,final List existingReversedTransactionIds) { + existingTransactionIds.addAll(findExistingTransactionIds()); + existingReversedTransactionIds.addAll(findExistingReversedTransactionIds()); LoanCharge charge = null; for (final LoanCharge loanCharge : this.charges) { if (chargeId.equals(loanCharge.getId())) { diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanAccountDomainServiceJpa.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanAccountDomainServiceJpa.java index 57d3c4bfe..93b146826 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanAccountDomainServiceJpa.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanAccountDomainServiceJpa.java @@ -166,7 +166,7 @@ public class LoanAccountDomainServiceJpa implements LoanAccountDomainService { final WorkingDays workingDays = this.workingDaysRepository.findOne(); final boolean allowTransactionsOnNonWorkingDay = this.configurationDomainService.allowTransactionsOnNonWorkingDayEnabled(); if (loanTransactionType.isRepaymentAtDisbursement()) { - loan.handlePayDisbursementTransaction(chargeId, newPaymentTransaction); + loan.handlePayDisbursementTransaction(chargeId, newPaymentTransaction, existingTransactionIds, existingReversedTransactionIds); } else { loan.makeChargePayment(chargeId, defaultLoanLifecycleStateMachine(), existingTransactionIds, existingReversedTransactionIds, allowTransactionsOnHoliday, holidays, workingDays, allowTransactionsOnNonWorkingDay, newPaymentTransaction);