From b692248a8a7e2bec611c8c76a3f8ce6383fcef0a Mon Sep 17 00:00:00 2001
From: Adam Saghy <adamsaghy@gmail.com>
Date: Wed, 8 Oct 2025 10:15:58 +0200
Subject: [PATCH] FINERACT-2326: Fix `Trial Balance Summary with asset owner`
 report

---
 ...ummary_with_asset_owner_journal_entry_aggregation.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/parts/0202_trial_balance_summary_with_asset_owner_journal_entry_aggregation.xml b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0202_trial_balance_summary_with_asset_owner_journal_entry_aggregation.xml
index d66a8b2ea..b0e126f15 100644
--- a/fineract-provider/src/main/resources/db/changelog/tenant/parts/0202_trial_balance_summary_with_asset_owner_journal_entry_aggregation.xml
+++ b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0202_trial_balance_summary_with_asset_owner_journal_entry_aggregation.xml
@@ -23,7 +23,7 @@
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.3.xsd">
 
-    <changeSet author="fineract" id="trial-balance-summary-with-asset-owner-update-3">
+    <changeSet author="fineract" id="trial-balance-summary-with-asset-owner-update-4">
         <update tableName="stretchy_report">
             <column name="report_sql"  value="WITH retained_earning AS (
       SELECT DISTINCT '${endDate}' AS postingdate,
@@ -57,7 +57,7 @@
       JOIN m_product_loan lp ON lp.id = ags.product_id
       WHERE ags.entity_type_enum = 1
         AND ags.manual_entry = false
-        AND ags.submitted_on_date &lt;= (select latest from aggregated_date)
+        AND ags.aggregated_on_date &lt;= (select latest from aggregated_date)
         AND (ags.office_id = ${officeId})
       GROUP BY productname, glcode, glname, assetowner
   ),
@@ -75,7 +75,10 @@
       LEFT JOIN m_external_asset_owner_journal_entry_mapping aw ON aw.journal_entry_id = acc_gl_journal_entry.id
       WHERE acc_gl_journal_entry.entity_type_enum = 1
         AND acc_gl_journal_entry.manual_entry = false
-        AND acc_gl_journal_entry.submitted_on_date &gt; (select latest from aggregated_date)
+        AND (
+              (SELECT latest FROM aggregated_date) IS NULL
+              OR acc_gl_journal_entry.submitted_on_date &gt; (SELECT latest FROM aggregated_date)
+          )
         AND acc_gl_journal_entry.submitted_on_date &lt; '${endDate}'
         AND (acc_gl_journal_entry.office_id = ${officeId})
       GROUP BY productname, glcode, glname, assetowner