fineract-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nazeer1100...@apache.org
Subject [1/2] incubator-fineract git commit: FINERACT-312 : For Loan with interest recalculation periodic accrual with respect to current date is not getting modified after repayment in Transaction page
Date Fri, 17 Feb 2017 11:45:37 GMT
Repository: incubator-fineract
Updated Branches:
  refs/heads/develop ffa7bd71d -> c7905e945


FINERACT-312 : For Loan with interest recalculation periodic accrual with respect to current
date is not getting modified after repayment in Transaction page


Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/7ceb68fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/7ceb68fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/7ceb68fe

Branch: refs/heads/develop
Commit: 7ceb68fec9adfbb58cb916a7077d01b21794172f
Parents: b6f4230
Author: satish-conflux <satish.sajjan@confluxtechnologies.com>
Authored: Wed Feb 15 18:22:09 2017 +0530
Committer: satish-conflux <satish.sajjan@confluxtechnologies.com>
Committed: Wed Feb 15 18:22:09 2017 +0530

----------------------------------------------------------------------
 .../org/apache/fineract/portfolio/loanaccount/domain/Loan.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/7ceb68fe/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
index b714997..8b5a707 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
@@ -1191,7 +1191,9 @@ public class Loan extends AbstractPersistableCustom<Long> {
                     penality = penality.plus(loanTransaction.getPenaltyChargesPortion(getCurrency()));
                     if (installment.getFeeChargesCharged(getCurrency()).isLessThan(fee)
                             || installment.getInterestCharged(getCurrency()).isLessThan(interest)
-                            || installment.getPenaltyChargesCharged(getCurrency()).isLessThan(penality))
{
+                            || installment.getPenaltyChargesCharged(getCurrency()).isLessThan(penality)
+                            || (getAccruedTill().isEqual(loanTransaction.getTransactionDate())
&& !installment.getDueDate().isEqual(
+                                    getAccruedTill()))) {
                         interest = interest.minus(loanTransaction.getInterestPortion(getCurrency()));
                         fee = fee.minus(loanTransaction.getFeeChargesPortion(getCurrency()));
                         penality = penality.minus(loanTransaction.getPenaltyChargesPortion(getCurrency()));


Mime
View raw message