From 9000b6e82634536261bfc86c78cdc45ba7d6733e Mon Sep 17 00:00:00 2001
From: Dhaval Maniyar <dhavalmaniyar@Dhavals-MacBook-Pro.local>
Date: Sat, 30 Jul 2022 22:08:59 +0530
Subject: [PATCH] FINERACT-1646-backdated-transaction-available-balance-fix

---
 .../savings/domain/SavingsAccountAssembler.java          | 9 ++-------
 .../service/SavingsAccountReadPlatformServiceImpl.java   | 1 -
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountAssembler.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountAssembler.java
index e45626574..99cd32057 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountAssembler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountAssembler.java
@@ -390,13 +390,8 @@ public class SavingsAccountAssembler {
             for (int i = 0; i < account.getTransactions().size(); i++) {
                 SavingsAccountTransactionData savingsAccountTransaction = account.getTransactions().get(i);
                 removalList.add(savingsAccountTransaction);
-                if ((savingsAccountTransaction.isInterestPostingAndNotReversed()
-                        || savingsAccountTransaction.isOverdraftInterestAndNotReversed())
-                        && !savingsAccountTransaction.isReversalTransaction()) {
-                    account.getSummary().setRunningBalanceOnPivotDate(savingsAccountTransaction.getRunningBalance());
-                    account.setLastSavingsAccountTransaction(savingsAccountTransaction);
-                    break;
-                }
+                account.getSummary().setRunningBalanceOnPivotDate(savingsAccountTransaction.getRunningBalance());
+                account.setLastSavingsAccountTransaction(savingsAccountTransaction);
             }
             account.getTransactions().removeAll(removalList);
         } else {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountReadPlatformServiceImpl.java
index 31e8e3f0e..10c8a1cc2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountReadPlatformServiceImpl.java
@@ -264,7 +264,6 @@ public class SavingsAccountReadPlatformServiceImpl implements SavingsAccountRead
     public List<SavingsAccountData> retrieveAllSavingsDataForInterestPosting(final boolean backdatedTxnsAllowedTill, final int pageSize,
             final Integer status, final Long maxSavingsId) {
         LocalDate yesterday = DateUtils.getBusinessLocalDate().minusDays(1);
-
         String sql = "select " + this.savingAccountMapperForInterestPosting.schema()
                 + "join (select a.id from m_savings_account a where a.id > ? and a.status_enum = ? limit ?) b on b.id = sa.id ";
         if (backdatedTxnsAllowedTill) {