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

FINERACT-1958-backdated-disbursement

Browse Source
This commit is contained in:
Ruchi Dhamankar
2023-09-14 14:08:51 +02:00
committed by Adam Saghy
parent 781f3ae78c
commit f89147ed3c
3 changed files with 838 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
+6 -9
View File
@@ -2599,21 +2599,16 @@ public class Loan extends AbstractAuditableWithUTCDateTimeCustom {
}
public boolean canDisburse(final LocalDate actualDisbursementDate) {
LocalDate lastDisburseDate = this.actualDisbursementDate;
LocalDate loanSubmittedOnDate = this.submittedOnDate;
final LoanStatus statusEnum = this.loanLifecycleStateMachine.dryTransition(LoanEvent.LOAN_DISBURSED, this);
boolean isMultiTrancheDisburse = false;
LoanStatus actualLoanStatus = LoanStatus.fromInt(this.loanStatus);
if ((actualLoanStatus.isActive() || actualLoanStatus.isClosedObligationsMet() || actualLoanStatus.isOverpaid())
&& isAllTranchesNotDisbursed()) {
LoanDisbursementDetails details = fetchLastDisburseDetail();
if (details != null) {
lastDisburseDate = details.actualDisbursementDate();
}
if (actualDisbursementDate.isBefore(lastDisburseDate)) {
final String errorMsg = "Loan can't be disbursed before " + lastDisburseDate;
throw new LoanDisbursalException(errorMsg, "actualdisbursementdate.before.lastdusbursedate", lastDisburseDate,
if (actualDisbursementDate.isBefore(loanSubmittedOnDate)) {
final String errorMsg = "Loan can't be disbursed before " + loanSubmittedOnDate;
throw new LoanDisbursalException(errorMsg, "actualdisbursementdate.before.submittedDate", loanSubmittedOnDate,
actualDisbursementDate);
}
isMultiTrancheDisburse = true;
@@ -2626,6 +2621,8 @@ public class Loan extends AbstractAuditableWithUTCDateTimeCustom {
BigDecimal principalDisbursed = command.bigDecimalValueOfParameterNamed(LoanApiConstants.principalDisbursedParameterName);
if (this.actualDisbursementDate == null) {
this.actualDisbursementDate = actualDisbursementDate;
} else if (actualDisbursementDate.isBefore(this.actualDisbursementDate)) {
this.actualDisbursementDate = actualDisbursementDate;
}
BigDecimal diff = BigDecimal.ZERO;
Collection<LoanDisbursementDetails> details = fetchUndisbursedDetail();