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

FINERACT-2421: fix loan accrual posts after loan close

Browse Source
This commit is contained in:
Attila Budai
2026-02-17 13:31:09 +01:00
committed by Arnold Gálovics
parent 2ee6f22713
commit 3e98cf791a
11 changed files with 909 additions and 21 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
+11 -6
View File
@@ -487,14 +487,19 @@ public class LoanAccrualsProcessingServiceImpl implements LoanAccrualsProcessing
final AccrualPeriodData period = accrualPeriods.getPeriodByInstallmentNumber(installment.getInstallmentNumber());
final MonetaryCurrency currency = accrualPeriods.getCurrency();
Money interest = null;
final boolean isPastPeriod = isAfterPeriod(tillDate, installment);
final boolean isInPeriod = isInPeriod(tillDate, installment, false);
LocalDate effectiveDate = tillDate;
if (loan.isClosed() && loan.getClosedOnDate() != null && DateUtils.isBefore(loan.getClosedOnDate(), tillDate)) {
effectiveDate = loan.getClosedOnDate();
} else if (loanBalanceService.isOverPaid(loan) && loan.getOverpaidOnDate() != null
&& DateUtils.isBefore(loan.getOverpaidOnDate(), tillDate)) {
effectiveDate = loan.getOverpaidOnDate();
}
final boolean isPastPeriod = isAfterPeriod(effectiveDate, installment);
final boolean isInPeriod = isInPeriod(effectiveDate, installment, false);
if (isPastPeriod || loan.isClosed() || loanBalanceService.isOverPaid(loan)) {
interest = installment.getInterestCharged(currency).minus(installment.getCreditedInterest());
} else {
if (isInPeriod) { // first period first day is not accrued
interest = scheduleGenerator.getPeriodInterestTillDate(installment, tillDate);
}
} else if (isInPeriod) {
interest = scheduleGenerator.getPeriodInterestTillDate(installment, effectiveDate);
}
period.setInterestAmount(interest);
Money accruable = null;