You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by "ruchiD (via GitHub)" <gi...@apache.org> on 2023/02/06 15:33:29 UTC
[GitHub] [fineract] ruchiD opened a new pull request, #2953: FINERACT-1806-Accounting-treatments-for-Charge-off-loan-accounts
ruchiD opened a new pull request, #2953:
URL: https://github.com/apache/fineract/pull/2953
## Description
1.Added new fields for Loan product accounting for ChargeOff for Accrual and Cash based accounting
2.Accounting entries for transactions on Loan marked as Chargeoff and/or fraud for Accrual and Cash based accounting.
3.Tests.
Describe the changes made and why they were made.
Ignore if these details are present on the associated [Apache Fineract JIRA ticket](https://github.com/apache/fineract/pull/1284).
## Checklist
Please make sure these boxes are checked before submitting your pull request - thanks!
- [ ] Write the commit message as per https://github.com/apache/fineract/#pull-requests
- [ ] Acknowledge that we will not review PRs that are not passing the build _("green")_ - it is your responsibility to get a proposed PR to pass the build, not primarily the project's maintainers.
- [ ] Create/update unit or integration tests for verifying the changes made.
- [ ] Follow coding conventions at https://cwiki.apache.org/confluence/display/FINERACT/Coding+Conventions.
- [ ] Add required Swagger annotation and update API documentation at fineract-provider/src/main/resources/static/legacy-docs/apiLive.htm with details of any API changes
- [ ] Submission is not a "code dump". (Large changes can be made "in repository" via a branch. Ask on the developer mailing list for guidance, if required.)
FYI our guidelines for code reviews are at https://cwiki.apache.org/confluence/display/FINERACT/Code+Review+Guide.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy commented on a diff in pull request #2953: FINERACT-1806-Accounting-treatments-for-Charge-off-loan-accounts
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #2953:
URL: https://github.com/apache/fineract/pull/2953#discussion_r1102672678
##########
fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java:
##########
@@ -104,10 +105,208 @@ else if (loanTransactionDTO.getTransactionType().isChargeback()) {
else if (loanTransactionDTO.getTransactionType().isChargeAdjustment()) {
createJournalEntriesForChargeAdjustment(loanDTO, loanTransactionDTO, office);
}
+ // Logic for Charge-Off
+ else if (loanTransactionDTO.getTransactionType().isChargeoff()) {
+ createJournalEntriesForChargeOff(loanDTO, loanTransactionDTO, office);
+ }
+ }
+ }
+
+ private void createJournalEntriesForChargeOff(LoanDTO loanDTO, LoanTransactionDTO loanTransactionDTO, Office office) {
+ // loan properties
+ final Long loanProductId = loanDTO.getLoanProductId();
+ final Long loanId = loanDTO.getLoanId();
+ final String currencyCode = loanDTO.getCurrencyCode();
+ final boolean isMarkedFraud = loanDTO.isMarkedAsFraud();
+
+ // transaction properties
+ final String transactionId = loanTransactionDTO.getTransactionId();
+ final LocalDate transactionDate = loanTransactionDTO.getTransactionDate();
+ final BigDecimal principalAmount = loanTransactionDTO.getPrincipal();
+ final BigDecimal interestAmount = loanTransactionDTO.getInterest();
+ final BigDecimal feesAmount = loanTransactionDTO.getFees();
+ final BigDecimal penaltiesAmount = loanTransactionDTO.getPenalties();
+ final Long paymentTypeId = loanTransactionDTO.getPaymentTypeId();
+ final boolean isReversal = loanTransactionDTO.isReversed();
+
+ Map<GLAccount, BigDecimal> accountMapForCredit = new HashMap<>();
Review Comment:
Please use LinkedHashmap to have the same ordering of the account items.
it makes easier of testing the created journal entries
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy merged pull request #2953: FINERACT-1806-Accounting-treatments-for-Charge-off-loan-accounts
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy merged PR #2953:
URL: https://github.com/apache/fineract/pull/2953
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy commented on a diff in pull request #2953: FINERACT-1806-Accounting-treatments-for-Charge-off-loan-accounts
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #2953:
URL: https://github.com/apache/fineract/pull/2953#discussion_r1102679859
##########
fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java:
##########
@@ -104,10 +105,208 @@ else if (loanTransactionDTO.getTransactionType().isChargeback()) {
else if (loanTransactionDTO.getTransactionType().isChargeAdjustment()) {
createJournalEntriesForChargeAdjustment(loanDTO, loanTransactionDTO, office);
}
+ // Logic for Charge-Off
+ else if (loanTransactionDTO.getTransactionType().isChargeoff()) {
+ createJournalEntriesForChargeOff(loanDTO, loanTransactionDTO, office);
+ }
+ }
+ }
+
+ private void createJournalEntriesForChargeOff(LoanDTO loanDTO, LoanTransactionDTO loanTransactionDTO, Office office) {
+ // loan properties
+ final Long loanProductId = loanDTO.getLoanProductId();
+ final Long loanId = loanDTO.getLoanId();
+ final String currencyCode = loanDTO.getCurrencyCode();
+ final boolean isMarkedFraud = loanDTO.isMarkedAsFraud();
+
+ // transaction properties
+ final String transactionId = loanTransactionDTO.getTransactionId();
+ final LocalDate transactionDate = loanTransactionDTO.getTransactionDate();
+ final BigDecimal principalAmount = loanTransactionDTO.getPrincipal();
+ final BigDecimal interestAmount = loanTransactionDTO.getInterest();
+ final BigDecimal feesAmount = loanTransactionDTO.getFees();
+ final BigDecimal penaltiesAmount = loanTransactionDTO.getPenalties();
+ final Long paymentTypeId = loanTransactionDTO.getPaymentTypeId();
+ final boolean isReversal = loanTransactionDTO.isReversed();
+
+ Map<GLAccount, BigDecimal> accountMapForCredit = new HashMap<>();
+
+ Map<Integer, BigDecimal> accountMapForDebit = new HashMap<>();
+
+ // principal payment
+ if (principalAmount != null && principalAmount.compareTo(BigDecimal.ZERO) > 0) {
+ if (isMarkedFraud) {
+ populateCreditDebitMaps(loanProductId, principalAmount, paymentTypeId, AccrualAccountsForLoan.LOAN_PORTFOLIO.getValue(),
+ AccrualAccountsForLoan.CHARGE_OFF_FRAUD_EXPENSE.getValue(), accountMapForCredit, accountMapForDebit);
+ } else {
+ populateCreditDebitMaps(loanProductId, principalAmount, paymentTypeId, AccrualAccountsForLoan.LOAN_PORTFOLIO.getValue(),
+ AccrualAccountsForLoan.CHARGE_OFF_EXPENSE.getValue(), accountMapForCredit, accountMapForDebit);
+ }
+ }
+
+ // interest payment
+ if (interestAmount != null && interestAmount.compareTo(BigDecimal.ZERO) > 0) {
+
+ populateCreditDebitMaps(loanProductId, interestAmount, paymentTypeId, AccrualAccountsForLoan.INTEREST_RECEIVABLE.getValue(),
+ AccrualAccountsForLoan.INCOME_FROM_CHARGE_OFF_INTEREST.getValue(), accountMapForCredit, accountMapForDebit);
+ }
+
+ // handle fees payment
+ if (feesAmount != null && feesAmount.compareTo(BigDecimal.ZERO) > 0) {
+ populateCreditDebitMaps(loanProductId, feesAmount, paymentTypeId, AccrualAccountsForLoan.FEES_RECEIVABLE.getValue(),
+ AccrualAccountsForLoan.INCOME_FROM_CHARGE_OFF_FEES.getValue(), accountMapForCredit, accountMapForDebit);
+ }
+
+ // handle penalty payment
+ if (penaltiesAmount != null && penaltiesAmount.compareTo(BigDecimal.ZERO) > 0) {
+ populateCreditDebitMaps(loanProductId, penaltiesAmount, paymentTypeId, AccrualAccountsForLoan.PENALTIES_RECEIVABLE.getValue(),
+ AccrualAccountsForLoan.INCOME_FROM_CHARGE_OFF_PENALTY.getValue(), accountMapForCredit, accountMapForDebit);
+ }
+
+ // create credit entries
+ for (Map.Entry<GLAccount, BigDecimal> creditEntry : accountMapForCredit.entrySet()) {
+ this.helper.createCreditJournalEntryOrReversalForLoan(office, currencyCode, loanId, transactionId, transactionDate,
+ creditEntry.getValue(), isReversal, creditEntry.getKey());
+ }
+
+ // create debit entries
+ for (Map.Entry<Integer, BigDecimal> debitEntry : accountMapForDebit.entrySet()) {
+ this.helper.createDebitJournalEntryOrReversalForLoan(office, currencyCode, debitEntry.getKey().intValue(), loanProductId,
+ paymentTypeId, loanId, transactionId, transactionDate, debitEntry.getValue(), isReversal);
+ }
+
+ }
+
+ private void populateCreditDebitMaps(Long loanProductId, BigDecimal transactionPartAmount, Long paymentTypeId,
+ Integer creditAccountType, Integer debitAccountType, Map<GLAccount, BigDecimal> accountMapForCredit,
+ Map<Integer, BigDecimal> accountMapForDebit) {
+ GLAccount accountCredit = this.helper.getLinkedGLAccountForLoanProduct(loanProductId, creditAccountType, paymentTypeId);
+ if (accountMapForCredit.containsKey(accountCredit)) {
+ BigDecimal amount = accountMapForCredit.get(accountCredit).add(transactionPartAmount);
+ accountMapForCredit.put(accountCredit, amount);
+ } else {
+ accountMapForCredit.put(accountCredit, transactionPartAmount);
+ }
+ Integer accountDebit = debitAccountType;
+ if (accountMapForDebit.containsKey(accountDebit)) {
+ BigDecimal amount = accountMapForDebit.get(accountDebit).add(transactionPartAmount);
+ accountMapForDebit.put(accountDebit, amount);
+ } else {
+ accountMapForDebit.put(accountDebit, transactionPartAmount);
}
}
private void createJournalEntriesForChargeAdjustment(LoanDTO loanDTO, LoanTransactionDTO loanTransactionDTO, Office office) {
+ final boolean isMarkedAsChargeOff = loanDTO.isMarkedAsChargeOff();
+ if (isMarkedAsChargeOff) {
+ createJournalEntriesForChargeOffLoanChargeAdjustment(loanDTO, loanTransactionDTO, office);
+ } else {
+ createJournalEntriesForLoanChargeAdjustment(loanDTO, loanTransactionDTO, office);
+ }
+ }
+
+ private void createJournalEntriesForChargeOffLoanChargeAdjustment(LoanDTO loanDTO, LoanTransactionDTO loanTransactionDTO,
+ Office office) {
+ // loan properties
+ final Long loanProductId = loanDTO.getLoanProductId();
+ final Long loanId = loanDTO.getLoanId();
+ final String currencyCode = loanDTO.getCurrencyCode();
+
+ // transaction properties
+ final String transactionId = loanTransactionDTO.getTransactionId();
+ final LocalDate transactionDate = loanTransactionDTO.getTransactionDate();
+ final BigDecimal principalAmount = loanTransactionDTO.getPrincipal();
+ final BigDecimal interestAmount = loanTransactionDTO.getInterest();
+ final BigDecimal feesAmount = loanTransactionDTO.getFees();
+ final BigDecimal penaltiesAmount = loanTransactionDTO.getPenalties();
+ final BigDecimal overPaymentAmount = loanTransactionDTO.getOverPayment();
+ final Long paymentTypeId = loanTransactionDTO.getPaymentTypeId();
+ final boolean isReversal = loanTransactionDTO.isReversed();
+
+ BigDecimal totalDebitAmount = new BigDecimal(0);
+
+ Map<GLAccount, BigDecimal> accountMap = new HashMap<>();
Review Comment:
Please use LinkedHashmap for keeping a consistent ordering
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] ruchiD commented on a diff in pull request #2953: FINERACT-1806-Accounting-treatments-for-Charge-off-loan-accounts
Posted by "ruchiD (via GitHub)" <gi...@apache.org>.
ruchiD commented on code in PR #2953:
URL: https://github.com/apache/fineract/pull/2953#discussion_r1104088916
##########
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java:
##########
@@ -2675,8 +2675,13 @@ public CommandProcessingResult chargeOff(JsonCommand command) {
loan.markAsChargedOff(transactionDate, currentUser, null);
}
+ final List<Long> existingTransactionIds = loan.findExistingTransactionIds();
+ final List<Long> existingReversedTransactionIds = loan.findExistingReversedTransactionIds();
+
LoanTransaction chargeOffTransaction = LoanTransaction.chargeOff(loan, transactionDate, txnExternalId);
+ loan.addLoanTransaction(chargeOffTransaction);
loanTransactionRepository.saveAndFlush(chargeOffTransaction);
Review Comment:
Fixed
##########
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java:
##########
@@ -2685,6 +2690,7 @@ public CommandProcessingResult chargeOff(JsonCommand command) {
this.noteRepository.save(note);
}
+ postJournalEntries(loan, existingTransactionIds, existingReversedTransactionIds);
// TODO: add accounting
Review Comment:
Fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy commented on a diff in pull request #2953: FINERACT-1806-Accounting-treatments-for-Charge-off-loan-accounts
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #2953:
URL: https://github.com/apache/fineract/pull/2953#discussion_r1102711043
##########
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java:
##########
@@ -2685,6 +2690,7 @@ public CommandProcessingResult chargeOff(JsonCommand command) {
this.noteRepository.save(note);
}
+ postJournalEntries(loan, existingTransactionIds, existingReversedTransactionIds);
// TODO: add accounting
Review Comment:
you can remove this TODO line, accounting was added.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy commented on a diff in pull request #2953: FINERACT-1806-Accounting-treatments-for-Charge-off-loan-accounts
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #2953:
URL: https://github.com/apache/fineract/pull/2953#discussion_r1102697733
##########
fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForLoan.java:
##########
@@ -115,10 +115,108 @@ else if (loanTransactionDTO.getTransactionType().isChargeback()) {
else if (loanTransactionDTO.getTransactionType().isChargeAdjustment()) {
createJournalEntriesForChargeAdjustment(loanDTO, loanTransactionDTO, office);
}
+ // Logic for Charge-Off
+ else if (loanTransactionDTO.getTransactionType().isChargeoff()) {
+ createJournalEntriesForChargeOff(loanDTO, loanTransactionDTO, office);
+ }
+ }
+ }
+
+ private void createJournalEntriesForChargeOff(LoanDTO loanDTO, LoanTransactionDTO loanTransactionDTO, Office office) {
+ // loan properties
+ final Long loanProductId = loanDTO.getLoanProductId();
+ final Long loanId = loanDTO.getLoanId();
+ final String currencyCode = loanDTO.getCurrencyCode();
+ final boolean isMarkedFraud = loanDTO.isMarkedAsFraud();
+
+ // transaction properties
+ final String transactionId = loanTransactionDTO.getTransactionId();
+ final LocalDate transactionDate = loanTransactionDTO.getTransactionDate();
+ final BigDecimal principalAmount = loanTransactionDTO.getPrincipal();
+ final BigDecimal interestAmount = loanTransactionDTO.getInterest();
+ final BigDecimal feesAmount = loanTransactionDTO.getFees();
+ final BigDecimal penaltiesAmount = loanTransactionDTO.getPenalties();
+ final Long paymentTypeId = loanTransactionDTO.getPaymentTypeId();
+ final boolean isReversal = loanTransactionDTO.isReversed();
+
+ Map<GLAccount, BigDecimal> accountMapForCredit = new HashMap<>();
Review Comment:
Please use LinkedHashmap for having consistent ordering
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy commented on a diff in pull request #2953: FINERACT-1806-Accounting-treatments-for-Charge-off-loan-accounts
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #2953:
URL: https://github.com/apache/fineract/pull/2953#discussion_r1102673840
##########
fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java:
##########
@@ -104,10 +105,208 @@ else if (loanTransactionDTO.getTransactionType().isChargeback()) {
else if (loanTransactionDTO.getTransactionType().isChargeAdjustment()) {
createJournalEntriesForChargeAdjustment(loanDTO, loanTransactionDTO, office);
}
+ // Logic for Charge-Off
+ else if (loanTransactionDTO.getTransactionType().isChargeoff()) {
+ createJournalEntriesForChargeOff(loanDTO, loanTransactionDTO, office);
+ }
+ }
+ }
+
+ private void createJournalEntriesForChargeOff(LoanDTO loanDTO, LoanTransactionDTO loanTransactionDTO, Office office) {
+ // loan properties
+ final Long loanProductId = loanDTO.getLoanProductId();
+ final Long loanId = loanDTO.getLoanId();
+ final String currencyCode = loanDTO.getCurrencyCode();
+ final boolean isMarkedFraud = loanDTO.isMarkedAsFraud();
+
+ // transaction properties
+ final String transactionId = loanTransactionDTO.getTransactionId();
+ final LocalDate transactionDate = loanTransactionDTO.getTransactionDate();
+ final BigDecimal principalAmount = loanTransactionDTO.getPrincipal();
+ final BigDecimal interestAmount = loanTransactionDTO.getInterest();
+ final BigDecimal feesAmount = loanTransactionDTO.getFees();
+ final BigDecimal penaltiesAmount = loanTransactionDTO.getPenalties();
+ final Long paymentTypeId = loanTransactionDTO.getPaymentTypeId();
+ final boolean isReversal = loanTransactionDTO.isReversed();
+
+ Map<GLAccount, BigDecimal> accountMapForCredit = new HashMap<>();
+
+ Map<Integer, BigDecimal> accountMapForDebit = new HashMap<>();
Review Comment:
Same as above
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] ruchiD commented on a diff in pull request #2953: FINERACT-1806-Accounting-treatments-for-Charge-off-loan-accounts
Posted by "ruchiD (via GitHub)" <gi...@apache.org>.
ruchiD commented on code in PR #2953:
URL: https://github.com/apache/fineract/pull/2953#discussion_r1104088457
##########
fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java:
##########
@@ -104,10 +105,208 @@ else if (loanTransactionDTO.getTransactionType().isChargeback()) {
else if (loanTransactionDTO.getTransactionType().isChargeAdjustment()) {
createJournalEntriesForChargeAdjustment(loanDTO, loanTransactionDTO, office);
}
+ // Logic for Charge-Off
+ else if (loanTransactionDTO.getTransactionType().isChargeoff()) {
+ createJournalEntriesForChargeOff(loanDTO, loanTransactionDTO, office);
+ }
+ }
+ }
+
+ private void createJournalEntriesForChargeOff(LoanDTO loanDTO, LoanTransactionDTO loanTransactionDTO, Office office) {
+ // loan properties
+ final Long loanProductId = loanDTO.getLoanProductId();
+ final Long loanId = loanDTO.getLoanId();
+ final String currencyCode = loanDTO.getCurrencyCode();
+ final boolean isMarkedFraud = loanDTO.isMarkedAsFraud();
+
+ // transaction properties
+ final String transactionId = loanTransactionDTO.getTransactionId();
+ final LocalDate transactionDate = loanTransactionDTO.getTransactionDate();
+ final BigDecimal principalAmount = loanTransactionDTO.getPrincipal();
+ final BigDecimal interestAmount = loanTransactionDTO.getInterest();
+ final BigDecimal feesAmount = loanTransactionDTO.getFees();
+ final BigDecimal penaltiesAmount = loanTransactionDTO.getPenalties();
+ final Long paymentTypeId = loanTransactionDTO.getPaymentTypeId();
+ final boolean isReversal = loanTransactionDTO.isReversed();
+
+ Map<GLAccount, BigDecimal> accountMapForCredit = new HashMap<>();
+
+ Map<Integer, BigDecimal> accountMapForDebit = new HashMap<>();
Review Comment:
Helper methods for creating credit entries take GA account while for creating debit entires Integer is taken. Hence different keys for Credit and Debit maps.
1.AccountProcessingHelper->createCreditJournalEntryOrReversalForLoan
2.AccountProcessingHelper->createDebitJournalEntryOrReversalForLoan
##########
fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java:
##########
@@ -104,10 +105,208 @@ else if (loanTransactionDTO.getTransactionType().isChargeback()) {
else if (loanTransactionDTO.getTransactionType().isChargeAdjustment()) {
createJournalEntriesForChargeAdjustment(loanDTO, loanTransactionDTO, office);
}
+ // Logic for Charge-Off
+ else if (loanTransactionDTO.getTransactionType().isChargeoff()) {
+ createJournalEntriesForChargeOff(loanDTO, loanTransactionDTO, office);
+ }
+ }
+ }
+
+ private void createJournalEntriesForChargeOff(LoanDTO loanDTO, LoanTransactionDTO loanTransactionDTO, Office office) {
+ // loan properties
+ final Long loanProductId = loanDTO.getLoanProductId();
+ final Long loanId = loanDTO.getLoanId();
+ final String currencyCode = loanDTO.getCurrencyCode();
+ final boolean isMarkedFraud = loanDTO.isMarkedAsFraud();
+
+ // transaction properties
+ final String transactionId = loanTransactionDTO.getTransactionId();
+ final LocalDate transactionDate = loanTransactionDTO.getTransactionDate();
+ final BigDecimal principalAmount = loanTransactionDTO.getPrincipal();
+ final BigDecimal interestAmount = loanTransactionDTO.getInterest();
+ final BigDecimal feesAmount = loanTransactionDTO.getFees();
+ final BigDecimal penaltiesAmount = loanTransactionDTO.getPenalties();
+ final Long paymentTypeId = loanTransactionDTO.getPaymentTypeId();
+ final boolean isReversal = loanTransactionDTO.isReversed();
+
+ Map<GLAccount, BigDecimal> accountMapForCredit = new HashMap<>();
+
+ Map<Integer, BigDecimal> accountMapForDebit = new HashMap<>();
+
+ // principal payment
+ if (principalAmount != null && principalAmount.compareTo(BigDecimal.ZERO) > 0) {
+ if (isMarkedFraud) {
+ populateCreditDebitMaps(loanProductId, principalAmount, paymentTypeId, AccrualAccountsForLoan.LOAN_PORTFOLIO.getValue(),
+ AccrualAccountsForLoan.CHARGE_OFF_FRAUD_EXPENSE.getValue(), accountMapForCredit, accountMapForDebit);
+ } else {
+ populateCreditDebitMaps(loanProductId, principalAmount, paymentTypeId, AccrualAccountsForLoan.LOAN_PORTFOLIO.getValue(),
+ AccrualAccountsForLoan.CHARGE_OFF_EXPENSE.getValue(), accountMapForCredit, accountMapForDebit);
+ }
+ }
+
+ // interest payment
+ if (interestAmount != null && interestAmount.compareTo(BigDecimal.ZERO) > 0) {
+
+ populateCreditDebitMaps(loanProductId, interestAmount, paymentTypeId, AccrualAccountsForLoan.INTEREST_RECEIVABLE.getValue(),
+ AccrualAccountsForLoan.INCOME_FROM_CHARGE_OFF_INTEREST.getValue(), accountMapForCredit, accountMapForDebit);
+ }
+
+ // handle fees payment
+ if (feesAmount != null && feesAmount.compareTo(BigDecimal.ZERO) > 0) {
+ populateCreditDebitMaps(loanProductId, feesAmount, paymentTypeId, AccrualAccountsForLoan.FEES_RECEIVABLE.getValue(),
+ AccrualAccountsForLoan.INCOME_FROM_CHARGE_OFF_FEES.getValue(), accountMapForCredit, accountMapForDebit);
+ }
+
+ // handle penalty payment
+ if (penaltiesAmount != null && penaltiesAmount.compareTo(BigDecimal.ZERO) > 0) {
+ populateCreditDebitMaps(loanProductId, penaltiesAmount, paymentTypeId, AccrualAccountsForLoan.PENALTIES_RECEIVABLE.getValue(),
+ AccrualAccountsForLoan.INCOME_FROM_CHARGE_OFF_PENALTY.getValue(), accountMapForCredit, accountMapForDebit);
+ }
+
+ // create credit entries
+ for (Map.Entry<GLAccount, BigDecimal> creditEntry : accountMapForCredit.entrySet()) {
+ this.helper.createCreditJournalEntryOrReversalForLoan(office, currencyCode, loanId, transactionId, transactionDate,
+ creditEntry.getValue(), isReversal, creditEntry.getKey());
+ }
+
+ // create debit entries
+ for (Map.Entry<Integer, BigDecimal> debitEntry : accountMapForDebit.entrySet()) {
+ this.helper.createDebitJournalEntryOrReversalForLoan(office, currencyCode, debitEntry.getKey().intValue(), loanProductId,
+ paymentTypeId, loanId, transactionId, transactionDate, debitEntry.getValue(), isReversal);
+ }
+
+ }
+
+ private void populateCreditDebitMaps(Long loanProductId, BigDecimal transactionPartAmount, Long paymentTypeId,
+ Integer creditAccountType, Integer debitAccountType, Map<GLAccount, BigDecimal> accountMapForCredit,
+ Map<Integer, BigDecimal> accountMapForDebit) {
+ GLAccount accountCredit = this.helper.getLinkedGLAccountForLoanProduct(loanProductId, creditAccountType, paymentTypeId);
+ if (accountMapForCredit.containsKey(accountCredit)) {
+ BigDecimal amount = accountMapForCredit.get(accountCredit).add(transactionPartAmount);
+ accountMapForCredit.put(accountCredit, amount);
+ } else {
+ accountMapForCredit.put(accountCredit, transactionPartAmount);
+ }
+ Integer accountDebit = debitAccountType;
+ if (accountMapForDebit.containsKey(accountDebit)) {
+ BigDecimal amount = accountMapForDebit.get(accountDebit).add(transactionPartAmount);
+ accountMapForDebit.put(accountDebit, amount);
+ } else {
+ accountMapForDebit.put(accountDebit, transactionPartAmount);
}
}
private void createJournalEntriesForChargeAdjustment(LoanDTO loanDTO, LoanTransactionDTO loanTransactionDTO, Office office) {
+ final boolean isMarkedAsChargeOff = loanDTO.isMarkedAsChargeOff();
+ if (isMarkedAsChargeOff) {
+ createJournalEntriesForChargeOffLoanChargeAdjustment(loanDTO, loanTransactionDTO, office);
+ } else {
+ createJournalEntriesForLoanChargeAdjustment(loanDTO, loanTransactionDTO, office);
+ }
+ }
+
+ private void createJournalEntriesForChargeOffLoanChargeAdjustment(LoanDTO loanDTO, LoanTransactionDTO loanTransactionDTO,
+ Office office) {
+ // loan properties
+ final Long loanProductId = loanDTO.getLoanProductId();
+ final Long loanId = loanDTO.getLoanId();
+ final String currencyCode = loanDTO.getCurrencyCode();
+
+ // transaction properties
+ final String transactionId = loanTransactionDTO.getTransactionId();
+ final LocalDate transactionDate = loanTransactionDTO.getTransactionDate();
+ final BigDecimal principalAmount = loanTransactionDTO.getPrincipal();
+ final BigDecimal interestAmount = loanTransactionDTO.getInterest();
+ final BigDecimal feesAmount = loanTransactionDTO.getFees();
+ final BigDecimal penaltiesAmount = loanTransactionDTO.getPenalties();
+ final BigDecimal overPaymentAmount = loanTransactionDTO.getOverPayment();
+ final Long paymentTypeId = loanTransactionDTO.getPaymentTypeId();
+ final boolean isReversal = loanTransactionDTO.isReversed();
+
+ BigDecimal totalDebitAmount = new BigDecimal(0);
+
+ Map<GLAccount, BigDecimal> accountMap = new HashMap<>();
Review Comment:
Fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] ruchiD commented on a diff in pull request #2953: FINERACT-1806-Accounting-treatments-for-Charge-off-loan-accounts
Posted by "ruchiD (via GitHub)" <gi...@apache.org>.
ruchiD commented on code in PR #2953:
URL: https://github.com/apache/fineract/pull/2953#discussion_r1104088669
##########
fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForLoan.java:
##########
@@ -115,10 +115,108 @@ else if (loanTransactionDTO.getTransactionType().isChargeback()) {
else if (loanTransactionDTO.getTransactionType().isChargeAdjustment()) {
createJournalEntriesForChargeAdjustment(loanDTO, loanTransactionDTO, office);
}
+ // Logic for Charge-Off
+ else if (loanTransactionDTO.getTransactionType().isChargeoff()) {
+ createJournalEntriesForChargeOff(loanDTO, loanTransactionDTO, office);
+ }
+ }
+ }
+
+ private void createJournalEntriesForChargeOff(LoanDTO loanDTO, LoanTransactionDTO loanTransactionDTO, Office office) {
+ // loan properties
+ final Long loanProductId = loanDTO.getLoanProductId();
+ final Long loanId = loanDTO.getLoanId();
+ final String currencyCode = loanDTO.getCurrencyCode();
+ final boolean isMarkedFraud = loanDTO.isMarkedAsFraud();
+
+ // transaction properties
+ final String transactionId = loanTransactionDTO.getTransactionId();
+ final LocalDate transactionDate = loanTransactionDTO.getTransactionDate();
+ final BigDecimal principalAmount = loanTransactionDTO.getPrincipal();
+ final BigDecimal interestAmount = loanTransactionDTO.getInterest();
+ final BigDecimal feesAmount = loanTransactionDTO.getFees();
+ final BigDecimal penaltiesAmount = loanTransactionDTO.getPenalties();
+ final Long paymentTypeId = loanTransactionDTO.getPaymentTypeId();
+ final boolean isReversal = loanTransactionDTO.isReversed();
+
+ Map<GLAccount, BigDecimal> accountMapForCredit = new HashMap<>();
Review Comment:
Fixed
##########
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualWritePlatformServiceImpl.java:
##########
@@ -289,6 +289,8 @@ public Map<String, Object> deriveAccountingBridgeData(final LoanScheduleAccrualD
accountingBridgeData.put("upfrontAccrualBasedAccountingEnabled", false);
accountingBridgeData.put("periodicAccrualBasedAccountingEnabled", true);
accountingBridgeData.put("isAccountTransfer", false);
+ accountingBridgeData.put("isChargeOff", false);
Review Comment:
Fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy commented on a diff in pull request #2953: FINERACT-1806-Accounting-treatments-for-Charge-off-loan-accounts
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #2953:
URL: https://github.com/apache/fineract/pull/2953#discussion_r1102708746
##########
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualWritePlatformServiceImpl.java:
##########
@@ -289,6 +289,8 @@ public Map<String, Object> deriveAccountingBridgeData(final LoanScheduleAccrualD
accountingBridgeData.put("upfrontAccrualBasedAccountingEnabled", false);
accountingBridgeData.put("periodicAccrualBasedAccountingEnabled", true);
accountingBridgeData.put("isAccountTransfer", false);
+ accountingBridgeData.put("isChargeOff", false);
Review Comment:
Please mark this method to private to avoid anyone call it by mistake. Many of the fields are hardcoded specially for accrual transactions only!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy commented on a diff in pull request #2953: FINERACT-1806-Accounting-treatments-for-Charge-off-loan-accounts
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #2953:
URL: https://github.com/apache/fineract/pull/2953#discussion_r1102708746
##########
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualWritePlatformServiceImpl.java:
##########
@@ -289,6 +289,8 @@ public Map<String, Object> deriveAccountingBridgeData(final LoanScheduleAccrualD
accountingBridgeData.put("upfrontAccrualBasedAccountingEnabled", false);
accountingBridgeData.put("periodicAccrualBasedAccountingEnabled", true);
accountingBridgeData.put("isAccountTransfer", false);
+ accountingBridgeData.put("isChargeOff", false);
Review Comment:
Please mark this method to private to avoid anyone call it by mistake
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy commented on a diff in pull request #2953: FINERACT-1806-Accounting-treatments-for-Charge-off-loan-accounts
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #2953:
URL: https://github.com/apache/fineract/pull/2953#discussion_r1102672678
##########
fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java:
##########
@@ -104,10 +105,208 @@ else if (loanTransactionDTO.getTransactionType().isChargeback()) {
else if (loanTransactionDTO.getTransactionType().isChargeAdjustment()) {
createJournalEntriesForChargeAdjustment(loanDTO, loanTransactionDTO, office);
}
+ // Logic for Charge-Off
+ else if (loanTransactionDTO.getTransactionType().isChargeoff()) {
+ createJournalEntriesForChargeOff(loanDTO, loanTransactionDTO, office);
+ }
+ }
+ }
+
+ private void createJournalEntriesForChargeOff(LoanDTO loanDTO, LoanTransactionDTO loanTransactionDTO, Office office) {
+ // loan properties
+ final Long loanProductId = loanDTO.getLoanProductId();
+ final Long loanId = loanDTO.getLoanId();
+ final String currencyCode = loanDTO.getCurrencyCode();
+ final boolean isMarkedFraud = loanDTO.isMarkedAsFraud();
+
+ // transaction properties
+ final String transactionId = loanTransactionDTO.getTransactionId();
+ final LocalDate transactionDate = loanTransactionDTO.getTransactionDate();
+ final BigDecimal principalAmount = loanTransactionDTO.getPrincipal();
+ final BigDecimal interestAmount = loanTransactionDTO.getInterest();
+ final BigDecimal feesAmount = loanTransactionDTO.getFees();
+ final BigDecimal penaltiesAmount = loanTransactionDTO.getPenalties();
+ final Long paymentTypeId = loanTransactionDTO.getPaymentTypeId();
+ final boolean isReversal = loanTransactionDTO.isReversed();
+
+ Map<GLAccount, BigDecimal> accountMapForCredit = new HashMap<>();
Review Comment:
Please use LinkedHashmap to have the same ordering of the account items.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy commented on a diff in pull request #2953: FINERACT-1806-Accounting-treatments-for-Charge-off-loan-accounts
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #2953:
URL: https://github.com/apache/fineract/pull/2953#discussion_r1102677197
##########
fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java:
##########
@@ -104,10 +105,208 @@ else if (loanTransactionDTO.getTransactionType().isChargeback()) {
else if (loanTransactionDTO.getTransactionType().isChargeAdjustment()) {
createJournalEntriesForChargeAdjustment(loanDTO, loanTransactionDTO, office);
}
+ // Logic for Charge-Off
+ else if (loanTransactionDTO.getTransactionType().isChargeoff()) {
+ createJournalEntriesForChargeOff(loanDTO, loanTransactionDTO, office);
+ }
+ }
+ }
+
+ private void createJournalEntriesForChargeOff(LoanDTO loanDTO, LoanTransactionDTO loanTransactionDTO, Office office) {
+ // loan properties
+ final Long loanProductId = loanDTO.getLoanProductId();
+ final Long loanId = loanDTO.getLoanId();
+ final String currencyCode = loanDTO.getCurrencyCode();
+ final boolean isMarkedFraud = loanDTO.isMarkedAsFraud();
+
+ // transaction properties
+ final String transactionId = loanTransactionDTO.getTransactionId();
+ final LocalDate transactionDate = loanTransactionDTO.getTransactionDate();
+ final BigDecimal principalAmount = loanTransactionDTO.getPrincipal();
+ final BigDecimal interestAmount = loanTransactionDTO.getInterest();
+ final BigDecimal feesAmount = loanTransactionDTO.getFees();
+ final BigDecimal penaltiesAmount = loanTransactionDTO.getPenalties();
+ final Long paymentTypeId = loanTransactionDTO.getPaymentTypeId();
+ final boolean isReversal = loanTransactionDTO.isReversed();
+
+ Map<GLAccount, BigDecimal> accountMapForCredit = new HashMap<>();
+
+ Map<Integer, BigDecimal> accountMapForDebit = new HashMap<>();
Review Comment:
Why GLAccount is the key for credit and Integer for debit? Can we use similar logic for both?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy commented on a diff in pull request #2953: FINERACT-1806-Accounting-treatments-for-Charge-off-loan-accounts
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #2953:
URL: https://github.com/apache/fineract/pull/2953#discussion_r1102710736
##########
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java:
##########
@@ -2675,8 +2675,13 @@ public CommandProcessingResult chargeOff(JsonCommand command) {
loan.markAsChargedOff(transactionDate, currentUser, null);
}
+ final List<Long> existingTransactionIds = loan.findExistingTransactionIds();
+ final List<Long> existingReversedTransactionIds = loan.findExistingReversedTransactionIds();
+
LoanTransaction chargeOffTransaction = LoanTransaction.chargeOff(loan, transactionDate, txnExternalId);
+ loan.addLoanTransaction(chargeOffTransaction);
loanTransactionRepository.saveAndFlush(chargeOffTransaction);
Review Comment:
since you are adding to loan and save the loan, you can remove the "loanTransactionRepository.saveAndFlush(chargeOffTransaction);"
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] ruchiD commented on a diff in pull request #2953: FINERACT-1806-Accounting-treatments-for-Charge-off-loan-accounts
Posted by "ruchiD (via GitHub)" <gi...@apache.org>.
ruchiD commented on code in PR #2953:
URL: https://github.com/apache/fineract/pull/2953#discussion_r1104084650
##########
fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java:
##########
@@ -104,10 +105,208 @@ else if (loanTransactionDTO.getTransactionType().isChargeback()) {
else if (loanTransactionDTO.getTransactionType().isChargeAdjustment()) {
createJournalEntriesForChargeAdjustment(loanDTO, loanTransactionDTO, office);
}
+ // Logic for Charge-Off
+ else if (loanTransactionDTO.getTransactionType().isChargeoff()) {
+ createJournalEntriesForChargeOff(loanDTO, loanTransactionDTO, office);
+ }
+ }
+ }
+
+ private void createJournalEntriesForChargeOff(LoanDTO loanDTO, LoanTransactionDTO loanTransactionDTO, Office office) {
+ // loan properties
+ final Long loanProductId = loanDTO.getLoanProductId();
+ final Long loanId = loanDTO.getLoanId();
+ final String currencyCode = loanDTO.getCurrencyCode();
+ final boolean isMarkedFraud = loanDTO.isMarkedAsFraud();
+
+ // transaction properties
+ final String transactionId = loanTransactionDTO.getTransactionId();
+ final LocalDate transactionDate = loanTransactionDTO.getTransactionDate();
+ final BigDecimal principalAmount = loanTransactionDTO.getPrincipal();
+ final BigDecimal interestAmount = loanTransactionDTO.getInterest();
+ final BigDecimal feesAmount = loanTransactionDTO.getFees();
+ final BigDecimal penaltiesAmount = loanTransactionDTO.getPenalties();
+ final Long paymentTypeId = loanTransactionDTO.getPaymentTypeId();
+ final boolean isReversal = loanTransactionDTO.isReversed();
+
+ Map<GLAccount, BigDecimal> accountMapForCredit = new HashMap<>();
Review Comment:
Fixed
##########
fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java:
##########
@@ -104,10 +105,208 @@ else if (loanTransactionDTO.getTransactionType().isChargeback()) {
else if (loanTransactionDTO.getTransactionType().isChargeAdjustment()) {
createJournalEntriesForChargeAdjustment(loanDTO, loanTransactionDTO, office);
}
+ // Logic for Charge-Off
+ else if (loanTransactionDTO.getTransactionType().isChargeoff()) {
+ createJournalEntriesForChargeOff(loanDTO, loanTransactionDTO, office);
+ }
+ }
+ }
+
+ private void createJournalEntriesForChargeOff(LoanDTO loanDTO, LoanTransactionDTO loanTransactionDTO, Office office) {
+ // loan properties
+ final Long loanProductId = loanDTO.getLoanProductId();
+ final Long loanId = loanDTO.getLoanId();
+ final String currencyCode = loanDTO.getCurrencyCode();
+ final boolean isMarkedFraud = loanDTO.isMarkedAsFraud();
+
+ // transaction properties
+ final String transactionId = loanTransactionDTO.getTransactionId();
+ final LocalDate transactionDate = loanTransactionDTO.getTransactionDate();
+ final BigDecimal principalAmount = loanTransactionDTO.getPrincipal();
+ final BigDecimal interestAmount = loanTransactionDTO.getInterest();
+ final BigDecimal feesAmount = loanTransactionDTO.getFees();
+ final BigDecimal penaltiesAmount = loanTransactionDTO.getPenalties();
+ final Long paymentTypeId = loanTransactionDTO.getPaymentTypeId();
+ final boolean isReversal = loanTransactionDTO.isReversed();
+
+ Map<GLAccount, BigDecimal> accountMapForCredit = new HashMap<>();
+
+ Map<Integer, BigDecimal> accountMapForDebit = new HashMap<>();
Review Comment:
Fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org