Skip to content

[FINERACT-1888] Chargeback accounting fix #3099

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
taskain7 wants to merge 4 commits into from
Closed

[FINERACT-1888] Chargeback accounting fix #3099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c0434ee
[FINERACT-1678] all Loan COB steps are completed if there is no loan …
taskain7 Mar 17, 2023
7b55690
Merge branch 'apache:develop' into develop
taskain7 Mar 17, 2023
009b6cc
Merge branch 'apache:develop' into develop
taskain7 Apr 3, 2023
4833540
[FINERACT-1888] Chargeback acoounting fix
taskain7 Apr 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...ract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/LoanDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
package org.apache.fineract.accounting.journalentry.data;

import java.math.BigDecimal;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down Expand Up @@ -45,4 +46,6 @@ public class LoanDTO {
private boolean markedAsChargeOff;
@Setter
private boolean markedAsFraud;
@Setter
private BigDecimal overpaidAmount;
}
5 changes: 3 additions & 2 deletions ...n/java/org/apache/fineract/accounting/journalentry/service/AccountingProcessorHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ public LoanDTO populateLoanDtoFromMap(final Map<String, Object> accountingBridge
boolean isAccountTransfer = (Boolean) accountingBridgeData.get("isAccountTransfer");
boolean isLoanMarkedAsChargeOff = (Boolean) accountingBridgeData.get("isChargeOff");
boolean isLoanMarkedAsFraud = (Boolean) accountingBridgeData.get("isFraud");
BigDecimal overpaidAmount = (BigDecimal) accountingBridgeData.get("overpaidAmount");

@SuppressWarnings("unchecked")
final List<Map<String, Object>> newTransactionsMap = (List<Map<String, Object>>) accountingBridgeData.get("newLoanTransactions");
Expand Down Expand Up @@ -164,7 +165,7 @@ public LoanDTO populateLoanDtoFromMap(final Map<String, Object> accountingBridge
}

return new LoanDTO(loanId, loanProductId, officeId, currencyCode, cashBasedAccountingEnabled, upfrontAccrualBasedAccountingEnabled,
periodicAccrualBasedAccountingEnabled, newLoanTransactions, isLoanMarkedAsChargeOff, isLoanMarkedAsFraud);
periodicAccrualBasedAccountingEnabled, newLoanTransactions, isLoanMarkedAsChargeOff, isLoanMarkedAsFraud, overpaidAmount);
}

public SavingsDTO populateSavingsDtoFromMap(final Map<String, Object> accountingBridgeData, final boolean cashBasedAccountingEnabled,
Expand Down Expand Up @@ -786,7 +787,7 @@ public Office getOfficeById(final long officeId) {
return this.officeRepository.getReferenceById(officeId);
}

private void createCreditJournalEntryOrReversalForLoan(final Office office, final String currencyCode, final int accountMappingTypeId,
public void createCreditJournalEntryOrReversalForLoan(final Office office, final String currencyCode, final int accountMappingTypeId,
final Long loanProductId, final Long paymentTypeId, final Long loanId, final String transactionId,
final LocalDate transactionDate, final BigDecimal amount, final Boolean isReversal) {
final GLAccount account = getLinkedGLAccountForLoanProduct(loanProductId, accountMappingTypeId, paymentTypeId);
Expand Down
22 changes: 19 additions & 3 deletions ...ache/fineract/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,7 @@ private void createJournalEntriesForChargeback(LoanDTO loanDTO, LoanTransactionD
final Long loanProductId = loanDTO.getLoanProductId();
final Long loanId = loanDTO.getLoanId();
final String currencyCode = loanDTO.getCurrencyCode();
final BigDecimal overpaidAmount = loanDTO.getOverpaidAmount();

// transaction properties
final String transactionId = loanTransactionDTO.getTransactionId();
Expand All @@ -426,9 +427,24 @@ private void createJournalEntriesForChargeback(LoanDTO loanDTO, LoanTransactionD
final boolean isReversal = loanTransactionDTO.isReversed();
final Long paymentTypeId = loanTransactionDTO.getPaymentTypeId();

this.helper.createJournalEntriesAndReversalsForLoan(office, currencyCode, AccrualAccountsForLoan.LOAN_PORTFOLIO.getValue(),
AccrualAccountsForLoan.FUND_SOURCE.getValue(), loanProductId, paymentTypeId, loanId, transactionId, transactionDate, amount,
isReversal);
if (BigDecimal.ZERO.compareTo(overpaidAmount) == 0) {
helper.createJournalEntriesAndReversalsForLoan(office, currencyCode, AccrualAccountsForLoan.LOAN_PORTFOLIO.getValue(),
AccrualAccountsForLoan.FUND_SOURCE.getValue(), loanProductId, paymentTypeId, loanId, transactionId, transactionDate,
amount, isReversal);
} else if (overpaidAmount.compareTo(amount) > 0) {
helper.createJournalEntriesAndReversalsForLoan(office, currencyCode, AccrualAccountsForLoan.OVERPAYMENT.getValue(),
AccrualAccountsForLoan.FUND_SOURCE.getValue(), loanProductId, paymentTypeId, loanId, transactionId, transactionDate,
amount, isReversal);
} else {
BigDecimal diff = amount.subtract(overpaidAmount);
helper.createDebitJournalEntryOrReversalForLoan(office, currencyCode, AccrualAccountsForLoan.LOAN_PORTFOLIO.getValue(),
loanProductId, paymentTypeId, loanId, transactionId, transactionDate, diff, isReversal);
helper.createCreditJournalEntryOrReversalForLoan(office, currencyCode, AccrualAccountsForLoan.FUND_SOURCE.getValue(),
loanProductId, paymentTypeId, loanId, transactionId, transactionDate, amount, isReversal);
helper.createDebitJournalEntryOrReversalForLoan(office, currencyCode, AccrualAccountsForLoan.OVERPAYMENT.getValue(),
loanProductId, paymentTypeId, loanId, transactionId, transactionDate, overpaidAmount, isReversal);
}

}

/**
Expand Down
1 change: 1 addition & 0 deletions fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4492,6 +4492,7 @@ public Map<String, Object> deriveAccountingBridgeData(final String currencyCode,
accountingBridgeData.put("isAccountTransfer", isAccountTransfer);
accountingBridgeData.put("isChargeOff", isChargedOff());
accountingBridgeData.put("isFraud", isFraud());
accountingBridgeData.put("overpaidAmount", calculateTotalOverpayment().getAmount().abs());

final List<Map<String, Object>> newLoanTransactions = new ArrayList<>();
for (final LoanTransaction transaction : this.loanTransactions) {
Expand Down