This is an automated email from the ASF dual-hosted git repository.

bagrijp pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git


The following commit(s) were added to refs/heads/develop by this push:
     new c85752738 FINERACT-1971: Adding missing assertion for overpayment 
portion
c85752738 is described below

commit c8575273895189e10be7589ab6793393ca1325a0
Author: Peter Bagrij <[email protected]>
AuthorDate: Thu Mar 7 15:03:59 2024 +0100

    FINERACT-1971: Adding missing assertion for overpayment portion
---
 ...edPaymentAllocationLoanRepaymentScheduleTest.java | 20 ++++++++++----------
 .../integrationtests/BaseLoanIntegrationTest.java    |  1 +
 ...BalanceRefundandRepaymentTypeIntegrationTest.java | 20 ++++++++++----------
 ...rgebackWithCreditAllocationsIntegrationTests.java | 16 ++++++++--------
 .../LoanRepaymentScheduleWithDownPaymentTest.java    | 18 +++++++++---------
 5 files changed, 38 insertions(+), 37 deletions(-)

diff --git 
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/AdvancedPaymentAllocationLoanRepaymentScheduleTest.java
 
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/AdvancedPaymentAllocationLoanRepaymentScheduleTest.java
index 7e71d4223..7a25c2e47 100644
--- 
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/AdvancedPaymentAllocationLoanRepaymentScheduleTest.java
+++ 
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/AdvancedPaymentAllocationLoanRepaymentScheduleTest.java
@@ -3387,12 +3387,12 @@ public class 
AdvancedPaymentAllocationLoanRepaymentScheduleTest extends BaseLoan
                     transaction(100, "Disbursement", "25 January 2024", 100.0, 
0.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(100, "Repayment", "24 February 2024", 0.0, 
100.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(18.94, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 18.94), //
-                    transaction(36.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 55.93), //
-                    transaction(36.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 92.92), //
-                    transaction(31.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 124.91), //
+                    transaction(36.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 36.99), //
+                    transaction(36.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 36.99), //
+                    transaction(31.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 31.99), //
                     transaction(124.91, "Credit Balance Refund", "01 March 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 124.91), //
                     transaction(19.99, "Merchant Issued Refund", "02 March 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 19.99), //
-                    transaction(19.99, "Merchant Issued Refund", "02 March 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 39.98) //
+                    transaction(19.99, "Merchant Issued Refund", "02 March 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 19.99) //
             );
 
             
loanTransactionHelper.reverseLoanTransaction(loanResponse.getLoanId(), 
mir1ExternalId,
@@ -3410,8 +3410,8 @@ public class 
AdvancedPaymentAllocationLoanRepaymentScheduleTest extends BaseLoan
                     transaction(100, "Repayment", "24 February 2024", 0.0, 
100.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(36.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 36.99, true), //
                     transaction(18.94, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 18.94), //
-                    transaction(36.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 55.93), //
-                    transaction(31.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 87.92), //
+                    transaction(36.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 36.99), //
+                    transaction(31.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 31.99), //
                     transaction(124.91, "Credit Balance Refund", "01 March 
2024", 36.99, 36.99, 0.0, 0.0, 0.0, 0.0, 87.92), //
                     transaction(19.99, "Merchant Issued Refund", "02 March 
2024", 17.0, 19.99, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(19.99, "Merchant Issued Refund", "02 March 
2024", 0.0, 17.0, 0.0, 0.0, 0.0, 0.0, 2.99) //
@@ -3431,8 +3431,8 @@ public class 
AdvancedPaymentAllocationLoanRepaymentScheduleTest extends BaseLoan
                     transaction(100, "Repayment", "24 February 2024", 0.0, 
100.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(36.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 36.99, true), //
                     transaction(18.94, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 18.94), //
-                    transaction(36.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 55.93), //
-                    transaction(31.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 87.92), //
+                    transaction(36.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 36.99), //
+                    transaction(31.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 31.99), //
                     transaction(124.91, "Credit Balance Refund", "01 March 
2024", 36.99, 36.99, 0.0, 0.0, 0.0, 0.0, 87.92), //
                     transaction(19.99, "Merchant Issued Refund", "02 March 
2024", 17.0, 19.99, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(19.99, "Merchant Issued Refund", "02 March 
2024", 0.0, 17.0, 0.0, 0.0, 0.0, 0.0, 2.99), //
@@ -3453,8 +3453,8 @@ public class 
AdvancedPaymentAllocationLoanRepaymentScheduleTest extends BaseLoan
                     transaction(100, "Repayment", "24 February 2024", 0.0, 
100.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(36.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 36.99, true), //
                     transaction(18.94, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 18.94), //
-                    transaction(36.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 55.93), //
-                    transaction(31.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 87.92), //
+                    transaction(36.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 36.99), //
+                    transaction(31.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 31.99), //
                     transaction(124.91, "Credit Balance Refund", "01 March 
2024", 36.99, 36.99, 0.0, 0.0, 0.0, 0.0, 87.92), //
                     transaction(19.99, "Merchant Issued Refund", "02 March 
2024", 17.0, 19.99, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(19.99, "Merchant Issued Refund", "02 March 
2024", 0.0, 17.0, 0.0, 0.0, 0.0, 0.0, 2.99), //
diff --git 
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/BaseLoanIntegrationTest.java
 
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/BaseLoanIntegrationTest.java
index a45d07ef2..926ce0c98 100644
--- 
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/BaseLoanIntegrationTest.java
+++ 
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/BaseLoanIntegrationTest.java
@@ -362,6 +362,7 @@ public abstract class BaseLoanIntegrationTest {
                         && Objects.equals(item.getInterestPortion(), 
tr.interestPortion) //
                         && Objects.equals(item.getFeeChargesPortion(), 
tr.feePortion) //
                         && Objects.equals(item.getPenaltyChargesPortion(), 
tr.penaltyPortion) //
+                        && Objects.equals(item.getOverpaymentPortion(), 
tr.overpaymentPortion) //
                         && Objects.equals(item.getUnrecognizedIncomePortion(), 
tr.unrecognizedPortion) //
                 );
                 Assertions.assertTrue(found, "Required transaction not found: 
" + tr);
diff --git 
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientLoanCreditBalanceRefundandRepaymentTypeIntegrationTest.java
 
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientLoanCreditBalanceRefundandRepaymentTypeIntegrationTest.java
index cffaa660c..38c8843d4 100644
--- 
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientLoanCreditBalanceRefundandRepaymentTypeIntegrationTest.java
+++ 
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientLoanCreditBalanceRefundandRepaymentTypeIntegrationTest.java
@@ -801,12 +801,12 @@ public class 
ClientLoanCreditBalanceRefundandRepaymentTypeIntegrationTest extend
                     transaction(100, "Disbursement", "25 January 2024", 100.0, 
0.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(100, "Repayment", "24 February 2024", 0.0, 
100.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(18.94, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 18.94), //
-                    transaction(36.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 55.93), //
-                    transaction(36.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 92.92), //
-                    transaction(31.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 124.91), //
+                    transaction(36.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 36.99), //
+                    transaction(36.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 36.99), //
+                    transaction(31.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 31.99), //
                     transaction(124.91, "Credit Balance Refund", "01 March 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 124.91), //
                     transaction(19.99, "Merchant Issued Refund", "02 March 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 19.99), //
-                    transaction(19.99, "Merchant Issued Refund", "02 March 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 39.98) //
+                    transaction(19.99, "Merchant Issued Refund", "02 March 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 19.99) //
             );
 
             
loanTransactionHelper.reverseLoanTransaction(loanResponse.getLoanId(), 
mir1ExternalId,
@@ -824,8 +824,8 @@ public class 
ClientLoanCreditBalanceRefundandRepaymentTypeIntegrationTest extend
                     transaction(100, "Repayment", "24 February 2024", 0.0, 
100.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(36.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 36.99, true), //
                     transaction(18.94, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 18.94), //
-                    transaction(36.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 55.93), //
-                    transaction(31.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 87.92), //
+                    transaction(36.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 36.99), //
+                    transaction(31.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 31.99), //
                     transaction(124.91, "Credit Balance Refund", "01 March 
2024", 36.99, 36.99, 0.0, 0.0, 0.0, 0.0, 87.92), //
                     transaction(19.99, "Merchant Issued Refund", "02 March 
2024", 17.0, 19.99, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(19.99, "Merchant Issued Refund", "02 March 
2024", 0.0, 17.0, 0.0, 0.0, 0.0, 0.0, 2.99) //
@@ -845,8 +845,8 @@ public class 
ClientLoanCreditBalanceRefundandRepaymentTypeIntegrationTest extend
                     transaction(100, "Repayment", "24 February 2024", 0.0, 
100.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(36.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 36.99, true), //
                     transaction(18.94, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 18.94), //
-                    transaction(36.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 55.93), //
-                    transaction(31.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 87.92), //
+                    transaction(36.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 36.99), //
+                    transaction(31.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 31.99), //
                     transaction(124.91, "Credit Balance Refund", "01 March 
2024", 36.99, 36.99, 0.0, 0.0, 0.0, 0.0, 87.92), //
                     transaction(19.99, "Merchant Issued Refund", "02 March 
2024", 17.0, 19.99, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(19.99, "Merchant Issued Refund", "02 March 
2024", 0.0, 17.0, 0.0, 0.0, 0.0, 0.0, 2.99), //
@@ -867,8 +867,8 @@ public class 
ClientLoanCreditBalanceRefundandRepaymentTypeIntegrationTest extend
                     transaction(100, "Repayment", "24 February 2024", 0.0, 
100.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(36.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 36.99, true), //
                     transaction(18.94, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 18.94), //
-                    transaction(36.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 55.93), //
-                    transaction(31.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 87.92), //
+                    transaction(36.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 36.99), //
+                    transaction(31.99, "Merchant Issued Refund", "28 February 
2024", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 31.99), //
                     transaction(124.91, "Credit Balance Refund", "01 March 
2024", 36.99, 36.99, 0.0, 0.0, 0.0, 0.0, 87.92), //
                     transaction(19.99, "Merchant Issued Refund", "02 March 
2024", 17.0, 19.99, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(19.99, "Merchant Issued Refund", "02 March 
2024", 0.0, 17.0, 0.0, 0.0, 0.0, 0.0, 2.99), //
diff --git 
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanChargebackWithCreditAllocationsIntegrationTests.java
 
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanChargebackWithCreditAllocationsIntegrationTests.java
index 15986d92f..ba35a5dac 100644
--- 
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanChargebackWithCreditAllocationsIntegrationTests.java
+++ 
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanChargebackWithCreditAllocationsIntegrationTests.java
@@ -587,7 +587,7 @@ public class 
LoanChargebackWithCreditAllocationsIntegrationTests extends BaseLoa
 
             verifyTransactions(loanId, //
                     transaction(1250.0, "Disbursement", "01 January 2023", 
1250.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
-                    transaction(1370.0, "Repayment", "20 January 2023", 0, 
1250.0, 0.0, 50.0, 20.0, 0.0, 0.0), //
+                    transaction(1370.0, "Repayment", "20 January 2023", 0, 
1250.0, 0.0, 50.0, 20.0, 0.0, 50.0), //
                     transaction(70.0, "Accrual", "20 January 2023", 0.0, 0.0, 
0.0, 50.0, 20.0, 0.0, 0.0), //
                     transaction(100.0, "Chargeback", "02 May 2023", 50.0, 
100.0, 0.0, 0.0, 0.0, 0.0, 50.0) //
             );
@@ -653,7 +653,7 @@ public class 
LoanChargebackWithCreditAllocationsIntegrationTests extends BaseLoa
 
             verifyTransactions(loanId, //
                     transaction(1250.0, "Disbursement", "01 January 2023", 
1250.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
-                    transaction(1370.0, "Repayment", "20 January 2023", 0, 
1250.0, 0.0, 50.0, 20.0, 0.0, 0.0), //
+                    transaction(1370.0, "Repayment", "20 January 2023", 0, 
1250.0, 0.0, 50.0, 20.0, 0.0, 50.0), //
                     transaction(70.0, "Accrual", "20 January 2023", 0.0, 0.0, 
0.0, 50.0, 20.0, 0.0, 0.0), //
                     transaction(100.0, "Chargeback", "20 January 2023", 30.0, 
30.0, 0.0, 50.0, 20.0, 0.0, 50.0) //
             );
@@ -720,7 +720,7 @@ public class 
LoanChargebackWithCreditAllocationsIntegrationTests extends BaseLoa
 
             verifyTransactions(loanId, //
                     transaction(1250.0, "Disbursement", "01 January 2023", 
1250.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
-                    transaction(1370.0, "Repayment", "20 January 2023", 0, 
1250.0, 0.0, 50.0, 20.0, 0.0, 0.0), //
+                    transaction(1370.0, "Repayment", "20 January 2023", 0, 
1250.0, 0.0, 50.0, 20.0, 0.0, 50.0), //
                     transaction(70.0, "Accrual", "20 January 2023", 0.0, 0.0, 
0.0, 50.0, 20.0, 0.0, 0.0), //
                     transaction(100.0, "Chargeback", "20 January 2023", 0.0, 
30.0, 0.0, 50.0, 20.0, 0.0, 50.0) //
             );
@@ -1280,7 +1280,7 @@ public class 
LoanChargebackWithCreditAllocationsIntegrationTests extends BaseLoa
                     transaction(750.0, "Disbursement", "01 January 2023", 
750.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(250.0, "Repayment", "01 February 2023", 500.0, 
250.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(250.0, "Repayment", "01 March 2023", 250.0, 
250.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
-                    transaction(400.0, "Repayment", "30 March 2023", 0.0, 
250.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
+                    transaction(400.0, "Repayment", "30 March 2023", 0.0, 
250.0, 0.0, 0.0, 0.0, 0.0, 150.0), //
                     transaction(250.0, "Chargeback", "31 March 2023", 100, 
250.0, 0.0, 0.0, 0.0, 0.0, 150.0) //
             );
 
@@ -1352,8 +1352,8 @@ public class 
LoanChargebackWithCreditAllocationsIntegrationTests extends BaseLoa
                     transaction(750.0, "Disbursement", "01 January 2023", 
750.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(250.0, "Repayment", "01 February 2023", 500.0, 
250.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(250.0, "Repayment", "01 March 2023", 250.0, 
250.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
-                    transaction(400.0, "Repayment", "30 March 2023", 0.0, 
250.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
-                    transaction(100.0, "Chargeback", "31 March 2023", 0.0, 
100.0, 0.0, 0.0, 0.0, 0.0, -50.0) //
+                    transaction(400.0, "Repayment", "30 March 2023", 0.0, 
250.0, 0.0, 0.0, 0.0, 0.0, 150.0), //
+                    transaction(100.0, "Chargeback", "31 March 2023", 0.0, 
100.0, 0.0, 0.0, 0.0, 0.0, 100.0) //
             );
 
             // Verify GL entries
@@ -1426,8 +1426,8 @@ public class 
LoanChargebackWithCreditAllocationsIntegrationTests extends BaseLoa
                     transaction(250.0, "Repayment", "01 February 2023", 500.0, 
250.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(280.0, "Repayment", "01 March 2023", 250.0, 
250.0, 0.0, 30.0, 0.0, 0.0, 0.0), //
                     transaction(30.0, "Accrual", "01 March 2023", 0.0, 0.0, 
0.0, 30.0, 0.0, 0.0, 0.0), //
-                    transaction(400.0, "Repayment", "30 March 2023", 0.0, 
250.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
-                    transaction(100.0, "Chargeback", "31 March 2023", 0.0, 
70.0, 0.0, 30.0, 0.0, 0.0, -50.0) //
+                    transaction(400.0, "Repayment", "30 March 2023", 0.0, 
250.0, 0.0, 0.0, 0.0, 0.0, 150.0), //
+                    transaction(100.0, "Chargeback", "31 March 2023", 0.0, 
70.0, 0.0, 30.0, 0.0, 0.0, 100.0) //
             );
 
             // Verify GL entries
diff --git 
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanRepaymentScheduleWithDownPaymentTest.java
 
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanRepaymentScheduleWithDownPaymentTest.java
index 9ef2a6acb..1b8b497a4 100644
--- 
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanRepaymentScheduleWithDownPaymentTest.java
+++ 
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanRepaymentScheduleWithDownPaymentTest.java
@@ -1300,7 +1300,7 @@ public class LoanRepaymentScheduleWithDownPaymentTest 
extends BaseLoanIntegratio
                     transaction(1000.0, "Disbursement", "03 March 2023", 
1000.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(250.0, "Down Payment", "03 March 2023", 750.0, 
250.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(800.0, "Repayment", "03 March 2023", 0.0, 
750.0, 0.0, 0.0, 0.0, 0.0, 50.0), //
-                    transaction(20.0, "Disbursement", "05 March 2023", 0.0, 
0.0, 0.0, 0.0, 0.0, 0.0, 30.0) //
+                    transaction(20.0, "Disbursement", "05 March 2023", 0.0, 
0.0, 0.0, 0.0, 0.0, 0.0, 20.0) //
             );
             assertTrue(loanDetails.getStatus().getOverpaid());
             assertEquals(30.0, loanDetails.getTotalOverpaid());
@@ -1325,8 +1325,8 @@ public class LoanRepaymentScheduleWithDownPaymentTest 
extends BaseLoanIntegratio
                     transaction(1000.0, "Disbursement", "03 March 2023", 
1000.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(250.0, "Down Payment", "03 March 2023", 750.0, 
250.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(800.0, "Repayment", "03 March 2023", 0.0, 
750.0, 0.0, 0.0, 0.0, 0.0, 50.0), //
-                    transaction(20.0, "Disbursement", "05 March 2023", 0.0, 
0.0, 0.0, 0.0, 0.0, 0.0, 30.0), //
-                    transaction(30.0, "Disbursement", "05 March 2023", 0.0, 
0.0, 0.0, 0.0, 0.0, 0.0, 0.0) //
+                    transaction(20.0, "Disbursement", "05 March 2023", 0.0, 
0.0, 0.0, 0.0, 0.0, 0.0, 20.0), //
+                    transaction(30.0, "Disbursement", "05 March 2023", 0.0, 
0.0, 0.0, 0.0, 0.0, 0.0, 30.0) //
             );
 
             assertTrue(loanDetails.getStatus().getClosedObligationsMet());
@@ -1343,8 +1343,8 @@ public class LoanRepaymentScheduleWithDownPaymentTest 
extends BaseLoanIntegratio
                     transaction(1000.0, "Disbursement", "03 March 2023", 
1000.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(250.0, "Down Payment", "03 March 2023", 750.0, 
250.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(800.0, "Repayment", "03 March 2023", 0.0, 
750.0, 0.0, 0.0, 0.0, 0.0, 50.0), //
-                    transaction(20.0, "Disbursement", "05 March 2023", 0.0, 
0.0, 0.0, 0.0, 0.0, 0.0, 30.0), //
-                    transaction(30.0, "Disbursement", "05 March 2023", 0.0, 
0.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
+                    transaction(20.0, "Disbursement", "05 March 2023", 0.0, 
0.0, 0.0, 0.0, 0.0, 0.0, 20.0), //
+                    transaction(30.0, "Disbursement", "05 March 2023", 0.0, 
0.0, 0.0, 0.0, 0.0, 0.0, 30.0), //
                     transaction(1.0, "Repayment", "05 March 2023", 0.0, 0.0, 
0.0, 0.0, 0.0, 0.0, 1.0) //
             );
             assertTrue(loanDetails.getStatus().getOverpaid());
@@ -1371,8 +1371,8 @@ public class LoanRepaymentScheduleWithDownPaymentTest 
extends BaseLoanIntegratio
                     transaction(1000.0, "Disbursement", "03 March 2023", 
1000.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(250.0, "Down Payment", "03 March 2023", 750.0, 
250.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(800.0, "Repayment", "03 March 2023", 0.0, 
750.0, 0.0, 0.0, 0.0, 0.0, 50.0), //
-                    transaction(20.0, "Disbursement", "05 March 2023", 0.0, 
0.0, 0.0, 0.0, 0.0, 0.0, 30.0), //
-                    transaction(30.0, "Disbursement", "05 March 2023", 0.0, 
0.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
+                    transaction(20.0, "Disbursement", "05 March 2023", 0.0, 
0.0, 0.0, 0.0, 0.0, 0.0, 20.0), //
+                    transaction(30.0, "Disbursement", "05 March 2023", 0.0, 
0.0, 0.0, 0.0, 0.0, 0.0, 30.0), //
                     transaction(1.0, "Repayment", "05 March 2023", 0.0, 0.0, 
0.0, 0.0, 0.0, 0.0, 1.0), //
                     transaction(40.0, "Disbursement", "05 March 2023", 39.0, 
0.0, 0.0, 0.0, 0.0, 0.0, 1.0), //
                     transaction(9.0, "Down Payment", "05 March 2023", 30.0, 
9.0, 0.0, 0.0, 0.0, 0.0, 0.0) //
@@ -1403,8 +1403,8 @@ public class LoanRepaymentScheduleWithDownPaymentTest 
extends BaseLoanIntegratio
                     transaction(1000.0, "Disbursement", "03 March 2023", 
1000.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(250.0, "Down Payment", "03 March 2023", 750.0, 
250.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(800.0, "Repayment", "03 March 2023", 0.0, 
750.0, 0.0, 0.0, 0.0, 0.0, 50.0), //
-                    transaction(20.0, "Disbursement", "05 March 2023", 0.0, 
0.0, 0.0, 0.0, 0.0, 0.0, 30.0), //
-                    transaction(30.0, "Disbursement", "05 March 2023", 0.0, 
0.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
+                    transaction(20.0, "Disbursement", "05 March 2023", 0.0, 
0.0, 0.0, 0.0, 0.0, 0.0, 20.0), //
+                    transaction(30.0, "Disbursement", "05 March 2023", 0.0, 
0.0, 0.0, 0.0, 0.0, 0.0, 30.0), //
                     transaction(1.0, "Repayment", "05 March 2023", 0.0, 0.0, 
0.0, 0.0, 0.0, 0.0, 1.0, true), //
                     transaction(40.0, "Disbursement", "05 March 2023", 40.0, 
0.0, 0.0, 0.0, 0.0, 0.0, 0.0), //
                     transaction(9.0, "Down Payment", "05 March 2023", 31.0, 
9.0, 0.0, 0.0, 0.0, 0.0, 0.0) //

Reply via email to