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


The following commit(s) were added to refs/heads/develop by this push:
     new b7e6f356d FINERACT-2148: Resolve rounding issue in interest period 
calculation
b7e6f356d is described below

commit b7e6f356dab07be80b9e4e409b0149489f343207
Author: Oleksii Novikov <[email protected]>
AuthorDate: Mon Jan 6 18:12:51 2025 +0200

    FINERACT-2148: Resolve rounding issue in interest period calculation
---
 .../test/resources/features/EMICalculation.feature | 196 ++++++++++-----------
 .../resources/features/LoanAccrualActivity.feature |  54 +++---
 .../test/resources/features/LoanChargeOff.feature  |  12 +-
 .../loanschedule/data/InterestPeriod.java          |   4 +-
 .../calc/ProgressiveEMICalculatorTest.java         |  34 ++--
 ...PaymentAllocationLoanRepaymentScheduleTest.java |   6 +-
 .../ExternalBusinessEventTest.java                 |   4 +-
 .../integrationtests/LoanInterestRefundTest.java   |  48 ++---
 8 files changed, 179 insertions(+), 179 deletions(-)

diff --git 
a/fineract-e2e-tests-runner/src/test/resources/features/EMICalculation.feature 
b/fineract-e2e-tests-runner/src/test/resources/features/EMICalculation.feature
index 3966682d8..42d779162 100644
--- 
a/fineract-e2e-tests-runner/src/test/resources/features/EMICalculation.feature
+++ 
b/fineract-e2e-tests-runner/src/test/resources/features/EMICalculation.feature
@@ -2127,8 +2127,8 @@ Feature: EMI calculation and repayment schedule checks 
for interest bearing loan
       | 02 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 03 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 04 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 05 March 2024    | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 06 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 05 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 06 March 2024    | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 07 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 08 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 09 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
@@ -2211,8 +2211,8 @@ Feature: EMI calculation and repayment schedule checks 
for interest bearing loan
       | 02 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 03 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 04 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 05 March 2024    | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 06 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 05 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 06 March 2024    | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 07 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 08 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 09 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
@@ -2295,8 +2295,8 @@ Feature: EMI calculation and repayment schedule checks 
for interest bearing loan
       | 02 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 03 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 04 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 05 March 2024    | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 06 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 05 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 06 March 2024    | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 07 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 08 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 09 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
@@ -2379,8 +2379,8 @@ Feature: EMI calculation and repayment schedule checks 
for interest bearing loan
       | 02 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 03 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 04 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 05 March 2024    | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 06 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 05 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 06 March 2024    | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 07 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 08 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 09 March 2024    | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
@@ -2724,7 +2724,7 @@ Feature: EMI calculation and repayment schedule checks 
for interest bearing loan
       | 01 January 2024  | Disbursement     | 100.0  | 0.0       | 0.0      | 
0.0  | 0.0       | 100.0        | false    | false    |
       | 01 February 2024 | Repayment        | 17.01  | 16.43     | 0.58     | 
0.0  | 0.0       | 83.57        | false    | false    |
       | 05 March 2024    | Repayment        | 10.0   | 10.0      | 0.0      | 
0.0  | 0.0       | 73.57        | false    | false    |
-      | 09 March 2024    | Accrual          | 1.18   | 0.0       | 1.18     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 09 March 2024    | Accrual          | 1.19   | 0.0       | 1.19     | 
0.0  | 0.0       | 0.0          | false    | false    |
 
   @TestRailId:C3239
   Scenario: Verify interest recalculation in case of overdue installments: 
UC14 - 1st installment paid on due date, 2nd installment overdue with partial 
late repayment, interest recalculation: daily, till rest frequency date
@@ -2809,7 +2809,7 @@ Feature: EMI calculation and repayment schedule checks 
for interest bearing loan
       | 01 January 2024  | Disbursement     | 100.0  | 0.0       | 0.0      | 
0.0  | 0.0       | 100.0        | false    | false    |
       | 01 February 2024 | Repayment        | 17.01  | 16.43     | 0.58     | 
0.0  | 0.0       | 83.57        | false    | false    |
       | 05 March 2024    | Repayment        | 10.0   | 10.0      | 0.0      | 
0.0  | 0.0       | 73.57        | false    | false    |
-      | 09 March 2024    | Accrual          | 1.18   | 0.0       | 1.18     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 09 March 2024    | Accrual          | 1.19   | 0.0       | 1.19     | 
0.0  | 0.0       | 0.0          | false    | false    |
 
   @TestRailId:C3240
   Scenario: Verify interest recalculation in case of overdue installments: 
UC15 - 1st installment paid on due date, 2nd installment overdue, interest 
recalculation: same as repayment period, till preclose
@@ -3423,16 +3423,16 @@ Feature: EMI calculation and repayment schedule checks 
for interest bearing loan
       | 02 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 03 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 04 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 05 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 06 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 05 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 06 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 07 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 08 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 09 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 10 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 11 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 12 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 13 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 14 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 13 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 14 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 15 January 2024  | Repayment        | 0.2    | 0.0       | 0.2      | 
0.0  | 0.0       | 100.0        | false    | false    |
 
   @TestRailId:C3252
@@ -3483,16 +3483,16 @@ Feature: EMI calculation and repayment schedule checks 
for interest bearing loan
       | 02 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 03 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 04 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 05 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 06 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 05 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 06 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 07 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 08 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 09 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 10 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 11 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 12 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 13 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 14 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 13 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 14 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 15 January 2024  | Repayment        | 0.27   | 0.01      | 0.26     | 
0.0  | 0.0       | 99.99        | false    | false    |
 
   @TestRailId:C3253
@@ -3543,16 +3543,16 @@ Feature: EMI calculation and repayment schedule checks 
for interest bearing loan
       | 02 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 03 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 04 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 05 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 06 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 05 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 06 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 07 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 08 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 09 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 10 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 11 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 12 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 13 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 14 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 13 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 14 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 15 January 2024  | Repayment        | 15.0   | 14.74     | 0.26     | 
0.0  | 0.0       | 85.26        | false    | false    |
 
   @TestRailId:C3254
@@ -3603,16 +3603,16 @@ Feature: EMI calculation and repayment schedule checks 
for interest bearing loan
       | 02 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 03 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 04 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 05 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 06 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 05 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 06 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 07 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 08 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 09 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 10 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 11 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 12 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 13 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 14 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 13 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 14 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 15 January 2024  | Repayment        | 17.0   | 16.74     | 0.26     | 
0.0  | 0.0       | 83.26        | false    | false    |
 
   @TestRailId:C3255
@@ -3667,16 +3667,16 @@ Feature: EMI calculation and repayment schedule checks 
for interest bearing loan
       | 02 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 03 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 04 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 05 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 06 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 05 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 06 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 07 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 08 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 09 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 10 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 11 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 12 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 13 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 14 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 13 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 14 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 15 January 2024  | Repayment        | 15.0   | 14.74     | 0.26     | 
0.0  | 0.0       | 85.26        | false    | false    |
       | 15 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 16 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
@@ -3733,16 +3733,16 @@ Feature: EMI calculation and repayment schedule checks 
for interest bearing loan
       | 02 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 03 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 04 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 05 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 06 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 05 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 06 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 07 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 08 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 09 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 10 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 11 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 12 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 13 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 14 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 13 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 14 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 15 January 2024  | Repayment        | 17.01  | 16.75     | 0.26     | 
0.0  | 0.0       | 83.25        | false    | false    |
 
   @TestRailId:C3257
@@ -3793,16 +3793,16 @@ Feature: EMI calculation and repayment schedule checks 
for interest bearing loan
       | 02 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 03 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 04 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 05 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 06 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 05 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 06 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 07 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 08 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 09 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 10 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 11 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 12 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 13 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 14 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 13 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 14 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 15 January 2024  | Repayment        | 34.02  | 33.76     | 0.26     | 
0.0  | 0.0       | 66.24        | false    | false    |
 
   @TestRailId:C3258
@@ -3857,16 +3857,16 @@ Feature: EMI calculation and repayment schedule checks 
for interest bearing loan
       | 02 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 03 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 04 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 05 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 06 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 05 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 06 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 07 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 08 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 09 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 10 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 11 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 12 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 13 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 14 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 13 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 14 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 15 January 2024  | Repayment        | 17.01  | 16.75     | 0.26     | 
0.0  | 0.0       | 83.25        | false    | false    |
       | 20 January 2024  | Repayment        | 83.33  | 83.25     | 0.08     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 20 January 2024  | Accrual          | 0.1    | 0.0       | 0.1      | 
0.0  | 0.0       | 0.0          | false    | false    |
@@ -3925,16 +3925,16 @@ Feature: EMI calculation and repayment schedule checks 
for interest bearing loan
       | 02 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 03 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 04 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 05 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 06 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 05 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 06 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 07 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 08 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 09 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 10 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 11 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 12 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 13 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 14 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 13 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 14 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 15 January 2024  | Repayment        | 17.01  | 16.75     | 0.26     | 
0.0  | 0.0       | 83.25        | false    | false    |
       | 15 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 16 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
@@ -3949,16 +3949,16 @@ Feature: EMI calculation and repayment schedule checks 
for interest bearing loan
       | 02 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 03 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 04 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 05 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 06 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 05 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 06 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 07 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 08 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 09 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 10 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 11 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 12 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 13 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 14 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 13 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 14 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 15 January 2024  | Repayment        | 17.01  | 16.75     | 0.26     | 
0.0  | 0.0       | 83.25        | false    | false    |
       | 15 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 16 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
@@ -4233,17 +4233,17 @@ Feature: EMI calculation and repayment schedule checks 
for interest bearing loan
       | Nr | Days | Date             | Paid date        | Balance of loan | 
Principal due | Interest | Fees | Penalties | Due    | Paid   | In advance | 
Late   | Outstanding |
       |    |      | 01 January 2024  |                  | 1000.0          |    
           |          | 0.0  |           | 0.0    | 0.0    |            |       
 |             |
       | 1  | 31   | 01 February 2024 | 14 February 2024 | 753.25          | 
246.75        | 8.39     | 0.0  | 0.0       | 255.14 | 255.14 | 0.0        | 
255.14 | 0.0         |
-      | 2  | 29   | 01 March 2024    |                  | 498.11          | 
255.14        | 0.0      | 0.0  | 0.0       | 255.14 | 250.81 | 250.81     | 
0.0    | 4.33        |
-      | 3  | 31   | 01 April 2024    |                  | 252.83          | 
245.28        | 9.86     | 0.0  | 0.0       | 255.14 | 0.0    | 0.0        | 
0.0    | 255.14      |
-      | 4  | 30   | 01 May 2024      |                  | 0.0             | 
252.83        | 2.05     | 0.0  | 0.0       | 254.88 | 0.0    | 0.0        | 
0.0    | 254.88      |
+      | 2  | 29   | 01 March 2024    |                  | 498.11          | 
255.14        | 0.0      | 0.0  | 0.0       | 255.14 | 250.82 | 250.82     | 
0.0    | 4.32        |
+      | 3  | 31   | 01 April 2024    |                  | 252.84          | 
245.27        | 9.87     | 0.0  | 0.0       | 255.14 | 0.0    | 0.0        | 
0.0    | 255.14      |
+      | 4  | 30   | 01 May 2024      |                  | 0.0             | 
252.84        | 2.05     | 0.0  | 0.0       | 254.89 | 0.0    | 0.0        | 
0.0    | 254.89      |
     Then Loan Repayment schedule has the following data in Total row:
       | Principal due | Interest | Fees | Penalties | Due     | Paid   | In 
advance | Late   | Outstanding |
-      | 1000.0        | 20.30    | 0.0  | 0.0       | 1020.30 | 505.95 | 
250.81     | 255.14 | 514.35      |
+      | 1000.0        | 20.31    | 0.0  | 0.0       | 1020.31 | 505.96 | 
250.82     | 255.14 | 514.35      |
     Then Loan Transactions tab has the following data:
       | Transaction date | Transaction Type | Amount | Principal | Interest | 
Fees | Penalties | Loan Balance | Reverted | Replayed |
       | 01 January 2024  | Disbursement     | 1000.0 | 0.0       | 0.0      | 
0.0  | 0.0       | 1000.0       | false    | false    |
       | 14 February 2024 | Payout Refund    | 500.0  | 491.61    | 8.39     | 
0.0  | 0.0       | 508.39       | false    | false    |
-      | 14 February 2024 | Interest Refund  | 5.95   | 5.95      | 0.0      | 
0.0  | 0.0       | 502.44       | false    | false    |
+      | 14 February 2024 | Interest Refund  | 5.96   | 5.96      | 0.0      | 
0.0  | 0.0       | 502.43       | false    | false    |
     When Admin sets the business date to "01 March 2024"
     And Customer makes "AUTOPAY" repayment on "01 March 2024" with 4.33 EUR 
transaction amount
     When Admin sets the business date to "01 April 2024"
@@ -4254,21 +4254,21 @@ Feature: EMI calculation and repayment schedule checks 
for interest bearing loan
       | Nr | Days | Date             | Paid date        | Balance of loan | 
Principal due | Interest | Fees | Penalties | Due    | Paid   | In advance | 
Late   | Outstanding |
       |    |      | 01 January 2024  |                  | 1000.0          |    
           |          | 0.0  |           | 0.0    | 0.0    |            |       
 |             |
       | 1  | 31   | 01 February 2024 | 14 February 2024 | 753.25          | 
246.75        | 8.39     | 0.0  | 0.0       | 255.14 | 255.14 | 0.0        | 
255.14 | 0.0         |
-      | 2  | 29   | 01 March 2024    | 01 March 2024    | 498.11          | 
255.14        | 0.0      | 0.0  | 0.0       | 255.14 | 255.14 | 250.81     | 
0.0    | 0.0         |
-      | 3  | 31   | 01 April 2024    | 01 April 2024    | 252.83          | 
245.28        | 9.86     | 0.0  | 0.0       | 255.14 | 255.14 | 0.0        | 
0.0    | 0.0         |
-      | 4  | 30   | 01 May 2024      | 01 May 2024      | 0.0             | 
252.83        | 2.05     | 0.0  | 0.0       | 254.88 | 254.88 | 0.0        | 
0.0    | 0.0         |
+      | 2  | 29   | 01 March 2024    | 01 March 2024    | 498.11          | 
255.14        | 0.0      | 0.0  | 0.0       | 255.14 | 255.14 | 250.82     | 
0.0    | 0.0         |
+      | 3  | 31   | 01 April 2024    | 01 April 2024    | 252.84          | 
245.27        | 9.87     | 0.0  | 0.0       | 255.14 | 255.14 | 0.01       | 
0.0    | 0.0         |
+      | 4  | 30   | 01 May 2024      | 01 May 2024      | 0.0             | 
252.84        | 2.05     | 0.0  | 0.0       | 254.89 | 254.89 | 0.01       | 
0.0    | 0.0         |
     Then Loan Repayment schedule has the following data in Total row:
       | Principal due | Interest | Fees | Penalties | Due     | Paid    | In 
advance | Late   | Outstanding |
-      | 1000.0        | 20.30    | 0.0  | 0.0       | 1020.30 | 1020.30 | 
250.81     | 255.14 | 0.0         |
+      | 1000.0        | 20.31    | 0.0  | 0.0       | 1020.31 | 1020.31 | 
250.84     | 255.14 | 0.0         |
     Then Loan Transactions tab has the following data:
       | Transaction date | Transaction Type | Amount | Principal | Interest | 
Fees | Penalties | Loan Balance | Reverted | Replayed |
       | 01 January 2024  | Disbursement     | 1000.0 | 0.0       | 0.0      | 
0.0  | 0.0       | 1000.0       | false    | false    |
       | 14 February 2024 | Payout Refund    | 500.0  | 491.61    | 8.39     | 
0.0  | 0.0       | 508.39       | false    | false    |
-      | 14 February 2024 | Interest Refund  | 5.95   | 5.95      | 0.0      | 
0.0  | 0.0       | 502.44       | false    | false    |
-      | 01 March 2024    | Repayment        | 4.33   | 4.33      | 0.0      | 
0.0  | 0.0       | 498.11       | false    | false    |
-      | 01 April 2024    | Repayment        | 255.14 | 245.28    | 9.86     | 
0.0  | 0.0       | 252.83       | false    | false    |
+      | 14 February 2024 | Interest Refund  | 5.96   | 5.96      | 0.0      | 
0.0  | 0.0       | 502.43       | false    | false    |
+      | 01 March 2024    | Repayment        | 4.33   | 4.33      | 0.0      | 
0.0  | 0.0       | 498.1        | false    | false    |
+      | 01 April 2024    | Repayment        | 255.14 | 245.27    | 9.87     | 
0.0  | 0.0       | 252.83       | false    | false    |
       | 01 May 2024      | Repayment        | 254.88 | 252.83    | 2.05     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 01 May 2024      | Accrual          | 20.3   | 0.0       | 20.3     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 01 May 2024      | Accrual          | 20.31  | 0.0       | 20.31    | 
0.0  | 0.0       | 0.0          | false    | false    |
     Then Loan status will be "CLOSED_OBLIGATIONS_MET"
 
 
@@ -4597,33 +4597,33 @@ Feature: EMI calculation and repayment schedule checks 
for interest bearing loan
       | 02 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 03 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 04 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 05 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 06 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 05 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 06 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 07 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 08 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 09 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 10 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 11 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 12 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 13 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 14 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 13 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 14 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 15 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 16 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 17 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 18 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 19 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 20 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 21 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 21 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 22 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 23 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 23 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 24 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 25 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 26 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 27 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 28 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 29 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 29 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 30 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 31 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 31 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 01 February 2024 | Repayment        | 33.91  | 33.33     | 0.58     | 
0.0  | 0.0       | 66.67        | false    | false    |
       | 01 February 2024 | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
 
@@ -4675,16 +4675,16 @@ Feature: EMI calculation and repayment schedule checks 
for interest bearing loan
       | 02 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 03 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 04 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 05 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 06 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 05 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 06 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 07 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 08 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 09 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 10 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 11 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 12 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 13 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 14 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 13 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 14 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 15 January 2024  | Repayment        | 15.0   | 15.0      | 0.0      | 
0.0  | 0.0       | 85.0         | false    | false    |
     When Admin set 
"LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALCULATION_DAILY_TILL_PRECLOSE"
 loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future 
installment allocation rule
 
@@ -4736,16 +4736,16 @@ Feature: EMI calculation and repayment schedule checks 
for interest bearing loan
       | 02 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 03 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 04 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 05 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 06 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 05 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 06 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 07 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 08 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 09 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 10 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 11 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 12 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 13 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 14 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 13 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 14 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 15 January 2024  | Repayment        | 17.01  | 17.01     | 0.0      | 
0.0  | 0.0       | 82.99        | false    | false    |
     When Admin set 
"LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALCULATION_DAILY_TILL_PRECLOSE"
 loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future 
installment allocation rule
 
@@ -4797,16 +4797,16 @@ Feature: EMI calculation and repayment schedule checks 
for interest bearing loan
       | 02 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 03 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 04 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 05 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 06 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 05 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 06 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 07 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 08 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 09 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 10 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 11 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 12 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 13 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 14 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 13 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 14 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 15 January 2024  | Repayment        | 34.02  | 34.02     | 0.0      | 
0.0  | 0.0       | 65.98        | false    | false    |
     When Admin set 
"LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALCULATION_DAILY_TILL_PRECLOSE"
 loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future 
installment allocation rule
 
@@ -4859,16 +4859,16 @@ Feature: EMI calculation and repayment schedule checks 
for interest bearing loan
       | 02 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 03 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 04 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 05 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 06 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 05 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 06 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 07 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 08 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 09 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 10 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 11 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 12 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 13 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 14 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 13 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 14 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 15 January 2024  | Repayment        | 17.01  | 17.01     | 0.0      | 
0.0  | 0.0       | 82.99       | false    | false    |
 #    --- Early repayment with 83.07 EUR on 20 Jan ---
     When Admin sets the business date to "20 January 2024"
@@ -4893,16 +4893,16 @@ Feature: EMI calculation and repayment schedule checks 
for interest bearing loan
       | 02 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 03 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 04 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 05 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 06 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 05 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 06 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 07 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 08 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 09 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 10 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 11 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 12 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 13 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 14 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 13 January 2024  | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 14 January 2024  | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 15 January 2024  | Repayment        | 17.01  | 17.01     | 0.0      | 
0.0  | 0.0       | 82.99        | false    | false    |
       | 20 January 2024  | Repayment        | 83.33  | 82.99     | 0.34     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 20 January 2024  | Accrual          | 0.1    | 0.0       | 0.1      | 
0.0  | 0.0       | 0.0          | false    | false    |
@@ -5176,20 +5176,20 @@ Feature: EMI calculation and repayment schedule checks 
for interest bearing loan
       | Nr | Days | Date             | Paid date        | Balance of loan | 
Principal due | Interest | Fees | Penalties | Due   | Paid  | In advance | Late 
| Outstanding |
       |    |      | 01 January 2024  |                  | 100.0           |    
           |          | 0.0  |           | 0.0   | 0.0   |            |      |  
           |
       | 1  | 31   | 01 February 2024 | 15 January 2024  | 83.25           | 
16.75         | 0.26     | 0.0  | 0.0       | 17.01 | 17.01 | 17.01      | 0.0  
| 0.0         |
-      | 2  | 29   | 01 March 2024    |                  | 67.01           | 
16.24         | 0.65     | 0.0  | 0.0       | 16.89 | 0.0   | 0.0        | 0.0  
| 16.89       |
-      | 3  | 31   | 01 April 2024    |                  | 50.34           | 
16.67         | 0.22     | 0.0  | 0.0       | 16.89 | 0.0   | 0.0        | 0.0  
| 16.89       |
-      | 4  | 30   | 01 May 2024      |                  | 33.62           | 
16.72         | 0.17     | 0.0  | 0.0       | 16.89 | 0.0   | 0.0        | 0.0  
| 16.89      |
-      | 5  | 31   | 01 June 2024     |                  | 16.84           | 
16.78         | 0.11     | 0.0  | 0.0       | 16.89 | 0.0   | 0.0        | 0.0  
| 16.89       |
-      | 6  | 30   | 01 July 2024     |                  | 0.0             | 
16.84         | 0.06     | 0.0  | 0.0       | 16.9  | 0.0   | 0.0        | 0.0  
| 16.9        |
+      | 2  | 29   | 01 March 2024    |                  | 67.0            | 
16.25         | 0.64     | 0.0  | 0.0       | 16.89 | 0.0   | 0.0        | 0.0  
| 16.89       |
+      | 3  | 31   | 01 April 2024    |                  | 50.33           | 
16.67         | 0.22     | 0.0  | 0.0       | 16.89 | 0.0   | 0.0        | 0.0  
| 16.89       |
+      | 4  | 30   | 01 May 2024      |                  | 33.61           | 
16.72         | 0.17     | 0.0  | 0.0       | 16.89 | 0.0   | 0.0        | 0.0  
| 16.89       |
+      | 5  | 31   | 01 June 2024     |                  | 16.83           | 
16.78         | 0.11     | 0.0  | 0.0       | 16.89 | 0.0   | 0.0        | 0.0  
| 16.89       |
+      | 6  | 30   | 01 July 2024     |                  | 0.0             | 
16.83         | 0.06     | 0.0  | 0.0       | 16.89 | 0.0   | 0.0        | 0.0  
| 16.89       |
     Then Loan Repayment schedule has the following data in Total row:
       | Principal due | Interest | Fees | Penalties | Due    | Paid  | In 
advance | Late | Outstanding |
-      | 100.0         | 1.47     | 0.0  | 0.0       | 101.47 | 17.01 | 17.01   
     | 0.0  | 84.46       |
+      | 100.0         | 1.46     | 0.0  | 0.0       | 101.46 | 17.01 | 17.01   
   | 0.0  | 84.45       |
     Then Loan Transactions tab has the following data:
       | Transaction date | Transaction Type | Amount | Principal | Interest | 
Fees | Penalties | Loan Balance | Reverted | Replayed |
       | 01 January 2024  | Disbursement     | 100.0  | 0.0       | 0.0      | 
0.0  | 0.0       | 100.0        | false    | false    |
       | 15 January 2024  | Repayment        | 17.01  | 16.75     | 0.26     | 
0.0  | 0.0       | 83.25        | false    | false    |
       | 14 February 2024 | Accrual          | 0.75   | 0.0       | 0.75     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 15 February 2024 | Accrual          | 0.02   | 0.0       | 0.02     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 15 February 2024 | Accrual          | 0.01   | 0.0       | 0.01     | 
0.0  | 0.0       | 0.0          | false    | false    |
 
   @TestRailId:C3301
   Scenario: UC18-1 - In case of backdated repayment the Interest Refund 
transaction needs to be recalculated
diff --git 
a/fineract-e2e-tests-runner/src/test/resources/features/LoanAccrualActivity.feature
 
b/fineract-e2e-tests-runner/src/test/resources/features/LoanAccrualActivity.feature
index c16a4f24c..7f6544b30 100644
--- 
a/fineract-e2e-tests-runner/src/test/resources/features/LoanAccrualActivity.feature
+++ 
b/fineract-e2e-tests-runner/src/test/resources/features/LoanAccrualActivity.feature
@@ -2105,19 +2105,19 @@ Feature: LoanAccrualActivity
     Then Loan Repayment schedule has 4 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 2024  |                 | 1000.0          |     
          |          | 0.0  |           | 0.0    | 0.0    |            |      | 
            |
-      | 1  | 31   | 01 February 2024 | 15 January 2024 | 746.1           | 
253.9         | 9.79     | 0.0  | 0.0       | 263.69 | 263.69 | 263.69     | 
0.0  | 0.0         |
-      | 2  | 29   | 01 March 2024    |                 | 507.44          | 
238.66        | 25.03    | 0.0  | 0.0       | 263.69 | 0.0    | 0.0        | 
0.0  | 263.69      |
-      | 3  | 31   | 01 April 2024    |                 | 254.74          | 
252.7         | 10.99    | 0.0  | 0.0       | 263.69 | 0.0    | 0.0        | 
0.0  | 263.69      |
-      | 4  | 30   | 01 May 2024      |                 | 0.0             | 
254.74        | 5.52     | 0.0  | 0.0       | 260.26 | 0.0    | 0.0        | 
0.0  | 260.26      |
+      | 1  | 31   | 01 February 2024 | 15 January 2024 | 746.09          | 
253.91        | 9.78     | 0.0  | 0.0       | 263.69 | 263.69 | 263.69     | 
0.0  | 0.0         |
+      | 2  | 29   | 01 March 2024    |                 | 507.43          | 
238.66        | 25.03    | 0.0  | 0.0       | 263.69 | 0.0    | 0.0        | 
0.0  | 263.69      |
+      | 3  | 31   | 01 April 2024    |                 | 254.73          | 
252.7         | 10.99    | 0.0  | 0.0       | 263.69 | 0.0    | 0.0        | 
0.0  | 263.69      |
+      | 4  | 30   | 01 May 2024      |                 | 0.0             | 
254.73        | 5.52     | 0.0  | 0.0       | 260.25 | 0.0    | 0.0        | 
0.0  | 260.25      |
     Then Loan Repayment schedule has the following data in Total row:
-      | Principal due | Interest | Fees | Penalties | Due      | Paid | In 
advance | Late | Outstanding |
-      | 1000.0        | 51.33    | 0.0  | 0.0       | 1051.33  | 263.69  | 
263.69  | 0.0  | 787.64      |
+      | Principal due | Interest | Fees | Penalties | Due      | Paid   | In 
advance | Late | Outstanding |
+      | 1000.0        | 51.32    | 0.0  | 0.0       | 1051.32  | 263.69 | 
263.69     | 0.0  | 787.63      |
     Then Loan Transactions tab has the following data:
       | Transaction date | Transaction Type | Amount | Principal | Interest | 
Fees | Penalties | Loan Balance | Reverted | Replayed |
       | 01 January 2024  | Disbursement     | 1000.0 | 0.0       | 0.0      | 
0.0  | 0.0       | 1000.0       | false    | false    |
       | 13 January 2024  | Accrual          | 8.39   | 0.0       | 8.39     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 14 January 2024  | Accrual          | 0.7    | 0.0       | 0.7      | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 15 January 2024  | Repayment        | 263.69 | 253.9     | 9.79     | 
0.0  | 0.0       | 746.1        | false    | false    |
+      | 15 January 2024  | Repayment        | 263.69 | 253.91    | 9.78     | 
0.0  | 0.0       | 746.09       | false    | false    |
     When Admin sets the business date to "21 January 2024"
     And Admin runs inline COB job for Loan
     Then Loan Transactions tab has the following data:
@@ -2125,13 +2125,13 @@ Feature: LoanAccrualActivity
       | 01 January 2024  | Disbursement     | 1000.0 | 0.0       | 0.0      | 
0.0  | 0.0       | 1000.0       | false    | false    |
       | 13 January 2024  | Accrual          | 8.39   | 0.0       | 8.39     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 14 January 2024  | Accrual          | 0.7    | 0.0       | 0.7      | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 15 January 2024  | Repayment        | 263.69 | 253.9     | 9.79     | 
0.0  | 0.0       | 746.1        | false    | false    |
-      | 15 January 2024  | Accrual          | 0.7    | 0.0       | 0.7      | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 15 January 2024  | Repayment        | 263.69 | 253.91    | 9.78     | 
0.0  | 0.0       | 746.09       | false    | false    |
+      | 15 January 2024  | Accrual          | 0.69   | 0.0       | 0.69     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 16 January 2024  | Accrual          | 0.52   | 0.0       | 0.52     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 17 January 2024  | Accrual          | 0.52   | 0.0       | 0.52     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 18 January 2024  | Accrual          | 0.52   | 0.0       | 0.52     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 19 January 2024  | Accrual          | 0.52   | 0.0       | 0.52     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 20 January 2024  | Accrual          | 0.53   | 0.0       | 0.53     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 19 January 2024  | Accrual          | 0.53   | 0.0       | 0.53     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 20 January 2024  | Accrual          | 0.52   | 0.0       | 0.52     | 
0.0  | 0.0       | 0.0          | false    | false    |
     When Customer undo "1"th repayment on "15 January 2024"
     Then Loan Repayment schedule has 4 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 |
@@ -2148,13 +2148,13 @@ Feature: LoanAccrualActivity
       | 01 January 2024  | Disbursement     | 1000.0 | 0.0       | 0.0      | 
0.0  | 0.0       | 1000.0       | false    | false    |
       | 13 January 2024  | Accrual          | 8.39   | 0.0       | 8.39     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 14 January 2024  | Accrual          | 0.7    | 0.0       | 0.7      | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 15 January 2024  | Repayment        | 263.69 | 253.9     | 9.79     | 
0.0  | 0.0       | 746.1        | true     | false    |
-      | 15 January 2024  | Accrual          | 0.7    | 0.0       | 0.7      | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 15 January 2024  | Repayment        | 263.69 | 253.91    | 9.78     | 
0.0  | 0.0       | 746.09       | true     | false    |
+      | 15 January 2024  | Accrual          | 0.69   | 0.0       | 0.69     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 16 January 2024  | Accrual          | 0.52   | 0.0       | 0.52     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 17 January 2024  | Accrual          | 0.52   | 0.0       | 0.52     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 18 January 2024  | Accrual          | 0.52   | 0.0       | 0.52     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 19 January 2024  | Accrual          | 0.52   | 0.0       | 0.52     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 20 January 2024  | Accrual          | 0.53   | 0.0       | 0.53     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 19 January 2024  | Accrual          | 0.53   | 0.0       | 0.53     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 20 January 2024  | Accrual          | 0.52   | 0.0       | 0.52     | 
0.0  | 0.0       | 0.0          | false    | false    |
     When Admin sets the business date to "23 January 2024"
     And Admin runs inline COB job for Loan
     Then Loan Repayment schedule has 4 periods, with the following data for 
periods:
@@ -2172,14 +2172,14 @@ Feature: LoanAccrualActivity
       | 01 January 2024  | Disbursement     | 1000.0 | 0.0       | 0.0      | 
0.0  | 0.0       | 1000.0       | false    | false    |
       | 13 January 2024  | Accrual          | 8.39   | 0.0       | 8.39     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 14 January 2024  | Accrual          | 0.7    | 0.0       | 0.7      | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 15 January 2024  | Repayment        | 263.69 | 253.9     | 9.79     | 
0.0  | 0.0       | 746.1        | true     | false    |
-      | 15 January 2024  | Accrual          | 0.7    | 0.0       | 0.7      | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 15 January 2024  | Repayment        | 263.69 | 253.91    | 9.78     | 
0.0  | 0.0       | 746.09       | true     | false    |
+      | 15 January 2024  | Accrual          | 0.69   | 0.0       | 0.69     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 16 January 2024  | Accrual          | 0.52   | 0.0       | 0.52     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 17 January 2024  | Accrual          | 0.52   | 0.0       | 0.52     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 18 January 2024  | Accrual          | 0.52   | 0.0       | 0.52     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 19 January 2024  | Accrual          | 0.52   | 0.0       | 0.52     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 20 January 2024  | Accrual          | 0.53   | 0.0       | 0.53     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 21 January 2024  | Accrual          | 1.58   | 0.0       | 1.58     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 19 January 2024  | Accrual          | 0.53   | 0.0       | 0.53     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 20 January 2024  | Accrual          | 0.52   | 0.0       | 0.52     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 21 January 2024  | Accrual          | 1.59   | 0.0       | 1.59     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 22 January 2024  | Accrual          | 0.7    | 0.0       | 0.7      | 
0.0  | 0.0       | 0.0          | false    | false    |
     When Admin sets the business date to "28 January 2024"
     And Admin runs inline COB job for Loan
@@ -2198,17 +2198,17 @@ Feature: LoanAccrualActivity
       | 01 January 2024  | Disbursement     | 1000.0 | 0.0       | 0.0      | 
0.0  | 0.0       | 1000.0       | false    | false    |
       | 13 January 2024  | Accrual          | 8.39   | 0.0       | 8.39     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 14 January 2024  | Accrual          | 0.7    | 0.0       | 0.7      | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 15 January 2024  | Repayment        | 263.69 | 253.9     | 9.79     | 
0.0  | 0.0       | 746.1        | true     | false    |
-      | 15 January 2024  | Accrual          | 0.7    | 0.0       | 0.7      | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 15 January 2024  | Repayment        | 263.69 | 253.91    | 9.78     | 
0.0  | 0.0       | 746.09       | true     | false    |
+      | 15 January 2024  | Accrual          | 0.69   | 0.0       | 0.69     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 16 January 2024  | Accrual          | 0.52   | 0.0       | 0.52     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 17 January 2024  | Accrual          | 0.52   | 0.0       | 0.52     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 18 January 2024  | Accrual          | 0.52   | 0.0       | 0.52     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 19 January 2024  | Accrual          | 0.52   | 0.0       | 0.52     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 20 January 2024  | Accrual          | 0.53   | 0.0       | 0.53     | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 21 January 2024  | Accrual          | 1.58   | 0.0       | 1.58     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 19 January 2024  | Accrual          | 0.53   | 0.0       | 0.53     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 20 January 2024  | Accrual          | 0.52   | 0.0       | 0.52     | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 21 January 2024  | Accrual          | 1.59   | 0.0       | 1.59     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 22 January 2024  | Accrual          | 0.7    | 0.0       | 0.7      | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 23 January 2024  | Accrual          | 0.7    | 0.0       | 0.7      | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 24 January 2024  | Accrual          | 0.7    | 0.0       | 0.7      | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 25 January 2024  | Accrual          | 0.7    | 0.0       | 0.7      | 
0.0  | 0.0       | 0.0          | false    | false    |
+      | 25 January 2024  | Accrual          | 0.69   | 0.0       | 0.69     | 
0.0  | 0.0       | 0.0          | false    | false    |
       | 26 January 2024  | Accrual          | 0.7    | 0.0       | 0.7      | 
0.0  | 0.0       | 0.0          | false    | false    |
-      | 27 January 2024  | Accrual          | 0.69   | 0.0       | 0.69     | 
0.0  | 0.0       | 0.0          | false    | false    |
\ No newline at end of file
+      | 27 January 2024  | Accrual          | 0.7    | 0.0       | 0.7      | 
0.0  | 0.0       | 0.0          | false    | false    |
\ No newline at end of file
diff --git 
a/fineract-e2e-tests-runner/src/test/resources/features/LoanChargeOff.feature 
b/fineract-e2e-tests-runner/src/test/resources/features/LoanChargeOff.feature
index 8be3ecae6..2fa6c4e1d 100644
--- 
a/fineract-e2e-tests-runner/src/test/resources/features/LoanChargeOff.feature
+++ 
b/fineract-e2e-tests-runner/src/test/resources/features/LoanChargeOff.feature
@@ -2301,19 +2301,19 @@ Feature: Charge-off
       | Nr | Days | Date             | Paid date        | Balance of loan | 
Principal due | Interest | Fees  | Penalties | Due     | Paid  | In advance | 
Late | Outstanding |
       |    |      | 01 January 2024  |                  | 100.0           |    
           |          | 0.0   |           | 0.0     | 0.0   |            |      
|             |
       | 1  | 31   | 01 February 2024 |                  | 83.52           | 
16.48         | 0.53     | 0.0   | 0.0       | 17.01   | 0.0   | 0.0        | 
0.0  | 17.01       |
-      | 2  | 29   | 01 March 2024    |                  | 66.97           | 
16.55         | 0.46     | 0.0   | 0.0       | 17.01   | 0.0   | 0.0        | 
0.0  | 17.01       |
-      | 3  | 31   | 01 April 2024    |                  | 49.96           | 
17.01         | 0.0      | 0.0   | 0.0       | 17.01   | 0.0   | 0.0        | 
0.0  | 17.01       |
-      | 4  | 30   | 01 May 2024      |                  | 32.95           | 
17.01         | 0.0      | 0.0   | 0.0       | 17.01   | 0.0   | 0.0        | 
0.0  | 17.01       |
-      | 5  | 31   | 01 June 2024     |                  | 17.01           | 
15.94         | 0.0      | 0.0   | 0.0       | 15.94   | 0.0   | 0.0        | 
0.0  | 15.94       |
+      | 2  | 29   | 01 March 2024    |                  | 66.98           | 
16.54         | 0.47     | 0.0   | 0.0       | 17.01   | 0.0   | 0.0        | 
0.0  | 17.01       |
+      | 3  | 31   | 01 April 2024    |                  | 49.97           | 
17.01         | 0.0      | 0.0   | 0.0       | 17.01   | 0.0   | 0.0        | 
0.0  | 17.01       |
+      | 4  | 30   | 01 May 2024      |                  | 32.96           | 
17.01         | 0.0      | 0.0   | 0.0       | 17.01   | 0.0   | 0.0        | 
0.0  | 17.01       |
+      | 5  | 31   | 01 June 2024     |                  | 17.01           | 
15.95         | 0.0      | 0.0   | 0.0       | 15.95   | 0.0   | 0.0        | 
0.0  | 15.95       |
       | 6  | 30   | 01 July 2024     | 15 January 2024  | 0.0             | 
17.01         | 0.0      | 0.0   | 0.0       | 17.01   | 17.01 | 17.01      | 
0.0  | 0.0         |
     Then Loan Repayment schedule has the following data in Total row:
       | Principal due | Interest | Fees | Penalties | Due     | Paid | In 
advance | Late | Outstanding |
-      | 100           | 0.99     | 0    | 0         | 100.99  | 17.01| 17.01   
   | 0    | 83.98       |
+      | 100           | 1.0      | 0    | 0         | 101.0   | 17.01| 17.01   
   | 0    | 83.99       |
     Then Loan Transactions tab has the following data:
       | Transaction date | Transaction Type | Amount  | Principal | Interest | 
Fees  | Penalties | Loan Balance | Reverted | Replayed |
       | 01 January 2024  | Disbursement     | 100.0   | 0.0       | 0.0      | 
0.0   | 0.0       | 100.0        | false    | false    |
       | 15 January 2024  | Repayment        | 17.01   | 17.01     | 0.0      | 
0.0   | 0.0       | 82.99        | false    | false    |
-      | 29 February 2024 | Charge-off       | 83.98   | 82.99     | 0.99     | 
0.0   | 0.0       | 0.0          | false    | false    |
+      | 29 February 2024 | Charge-off       | 83.99   | 82.99     | 1.0      | 
0.0   | 0.0       | 0.0          | false    | false    |
     And Admin set 
"LP2_ADV_PYMNT_INTEREST_DAILY_INTEREST_RECALCULATION_ZERO_INTEREST_CHARGE_OFF_BEHAVIOUR"
 loan product "DEFAULT" transaction type to "NEXT_INSTALLMENT" future 
installment allocation rule
 
   Scenario: Charge-off on due date when loan behaviour is zero-interest and 
interestRecalculation = false
diff --git 
a/fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/data/InterestPeriod.java
 
b/fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/data/InterestPeriod.java
index 97bdeb54a..3d4824195 100644
--- 
a/fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/data/InterestPeriod.java
+++ 
b/fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/data/InterestPeriod.java
@@ -87,8 +87,8 @@ public class InterestPeriod implements 
Comparable<InterestPeriod> {
         long lengthTillPeriodDueDate = getLengthTillPeriodDueDate();
         final BigDecimal interestDueTillRepaymentDueDate = 
lengthTillPeriodDueDate == 0 //
                 ? BigDecimal.ZERO //
-                : getOutstandingLoanBalance() //
-                        .multipliedBy(getRateFactorTillPeriodDueDate(), 
mc).getAmount() //
+                : getOutstandingLoanBalance().getAmount() //
+                        .multiply(getRateFactorTillPeriodDueDate(), mc) //
                         .divide(BigDecimal.valueOf(lengthTillPeriodDueDate), 
mc) //
                         .multiply(BigDecimal.valueOf(getLength()), mc); //
         return Money.of(outstandingLoanBalance.getCurrencyData(), 
interestDueTillRepaymentDueDate, mc);
diff --git 
a/fineract-progressive-loan/src/test/java/org/apache/fineract/portfolio/loanproduct/calc/ProgressiveEMICalculatorTest.java
 
b/fineract-progressive-loan/src/test/java/org/apache/fineract/portfolio/loanproduct/calc/ProgressiveEMICalculatorTest.java
index a60e7a537..c6c5589be 100644
--- 
a/fineract-progressive-loan/src/test/java/org/apache/fineract/portfolio/loanproduct/calc/ProgressiveEMICalculatorTest.java
+++ 
b/fineract-progressive-loan/src/test/java/org/apache/fineract/portfolio/loanproduct/calc/ProgressiveEMICalculatorTest.java
@@ -1168,30 +1168,30 @@ class ProgressiveEMICalculatorTest {
         checkDailyInterest(interestModel, dueDate, startDay, 5, 0.19, 0.94);
         checkDailyInterest(interestModel, dueDate, startDay, 6, 0.19, 1.13);
         checkDailyInterest(interestModel, dueDate, startDay, 7, 0.19, 1.32);
-        checkDailyInterest(interestModel, dueDate, startDay, 8, 0.18, 1.50);
-        checkDailyInterest(interestModel, dueDate, startDay, 9, 0.19, 1.69);
+        checkDailyInterest(interestModel, dueDate, startDay, 8, 0.19, 1.51);
+        checkDailyInterest(interestModel, dueDate, startDay, 9, 0.18, 1.69);
         checkDailyInterest(interestModel, dueDate, startDay, 10, 0.19, 1.88);
         checkDailyInterest(interestModel, dueDate, startDay, 11, 0.19, 2.07);
         checkDailyInterest(interestModel, dueDate, startDay, 12, 0.19, 2.26);
-        checkDailyInterest(interestModel, dueDate, startDay, 13, 0.18, 2.44);
-        checkDailyInterest(interestModel, dueDate, startDay, 14, 0.19, 2.63);
+        checkDailyInterest(interestModel, dueDate, startDay, 13, 0.19, 2.45);
+        checkDailyInterest(interestModel, dueDate, startDay, 14, 0.18, 2.63);
         checkDailyInterest(interestModel, dueDate, startDay, 15, 0.19, 2.82);
         checkDailyInterest(interestModel, dueDate, startDay, 16, 0.19, 3.01);
         checkDailyInterest(interestModel, dueDate, startDay, 17, 0.19, 3.20);
         checkDailyInterest(interestModel, dueDate, startDay, 18, 0.19, 3.39);
-        checkDailyInterest(interestModel, dueDate, startDay, 19, 0.18, 3.57);
-        checkDailyInterest(interestModel, dueDate, startDay, 20, 0.19, 3.76);
+        checkDailyInterest(interestModel, dueDate, startDay, 19, 0.19, 3.58);
+        checkDailyInterest(interestModel, dueDate, startDay, 20, 0.18, 3.76);
         checkDailyInterest(interestModel, dueDate, startDay, 21, 0.19, 3.95);
         checkDailyInterest(interestModel, dueDate, startDay, 22, 0.19, 4.14);
         checkDailyInterest(interestModel, dueDate, startDay, 23, 0.19, 4.33);
-        checkDailyInterest(interestModel, dueDate, startDay, 24, 0.18, 4.51);
-        checkDailyInterest(interestModel, dueDate, startDay, 25, 0.19, 4.70);
+        checkDailyInterest(interestModel, dueDate, startDay, 24, 0.19, 4.52);
+        checkDailyInterest(interestModel, dueDate, startDay, 25, 0.18, 4.7);
         checkDailyInterest(interestModel, dueDate, startDay, 26, 0.19, 4.89);
         checkDailyInterest(interestModel, dueDate, startDay, 27, 0.19, 5.08);
         checkDailyInterest(interestModel, dueDate, startDay, 28, 0.19, 5.27);
-        checkDailyInterest(interestModel, dueDate, startDay, 29, 0.18, 5.45);
-        checkDailyInterest(interestModel, dueDate, startDay, 30, 0.19, 5.64);
-        checkDailyInterest(interestModel, dueDate, startDay, 31, 0.19, 5.83);
+        checkDailyInterest(interestModel, dueDate, startDay, 29, 0.19, 5.46);
+        checkDailyInterest(interestModel, dueDate, startDay, 30, 0.19, 5.65);
+        checkDailyInterest(interestModel, dueDate, startDay, 31, 0.18, 5.83);
     }
 
     @Test
@@ -1235,13 +1235,13 @@ class ProgressiveEMICalculatorTest {
         checkDailyInterest(interestModel, dueDate, startDay, 5, 0.19, 0.94);
         checkDailyInterest(interestModel, dueDate, startDay, 6, 0.19, 1.13);
         checkDailyInterest(interestModel, dueDate, startDay, 7, 0.19, 1.32);
-        checkDailyInterest(interestModel, dueDate, startDay, 8, 0.18, 1.50);
-        checkDailyInterest(interestModel, dueDate, startDay, 9, 0.19, 1.69);
+        checkDailyInterest(interestModel, dueDate, startDay, 8, 0.19, 1.51);
+        checkDailyInterest(interestModel, dueDate, startDay, 9, 0.18, 1.69);
         checkDailyInterest(interestModel, dueDate, startDay, 10, 0.19, 1.88);
         checkDailyInterest(interestModel, dueDate, startDay, 11, 0.19, 2.07);
         checkDailyInterest(interestModel, dueDate, startDay, 12, 0.19, 2.26);
-        checkDailyInterest(interestModel, dueDate, startDay, 13, 0.18, 2.44);
-        checkDailyInterest(interestModel, dueDate, startDay, 14, 0.19, 2.63);
+        checkDailyInterest(interestModel, dueDate, startDay, 13, 0.19, 2.45);
+        checkDailyInterest(interestModel, dueDate, startDay, 14, 0.18, 2.63);
 
         // 2nd 1000 disbursement accruals
         // Total Interest: 6.40 (17 days)
@@ -1251,8 +1251,8 @@ class ProgressiveEMICalculatorTest {
         checkDailyInterest(interestModel, dueDate, startDay, 18, 0.38, 4.14);
         checkDailyInterest(interestModel, dueDate, startDay, 19, 0.37, 4.51);
         checkDailyInterest(interestModel, dueDate, startDay, 20, 0.38, 4.89);
-        checkDailyInterest(interestModel, dueDate, startDay, 21, 0.38, 5.27);
-        checkDailyInterest(interestModel, dueDate, startDay, 22, 0.37, 5.64);
+        checkDailyInterest(interestModel, dueDate, startDay, 21, 0.37, 5.26);
+        checkDailyInterest(interestModel, dueDate, startDay, 22, 0.38, 5.64);
         checkDailyInterest(interestModel, dueDate, startDay, 23, 0.38, 6.02);
         checkDailyInterest(interestModel, dueDate, startDay, 24, 0.37, 6.39);
         checkDailyInterest(interestModel, dueDate, startDay, 25, 0.38, 6.77);
diff --git 
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/AdvancedPaymentAllocationLoanRepaymentScheduleTest.java
 
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/AdvancedPaymentAllocationLoanRepaymentScheduleTest.java
index bfe96eb77..03002d86b 100644
--- 
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/AdvancedPaymentAllocationLoanRepaymentScheduleTest.java
+++ 
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/AdvancedPaymentAllocationLoanRepaymentScheduleTest.java
@@ -4665,13 +4665,13 @@ public class 
AdvancedPaymentAllocationLoanRepaymentScheduleTest extends BaseLoan
 
             GetLoansLoanIdResponse loanDetails = 
loanTransactionHelper.getLoanDetails(createdLoanId.get());
             assertEquals(BigDecimal.ZERO, 
loanDetails.getSummary().getTotalUnpaidPayableDueInterest().stripTrailingZeros());
-            assertEquals(new BigDecimal("0.97"), 
loanDetails.getSummary().getTotalUnpaidPayableNotDueInterest().stripTrailingZeros());
+            assertEquals(new BigDecimal("0.98"), 
loanDetails.getSummary().getTotalUnpaidPayableNotDueInterest().stripTrailingZeros());
 
             // Partial interest repayment
             addRepaymentForLoan(createdLoanId.get(), 20.50, "30 January 2024");
             loanDetails = 
loanTransactionHelper.getLoanDetails(createdLoanId.get());
             assertEquals(BigDecimal.ZERO, 
loanDetails.getSummary().getTotalUnpaidPayableDueInterest().stripTrailingZeros());
-            assertEquals(new BigDecimal("0.05"), 
loanDetails.getSummary().getTotalUnpaidPayableNotDueInterest().stripTrailingZeros());
+            assertEquals(new BigDecimal("0.06"), 
loanDetails.getSummary().getTotalUnpaidPayableNotDueInterest().stripTrailingZeros());
         });
 
         runAt("31 January 2024", () -> {
@@ -4704,7 +4704,7 @@ public class 
AdvancedPaymentAllocationLoanRepaymentScheduleTest extends BaseLoan
 
             GetLoansLoanIdResponse loanDetails = 
loanTransactionHelper.getLoanDetails(createdLoanId.get());
             assertEquals(new BigDecimal("0.12"), 
loanDetails.getSummary().getTotalUnpaidPayableDueInterest().stripTrailingZeros());
-            assertEquals(new BigDecimal("0.52"), 
loanDetails.getSummary().getTotalUnpaidPayableNotDueInterest().stripTrailingZeros());
+            assertEquals(new BigDecimal("0.51"), 
loanDetails.getSummary().getTotalUnpaidPayableNotDueInterest().stripTrailingZeros());
         });
     }
 
diff --git 
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/ExternalBusinessEventTest.java
 
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/ExternalBusinessEventTest.java
index 06d3b9d8f..7d8b137e4 100644
--- 
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/ExternalBusinessEventTest.java
+++ 
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/ExternalBusinessEventTest.java
@@ -182,8 +182,8 @@ public class ExternalBusinessEventTest extends 
BaseLoanIntegrationTest {
             Assertions.assertNotNull(postLoansLoanIdTransactionsResponse);
             
Assertions.assertNotNull(postLoansLoanIdTransactionsResponse.getResourceId());
 
-            verifyBusinessEvents(new 
LoanTransactionBusinessEvent("LoanTransactionInterestRefundPostBusinessEvent", 
"22 January 2021", 5.74,
-                    0.0, 5.74, 0.0, 0.0, 0.0));
+            verifyBusinessEvents(new 
LoanTransactionBusinessEvent("LoanTransactionInterestRefundPostBusinessEvent", 
"22 January 2021", 5.75,
+                    0.0, 5.75, 0.0, 0.0, 0.0));
         });
         enableLoanInterestRefundPstBusinessEvent(false);
     }
diff --git 
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanInterestRefundTest.java
 
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanInterestRefundTest.java
index c9cc50765..f43985025 100644
--- 
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanInterestRefundTest.java
+++ 
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanInterestRefundTest.java
@@ -155,8 +155,8 @@ public class LoanInterestRefundTest extends 
BaseLoanIntegrationTest {
             verifyTransactions(loanId, //
                     transaction(1000.0, "Disbursement", "01 January 2021"), //
                     transaction(1000.0, "Payout Refund", "22 January 2021"), //
-                    transaction(5.74, "Interest Refund", "22 January 2021"), //
-                    transaction(5.74, "Accrual", "22 January 2021")); //
+                    transaction(5.75, "Interest Refund", "22 January 2021"), //
+                    transaction(5.75, "Accrual", "22 January 2021")); //
 
             
checkTransactionWasNotReverseReplayed(postLoansLoanIdTransactionsResponse.getLoanId(),
                     postLoansLoanIdTransactionsResponse.getResourceId());
@@ -165,12 +165,12 @@ public class LoanInterestRefundTest extends 
BaseLoanIntegrationTest {
 
             
verifyTRJournalEntries(postLoansLoanIdTransactionsResponse.getResourceId(), //
                     journalEntry(1000, fundSource, "DEBIT"), //
-                    journalEntry(5.74, interestReceivableAccount, "CREDIT"), //
-                    journalEntry(994.26, loansReceivableAccount, "CREDIT"));
+                    journalEntry(5.75, interestReceivableAccount, "CREDIT"), //
+                    journalEntry(994.25, loansReceivableAccount, "CREDIT"));
 
             
verifyTRJournalEntries(postLoansLoanIdTransactionsResponse.getSubResourceId(),
-                    journalEntry(5.74, interestIncomeAccount, "DEBIT"), //
-                    journalEntry(5.74, loansReceivableAccount, "CREDIT")); //
+                    journalEntry(5.75, interestIncomeAccount, "DEBIT"), //
+                    journalEntry(5.75, loansReceivableAccount, "CREDIT")); //
         });
     }
 
@@ -212,8 +212,8 @@ public class LoanInterestRefundTest extends 
BaseLoanIntegrationTest {
             logLoanTransactions(loanId);
             verifyTransactions(loanId, transaction(1000.0, "Disbursement", "01 
January 2021"), //
                     transaction(1000.0, "Merchant Issued Refund", "22 January 
2021"), //
-                    transaction(5.74, "Accrual", "22 January 2021"), //
-                    transaction(5.74, "Interest Refund", "22 January 2021") //
+                    transaction(5.75, "Accrual", "22 January 2021"), //
+                    transaction(5.75, "Interest Refund", "22 January 2021") //
             );
         });
     }
@@ -245,8 +245,8 @@ public class LoanInterestRefundTest extends 
BaseLoanIntegrationTest {
             logLoanTransactions(loanId);
             verifyTransactions(loanId, transaction(1000.0, "Disbursement", "01 
January 2021"), //
                     transaction(1000.0, "Payout Refund", "22 January 2021"), //
-                    transaction(5.74, "Accrual", "22 January 2021"), //
-                    transaction(5.74, "Interest Refund", "22 January 2021") //
+                    transaction(5.75, "Accrual", "22 January 2021"), //
+                    transaction(5.75, "Interest Refund", "22 January 2021") //
             );
         });
     }
@@ -323,8 +323,8 @@ public class LoanInterestRefundTest extends 
BaseLoanIntegrationTest {
             verifyTransactions(loanId, transaction(1000.0, "Disbursement", "01 
January 2021"), //
                     transaction(87.89, "Repayment", "01 February 2021"), //
                     transaction(1000.0, "Payout Refund", "09 February 2021"), 
//
-                    transaction(10.49, "Interest Refund", "09 February 2021"), 
//
-                    transaction(10.49, "Accrual", "09 February 2021") //
+                    transaction(10.5, "Interest Refund", "09 February 2021"), 
//
+                    transaction(10.5, "Accrual", "09 February 2021") //
             );
         });
     }
@@ -361,8 +361,8 @@ public class LoanInterestRefundTest extends 
BaseLoanIntegrationTest {
             verifyTransactions(loanId, transaction(750.0, "Disbursement", "01 
January 2021"), //
                     transaction(250.0, "Disbursement", "01 January 2021"), //
                     transaction(1000.0, "Payout Refund", "22 January 2021"), //
-                    transaction(5.74, "Accrual", "22 January 2021"), //
-                    transaction(5.74, "Interest Refund", "22 January 2021") //
+                    transaction(5.75, "Accrual", "22 January 2021"), //
+                    transaction(5.75, "Interest Refund", "22 January 2021") //
             );
         });
     }
@@ -400,8 +400,8 @@ public class LoanInterestRefundTest extends 
BaseLoanIntegrationTest {
             verifyTransactions(loanId, transaction(750.0, "Disbursement", "04 
January 2021"), //
                     transaction(250.0, "Disbursement", "01 January 2021"), //
                     transaction(1000.0, "Payout Refund", "22 January 2021"), //
-                    transaction(5.13, "Accrual", "22 January 2021"), //
-                    transaction(5.13, "Interest Refund", "22 January 2021") //
+                    transaction(5.14, "Accrual", "22 January 2021"), //
+                    transaction(5.14, "Interest Refund", "22 January 2021") //
             );
         });
     }
@@ -533,7 +533,7 @@ public class LoanInterestRefundTest extends 
BaseLoanIntegrationTest {
             verifyTransactions(loanId, transaction(1000.0, "Disbursement", "01 
January 2021"), //
                     transaction(87.89, "Repayment", "01 February 2021"), //
                     transaction(500.0, "Payout Refund", "09 February 2021"), //
-                    transaction(5.34, "Interest Refund", "09 February 2021"));
+                    transaction(5.35, "Interest Refund", "09 February 2021"));
         });
     }
 
@@ -568,7 +568,7 @@ public class LoanInterestRefundTest extends 
BaseLoanIntegrationTest {
             verifyTransactions(loanId, transaction(250.0, "Disbursement", "01 
January 2021"), //
                     transaction(750.0, "Disbursement", "01 January 2021"), //
                     transaction(500.0, "Payout Refund", "22 January 2021"), //
-                    transaction(2.87, "Interest Refund", "22 January 2021"));
+                    transaction(2.88, "Interest Refund", "22 January 2021"));
         });
     }
 
@@ -605,7 +605,7 @@ public class LoanInterestRefundTest extends 
BaseLoanIntegrationTest {
             verifyTransactions(loanId, transaction(250.0, "Disbursement", "01 
January 2021"), //
                     transaction(750.0, "Disbursement", "07 January 2021"), //
                     transaction(500.0, "Payout Refund", "22 January 2021"), //
-                    transaction(2.46, "Interest Refund", "22 January 2021"));
+                    transaction(2.47, "Interest Refund", "22 January 2021"));
         });
     }
 
@@ -795,7 +795,7 @@ public class LoanInterestRefundTest extends 
BaseLoanIntegrationTest {
             verifyTransactions(loanId, transaction(250.0, "Disbursement", "01 
January 2021"), //
                     transaction(750.0, "Disbursement", "01 January 2021"), //
                     transaction(500.0, "Merchant Issued Refund", "22 January 
2021"), //
-                    transaction(2.87, "Interest Refund", "22 January 2021") //
+                    transaction(2.88, "Interest Refund", "22 January 2021") //
             );
         });
         runAt("26 January 2021", () -> {
@@ -805,14 +805,14 @@ public class LoanInterestRefundTest extends 
BaseLoanIntegrationTest {
             verifyTransactions(loanId, transaction(250.0, "Disbursement", "01 
January 2021"), //
                     transaction(750.0, "Disbursement", "01 January 2021"), //
                     transaction(500.0, "Merchant Issued Refund", "22 January 
2021"), //
-                    transaction(2.87, "Interest Refund", "22 January 2021"), //
+                    transaction(2.88, "Interest Refund", "22 January 2021"), //
                     transaction(400.0, "Payout Refund", "26 January 2021"), //
-                    transaction(2.73, "Interest Refund", "26 January 2021") //
+                    transaction(2.74, "Interest Refund", "26 January 2021") //
             );
         });
         runAt("1 February 2021", () -> {
             Long loanId = loanIdRef.get();
-            loanTransactionHelper.makeLoanRepayment("Repayment", "1 February 
2021", 100.86F, loanId.intValue());
+            loanTransactionHelper.makeLoanRepayment("Repayment", "1 February 
2021", 100.85F, loanId.intValue());
             GetLoansLoanIdResponse loanDetails = 
loanTransactionHelper.getLoanDetails(loanId);
             Assertions.assertNotNull(loanDetails);
             Assertions.assertNotNull(loanDetails.getStatus());
@@ -867,7 +867,7 @@ public class LoanInterestRefundTest extends 
BaseLoanIntegrationTest {
                     transaction(250.0, "Merchant Issued Refund", "22 January 
2021"), //
                     transaction(1.44, "Interest Refund", "22 January 2021"), //
                     transaction(400.0, "Payout Refund", "26 January 2021"), //
-                    transaction(2.57, "Interest Refund", "26 January 2021") //
+                    transaction(2.58, "Interest Refund", "26 January 2021") //
             );
         });
         runAt("1 April 2021", () -> {

Reply via email to