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

FINERACT-1724: Fix journal entry order

Browse Source
This commit is contained in:
Adam Saghy
2023-02-09 12:10:33 +01:00
parent 70dd1582bc
commit 8bd96f55e0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java
+3 -3
View File
@@ -21,7 +21,7 @@ package org.apache.fineract.accounting.journalentry.service;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@@ -126,7 +126,7 @@ public class AccrualBasedAccountingProcessorForLoan implements AccountingProcess
BigDecimal totalDebitAmount = new BigDecimal(0); BigDecimal totalDebitAmount = new BigDecimal(0);
Map<GLAccount, BigDecimal> accountMap = new HashMap<>(); Map<GLAccount, BigDecimal> accountMap = new LinkedHashMap<>();
// handle principal payment (and reversals) // handle principal payment (and reversals)
if (principalAmount != null && principalAmount.compareTo(BigDecimal.ZERO) > 0) { if (principalAmount != null && principalAmount.compareTo(BigDecimal.ZERO) > 0) {
@@ -324,7 +324,7 @@ public class AccrualBasedAccountingProcessorForLoan implements AccountingProcess
BigDecimal totalDebitAmount = new BigDecimal(0); BigDecimal totalDebitAmount = new BigDecimal(0);
Map<GLAccount, BigDecimal> accountMap = new HashMap<>(); Map<GLAccount, BigDecimal> accountMap = new LinkedHashMap<>();
// handle principal payment or writeOff (and reversals) // handle principal payment or writeOff (and reversals)
if (principalAmount != null && principalAmount.compareTo(BigDecimal.ZERO) > 0) { if (principalAmount != null && principalAmount.compareTo(BigDecimal.ZERO) > 0) {
fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForLoan.java
+2 -2
View File
@@ -21,7 +21,7 @@ package org.apache.fineract.accounting.journalentry.service;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@@ -137,7 +137,7 @@ public class CashBasedAccountingProcessorForLoan implements AccountingProcessorF
BigDecimal totalDebitAmount = new BigDecimal(0); BigDecimal totalDebitAmount = new BigDecimal(0);
Map<GLAccount, BigDecimal> accountMap = new HashMap<>(); Map<GLAccount, BigDecimal> accountMap = new LinkedHashMap<>();
// handle principal payment (and reversals) // handle principal payment (and reversals)
if (principalAmount != null && principalAmount.compareTo(BigDecimal.ZERO) > 0) { if (principalAmount != null && principalAmount.compareTo(BigDecimal.ZERO) > 0) {