From e5078f9baca67c3b6d3a010a558e037171a85991 Mon Sep 17 00:00:00 2001 From: andrew-dzak Date: Tue, 3 Nov 2015 10:54:06 +0100 Subject: [PATCH] Mifosx-2334 eltdown in advanced accounting...sum of all charges is not equal to the fee charge for a transaction fix --- .../loanaccount/domain/LoanTransaction.java | 43 +++++++++---------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanTransaction.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanTransaction.java index eed2bab64..335f6d9ea 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanTransaction.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanTransaction.java @@ -5,27 +5,6 @@ */ package org.mifosplatform.portfolio.loanaccount.domain; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.UniqueConstraint; - import org.hibernate.annotations.LazyCollection; import org.hibernate.annotations.LazyCollectionOption; import org.joda.time.LocalDate; @@ -44,6 +23,26 @@ import org.mifosplatform.portfolio.paymentdetail.domain.PaymentDetail; import org.mifosplatform.useradministration.domain.AppUser; import org.springframework.data.jpa.domain.AbstractPersistable; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.UniqueConstraint; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * All monetary transactions against a loan are modelled through this entity. * Disbursements, Repayments, Waivers, Write-off etc @@ -579,7 +578,7 @@ public final class LoanTransaction extends AbstractPersistable { for (final LoanChargePaidBy chargePaidBy : this.loanChargesPaid) { final Map loanChargePaidData = new LinkedHashMap<>(); loanChargePaidData.put("chargeId", chargePaidBy.getLoanCharge().getCharge().getId()); - loanChargePaidData.put("isPenalty", chargePaidBy.getLoanCharge().getCharge().isPenalty()); + loanChargePaidData.put("isPenalty", chargePaidBy.getLoanCharge().isPenaltyCharge()); loanChargePaidData.put("loanChargeId", chargePaidBy.getLoanCharge().getId()); loanChargePaidData.put("amount", chargePaidBy.getAmount());