From 8bd96f55e06b866426b53318e1052c9861d8f1be Mon Sep 17 00:00:00 2001 From: Adam Saghy Date: Thu, 9 Feb 2023 11:20:40 +0100 Subject: [PATCH] FINERACT-1724: Fix journal entry order --- .../service/AccrualBasedAccountingProcessorForLoan.java | 6 +++--- .../service/CashBasedAccountingProcessorForLoan.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java index f99ed0df5..5c729eb6c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java @@ -21,7 +21,7 @@ package org.apache.fineract.accounting.journalentry.service; import java.math.BigDecimal; import java.time.LocalDate; import java.util.ArrayList; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import lombok.RequiredArgsConstructor; @@ -126,7 +126,7 @@ public class AccrualBasedAccountingProcessorForLoan implements AccountingProcess BigDecimal totalDebitAmount = new BigDecimal(0); - Map accountMap = new HashMap<>(); + Map accountMap = new LinkedHashMap<>(); // handle principal payment (and reversals) if (principalAmount != null && principalAmount.compareTo(BigDecimal.ZERO) > 0) { @@ -324,7 +324,7 @@ public class AccrualBasedAccountingProcessorForLoan implements AccountingProcess BigDecimal totalDebitAmount = new BigDecimal(0); - Map accountMap = new HashMap<>(); + Map accountMap = new LinkedHashMap<>(); // handle principal payment or writeOff (and reversals) if (principalAmount != null && principalAmount.compareTo(BigDecimal.ZERO) > 0) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForLoan.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForLoan.java index e4f1aa592..60cb1c7dc 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForLoan.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForLoan.java @@ -21,7 +21,7 @@ package org.apache.fineract.accounting.journalentry.service; import java.math.BigDecimal; import java.time.LocalDate; import java.util.ArrayList; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import lombok.RequiredArgsConstructor; @@ -137,7 +137,7 @@ public class CashBasedAccountingProcessorForLoan implements AccountingProcessorF BigDecimal totalDebitAmount = new BigDecimal(0); - Map accountMap = new HashMap<>(); + Map accountMap = new LinkedHashMap<>(); // handle principal payment (and reversals) if (principalAmount != null && principalAmount.compareTo(BigDecimal.ZERO) > 0) {