CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 55 Packages Projects Releases Wiki Activity

FINERACT-1981: fix progressive accruals on early repayment

Browse Source
This commit is contained in:
adam.magyari
2025-01-29 15:05:47 +01:00
committed by Adam Saghy
parent 15fcaed61f
commit 6e8024a004
2 changed files with 63 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualsProcessingServiceImpl.java
+4 -4
View File
@@ -427,9 +427,9 @@ public class LoanAccrualsProcessingServiceImpl implements LoanAccrualsProcessing
AccrualPeriodData period = accrualPeriods.getPeriodByInstallmentNumber(installment.getInstallmentNumber());
MonetaryCurrency currency = accrualPeriods.getCurrency();
Money interest = null;
boolean isFullPeriod = isFullPeriod(tillDate, installment);
boolean isPastPeriod = isAfterPeriod(tillDate, installment);
boolean isInPeriod = isInPeriod(tillDate, installment, false);
if (isFullPeriod) {
if (isPastPeriod || loan.isClosed() || loan.isOverPaid()) {
interest = installment.getInterestCharged(currency);
} else {
if (isInPeriod) { // first period first day is not accrued
@@ -447,7 +447,7 @@ public class LoanAccrualsProcessingServiceImpl implements LoanAccrualsProcessing
unrecognizedWaived = MathUtil.min(unrecognizedWaived,
MathUtil.minusToZero(installment.getInterestWaived(currency), transactionWaived), false);
period.setUnrecognizedWaive(unrecognizedWaived);
Money waived = isFullPeriod ? installment.getInterestWaived(currency) : MathUtil.plus(transactionWaived, unrecognizedWaived);
Money waived = isPastPeriod ? installment.getInterestWaived(currency) : MathUtil.plus(transactionWaived, unrecognizedWaived);
accruable = MathUtil.minusToZero(period.getInterestAmount(), waived);
}
period.setInterestAccruable(accruable);
@@ -499,7 +499,7 @@ public class LoanAccrualsProcessingServiceImpl implements LoanAccrualsProcessing
.map(p -> MathUtil.toBigDecimal(p.getTransactionAccrued())).reduce(BigDecimal.ZERO, MathUtil::add);
BigDecimal accrued = MathUtil.subtractToZero(totalAccrued, prevAccrued);
// if this is the current-last period, all the remaining accrued amount is added
return isInPeriod(tillDate, installment, false) ? accrued : MathUtil.min(installment.getInterestCharged(), accrued, false);
return isInPeriod(tillDate, installment, false) ? accrued : MathUtil.min(installment.getInterestAccrued(), accrued, false);
} else {
return isFullPeriod(tillDate, installment) ? installment.getInterestAccrued()
: loan.getLoanTransactions().stream()