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

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

commit 917dd4d1172d18efc4caa459298aa0befa3cc288
Author: MarianaDmytrivBinariks <[email protected]>
AuthorDate: Wed Aug 27 12:20:50 2025 +0300

    FINERACT-2326: added e2e auto tests for available over applied amount with 
disbursement amount calculation
---
 .../src/test/resources/features/Loan.feature       | 298 +--------------------
 ...nt.feature => LoanUpdateApprovedAmount.feature} | 281 ++++++-------------
 .../LoanUpdateAvailableDisbursementAmount.feature  |  91 ++++++-
 3 files changed, 187 insertions(+), 483 deletions(-)

diff --git a/fineract-e2e-tests-runner/src/test/resources/features/Loan.feature 
b/fineract-e2e-tests-runner/src/test/resources/features/Loan.feature
index f8dd5db2ab..f87d84d1da 100644
--- a/fineract-e2e-tests-runner/src/test/resources/features/Loan.feature
+++ b/fineract-e2e-tests-runner/src/test/resources/features/Loan.feature
@@ -93,7 +93,9 @@ Feature: Loan
     When Admin creates a client with random data
     When Admin successfully creates a new customised Loan submitted on date: 
"1 September 2022", with Principal: "1000", a loanTermFrequency: 3 months, and 
numberOfRepayments: 3
     And Admin successfully approves the loan on "1 September 2022" with "1300" 
amount and expected disbursement date on "1 September 2022"
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
1500
     And Admin successfully disburse the loan on "1 September 2022" with "1200" 
EUR transaction amount
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
300
     Then Admin fails to disburse the loan on "1 September 2022" with "301" EUR 
transaction amount because of wrong amount
 
     When Loan Pay-off is made on "1 September 2022"
@@ -119,7 +121,9 @@ Feature: Loan
       | LoanProduct                                                   | 
submitted on date | with Principal | ANNUAL interest rate % | interest type     
| interest calculation period | amortization type  | loanTermFrequency | 
loanTermFrequencyType | repaymentEvery | repaymentFrequencyType | 
numberOfRepayments | graceOnPrincipalPayment | graceOnInterestPayment | 
interest free period | Payment strategy            |
       | LP2_ADV_CUSTOM_PMT_ALLOC_PROGRESSIVE_LOAN_SCHEDULE_HORIZONTAL | 01 
January 2024   | 1000           | 7                      | DECLINING_BALANCE | 
DAILY                       | EQUAL_INSTALLMENTS | 6                 | MONTHS   
             | 1              | MONTHS                 | 6                  | 0 
                      | 0                      | 0                    | 
ADVANCED_PAYMENT_ALLOCATION |
     And Admin successfully approves the loan on "1 January 2024" with "9000" 
amount and expected disbursement date on "1 January 2024"
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
11000
     And Admin successfully disburse the loan on "1 January 2024" with "9900" 
EUR transaction amount
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
1100
     Then Admin fails to disburse the loan on "1 January 2024" with "1200" EUR 
transaction amount because of wrong amount
 
     When Loan Pay-off is made on "1 January 2024"
@@ -133,6 +137,7 @@ Feature: Loan
       | LoanProduct                                                            
                   | submitted on date | with Principal | ANNUAL interest rate 
% | interest type     | interest calculation period | amortization type  | 
loanTermFrequency | loanTermFrequencyType | repaymentEvery | 
repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            | 
1st_tranche_disb_expected_date |1st_tranche_disb [...]
       | 
LP2_PROGRESSIVE_ADV_PYMNT_INTEREST_RECALC_360_30_MULTIDISB_OVER_APPLIED_EXPECTED_TRANCHES
 | 01 January 2024   | 1000           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION | 01 January 2024                | 
1000.0          [...]
     And Admin successfully approves the loan on "1 January 2024" with "1200" 
amount and expected disbursement date on "1 January 2024"
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
500
     Then Loan status will be "APPROVED"
     Then Loan Tranche Details tab has the following data:
       | Expected Disbursement On | Disbursed On    | Principal   | Net 
Disbursal Amount |
@@ -144,14 +149,16 @@ Feature: Loan
       | 01 January 2024          |                 | 1000.0      |             
         |
       | 05 January 2024          |                 | 200.0       | 1200.0      
         |
     And Admin checks available disbursement amount 0.0 EUR
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
300
     Then Admin fails to disburse the loan on "2 January 2024" with "1600" EUR 
transaction amount because of wrong amount
     And Admin successfully disburse the loan on "2 January 2024" with "1500" 
EUR transaction amount
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 0
     Then Loan status will be "ACTIVE"
     And Admin checks available disbursement amount 0.0 EUR
     Then Loan Tranche Details tab has the following data:
       | Expected Disbursement On | Disbursed On    | Principal   | Net 
Disbursal Amount |
       | 01 January 2024          | 02 January 2024 | 1500.0      |             
         |
-      | 05 January 2024          |                 | 200.0       | 1200.0      
          |
+      | 05 January 2024          |                 | 200.0       | 1200.0      
         |
 
     When Loan Pay-off is made on "2 January 2024"
     Then Loan's all installments have obligations met
@@ -164,6 +171,7 @@ Feature: Loan
       | LoanProduct                                                            
                   | submitted on date | with Principal | ANNUAL interest rate 
% | interest type     | interest calculation period | amortization type  | 
loanTermFrequency | loanTermFrequencyType | repaymentEvery | 
repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            | 
1st_tranche_disb_expected_date |1st_tranche_disb [...]
       | 
LP2_PROGRESSIVE_ADV_PYMNT_INTEREST_RECALC_360_30_MULTIDISB_OVER_APPLIED_EXPECTED_TRANCHES
 | 01 January 2024   | 1000           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION | 01 January 2024                | 
1000.0          [...]
     And Admin successfully approves the loan on "1 January 2024" with "1200" 
amount and expected disbursement date on "1 January 2024"
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
500
     Then Loan status will be "APPROVED"
     Then Loan Tranche Details tab has the following data:
       | Expected Disbursement On | Disbursed On    | Principal   | Net 
Disbursal Amount |
@@ -175,14 +183,16 @@ Feature: Loan
       | 01 January 2024          |                 | 1000.0      |             
         |
       | 05 January 2024          |                 | 200.0       | 1200.0      
         |
     And Admin checks available disbursement amount 0.0 EUR
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
300
     Then Admin fails to disburse the loan on "2 January 2024" with "1600" EUR 
transaction amount because of wrong amount
     And Admin successfully disburse the loan on "2 January 2024" with "1100" 
EUR transaction amount
     Then Loan status will be "ACTIVE"
     And Admin checks available disbursement amount 100.0 EUR
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
200
     Then Loan Tranche Details tab has the following data:
       | Expected Disbursement On | Disbursed On    | Principal   | Net 
Disbursal Amount |
       | 01 January 2024          | 02 January 2024 | 1100.0      |             
         |
-      | 05 January 2024          |                 | 200.0       | 1200.0      
          |
+      | 05 January 2024          |                 | 200.0       | 1200.0      
         |
 
     When Loan Pay-off is made on "2 January 2024"
     Then Loan's all installments have obligations met
@@ -7310,228 +7320,7 @@ Feature: Loan
       | 08 August 2025   | Accrual Activity | 6.22    | 0.0       | 3.42     | 
0.0  | 2.8       | 0.0          | false    | false    |
       | 15 August 2025   | Repayment        | 2.8     | 0.0       | 0.0      | 
0.0  | 2.8       | 0.0          | false    | false    |
 
-  @TestRailId:C3858
-  Scenario: Verify update approved amount for progressive loan - UC1
-    When Admin sets the business date to "01 January 2025"
-    When Admin creates a client with random data
-    When Admin creates a fully customized loan with the following data:
-      | LoanProduct                                                            
                        | submitted on date | with Principal | ANNUAL interest 
rate % | interest type     | interest calculation period | amortization type  | 
loanTermFrequency | loanTermFrequencyType | repaymentEvery | 
repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            |
-      | 
LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALCULATION_DAILY_TILL_PRECLOSE_PMT_ALLOC_1
 | 01 January 2025   | 1000            | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION |
-    And Admin successfully approves the loan on "01 January 2025" with "1000" 
amount and expected disbursement date on "01 January 2025"
-    Then Update loan approved amount is forbidden with amount "0" due to min 
allowed amount
-    When Admin successfully disburse the loan on "01 January 2025" with "1000" 
EUR transaction amount
-
-    When Loan Pay-off is made on "1 January 2025"
-    Then Loan's all installments have obligations met
-
-  @TestRailId:C3859
-  Scenario: Verify update approved amount after undo disbursement for single 
disb progressive loan - UC3
-    When Admin sets the business date to "1 January 2025"
-    And Admin creates a client with random data
-    When Admin creates a fully customized loan with the following data:
-      | LoanProduct                                                            
            | submitted on date | with Principal | ANNUAL interest rate % | 
interest type     | interest calculation period | amortization type  | 
loanTermFrequency | loanTermFrequencyType | repaymentEvery | 
repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            |
-      | 
LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALCULATION_DAILY_TILL_PRECLOSE
 | 01 January 2025   | 1000           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION |
-    And Admin successfully approves the loan on "1 January 2025" with "1000" 
amount and expected disbursement date on "1 January 2025"
-    And Admin successfully disburse the loan on "1 January 2025" with "100" 
EUR transaction amount
-    Then Update loan approved amount with new amount "600" value
-    When Admin successfully undo disbursal
-    Then Admin fails to disburse the loan on "1 January 2025" with "700" EUR 
transaction amount due to exceed approved amount
-    When Admin successfully disburse the loan on "01 January 2025" with "600" 
EUR transaction amount
-
-    When Loan Pay-off is made on "1 January 2025"
-    Then Loan's all installments have obligations met
-
-  @TestRailId:C3860
-  Scenario: Verify update approved amount with approved over applied amount 
for progressive multidisbursal loan with percentage overAppliedCalculationType 
- UC4
-    When Admin sets the business date to "1 January 2025"
-    And Admin creates a client with random data
-    And Admin creates a fully customized loan with the following data:
-      | LoanProduct                                                            
                           | submitted on date | with Principal | ANNUAL 
interest rate % | interest type     | interest calculation period | 
amortization type  | loanTermFrequency | loanTermFrequencyType | repaymentEvery 
| repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            |
-      | 
LP2_ADV_PYMNT_INTEREST_DAILY_RECALC_EMI_360_30_MULTIDISB_APPROVED_OVER_APPLIED_CAPITALIZED_INCOME
 | 01 January 2025   | 1000           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION |
-    And Admin successfully approves the loan on "1 January 2025" with "1000" 
amount and expected disbursement date on "1 January 2025"
-    And Admin successfully disburse the loan on "1 January 2025" with "1100" 
EUR transaction amount
-    Then Update loan approved amount is forbidden with amount "1600" due to 
exceed applied amount
-    Then Update loan approved amount with new amount "1300" value
-    And Admin successfully disburse the loan on "1 January 2025" with "400" 
EUR transaction amount
-
-    When Loan Pay-off is made on "1 January 2025"
-    Then Loan's all installments have obligations met
-
-  @TestRailId:C3861
-  Scenario: Verify update approved amount with approved over applied amount 
and capitalized income for progressive loan with percentage 
overAppliedCalculationType - UC8_1
-    When Admin sets the business date to "1 January 2025"
-    And Admin creates a client with random data
-    And Admin creates a fully customized loan with the following data:
-      | LoanProduct                                                            
                            | submitted on date | with Principal | ANNUAL 
interest rate % | interest type     | interest calculation period | 
amortization type  | loanTermFrequency | loanTermFrequencyType | repaymentEvery 
| repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            |
-      | 
LP2_ADV_PYMNT_INTEREST_DAILY_RECALC_EMI_360_30_APPROVED_OVER_APPLIED_PERCENTAGE_CAPITALIZED_INCOME
 | 01 January 2025   | 1000           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION |
-    And Admin successfully approves the loan on "1 January 2025" with "1000" 
amount and expected disbursement date on "1 January 2025"
-    And Admin successfully disburse the loan on "1 January 2025" with "1100" 
EUR transaction amount
-    Then Update loan approved amount is forbidden with amount "1600" due to 
exceed applied amount
-    Then Update loan approved amount with new amount "1400" value
-    And Admin adds capitalized income with "AUTOPAY" payment type to the loan 
on "1 January 2025" with "400" EUR transaction amount
-
-    When Loan Pay-off is made on "1 January 2025"
-    Then Loan's all installments have obligations met
-
-  @TestRailId:C3862
-  Scenario: Verify update approved amount with capitalized income for 
progressive loan - UC8_2
-    When Admin sets the business date to "1 January 2025"
-    And Admin creates a client with random data
-    And Admin creates a fully customized loan with the following data:
-      | LoanProduct                                                            
          | submitted on date | with Principal | ANNUAL interest rate % | 
interest type     | interest calculation period | amortization type  | 
loanTermFrequency | loanTermFrequencyType | repaymentEvery | 
repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            |
-      | 
LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALC_DAILY_CAPITALIZED_INCOME
 | 01 January 2025   | 1000           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION |
-    And Admin successfully approves the loan on "1 January 2025" with "900" 
amount and expected disbursement date on "1 January 2025"
-    And Admin successfully disburse the loan on "1 January 2025" with "600" 
EUR transaction amount
-    Then Update loan approved amount is forbidden with amount "500" due to 
higher principal amount on loan
-    And Admin adds capitalized income with "AUTOPAY" payment type to the loan 
on "1 January 2025" with "200" EUR transaction amount
-    Then Update loan approved amount with new amount "1000" value
-    And Admin adds capitalized income with "AUTOPAY" payment type to the loan 
on "1 January 2025" with "200" EUR transaction amount
-
-    When Loan Pay-off is made on "1 January 2025"
-    Then Loan's all installments have obligations met
-
-  @TestRailId:C3863
-  Scenario: Verify update approved amount with capitalized income for 
progressive multidisbursal loan - UC8_3
-    When Admin sets the business date to "1 January 2025"
-    And Admin creates a client with random data
-    And Admin creates a fully customized loan with the following data:
-      | LoanProduct                                                            
                      | submitted on date | with Principal | ANNUAL interest 
rate % | interest type     | interest calculation period | amortization type  | 
loanTermFrequency | loanTermFrequencyType | repaymentEvery | 
repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            |
-      | 
LP2_ADV_PYMNT_INTEREST_DAILY_RECALC_EMI_360_30_MULTIDISB_CAPITALIZED_INCOME_ADJ_CUSTOM_ALLOC
 | 01 January 2025   | 1000           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION |
-    And Admin successfully approves the loan on "1 January 2025" with "900" 
amount and expected disbursement date on "1 January 2025"
-    And Admin successfully disburse the loan on "1 January 2025" with "600" 
EUR transaction amount
-    Then Update loan approved amount is forbidden with amount "500" due to 
higher principal amount on loan
-    And Admin adds capitalized income with "AUTOPAY" payment type to the loan 
on "1 January 2025" with "200" EUR transaction amount
-    Then Update loan approved amount with new amount "1000" value
-    And Admin successfully disburse the loan on "1 January 2025" with "200" 
EUR transaction amount
-
-    When Loan Pay-off is made on "1 January 2025"
-    Then Loan's all installments have obligations met
-
-  @TestRailId:C3864
-  Scenario: Verify update approved amount before disbursement for single disb 
cumulative loan - UC5_1
-    When Admin sets the business date to "1 January 2025"
-    And Admin creates a client with random data
-    When Admin creates a fully customized loan with the following data:
-      | LoanProduct       | submitted on date | with Principal | ANNUAL 
interest rate % | interest type     | interest calculation period | 
amortization type  | loanTermFrequency | loanTermFrequencyType | repaymentEvery 
| repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy                
        |
-      | LP1_INTEREST_FLAT | 1 January 2025    | 1000           | 0             
         | DECLINING_BALANCE | SAME_AS_REPAYMENT_PERIOD    | EQUAL_INSTALLMENTS 
| 3                 | MONTHS                | 1              | MONTHS           
      | 3                  | 0                       | 0                      | 
0                    | PENALTIES_FEES_INTEREST_PRINCIPAL_ORDER |
-    And Admin successfully approves the loan on "1 January 2025" with "1000" 
amount and expected disbursement date on "1 January 2025"
-    Then Update loan approved amount with new amount "900" value
-    And Admin successfully disburse the loan on "1 January 2025" with "100" 
EUR transaction amount
-
-    When Loan Pay-off is made on "1 January 2025"
-    Then Loan's all installments have obligations met
-
-  @TestRailId:C3865
-  Scenario: Verify update approved amount before disbursement for single disb 
progressive loan - UC5_2
-    When Admin sets the business date to "1 January 2025"
-    And Admin creates a client with random data
-    When Admin creates a fully customized loan with the following data:
-      | LoanProduct                                                            
            | submitted on date | with Principal | ANNUAL interest rate % | 
interest type     | interest calculation period | amortization type  | 
loanTermFrequency | loanTermFrequencyType | repaymentEvery | 
repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            |
-      | 
LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALCULATION_DAILY_TILL_PRECLOSE
 | 01 January 2025   | 1000           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION |
-    And Admin successfully approves the loan on "1 January 2025" with "1000" 
amount and expected disbursement date on "1 January 2025"
-    Then Update loan approved amount with new amount "900" value
-    And Admin successfully disburse the loan on "1 January 2025" with "100" 
EUR transaction amount
-
-    When Loan Pay-off is made on "1 January 2025"
-    Then Loan's all installments have obligations met
-
-  @TestRailId:C3866
-  Scenario: Verify approved amount change for progressive multidisbursal loan 
that doesn't expect tranches - UC6
-    When Admin sets the business date to "01 January 2025"
-    When Admin creates a client with random data
-    When Admin creates a fully customized loan with the following data:
-      | LoanProduct                                                            
     | submitted on date | with Principal | ANNUAL interest rate % | interest 
type     | interest calculation period | amortization type  | loanTermFrequency 
| loanTermFrequencyType | repaymentEvery | repaymentFrequencyType | 
numberOfRepayments | graceOnPrincipalPayment | graceOnInterestPayment | 
interest free period | Payment strategy            |
-      | 
LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALC_DAILY_MULTIDISBURSE | 
01 January 2025   | 1000           | 7                      | DECLINING_BALANCE 
| DAILY                       | EQUAL_INSTALLMENTS | 6                 | MONTHS 
               | 1              | MONTHS                 | 6                  | 
0                       | 0                      | 0                    | 
ADVANCED_PAYMENT_ALLOCATION |
-    And Admin successfully approves the loan on "01 January 2025" with "1000" 
amount and expected disbursement date on "01 January 2025"
-    When Admin successfully disburse the loan on "01 January 2025" with "200" 
EUR transaction amount
-    Then Loan Repayment schedule has 6 periods, with the following data for 
periods:
-      | Nr | Days | Date             | Paid date | Balance of loan | Principal 
due | Interest | Fees | Penalties | Due   | Paid | In advance | Late | 
Outstanding |
-      |    |      | 01 January 2025  |           | 200.0           |           
    |          | 0.0  |           | 0.0   | 0.0  |            |      |          
   |
-      | 1  | 31   | 01 February 2025 |           | 167.15          | 32.85     
    | 1.17     | 0.0  | 0.0       | 34.02 | 0.0  | 0.0        | 0.0  | 34.02    
   |
-      | 2  | 28   | 01 March 2025    |           | 134.11          | 33.04     
    | 0.98     | 0.0  | 0.0       | 34.02 | 0.0  | 0.0        | 0.0  | 34.02    
   |
-      | 3  | 31   | 01 April 2025    |           | 100.87          | 33.24     
    | 0.78     | 0.0  | 0.0       | 34.02 | 0.0  | 0.0        | 0.0  | 34.02    
   |
-      | 4  | 30   | 01 May 2025      |           |  67.44          | 33.43     
    | 0.59     | 0.0  | 0.0       | 34.02 | 0.0  | 0.0        | 0.0  | 34.02    
   |
-      | 5  | 31   | 01 June 2025     |           |  33.81          | 33.63     
    | 0.39     | 0.0  | 0.0       | 34.02 | 0.0  | 0.0        | 0.0  | 34.02    
   |
-      | 6  | 30   | 01 July 2025     |           |   0.0           | 33.81     
    | 0.2      | 0.0  | 0.0       | 34.01 | 0.0  | 0.0        | 0.0  | 34.01    
   |
-    Then Loan Repayment schedule has the following data in Total row:
-      | Principal due | Interest | Fees | Penalties | Due    | Paid | In 
advance | Late | Outstanding |
-      | 200.0         | 4.11     | 0.0  | 0.0       | 204.11 | 0.0  | 0.0      
  | 0.0  | 204.11      |
-    Then Update loan approved amount with new amount "600" value
-    When Admin successfully disburse the loan on "01 January 2025" with "400" 
EUR transaction amount
-    Then Update loan approved amount is forbidden with amount "500" due to 
higher principal amount on loan
-
-    When Loan Pay-off is made on "1 January 2025"
-    Then Loan's all installments have obligations met
 
-  @TestRailId:C3867
-  Scenario: Verify approved amount change with lower value for progressive 
multidisbursal loan that expects two tranches - UC7_1
-    When Admin sets the business date to "01 January 2025"
-    When Admin creates a client with random data
-    When Admin creates a fully customized loan with three expected 
disbursements details and following data:
-      | LoanProduct                                                            
                    | submitted on date | with Principal | ANNUAL interest rate 
% | interest type     | interest calculation period | amortization type  | 
loanTermFrequency | loanTermFrequencyType | repaymentEvery | 
repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            | 
1st_tranche_disb_expected_date | 1st_tranche_di [...]
-      | 
LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALC_DAILY_MULTIDISBURSE_EXPECT_TRANCHE
 | 01 January 2025   | 1000           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION | 01 January 2025                | 
300.0          [...]
-    And Admin successfully approves the loan on "01 January 2025" with "1000" 
amount and expected disbursement date on "01 January 2025"
-    Then Loan Tranche Details tab has the following data:
-      | Expected Disbursement On | Disbursed On    | Principal   | Net 
Disbursal Amount |
-      | 01 January 2025          |                 | 300.0       |             
         |
-      | 02 January 2025          |                 | 200.0       |             
         |
-      | 03 January 2025          |                 | 500.0       |             
         |
-#    --- disbursement - 1 January, 2025  ---
-    When Admin successfully disburse the loan on "01 January 2025" with "300" 
EUR transaction amount
-    When Admin sets the business date to "03 January 2025"
-    Then Update loan approved amount is forbidden with amount "800" due to 
higher principal amount on loan
-
-    When Admin successfully disburse the loan on "02 January 2025" with "200" 
EUR transaction amount
-    Then Admin fails to disburse the loan on "03 January 2025" with "700" EUR 
transaction amount due to exceed approved amount
-    When Admin successfully disburse the loan on "03 January 2025" with "500" 
EUR transaction amount
-    Then Loan Tranche Details tab has the following data:
-      | Expected Disbursement On | Disbursed On    | Principal   | Net 
Disbursal Amount |
-      | 01 January 2025          | 01 January 2025 | 300.0       |             
         |
-      | 02 January 2025          | 02 January 2025 | 200.0       |             
         |
-      | 03 January 2025          | 03 January 2025 | 500.0       |             
         |
-    And Loan Transactions tab has the following data:
-      | Transaction date | Transaction Type | Amount  | Principal | Interest | 
Fees | Penalties | Loan Balance | Reverted | Replayed |
-      | 01 January 2025  | Disbursement     | 300.0   | 0.0       | 0.0      | 
0.0  | 0.0       | 300.0        | false    | false    |
-      | 02 January 2025  | Disbursement     | 200.0   | 0.0       | 0.0      | 
0.0  | 0.0       | 500.0        | false    | false    |
-      | 03 January 2025  | Disbursement     | 500.0   | 0.0       | 0.0      | 
0.0  | 0.0       | 1000.0       | false    | false    |
-
-    When Loan Pay-off is made on "3 January 2025"
-    Then Loan's all installments have obligations met
-
-  @TestRailId:C3868
-  Scenario: Verify approved amount change with greater value for progressive 
multidisbursal loan that expects two tranches - UC7_2
-    When Admin sets the business date to "01 January 2025"
-    When Admin creates a client with random data
-    When Admin creates a fully customized loan with three expected 
disbursements details and following data:
-      | LoanProduct                                                            
                    | submitted on date | with Principal | ANNUAL interest rate 
% | interest type     | interest calculation period | amortization type  | 
loanTermFrequency | loanTermFrequencyType | repaymentEvery | 
repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            | 
1st_tranche_disb_expected_date | 1st_tranche_di [...]
-      | 
LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALC_DAILY_MULTIDISBURSE_EXPECT_TRANCHE
 | 01 January 2025   | 1200           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION | 01 January 2025                | 
300.0          [...]
-    And Admin successfully approves the loan on "01 January 2025" with "1000" 
amount and expected disbursement date on "01 January 2025"
-    Then Loan Tranche Details tab has the following data:
-      | Expected Disbursement On | Disbursed On    | Principal   | Net 
Disbursal Amount |
-      | 01 January 2025          |                 | 300.0       |             
         |
-      | 02 January 2025          |                 | 200.0       |             
         |
-      | 03 January 2025          |                 | 500.0       |             
         |
-#    --- disbursement - 1 January, 2025  ---
-    When Admin successfully disburse the loan on "01 January 2025" with "300" 
EUR transaction amount
-    When Admin sets the business date to "03 January 2025"
-    Then Update loan approved amount with new amount "1200" value
-
-    When Admin successfully disburse the loan on "02 January 2025" with "300" 
EUR transaction amount
-    Then Admin fails to disburse the loan on "03 January 2025" with "700" EUR 
transaction amount due to exceed approved amount
-    When Admin successfully disburse the loan on "03 January 2025" with "600" 
EUR transaction amount
-    Then Loan Tranche Details tab has the following data:
-      | Expected Disbursement On | Disbursed On    | Principal   | Net 
Disbursal Amount |
-      | 01 January 2025          | 01 January 2025 | 300.0       |             
         |
-      | 02 January 2025          | 02 January 2025 | 300.0       |             
         |
-      | 03 January 2025          | 03 January 2025 | 600.0       |             
         |
-    And Loan Transactions tab has the following data:
-      | Transaction date | Transaction Type | Amount  | Principal | Interest | 
Fees | Penalties | Loan Balance | Reverted | Replayed |
-      | 01 January 2025  | Disbursement     | 300.0   | 0.0       | 0.0      | 
0.0  | 0.0       | 300.0        | false    | false    |
-      | 02 January 2025  | Disbursement     | 300.0   | 0.0       | 0.0      | 
0.0  | 0.0       | 600.0        | false    | false    |
-      | 03 January 2025  | Disbursement     | 600.0   | 0.0       | 0.0      | 
0.0  | 0.0       | 1200.0       | false    | false    |
-
-    When Loan Pay-off is made on "3 January 2025"
-    Then Loan's all installments have obligations met
 
   @TestRailId:C3963
   Scenario: Verify Progressive Loan reschedule by extending repayment period: 
Basic scenario without downpayment, flat interest type
@@ -7958,66 +7747,3 @@ Feature: Loan
       | Transaction date | Transaction Type | Amount | Principal | Interest | 
Fees | Penalties | Loan Balance |
       | 01 June 2024     | Disbursement     | 1200.0 | 0.0       | 0.0      | 
0.0  | 0.0       | 1200.0       |
       | 01 July 2024     | Repayment        | 417.03 | 405.03    | 12.0     | 
0.0  | 0.0       | 794.97       |
-
-  @TestRailId:C3999
-  Scenario: Verify availableDisbursementAmountWithOverApplied field calculation
-    When Admin sets the business date to "1 January 2025"
-    And Admin creates a client with random data
-    And Admin creates a fully customized loan with the following data:
-      | LoanProduct                                                            
                           | submitted on date | with Principal | ANNUAL 
interest rate % | interest type     | interest calculation period | 
amortization type  | loanTermFrequency | loanTermFrequencyType | repaymentEvery 
| repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            |
-      | 
LP2_ADV_PYMNT_INTEREST_DAILY_RECALC_EMI_360_30_MULTIDISB_APPROVED_OVER_APPLIED_CAPITALIZED_INCOME
 | 01 January 2025   | 1000           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION |
-    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
1500
-    And Admin successfully approves the loan on "1 January 2025" with "1000" 
amount and expected disbursement date on "1 January 2025"
-    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
1500
-    And Admin successfully disburse the loan on "1 January 2025" with "900" 
EUR transaction amount
-    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
600
-    And Admin successfully disburse the loan on "1 January 2025" with "300" 
EUR transaction amount
-    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
300
-    And Admin adds capitalized income with "AUTOPAY" payment type to the loan 
on "1 January 2025" with "100" EUR transaction amount
-    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
200
-    And Admin adds capitalized income with "AUTOPAY" payment type to the loan 
on "1 January 2025" with "150" EUR transaction amount
-    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
50
-    When Loan Pay-off is made on "01 January 2025"
-    Then Loan's all installments have obligations met
-
-  @TestRailId:C4003
-  Scenario: Verify availableDisbursementAmountWithOverApplied field 
calculation for progressive multidisbursal loan that expects tranches
-    When Admin sets the business date to "01 January 2025"
-    When Admin creates a client with random data
-    When Admin creates a fully customized loan with three expected 
disbursements details and following data:
-      | LoanProduct                                                            
                            | submitted on date | with Principal | ANNUAL 
interest rate % | interest type     | interest calculation period | 
amortization type  | loanTermFrequency | loanTermFrequencyType | repaymentEvery 
| repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            | 
1st_tranche_disb_expected_date | 1st_tr [...]
-      | 
LP2_ADV_PYMNT_INT_DAILY_EMI_360_30_INT_RECALC_DAILY_MULTIDISB_EXPECT_TRANCHE_APPROVED_OVER_APPLIED
 | 01 January 2025   | 1000           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION | 01 January 2025                | 
300.0  [...]
-    Then Loan Tranche Details tab has the following data:
-      | Expected Disbursement On | Disbursed On    | Principal   | Net 
Disbursal Amount |
-      | 01 January 2025          |                 | 300.0       |             
         |
-      | 02 January 2025          |                 | 200.0       |             
         |
-      | 03 January 2025          |                 | 500.0       |             
         |
-    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
500
-    And Admin successfully approves the loan on "01 January 2025" with "1000" 
amount and expected disbursement date on "01 January 2025"
-    Then Loan Tranche Details tab has the following data:
-      | Expected Disbursement On | Disbursed On    | Principal   | Net 
Disbursal Amount |
-      | 01 January 2025          |                 | 300.0       |             
         |
-      | 02 January 2025          |                 | 200.0       |             
         |
-      | 03 January 2025          |                 | 500.0       |             
         |
-    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
500
-    When Admin successfully disburse the loan on "01 January 2025" with "300" 
EUR transaction amount
-    And Loan Transactions tab has the following data:
-      | Transaction date | Transaction Type | Amount  | Principal | Interest | 
Fees | Penalties | Loan Balance | Reverted | Replayed |
-      | 01 January 2025  | Disbursement     | 300.0   | 0.0       | 0.0      | 
0.0  | 0.0       | 300.0        | false    | false    |
-    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
500
-    When Admin sets the business date to "02 January 2025"
-    When Admin successfully disburse the loan on "02 January 2025" with "200" 
EUR transaction amount
-    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
500
-    When Admin sets the business date to "03 January 2025"
-    When Admin successfully disburse the loan on "03 January 2025" with "1000" 
EUR transaction amount
-    Then Loan has availableDisbursementAmountWithOverApplied field with value: 0
-    Then Loan Tranche Details tab has the following data:
-      | Expected Disbursement On | Disbursed On    | Principal   | Net 
Disbursal Amount |
-      | 01 January 2025          | 01 January 2025 | 300.0       |             
         |
-      | 02 January 2025          | 02 January 2025 | 200.0       |             
         |
-      | 03 January 2025          | 03 January 2025 | 1000.0      |             
         |
-    And Loan Transactions tab has the following data:
-      | Transaction date | Transaction Type | Amount  | Principal | Interest | 
Fees | Penalties | Loan Balance | Reverted | Replayed |
-      | 01 January 2025  | Disbursement     | 300.0   | 0.0       | 0.0      | 
0.0  | 0.0       | 300.0        | false    | false    |
-      | 02 January 2025  | Disbursement     | 200.0   | 0.0       | 0.0      | 
0.0  | 0.0       | 500.0        | false    | false    |
-      | 03 January 2025  | Disbursement     | 1000.0  | 0.0       | 0.0      | 
0.0  | 0.0       | 1500.0       | false    | false    |
\ No newline at end of file
diff --git 
a/fineract-e2e-tests-runner/src/test/resources/features/LoanUpdateAvailableDisbursementAmount.feature
 
b/fineract-e2e-tests-runner/src/test/resources/features/LoanUpdateApprovedAmount.feature
similarity index 51%
copy from 
fineract-e2e-tests-runner/src/test/resources/features/LoanUpdateAvailableDisbursementAmount.feature
copy to 
fineract-e2e-tests-runner/src/test/resources/features/LoanUpdateApprovedAmount.feature
index 5e3327979d..c5e2f5928c 100644
--- 
a/fineract-e2e-tests-runner/src/test/resources/features/LoanUpdateAvailableDisbursementAmount.feature
+++ 
b/fineract-e2e-tests-runner/src/test/resources/features/LoanUpdateApprovedAmount.feature
@@ -1,24 +1,22 @@
-@LoanUpdateAvailableDisbursementAmount
-Feature: LoanUpdateAvailableDisbursementAmount
+@LoanUpdateApprovedAmount
+Feature: LoanUpdateApprovedAmount
 
-  @TestRailId:C3869
-  Scenario: Verify update available disbursement amount for progressive loan - 
UC1
+  @TestRailId:C3858
+  Scenario: Verify update approved amount for progressive loan - UC1
     When Admin sets the business date to "01 January 2025"
     When Admin creates a client with random data
     When Admin creates a fully customized loan with the following data:
       | LoanProduct                                                            
                        | submitted on date | with Principal | ANNUAL interest 
rate % | interest type     | interest calculation period | amortization type  | 
loanTermFrequency | loanTermFrequencyType | repaymentEvery | 
repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            |
       | 
LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALCULATION_DAILY_TILL_PRECLOSE_PMT_ALLOC_1
 | 01 January 2025   | 1000            | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION |
     And Admin successfully approves the loan on "01 January 2025" with "1000" 
amount and expected disbursement date on "01 January 2025"
-    And Update loan available disbursement amount is forbidden with amount 
"1001" due to exceed applied amount
-    Then Update loan available disbursement amount is forbidden with amount 
"-100" due to min allowed amount
-    Then Update loan available disbursement amount by external-id with new 
amount "600" value
-    When Admin successfully disburse the loan on "01 January 2025" with "600" 
EUR transaction amount
+    Then Update loan approved amount is forbidden with amount "0" due to min 
allowed amount
+    When Admin successfully disburse the loan on "01 January 2025" with "1000" 
EUR transaction amount
 
-    When Loan Pay-off is made on "01 January 2025"
+    When Loan Pay-off is made on "1 January 2025"
     Then Loan's all installments have obligations met
 
-  @TestRailId:C3919
-  Scenario: Verify update available disbursement amount after undo 
disbursement for single disb progressive loan - UC3
+  @TestRailId:C3859
+  Scenario: Verify update approved amount after undo disbursement for single 
disb progressive loan - UC3
     When Admin sets the business date to "1 January 2025"
     And Admin creates a client with random data
     When Admin creates a fully customized loan with the following data:
@@ -26,67 +24,72 @@ Feature: LoanUpdateAvailableDisbursementAmount
       | 
LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALCULATION_DAILY_TILL_PRECLOSE
 | 01 January 2025   | 1000           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION |
     And Admin successfully approves the loan on "1 January 2025" with "1000" 
amount and expected disbursement date on "1 January 2025"
     And Admin successfully disburse the loan on "1 January 2025" with "100" 
EUR transaction amount
-    Then Update loan available disbursement amount by external-id with new 
amount "600" value
+    Then Update loan approved amount with new amount "600" value
     When Admin successfully undo disbursal
-    Then Admin fails to disburse the loan on "1 January 2025" with "750" EUR 
transaction amount due to exceed approved amount
-    When Admin successfully disburse the loan on "01 January 2025" with "700" 
EUR transaction amount
+    Then Admin fails to disburse the loan on "1 January 2025" with "700" EUR 
transaction amount due to exceed approved amount
+    When Admin successfully disburse the loan on "01 January 2025" with "600" 
EUR transaction amount
 
-    When Loan Pay-off is made on "01 January 2025"
+    When Loan Pay-off is made on "1 January 2025"
     Then Loan's all installments have obligations met
 
-  @TestRailId:C3920
-  Scenario: Verify update available disbursement amount with approved over 
applied amount for progressive multidisbursal loan with percentage 
overAppliedCalculationType - UC4
+  @TestRailId:C3860
+  Scenario: Verify update approved amount with approved over applied amount 
for progressive multidisbursal loan with percentage overAppliedCalculationType 
- UC4
     When Admin sets the business date to "1 January 2025"
     And Admin creates a client with random data
     And Admin creates a fully customized loan with the following data:
       | LoanProduct                                                            
                           | submitted on date | with Principal | ANNUAL 
interest rate % | interest type     | interest calculation period | 
amortization type  | loanTermFrequency | loanTermFrequencyType | repaymentEvery 
| repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            |
       | 
LP2_ADV_PYMNT_INTEREST_DAILY_RECALC_EMI_360_30_MULTIDISB_APPROVED_OVER_APPLIED_CAPITALIZED_INCOME
 | 01 January 2025   | 1000           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION |
     And Admin successfully approves the loan on "1 January 2025" with "1000" 
amount and expected disbursement date on "1 January 2025"
-    And Admin successfully disburse the loan on "1 January 2025" with "900" 
EUR transaction amount
-    Then Update loan available disbursement amount is forbidden with amount 
"601" due to exceed applied amount
-    Then Update loan available disbursement amount with new amount "500" value
-    And Admin successfully disburse the loan on "1 January 2025" with "600" 
EUR transaction amount
-
-    When Loan Pay-off is made on "01 January 2025"
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
1500
+    And Admin successfully disburse the loan on "1 January 2025" with "1100" 
EUR transaction amount
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
400
+    Then Update loan approved amount is forbidden with amount "1600" due to 
exceed applied amount
+    Then Update loan approved amount with new amount "1300" value
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
400
+    And Admin successfully disburse the loan on "1 January 2025" with "400" 
EUR transaction amount
+
+    When Loan Pay-off is made on "1 January 2025"
     Then Loan's all installments have obligations met
 
-  @TestRailId:C3921
-  Scenario: Verify update available disbursement amount with approved over 
applied amount and capitalized income for progressive loan with percentage 
overAppliedCalculationType - UC8_1
+  @TestRailId:C3861
+  Scenario: Verify update approved amount with approved over applied amount 
and capitalized income for progressive loan with percentage 
overAppliedCalculationType - UC8_1
     When Admin sets the business date to "1 January 2025"
     And Admin creates a client with random data
     And Admin creates a fully customized loan with the following data:
       | LoanProduct                                                            
                            | submitted on date | with Principal | ANNUAL 
interest rate % | interest type     | interest calculation period | 
amortization type  | loanTermFrequency | loanTermFrequencyType | repaymentEvery 
| repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            |
       | 
LP2_ADV_PYMNT_INTEREST_DAILY_RECALC_EMI_360_30_APPROVED_OVER_APPLIED_PERCENTAGE_CAPITALIZED_INCOME
 | 01 January 2025   | 1000           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION |
     And Admin successfully approves the loan on "1 January 2025" with "1000" 
amount and expected disbursement date on "1 January 2025"
-    And Admin successfully disburse the loan on "1 January 2025" with "900" 
EUR transaction amount
-    Then Update loan available disbursement amount is forbidden with amount 
"700" due to exceed applied amount
-    Then Update loan available disbursement amount with new amount "500" value
-    And Capitalized income with payment type "AUTOPAY" on "1 January 2025" is 
forbidden with amount "601" while exceed approved amount
-    And Admin adds capitalized income with "AUTOPAY" payment type to the loan 
on "1 January 2025" with "600" EUR transaction amount
 
-    When Loan Pay-off is made on "01 January 2025"
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
1500
+    And Admin successfully disburse the loan on "1 January 2025" with "1100" 
EUR transaction amount
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
400
+    Then Update loan approved amount is forbidden with amount "1600" due to 
exceed applied amount
+    Then Update loan approved amount with new amount "1400" value
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
400
+    And Admin adds capitalized income with "AUTOPAY" payment type to the loan 
on "1 January 2025" with "400" EUR transaction amount
+
+    When Loan Pay-off is made on "1 January 2025"
     Then Loan's all installments have obligations met
 
-  @TestRailId:C3922
-  Scenario: Verify update available disbursement amount with capitalized 
income for progressive loan - UC8_2
+  @TestRailId:C3862
+  Scenario: Verify update approved amount with capitalized income for 
progressive loan - UC8_2
     When Admin sets the business date to "1 January 2025"
     And Admin creates a client with random data
     And Admin creates a fully customized loan with the following data:
       | LoanProduct                                                            
          | submitted on date | with Principal | ANNUAL interest rate % | 
interest type     | interest calculation period | amortization type  | 
loanTermFrequency | loanTermFrequencyType | repaymentEvery | 
repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            |
       | 
LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALC_DAILY_CAPITALIZED_INCOME
 | 01 January 2025   | 1000           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION |
-    And Admin successfully approves the loan on "1 January 2025" with "1000" 
amount and expected disbursement date on "1 January 2025"
+    And Admin successfully approves the loan on "1 January 2025" with "900" 
amount and expected disbursement date on "1 January 2025"
     And Admin successfully disburse the loan on "1 January 2025" with "600" 
EUR transaction amount
-    Then Update loan available disbursement amount is forbidden with amount 
"500" due to exceed applied amount
+    Then Update loan approved amount is forbidden with amount "500" due to 
higher principal amount on loan
+    And Admin adds capitalized income with "AUTOPAY" payment type to the loan 
on "1 January 2025" with "200" EUR transaction amount
+    Then Update loan approved amount with new amount "1000" value
     And Admin adds capitalized income with "AUTOPAY" payment type to the loan 
on "1 January 2025" with "200" EUR transaction amount
-    Then Update loan available disbursement amount with new amount "150" value
-    And Capitalized income with payment type "AUTOPAY" on "1 January 2025" is 
forbidden with amount "151" while exceed approved amount
-    And Admin adds capitalized income with "AUTOPAY" payment type to the loan 
on "1 January 2025" with "150" EUR transaction amount
 
-    When Loan Pay-off is made on "01 January 2025"
+    When Loan Pay-off is made on "1 January 2025"
     Then Loan's all installments have obligations met
 
-  @TestRailId:C3923
-  Scenario: Verify update available disbursement amount with capitalized 
income for progressive multidisbursal loan - UC8_3
+  @TestRailId:C3863
+  Scenario: Verify update approved amount with capitalized income for 
progressive multidisbursal loan - UC8_3
     When Admin sets the business date to "1 January 2025"
     And Admin creates a client with random data
     And Admin creates a fully customized loan with the following data:
@@ -94,47 +97,44 @@ Feature: LoanUpdateAvailableDisbursementAmount
       | 
LP2_ADV_PYMNT_INTEREST_DAILY_RECALC_EMI_360_30_MULTIDISB_CAPITALIZED_INCOME_ADJ_CUSTOM_ALLOC
 | 01 January 2025   | 1000           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION |
     And Admin successfully approves the loan on "1 January 2025" with "900" 
amount and expected disbursement date on "1 January 2025"
     And Admin successfully disburse the loan on "1 January 2025" with "600" 
EUR transaction amount
-    Then Update loan available disbursement amount is forbidden with amount 
"500" due to exceed applied amount
+    Then Update loan approved amount is forbidden with amount "500" due to 
higher principal amount on loan
     And Admin adds capitalized income with "AUTOPAY" payment type to the loan 
on "1 January 2025" with "200" EUR transaction amount
-    Then Update loan available disbursement amount by external-id with new 
amount "200" value
-    Then Admin fails to disburse the loan on "1 January 2025" with "201" EUR 
transaction amount due to exceed approved amount
+    Then Update loan approved amount with new amount "1000" value
     And Admin successfully disburse the loan on "1 January 2025" with "200" 
EUR transaction amount
 
-    When Loan Pay-off is made on "01 January 2025"
+    When Loan Pay-off is made on "1 January 2025"
     Then Loan's all installments have obligations met
 
-  @TestRailId:C3924
-  Scenario: Verify update available disbursement amount before disbursement 
for single disb cumulative loan - UC5_1
+  @TestRailId:C3864
+  Scenario: Verify update approved amount before disbursement for single disb 
cumulative loan - UC5_1
     When Admin sets the business date to "1 January 2025"
     And Admin creates a client with random data
     When Admin creates a fully customized loan with the following data:
-      | LoanProduct         | submitted on date | with Principal | ANNUAL 
interest rate % | interest type     | interest calculation period | 
amortization type  | loanTermFrequency | loanTermFrequencyType | repaymentEvery 
| repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy                
        |
-      | LP1_INTEREST_FLAT   | 1 January 2025    | 1000           | 0           
           | DECLINING_BALANCE | SAME_AS_REPAYMENT_PERIOD    | 
EQUAL_INSTALLMENTS | 3                 | MONTHS                | 1              
| MONTHS                 | 3                  | 0                       | 0     
                 | 0                    | 
PENALTIES_FEES_INTEREST_PRINCIPAL_ORDER |
+      | LoanProduct       | submitted on date | with Principal | ANNUAL 
interest rate % | interest type     | interest calculation period | 
amortization type  | loanTermFrequency | loanTermFrequencyType | repaymentEvery 
| repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy                
        |
+      | LP1_INTEREST_FLAT | 1 January 2025    | 1000           | 0             
         | DECLINING_BALANCE | SAME_AS_REPAYMENT_PERIOD    | EQUAL_INSTALLMENTS 
| 3                 | MONTHS                | 1              | MONTHS           
      | 3                  | 0                       | 0                      | 
0                    | PENALTIES_FEES_INTEREST_PRINCIPAL_ORDER |
     And Admin successfully approves the loan on "1 January 2025" with "1000" 
amount and expected disbursement date on "1 January 2025"
-    Then Update loan available disbursement amount with new amount "900" value
-    Then Admin fails to disburse the loan on "1 January 2025" with "901" EUR 
transaction amount due to exceed approved amount
-    And Admin successfully disburse the loan on "1 January 2025" with "900" 
EUR transaction amount
+    Then Update loan approved amount with new amount "900" value
+    And Admin successfully disburse the loan on "1 January 2025" with "100" 
EUR transaction amount
 
-    When Loan Pay-off is made on "01 January 2025"
+    When Loan Pay-off is made on "1 January 2025"
     Then Loan's all installments have obligations met
 
-  @TestRailId:C3925
-  Scenario: Verify update available disbursement amount before disbursement 
for single disb progressive loan - UC5_2
+  @TestRailId:C3865
+  Scenario: Verify update approved amount before disbursement for single disb 
progressive loan - UC5_2
     When Admin sets the business date to "1 January 2025"
     And Admin creates a client with random data
     When Admin creates a fully customized loan with the following data:
       | LoanProduct                                                            
            | submitted on date | with Principal | ANNUAL interest rate % | 
interest type     | interest calculation period | amortization type  | 
loanTermFrequency | loanTermFrequencyType | repaymentEvery | 
repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            |
       | 
LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALCULATION_DAILY_TILL_PRECLOSE
 | 01 January 2025   | 1000           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION |
     And Admin successfully approves the loan on "1 January 2025" with "1000" 
amount and expected disbursement date on "1 January 2025"
-    Then Update loan available disbursement amount by external-id with new 
amount "900" value
-    Then Admin fails to disburse the loan on "1 January 2025" with "901" EUR 
transaction amount due to exceed approved amount
-    And Admin successfully disburse the loan on "1 January 2025" with "900" 
EUR transaction amount
+    Then Update loan approved amount with new amount "900" value
+    And Admin successfully disburse the loan on "1 January 2025" with "100" 
EUR transaction amount
 
-    When Loan Pay-off is made on "01 January 2025"
+    When Loan Pay-off is made on "1 January 2025"
     Then Loan's all installments have obligations met
 
-  @TestRailId:C3926
-  Scenario: Verify available disbursement amount change for progressive 
multidisbursal loan that doesn't expect tranches - UC6
+  @TestRailId:C3866
+  Scenario: Verify approved amount change for progressive multidisbursal loan 
that doesn't expect tranches - UC6
     When Admin sets the business date to "01 January 2025"
     When Admin creates a client with random data
     When Admin creates a fully customized loan with the following data:
@@ -154,22 +154,22 @@ Feature: LoanUpdateAvailableDisbursementAmount
     Then Loan Repayment schedule has the following data in Total row:
       | Principal due | Interest | Fees | Penalties | Due    | Paid | In 
advance | Late | Outstanding |
       | 200.0         | 4.11     | 0.0  | 0.0       | 204.11 | 0.0  | 0.0      
  | 0.0  | 204.11      |
-    Then Update loan available disbursement amount with new amount "400" value
-    Then Admin fails to disburse the loan on "1 January 2025" with "420" EUR 
transaction amount due to exceed approved amount
-    When Admin successfully disburse the loan on "01 January 2025" with "399" 
EUR transaction amount
-    Then Update loan available disbursement amount is forbidden with amount 
"500" due to exceed applied amount
+    Then Update loan approved amount with new amount "600" value
+    When Admin successfully disburse the loan on "01 January 2025" with "400" 
EUR transaction amount
+    Then Update loan approved amount is forbidden with amount "500" due to 
higher principal amount on loan
 
-    When Loan Pay-off is made on "01 January 2025"
+    When Loan Pay-off is made on "1 January 2025"
     Then Loan's all installments have obligations met
 
-  @TestRailId:C3927
-  Scenario: Verify available disbursement amount change is forbidden with 
lower value for progressive multidisbursal loan that expects tranches - UC7_1
+  @TestRailId:C3867
+  Scenario: Verify approved amount change with lower value for progressive 
multidisbursal loan that expects two tranches - UC7_1
     When Admin sets the business date to "01 January 2025"
     When Admin creates a client with random data
     When Admin creates a fully customized loan with three expected 
disbursements details and following data:
       | LoanProduct                                                            
                    | submitted on date | with Principal | ANNUAL interest rate 
% | interest type     | interest calculation period | amortization type  | 
loanTermFrequency | loanTermFrequencyType | repaymentEvery | 
repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            | 
1st_tranche_disb_expected_date | 1st_tranche_di [...]
       | 
LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALC_DAILY_MULTIDISBURSE_EXPECT_TRANCHE
 | 01 January 2025   | 1000           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION | 01 January 2025                | 
300.0          [...]
     And Admin successfully approves the loan on "01 January 2025" with "1000" 
amount and expected disbursement date on "01 January 2025"
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 0
     Then Loan Tranche Details tab has the following data:
       | Expected Disbursement On | Disbursed On    | Principal   | Net 
Disbursal Amount |
       | 01 January 2025          |                 | 300.0       |             
         |
@@ -177,18 +177,15 @@ Feature: LoanUpdateAvailableDisbursementAmount
       | 03 January 2025          |                 | 500.0       |             
         |
 #    --- disbursement - 1 January, 2025  ---
     When Admin successfully disburse the loan on "01 January 2025" with "300" 
EUR transaction amount
-    And Loan Transactions tab has the following data:
-      | Transaction date | Transaction Type | Amount  | Principal | Interest | 
Fees | Penalties | Loan Balance | Reverted | Replayed |
-      | 01 January 2025  | Disbursement     | 300.0   | 0.0       | 0.0      | 
0.0  | 0.0       | 300.0        | false    | false    |
-    When Admin sets the business date to "02 January 2025"
-    Then Update loan available disbursement amount is forbidden with amount 
"100" due to exceed applied amount
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 0
     When Admin sets the business date to "03 January 2025"
-    Then Update loan available disbursement amount is forbidden with amount 
"100" due to exceed applied amount
-    When Admin sets the business date to "04 January 2025"
-    Then Update loan available disbursement amount is forbidden with amount 
"100" due to exceed applied amount
+    Then Update loan approved amount is forbidden with amount "800" due to 
higher principal amount on loan
 
     When Admin successfully disburse the loan on "02 January 2025" with "200" 
EUR transaction amount
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 0
+    Then Admin fails to disburse the loan on "03 January 2025" with "700" EUR 
transaction amount due to exceed approved amount
     When Admin successfully disburse the loan on "03 January 2025" with "500" 
EUR transaction amount
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 0
     Then Loan Tranche Details tab has the following data:
       | Expected Disbursement On | Disbursed On    | Principal   | Net 
Disbursal Amount |
       | 01 January 2025          | 01 January 2025 | 300.0       |             
         |
@@ -200,17 +197,18 @@ Feature: LoanUpdateAvailableDisbursementAmount
       | 02 January 2025  | Disbursement     | 200.0   | 0.0       | 0.0      | 
0.0  | 0.0       | 500.0        | false    | false    |
       | 03 January 2025  | Disbursement     | 500.0   | 0.0       | 0.0      | 
0.0  | 0.0       | 1000.0       | false    | false    |
 
-    When Loan Pay-off is made on "01 January 2025"
+    When Loan Pay-off is made on "3 January 2025"
     Then Loan's all installments have obligations met
 
-  @TestRailId:C3928
-  Scenario: Verify available disbursement amount change with greater value 
above approved amount for progressive multidisbursal loan that expects tranches 
- UC7_2
+  @TestRailId:C3868
+  Scenario: Verify approved amount change with greater value for progressive 
multidisbursal loan that expects two tranches - UC7_2
     When Admin sets the business date to "01 January 2025"
     When Admin creates a client with random data
     When Admin creates a fully customized loan with three expected 
disbursements details and following data:
       | LoanProduct                                                            
                    | submitted on date | with Principal | ANNUAL interest rate 
% | interest type     | interest calculation period | amortization type  | 
loanTermFrequency | loanTermFrequencyType | repaymentEvery | 
repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            | 
1st_tranche_disb_expected_date | 1st_tranche_di [...]
       | 
LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALC_DAILY_MULTIDISBURSE_EXPECT_TRANCHE
 | 01 January 2025   | 1200           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION | 01 January 2025                | 
300.0          [...]
     And Admin successfully approves the loan on "01 January 2025" with "1000" 
amount and expected disbursement date on "01 January 2025"
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 0
     Then Loan Tranche Details tab has the following data:
       | Expected Disbursement On | Disbursed On    | Principal   | Net 
Disbursal Amount |
       | 01 January 2025          |                 | 300.0       |             
         |
@@ -218,130 +216,25 @@ Feature: LoanUpdateAvailableDisbursementAmount
       | 03 January 2025          |                 | 500.0       |             
         |
 #    --- disbursement - 1 January, 2025  ---
     When Admin successfully disburse the loan on "01 January 2025" with "300" 
EUR transaction amount
-    When Admin sets the business date to "02 January 2025"
-    Then Update loan available disbursement amount with new amount "200" value
-
-    When Admin successfully disburse the loan on "02 January 2025" with "200" 
EUR transaction amount
     When Admin sets the business date to "03 January 2025"
-    Then Admin fails to disburse the loan on "03 January 2025" with "800" EUR 
transaction amount due to exceed approved amount
-    When Admin successfully disburse the loan on "03 January 2025" with "700" 
EUR transaction amount
-    Then Loan Tranche Details tab has the following data:
-      | Expected Disbursement On | Disbursed On    | Principal   | Net 
Disbursal Amount |
-      | 01 January 2025          | 01 January 2025 | 300.0       |             
         |
-      | 02 January 2025          | 02 January 2025 | 200.0       |             
         |
-      | 03 January 2025          | 03 January 2025 | 700.0       |             
         |
-    And Loan Transactions tab has the following data:
-      | Transaction date | Transaction Type | Amount  | Principal | Interest | 
Fees | Penalties | Loan Balance | Reverted | Replayed |
-      | 01 January 2025  | Disbursement     | 300.0   | 0.0       | 0.0      | 
0.0  | 0.0       | 300.0        | false    | false    |
-      | 02 January 2025  | Disbursement     | 200.0   | 0.0       | 0.0      | 
0.0  | 0.0       | 500.0        | false    | false    |
-      | 03 January 2025  | Disbursement     | 700.0   | 0.0       | 0.0      | 
0.0  | 0.0       | 1200.0       | false    | false    |
-
-    When Loan Pay-off is made on "01 January 2025"
-    Then Loan's all installments have obligations met
-
-  @TestRailId:C3929
-  Scenario: Verify available disbursement amount change with greater value 
under approved amount for progressive multidisbursal loan that expects tranches 
- UC7_3
-    When Admin sets the business date to "01 January 2025"
-    When Admin creates a client with random data
-    When Admin creates a fully customized loan with three expected 
disbursements details and following data:
-      | LoanProduct                                                            
                    | submitted on date | with Principal | ANNUAL interest rate 
% | interest type     | interest calculation period | amortization type  | 
loanTermFrequency | loanTermFrequencyType | repaymentEvery | 
repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            | 
1st_tranche_disb_expected_date | 1st_tranche_di [...]
-      | 
LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALC_DAILY_MULTIDISBURSE_EXPECT_TRANCHE
 | 01 January 2025   | 1200           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION | 01 January 2025                | 
300.0          [...]
-    And Admin successfully approves the loan on "01 January 2025" with "1000" 
amount and expected disbursement date on "01 January 2025"
-    Then Loan Tranche Details tab has the following data:
-      | Expected Disbursement On | Disbursed On    | Principal   | Net 
Disbursal Amount |
-      | 01 January 2025          |                 | 300.0       |             
         |
-      | 02 January 2025          |                 | 200.0       |             
         |
-      | 03 January 2025          |                 | 300.0       |             
         |
-#    --- disbursement - 1 January, 2025  ---
-    When Admin successfully disburse the loan on "01 January 2025" with "300" 
EUR transaction amount
-    When Admin sets the business date to "02 January 2025"
-    Then Update loan available disbursement amount by external-id with new 
amount "150" value
+    Then Update loan approved amount with new amount "1200" value
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
200
 
     When Admin successfully disburse the loan on "02 January 2025" with "300" 
EUR transaction amount
-    When Admin sets the business date to "03 January 2025"
-    Then Admin fails to disburse the loan on "03 January 2025" with "400" EUR 
transaction amount due to exceed approved amount
-    When Admin successfully disburse the loan on "03 January 2025" with "350" 
EUR transaction amount
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
100
+    Then Admin fails to disburse the loan on "03 January 2025" with "700" EUR 
transaction amount due to exceed approved amount
+    When Admin successfully disburse the loan on "03 January 2025" with "600" 
EUR transaction amount
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 0
     Then Loan Tranche Details tab has the following data:
       | Expected Disbursement On | Disbursed On    | Principal   | Net 
Disbursal Amount |
       | 01 January 2025          | 01 January 2025 | 300.0       |             
         |
       | 02 January 2025          | 02 January 2025 | 300.0       |             
         |
-      | 03 January 2025          | 03 January 2025 | 350.0       |             
         |
+      | 03 January 2025          | 03 January 2025 | 600.0       |             
         |
     And Loan Transactions tab has the following data:
       | Transaction date | Transaction Type | Amount  | Principal | Interest | 
Fees | Penalties | Loan Balance | Reverted | Replayed |
       | 01 January 2025  | Disbursement     | 300.0   | 0.0       | 0.0      | 
0.0  | 0.0       | 300.0        | false    | false    |
       | 02 January 2025  | Disbursement     | 300.0   | 0.0       | 0.0      | 
0.0  | 0.0       | 600.0        | false    | false    |
-      | 03 January 2025  | Disbursement     | 350.0   | 0.0       | 0.0      | 
0.0  | 0.0       | 950.0        | false    | false    |
-
-    When Loan Pay-off is made on "01 January 2025"
-    Then Loan's all installments have obligations met
-
-  @TestRailId:C3995
-  Scenario: Verify update available disbursement amount to zero is forbidden 
for not approved loan
-    When Admin sets the business date to "01 January 2025"
-    And Admin creates a client with random data
-    When Admin creates a fully customized loan with the following data:
-      | LoanProduct                                                            
            | submitted on date | with Principal | ANNUAL interest rate % | 
interest type     | interest calculation period | amortization type  | 
loanTermFrequency | loanTermFrequencyType | repaymentEvery | 
repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            |
-      | 
LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALCULATION_DAILY_TILL_PRECLOSE
 | 01 January 2025   | 1000           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION |
-    And Admin successfully approves the loan on "01 January 2025" with "1000" 
amount and expected disbursement date on "01 January 2025"
-    Then Updating the loan's available disbursement amount to "0" is forbidden 
because cannot be zero as nothing was disbursed
-
-    Then Admin can successfully undone the loan approval
-    Then Loan status will be "SUBMITTED_AND_PENDING_APPROVAL"
-
-  @TestRailId:C3996
-  Scenario: Verify update available disbursement amount to zero is forbidden 
for approved loan
-    When Admin sets the business date to "01 January 2025"
-    And Admin creates a client with random data
-    When Admin creates a fully customized loan with the following data:
-      | LoanProduct                                                            
            | submitted on date | with Principal | ANNUAL interest rate % | 
interest type     | interest calculation period | amortization type  | 
loanTermFrequency | loanTermFrequencyType | repaymentEvery | 
repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            |
-      | 
LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALCULATION_DAILY_TILL_PRECLOSE
 | 01 January 2025   | 1000           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION |
-    And Admin successfully approves the loan on "01 January 2025" with "1000" 
amount and expected disbursement date on "01 January 2025"
-    Then Updating the loan's available disbursement amount to "0" is forbidden 
because cannot be zero as nothing was disbursed
-
-    Then Admin can successfully undone the loan approval
-    Then Loan status will be "SUBMITTED_AND_PENDING_APPROVAL"
-
-  @TestRailId:C3997
-  Scenario: Verify update available disbursement amount to zero is allowed for 
active loan after partial disbursement for single disb loan
-    When Admin sets the business date to "01 January 2025"
-    And Admin creates a client with random data
-    When Admin creates a fully customized loan with the following data:
-      | LoanProduct                                                            
            | submitted on date | with Principal | ANNUAL interest rate % | 
interest type     | interest calculation period | amortization type  | 
loanTermFrequency | loanTermFrequencyType | repaymentEvery | 
repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            |
-      | 
LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALCULATION_DAILY_TILL_PRECLOSE
 | 01 January 2025   | 1000           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION |
-    And Admin successfully approves the loan on "01 January 2025" with "1000" 
amount and expected disbursement date on "01 January 2025"
-    And Admin successfully disburse the loan on "01 January 2025" with "500" 
EUR transaction amount
-    Then Update loan available disbursement amount with new amount "0" value
-
-    When Admin successfully undo disbursal
-    Then Admin fails to disburse the loan on "1 January 2025" with "501" EUR 
transaction amount due to exceed approved amount
-
-    Then Admin can successfully undone the loan approval
-    Then Loan status will be "SUBMITTED_AND_PENDING_APPROVAL"
+      | 03 January 2025  | Disbursement     | 600.0   | 0.0       | 0.0      | 
0.0  | 0.0       | 1200.0       | false    | false    |
 
-  @TestRailId:C3998
-  Scenario: Verify update available disbursement amount to zero is allowed for 
active loan after partial disbursement for multidisb loan that doesn't expect 
tranches
-    When Admin sets the business date to "01 January 2025"
-    When Admin creates a client with random data
-    When Admin creates a fully customized loan with the following data:
-      | LoanProduct                                                            
     | submitted on date | with Principal | ANNUAL interest rate % | interest 
type     | interest calculation period | amortization type  | loanTermFrequency 
| loanTermFrequencyType | repaymentEvery | repaymentFrequencyType | 
numberOfRepayments | graceOnPrincipalPayment | graceOnInterestPayment | 
interest free period | Payment strategy            |
-      | 
LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALC_DAILY_MULTIDISBURSE | 
01 January 2025   | 1000           | 7                      | DECLINING_BALANCE 
| DAILY                       | EQUAL_INSTALLMENTS | 6                 | MONTHS 
               | 1              | MONTHS                 | 6                  | 
0                       | 0                      | 0                    | 
ADVANCED_PAYMENT_ALLOCATION |
-    And Admin successfully approves the loan on "01 January 2025" with "1000" 
amount and expected disbursement date on "01 January 2025"
-    When Admin successfully disburse the loan on "01 January 2025" with "200" 
EUR transaction amount
-    Then Loan Repayment schedule has 6 periods, with the following data for 
periods:
-      | Nr | Days | Date             | Paid date | Balance of loan | Principal 
due | Interest | Fees | Penalties | Due   | Paid | In advance | Late | 
Outstanding |
-      |    |      | 01 January 2025  |           | 200.0           |           
    |          | 0.0  |           | 0.0   | 0.0  |            |      |          
   |
-      | 1  | 31   | 01 February 2025 |           | 167.15          | 32.85     
    | 1.17     | 0.0  | 0.0       | 34.02 | 0.0  | 0.0        | 0.0  | 34.02    
   |
-      | 2  | 28   | 01 March 2025    |           | 134.11          | 33.04     
    | 0.98     | 0.0  | 0.0       | 34.02 | 0.0  | 0.0        | 0.0  | 34.02    
   |
-      | 3  | 31   | 01 April 2025    |           | 100.87          | 33.24     
    | 0.78     | 0.0  | 0.0       | 34.02 | 0.0  | 0.0        | 0.0  | 34.02    
   |
-      | 4  | 30   | 01 May 2025      |           |  67.44          | 33.43     
    | 0.59     | 0.0  | 0.0       | 34.02 | 0.0  | 0.0        | 0.0  | 34.02    
   |
-      | 5  | 31   | 01 June 2025     |           |  33.81          | 33.63     
    | 0.39     | 0.0  | 0.0       | 34.02 | 0.0  | 0.0        | 0.0  | 34.02    
   |
-      | 6  | 30   | 01 July 2025     |           |   0.0           | 33.81     
    | 0.2      | 0.0  | 0.0       | 34.01 | 0.0  | 0.0        | 0.0  | 34.01    
   |
-    Then Loan Repayment schedule has the following data in Total row:
-      | Principal due | Interest | Fees | Penalties | Due    | Paid | In 
advance | Late | Outstanding |
-      | 200.0         | 4.11     | 0.0  | 0.0       | 204.11 | 0.0  | 0.0      
  | 0.0  | 204.11      |
-
-    Then Update loan available disbursement amount with new amount "0" value
-    Then Admin fails to disburse the loan on "1 January 2025" with "1" EUR 
transaction amount due to exceed approved amount
-
-    When Loan Pay-off is made on "01 January 2025"
-    Then Loan's all installments have obligations met
+    When Loan Pay-off is made on "3 January 2025"
+    Then Loan's all installments have obligations met
\ No newline at end of file
diff --git 
a/fineract-e2e-tests-runner/src/test/resources/features/LoanUpdateAvailableDisbursementAmount.feature
 
b/fineract-e2e-tests-runner/src/test/resources/features/LoanUpdateAvailableDisbursementAmount.feature
index 5e3327979d..96a03be9e8 100644
--- 
a/fineract-e2e-tests-runner/src/test/resources/features/LoanUpdateAvailableDisbursementAmount.feature
+++ 
b/fineract-e2e-tests-runner/src/test/resources/features/LoanUpdateAvailableDisbursementAmount.feature
@@ -42,10 +42,15 @@ Feature: LoanUpdateAvailableDisbursementAmount
       | LoanProduct                                                            
                           | submitted on date | with Principal | ANNUAL 
interest rate % | interest type     | interest calculation period | 
amortization type  | loanTermFrequency | loanTermFrequencyType | repaymentEvery 
| repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            |
       | 
LP2_ADV_PYMNT_INTEREST_DAILY_RECALC_EMI_360_30_MULTIDISB_APPROVED_OVER_APPLIED_CAPITALIZED_INCOME
 | 01 January 2025   | 1000           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION |
     And Admin successfully approves the loan on "1 January 2025" with "1000" 
amount and expected disbursement date on "1 January 2025"
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
1500
+
     And Admin successfully disburse the loan on "1 January 2025" with "900" 
EUR transaction amount
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
600
+
     Then Update loan available disbursement amount is forbidden with amount 
"601" due to exceed applied amount
-    Then Update loan available disbursement amount with new amount "500" value
+    Then Update loan available disbursement amount with new amount "600" value
     And Admin successfully disburse the loan on "1 January 2025" with "600" 
EUR transaction amount
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 0
 
     When Loan Pay-off is made on "01 January 2025"
     Then Loan's all installments have obligations met
@@ -58,11 +63,18 @@ Feature: LoanUpdateAvailableDisbursementAmount
       | LoanProduct                                                            
                            | submitted on date | with Principal | ANNUAL 
interest rate % | interest type     | interest calculation period | 
amortization type  | loanTermFrequency | loanTermFrequencyType | repaymentEvery 
| repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            |
       | 
LP2_ADV_PYMNT_INTEREST_DAILY_RECALC_EMI_360_30_APPROVED_OVER_APPLIED_PERCENTAGE_CAPITALIZED_INCOME
 | 01 January 2025   | 1000           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION |
     And Admin successfully approves the loan on "1 January 2025" with "1000" 
amount and expected disbursement date on "1 January 2025"
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
1500
+
     And Admin successfully disburse the loan on "1 January 2025" with "900" 
EUR transaction amount
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
600
+
     Then Update loan available disbursement amount is forbidden with amount 
"700" due to exceed applied amount
     Then Update loan available disbursement amount with new amount "500" value
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
600
+
     And Capitalized income with payment type "AUTOPAY" on "1 January 2025" is 
forbidden with amount "601" while exceed approved amount
     And Admin adds capitalized income with "AUTOPAY" payment type to the loan 
on "1 January 2025" with "600" EUR transaction amount
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 0
 
     When Loan Pay-off is made on "01 January 2025"
     Then Loan's all installments have obligations met
@@ -170,6 +182,7 @@ Feature: LoanUpdateAvailableDisbursementAmount
       | LoanProduct                                                            
                    | submitted on date | with Principal | ANNUAL interest rate 
% | interest type     | interest calculation period | amortization type  | 
loanTermFrequency | loanTermFrequencyType | repaymentEvery | 
repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            | 
1st_tranche_disb_expected_date | 1st_tranche_di [...]
       | 
LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALC_DAILY_MULTIDISBURSE_EXPECT_TRANCHE
 | 01 January 2025   | 1000           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION | 01 January 2025                | 
300.0          [...]
     And Admin successfully approves the loan on "01 January 2025" with "1000" 
amount and expected disbursement date on "01 January 2025"
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 0
     Then Loan Tranche Details tab has the following data:
       | Expected Disbursement On | Disbursed On    | Principal   | Net 
Disbursal Amount |
       | 01 January 2025          |                 | 300.0       |             
         |
@@ -181,6 +194,7 @@ Feature: LoanUpdateAvailableDisbursementAmount
       | Transaction date | Transaction Type | Amount  | Principal | Interest | 
Fees | Penalties | Loan Balance | Reverted | Replayed |
       | 01 January 2025  | Disbursement     | 300.0   | 0.0       | 0.0      | 
0.0  | 0.0       | 300.0        | false    | false    |
     When Admin sets the business date to "02 January 2025"
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 0
     Then Update loan available disbursement amount is forbidden with amount 
"100" due to exceed applied amount
     When Admin sets the business date to "03 January 2025"
     Then Update loan available disbursement amount is forbidden with amount 
"100" due to exceed applied amount
@@ -189,6 +203,7 @@ Feature: LoanUpdateAvailableDisbursementAmount
 
     When Admin successfully disburse the loan on "02 January 2025" with "200" 
EUR transaction amount
     When Admin successfully disburse the loan on "03 January 2025" with "500" 
EUR transaction amount
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 0
     Then Loan Tranche Details tab has the following data:
       | Expected Disbursement On | Disbursed On    | Principal   | Net 
Disbursal Amount |
       | 01 January 2025          | 01 January 2025 | 300.0       |             
         |
@@ -211,6 +226,7 @@ Feature: LoanUpdateAvailableDisbursementAmount
       | LoanProduct                                                            
                    | submitted on date | with Principal | ANNUAL interest rate 
% | interest type     | interest calculation period | amortization type  | 
loanTermFrequency | loanTermFrequencyType | repaymentEvery | 
repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            | 
1st_tranche_disb_expected_date | 1st_tranche_di [...]
       | 
LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALC_DAILY_MULTIDISBURSE_EXPECT_TRANCHE
 | 01 January 2025   | 1200           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION | 01 January 2025                | 
300.0          [...]
     And Admin successfully approves the loan on "01 January 2025" with "1000" 
amount and expected disbursement date on "01 January 2025"
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 0
     Then Loan Tranche Details tab has the following data:
       | Expected Disbursement On | Disbursed On    | Principal   | Net 
Disbursal Amount |
       | 01 January 2025          |                 | 300.0       |             
         |
@@ -218,13 +234,16 @@ Feature: LoanUpdateAvailableDisbursementAmount
       | 03 January 2025          |                 | 500.0       |             
         |
 #    --- disbursement - 1 January, 2025  ---
     When Admin successfully disburse the loan on "01 January 2025" with "300" 
EUR transaction amount
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 0
     When Admin sets the business date to "02 January 2025"
     Then Update loan available disbursement amount with new amount "200" value
-
     When Admin successfully disburse the loan on "02 January 2025" with "200" 
EUR transaction amount
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
200
+
     When Admin sets the business date to "03 January 2025"
     Then Admin fails to disburse the loan on "03 January 2025" with "800" EUR 
transaction amount due to exceed approved amount
     When Admin successfully disburse the loan on "03 January 2025" with "700" 
EUR transaction amount
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 0
     Then Loan Tranche Details tab has the following data:
       | Expected Disbursement On | Disbursed On    | Principal   | Net 
Disbursal Amount |
       | 01 January 2025          | 01 January 2025 | 300.0       |             
         |
@@ -247,6 +266,7 @@ Feature: LoanUpdateAvailableDisbursementAmount
       | LoanProduct                                                            
                    | submitted on date | with Principal | ANNUAL interest rate 
% | interest type     | interest calculation period | amortization type  | 
loanTermFrequency | loanTermFrequencyType | repaymentEvery | 
repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            | 
1st_tranche_disb_expected_date | 1st_tranche_di [...]
       | 
LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALC_DAILY_MULTIDISBURSE_EXPECT_TRANCHE
 | 01 January 2025   | 1200           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION | 01 January 2025                | 
300.0          [...]
     And Admin successfully approves the loan on "01 January 2025" with "1000" 
amount and expected disbursement date on "01 January 2025"
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 0
     Then Loan Tranche Details tab has the following data:
       | Expected Disbursement On | Disbursed On    | Principal   | Net 
Disbursal Amount |
       | 01 January 2025          |                 | 300.0       |             
         |
@@ -254,13 +274,15 @@ Feature: LoanUpdateAvailableDisbursementAmount
       | 03 January 2025          |                 | 300.0       |             
         |
 #    --- disbursement - 1 January, 2025  ---
     When Admin successfully disburse the loan on "01 January 2025" with "300" 
EUR transaction amount
+
     When Admin sets the business date to "02 January 2025"
     Then Update loan available disbursement amount by external-id with new 
amount "150" value
-
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
150
     When Admin successfully disburse the loan on "02 January 2025" with "300" 
EUR transaction amount
     When Admin sets the business date to "03 January 2025"
     Then Admin fails to disburse the loan on "03 January 2025" with "400" EUR 
transaction amount due to exceed approved amount
     When Admin successfully disburse the loan on "03 January 2025" with "350" 
EUR transaction amount
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 0
     Then Loan Tranche Details tab has the following data:
       | Expected Disbursement On | Disbursed On    | Principal   | Net 
Disbursal Amount |
       | 01 January 2025          | 01 January 2025 | 300.0       |             
         |
@@ -345,3 +367,66 @@ Feature: LoanUpdateAvailableDisbursementAmount
 
     When Loan Pay-off is made on "01 January 2025"
     Then Loan's all installments have obligations met
+
+  @TestRailId:C3999
+  Scenario: Verify availableDisbursementAmountWithOverApplied field calculation
+    When Admin sets the business date to "1 January 2025"
+    And Admin creates a client with random data
+    And Admin creates a fully customized loan with the following data:
+      | LoanProduct                                                            
                           | submitted on date | with Principal | ANNUAL 
interest rate % | interest type     | interest calculation period | 
amortization type  | loanTermFrequency | loanTermFrequencyType | repaymentEvery 
| repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            |
+      | 
LP2_ADV_PYMNT_INTEREST_DAILY_RECALC_EMI_360_30_MULTIDISB_APPROVED_OVER_APPLIED_CAPITALIZED_INCOME
 | 01 January 2025   | 1000           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION |
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
1500
+    And Admin successfully approves the loan on "1 January 2025" with "1000" 
amount and expected disbursement date on "1 January 2025"
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
1500
+    And Admin successfully disburse the loan on "1 January 2025" with "900" 
EUR transaction amount
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
600
+    And Admin successfully disburse the loan on "1 January 2025" with "300" 
EUR transaction amount
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
300
+    And Admin adds capitalized income with "AUTOPAY" payment type to the loan 
on "1 January 2025" with "100" EUR transaction amount
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
200
+    And Admin adds capitalized income with "AUTOPAY" payment type to the loan 
on "1 January 2025" with "150" EUR transaction amount
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
50
+    When Loan Pay-off is made on "01 January 2025"
+    Then Loan's all installments have obligations met
+
+  @TestRailId:C4003
+  Scenario: Verify availableDisbursementAmountWithOverApplied field 
calculation for progressive multidisbursal loan that expects tranches
+    When Admin sets the business date to "01 January 2025"
+    When Admin creates a client with random data
+    When Admin creates a fully customized loan with three expected 
disbursements details and following data:
+      | LoanProduct                                                            
                            | submitted on date | with Principal | ANNUAL 
interest rate % | interest type     | interest calculation period | 
amortization type  | loanTermFrequency | loanTermFrequencyType | repaymentEvery 
| repaymentFrequencyType | numberOfRepayments | graceOnPrincipalPayment | 
graceOnInterestPayment | interest free period | Payment strategy            | 
1st_tranche_disb_expected_date | 1st_tr [...]
+      | 
LP2_ADV_PYMNT_INT_DAILY_EMI_360_30_INT_RECALC_DAILY_MULTIDISB_EXPECT_TRANCHE_APPROVED_OVER_APPLIED
 | 01 January 2025   | 1000           | 7                      | 
DECLINING_BALANCE | DAILY                       | EQUAL_INSTALLMENTS | 6        
         | MONTHS                | 1              | MONTHS                 | 6  
                | 0                       | 0                      | 0          
          | ADVANCED_PAYMENT_ALLOCATION | 01 January 2025                | 
300.0  [...]
+    Then Loan Tranche Details tab has the following data:
+      | Expected Disbursement On | Disbursed On    | Principal   | Net 
Disbursal Amount |
+      | 01 January 2025          |                 | 300.0       |             
         |
+      | 02 January 2025          |                 | 200.0       |             
         |
+      | 03 January 2025          |                 | 500.0       |             
         |
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
500
+    And Admin successfully approves the loan on "01 January 2025" with "1000" 
amount and expected disbursement date on "01 January 2025"
+    Then Loan Tranche Details tab has the following data:
+      | Expected Disbursement On | Disbursed On    | Principal   | Net 
Disbursal Amount |
+      | 01 January 2025          |                 | 300.0       |             
         |
+      | 02 January 2025          |                 | 200.0       |             
         |
+      | 03 January 2025          |                 | 500.0       |             
         |
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
500
+    When Admin successfully disburse the loan on "01 January 2025" with "300" 
EUR transaction amount
+    And Loan Transactions tab has the following data:
+      | Transaction date | Transaction Type | Amount  | Principal | Interest | 
Fees | Penalties | Loan Balance | Reverted | Replayed |
+      | 01 January 2025  | Disbursement     | 300.0   | 0.0       | 0.0      | 
0.0  | 0.0       | 300.0        | false    | false    |
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
500
+    When Admin sets the business date to "02 January 2025"
+    When Admin successfully disburse the loan on "02 January 2025" with "200" 
EUR transaction amount
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 
500
+    When Admin sets the business date to "03 January 2025"
+    When Admin successfully disburse the loan on "03 January 2025" with "1000" 
EUR transaction amount
+    Then Loan has availableDisbursementAmountWithOverApplied field with value: 0
+    Then Loan Tranche Details tab has the following data:
+      | Expected Disbursement On | Disbursed On    | Principal   | Net 
Disbursal Amount |
+      | 01 January 2025          | 01 January 2025 | 300.0       |             
         |
+      | 02 January 2025          | 02 January 2025 | 200.0       |             
         |
+      | 03 January 2025          | 03 January 2025 | 1000.0      |             
         |
+    And Loan Transactions tab has the following data:
+      | Transaction date | Transaction Type | Amount  | Principal | Interest | 
Fees | Penalties | Loan Balance | Reverted | Replayed |
+      | 01 January 2025  | Disbursement     | 300.0   | 0.0       | 0.0      | 
0.0  | 0.0       | 300.0        | false    | false    |
+      | 02 January 2025  | Disbursement     | 200.0   | 0.0       | 0.0      | 
0.0  | 0.0       | 500.0        | false    | false    |
+      | 03 January 2025  | Disbursement     | 1000.0  | 0.0       | 0.0      | 
0.0  | 0.0       | 1500.0       | false    | false    |

Reply via email to