From 0698c4ada59af5d4e79eeb49fe22e137f744210b Mon Sep 17 00:00:00 2001
From: "adam.magyari" <magyari.adam96@gmail.com>
Date: Mon, 28 Jul 2025 13:51:21 +0200
Subject: [PATCH] FINERACT-2311: Buy down fee adjustment - portion fix

---
 .../features/LoanBuyDownFees.feature          | 32 +++++++++----------
 .../loanaccount/domain/LoanTransaction.java   |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/fineract-e2e-tests-runner/src/test/resources/features/LoanBuyDownFees.feature b/fineract-e2e-tests-runner/src/test/resources/features/LoanBuyDownFees.feature
index 3c5e449b4..8d1a4f847 100644
--- a/fineract-e2e-tests-runner/src/test/resources/features/LoanBuyDownFees.feature
+++ b/fineract-e2e-tests-runner/src/test/resources/features/LoanBuyDownFees.feature
@@ -1212,7 +1212,7 @@ Feature:Feature: Buy Down Fees
       | 01 January 2024  | Disbursement            | 100.0  | 0.0       | 0.0      | 0.0  | 0.0       | 100.0        | false    |
       | 01 January 2024  | Buy Down Fee            | 50.0   | 0.0       | 0.0      | 0.0  | 0.0       | 100.0        | false    |
       | 01 February 2024 | Repayment               | 33.72  | 33.14     | 0.58     | 0.0  | 0.0       | 66.86        | false    |
-      | 01 March 2024    | Buy Down Fee Adjustment | 10.0   | 10.0      | 0.0      | 0.0  | 0.0       | 56.86        | false    |
+      | 01 March 2024    | Buy Down Fee Adjustment | 10.0   | 0.0       | 0.0      | 0.0  | 0.0       | 66.86        | false    |
     And Loan Transactions tab has a "BUY_DOWN_FEE_ADJUSTMENT" transaction with date "01 March 2024" which has the following Journal entries:
       | Type      | Account code | Account name                | Debit | Credit |
       | EXPENSE   | 450280       | Buy Down Expense            |       | 10.0   |
@@ -1226,10 +1226,10 @@ Feature:Feature: Buy Down Fees
       | 01 January 2024  | Disbursement              | 100.0  | 0.0       | 0.0      | 0.0  | 0.0       | 100.0        | false    |
       | 01 January 2024  | Buy Down Fee              | 50.0   | 0.0       | 0.0      | 0.0  | 0.0       | 100.0        | false    |
       | 01 February 2024 | Repayment                 | 33.72  | 33.14     | 0.58     | 0.0  | 0.0       | 66.86        | false    |
-      | 01 March 2024    | Buy Down Fee Adjustment   | 10.0   | 10.0      | 0.0      | 0.0  | 0.0       | 56.86        | false    |
+      | 01 March 2024    | Buy Down Fee Adjustment   | 10.0   | 0.0       | 0.0      | 0.0  | 0.0       | 66.86        | false    |
       | 31 March 2024    | Accrual                   | 1.35   | 0.0       | 1.35     | 0.0  | 0.0       | 0.0          | false    |
       | 31 March 2024    | Buy Down Fee Amortization | 40.0   | 0.0       | 40.0     | 0.0  | 0.0       | 0.0          | false    |
-      | 01 April 2024    | Repayment                 | 33.73  | 33.34     | 0.39     | 0.0  | 0.0       | 23.52        | false    |
+      | 01 April 2024    | Repayment                 | 33.73  | 33.34     | 0.39     | 0.0  | 0.0       | 33.52        | false    |
 
     When Loan Pay-off is made on "1 April 2024"
     Then Loan's all installments have obligations met
@@ -1238,10 +1238,10 @@ Feature:Feature: Buy Down Fees
       | 01 January 2024  | Disbursement              | 100.0  | 0.0       | 0.0      | 0.0  | 0.0       | 100.0        | false    |
       | 01 January 2024  | Buy Down Fee              | 50.0   | 0.0       | 0.0      | 0.0  | 0.0       | 100.0        | false    |
       | 01 February 2024 | Repayment                 | 33.72  | 33.14     | 0.58     | 0.0  | 0.0       | 66.86        | false    |
-      | 01 March 2024    | Buy Down Fee Adjustment   | 10.0   | 10.0      | 0.0      | 0.0  | 0.0       | 56.86        | false    |
+      | 01 March 2024    | Buy Down Fee Adjustment   | 10.0   | 0.0       | 0.0      | 0.0  | 0.0       | 66.86        | false    |
       | 31 March 2024    | Accrual                   | 1.35   | 0.0       | 1.35     | 0.0  | 0.0       | 0.0          | false    |
       | 31 March 2024    | Buy Down Fee Amortization | 40.0   | 0.0       | 40.0     | 0.0  | 0.0       | 0.0          | false    |
-      | 01 April 2024    | Repayment                 | 33.73  | 33.34     | 0.39     | 0.0  | 0.0       | 23.52        | false    |
+      | 01 April 2024    | Repayment                 | 33.73  | 33.34     | 0.39     | 0.0  | 0.0       | 33.52        | false    |
       | 01 April 2024    | Repayment                 | 33.91  | 33.52     | 0.39     | 0.0  | 0.0       | 0.0          | false    |
       | 01 April 2024    | Accrual                   | 0.01   | 0.0       | 0.01     | 0.0  | 0.0       | 0.0          | false    |
 
@@ -1299,7 +1299,7 @@ Feature:Feature: Buy Down Fees
       | 01 January 2024  | Disbursement            | 100.0  | 0.0       | 0.0      | 0.0  | 0.0       | 100.0        | false    |
       | 01 January 2024  | Buy Down Fee            | 50.0   | 0.0       | 0.0      | 0.0  | 0.0       | 100.0        | false    |
       | 01 February 2024 | Repayment               | 33.72  | 33.14     | 0.58     | 0.0  | 0.0       | 66.86        | false    |
-      | 01 March 2024    | Buy Down Fee Adjustment | 10.0   | 10.0      | 0.0      | 0.0  | 0.0       | 56.86        | false    |
+      | 01 March 2024    | Buy Down Fee Adjustment | 10.0   | 0.0       | 0.0      | 0.0  | 0.0       | 66.86        | false    |
     And Loan Transactions tab has a "BUY_DOWN_FEE_ADJUSTMENT" transaction with date "01 March 2024" which has the following Journal entries:
       | Type      | Account code | Account name                | Debit | Credit |
       | EXPENSE   | 450280       | Buy Down Expense            |       | 10.0   |
@@ -1312,8 +1312,8 @@ Feature:Feature: Buy Down Fees
       | 01 January 2024  | Disbursement            | 100.0  | 0.0       | 0.0      | 0.0  | 0.0       | 100.0        | false    |
       | 01 January 2024  | Buy Down Fee            | 50.0   | 0.0       | 0.0      | 0.0  | 0.0       | 100.0        | false    |
       | 01 February 2024 | Repayment               | 33.72  | 33.14     | 0.58     | 0.0  | 0.0       | 66.86        | false    |
-      | 01 March 2024    | Buy Down Fee Adjustment | 10.0   | 10.0      | 0.0      | 0.0  | 0.0       | 56.86        | false    |
-      | 15 March 2024    | Buy Down Fee Adjustment |  5.0   |  5.0      | 0.0      | 0.0  | 0.0       | 51.86        | false    |
+      | 01 March 2024    | Buy Down Fee Adjustment | 10.0   | 0.0       | 0.0      | 0.0  | 0.0       | 66.86        | false    |
+      | 15 March 2024    | Buy Down Fee Adjustment |  5.0   | 0.0       | 0.0      | 0.0  | 0.0       | 66.86        | false    |
     And Loan Transactions tab has a "BUY_DOWN_FEE_ADJUSTMENT" transaction with date "15 March 2024" which has the following Journal entries:
       | Type      | Account code | Account name                | Debit | Credit |
       | EXPENSE   | 450280       | Buy Down Expense            |       |  5.0   |
@@ -1327,11 +1327,11 @@ Feature:Feature: Buy Down Fees
       | 01 January 2024  | Disbursement              | 100.0  | 0.0       | 0.0      | 0.0  | 0.0       | 100.0        | false    |
       | 01 January 2024  | Buy Down Fee              | 50.0   | 0.0       | 0.0      | 0.0  | 0.0       | 100.0        | false    |
       | 01 February 2024 | Repayment                 | 33.72  | 33.14     | 0.58     | 0.0  | 0.0       | 66.86        | false    |
-      | 01 March 2024    | Buy Down Fee Adjustment   | 10.0   | 10.0      | 0.0      | 0.0  | 0.0       | 56.86        | false    |
-      | 15 March 2024    | Buy Down Fee Adjustment   |  5.0   |  5.0      | 0.0      | 0.0  | 0.0       | 51.86        | false    |
+      | 01 March 2024    | Buy Down Fee Adjustment   | 10.0   | 0.0       | 0.0      | 0.0  | 0.0       | 66.86        | false    |
+      | 15 March 2024    | Buy Down Fee Adjustment   |  5.0   | 0.0       | 0.0      | 0.0  | 0.0       | 66.86        | false    |
       | 31 March 2024    | Accrual                   | 1.35   | 0.0       | 1.35     | 0.0  | 0.0       | 0.0          | false    |
       | 31 March 2024    | Buy Down Fee Amortization | 35.0   | 0.0       | 35.0     | 0.0  | 0.0       | 0.0          | false    |
-      | 01 April 2024    | Repayment                 | 33.73  | 33.34     | 0.39     | 0.0  | 0.0       | 18.52        | false    |
+      | 01 April 2024    | Repayment                 | 33.73  | 33.34     | 0.39     | 0.0  | 0.0       | 33.52        | false    |
 
     When Loan Pay-off is made on "1 April 2024"
     Then Loan's all installments have obligations met
@@ -1340,11 +1340,11 @@ Feature:Feature: Buy Down Fees
       | 01 January 2024  | Disbursement              | 100.0  | 0.0       | 0.0      | 0.0  | 0.0       | 100.0        | false    |
       | 01 January 2024  | Buy Down Fee              | 50.0   | 0.0       | 0.0      | 0.0  | 0.0       | 100.0        | false    |
       | 01 February 2024 | Repayment                 | 33.72  | 33.14     | 0.58     | 0.0  | 0.0       | 66.86        | false    |
-      | 01 March 2024    | Buy Down Fee Adjustment   | 10.0   | 10.0      | 0.0      | 0.0  | 0.0       | 56.86        | false    |
-      | 15 March 2024    | Buy Down Fee Adjustment   |  5.0   |  5.0      | 0.0      | 0.0  | 0.0       | 51.86        | false    |
+      | 01 March 2024    | Buy Down Fee Adjustment   | 10.0   | 0.0       | 0.0      | 0.0  | 0.0       | 66.86        | false    |
+      | 15 March 2024    | Buy Down Fee Adjustment   |  5.0   | 0.0       | 0.0      | 0.0  | 0.0       | 66.86        | false    |
       | 31 March 2024    | Accrual                   | 1.35   | 0.0       | 1.35     | 0.0  | 0.0       | 0.0          | false    |
       | 31 March 2024    | Buy Down Fee Amortization | 35.0   | 0.0       | 35.0     | 0.0  | 0.0       | 0.0          | false    |
-      | 01 April 2024    | Repayment                 | 33.73  | 33.34     | 0.39     | 0.0  | 0.0       | 18.52        | false    |
+      | 01 April 2024    | Repayment                 | 33.73  | 33.34     | 0.39     | 0.0  | 0.0       | 33.52        | false    |
       | 01 April 2024    | Repayment                 | 33.91  | 33.52     | 0.39     | 0.0  | 0.0       | 0.0          | false    |
       | 01 April 2024    | Accrual                   | 0.01   | 0.0       | 0.01     | 0.0  | 0.0       | 0.0          | false    |
 
@@ -1790,7 +1790,7 @@ Feature:Feature: Buy Down Fees
       | 29 February 2024 | Buy Down Fee Amortization | 0.55   | 0.0       | 0.55     | 0.0  | 0.0       | 0.0          | false    |
 
       | 01 March 2024    | Repayment                 | 33.72  | 33.33     | 0.39     | 0.0  | 0.0       | 33.53        | false    |
-      | 01 March 2024    | Buy Down Fee Adjustment   | 10.0   | 10.0      | 0.0      | 0.0  | 0.0       | 23.53        | false    |
+      | 01 March 2024    | Buy Down Fee Adjustment   | 10.0   | 0.0       | 0.0      | 0.0  | 0.0       | 33.53        | false    |
       | 01 March 2024    | Accrual                   | 0.01   | 0.0       | 0.01     | 0.0  | 0.0       | 0.0          | false    |
       | 01 March 2024    | Buy Down Fee Amortization | 0.22   | 0.0       | 0.22     | 0.0  | 0.0       | 0.0          | false    |
     And Loan Transactions tab has a "BUY_DOWN_FEE_ADJUSTMENT" transaction with date "01 March 2024" which has the following Journal entries:
@@ -1928,7 +1928,7 @@ Feature:Feature: Buy Down Fees
       | 29 February 2024 | Buy Down Fee Amortization | 0.55   | 0.0       | 0.55     | 0.0  | 0.0       | 0.0          | false    |
 
       | 01 March 2024    | Repayment                 | 33.72  | 33.33     | 0.39     | 0.0  | 0.0       | 33.53        | false    |
-      | 01 March 2024    | Buy Down Fee Adjustment   | 10.0   | 10.0      | 0.0      | 0.0  | 0.0       | 23.53        | true     |
+      | 01 March 2024    | Buy Down Fee Adjustment   | 10.0   | 0.0       | 0.0      | 0.0  | 0.0       | 33.53        | true     |
       | 01 March 2024    | Accrual                   | 0.01   | 0.0       | 0.01     | 0.0  | 0.0       | 0.0          | false    |
       | 01 March 2024    | Buy Down Fee Amortization | 0.22   | 0.0       | 0.22     | 0.0  | 0.0       | 0.0          | false    |
       | 02 March 2024    | Accrual                   | 0.01   | 0.0       | 0.01     | 0.0  | 0.0       | 0.0          | false    |
diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTransaction.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTransaction.java
index 4b692da5f..36f1b41f0 100644
--- a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTransaction.java
+++ b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTransaction.java
@@ -340,7 +340,7 @@ public class LoanTransaction extends AbstractAuditableWithUTCDateTimeCustom<Long
     public static LoanTransaction buyDownFeeAdjustment(final Loan loan, final Money amount, final PaymentDetail paymentDetail,
             final LocalDate transactionDate, final ExternalId externalId) {
         return new LoanTransaction(loan, loan.getOffice(), LoanTransactionType.BUY_DOWN_FEE_ADJUSTMENT, transactionDate, amount.getAmount(),
-                amount.getAmount(), null, null, null, null, false, paymentDetail, externalId);
+                null, null, null, null, null, false, paymentDetail, externalId);
     }
 
     public static LoanTransaction capitalizedIncomeAmortizationAdjustment(final Loan loan, final Money amount,