From 3a59a728914768f61ddc3e26ce108fcf5dab362a Mon Sep 17 00:00:00 2001
From: Adam Saghy <adamsaghy@gmail.com>
Date: Tue, 7 Oct 2025 13:56:09 +0200
Subject: [PATCH] FINERACT-2326: Fix `Trial Balance Summary with asset owner`
 report

---
 ...mary_with_asset_owner_journal_entry_aggregation.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 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 902aca295..d66a8b2ea 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-2">
+    <changeSet author="fineract" id="trial-balance-summary-with-asset-owner-update-3">
         <update tableName="stretchy_report">
             <column name="report_sql"  value="WITH retained_earning AS (
       SELECT DISTINCT '${endDate}' AS postingdate,
@@ -81,10 +81,10 @@
       GROUP BY productname, glcode, glname, assetowner
   ),
   merged_historical_data AS (
-      SELECT summary_snapshot_baseline_data.productname,
-             summary_snapshot_baseline_data.glcode,
-             summary_snapshot_baseline_data.glname,
-             summary_snapshot_baseline_data.assetowner,
+      SELECT COALESCE(summary_snapshot_baseline_data.productname, post_snapshot_delta_data.productname) AS productname,
+             COALESCE(summary_snapshot_baseline_data.glcode, post_snapshot_delta_data.glcode) AS glcode,
+             COALESCE(summary_snapshot_baseline_data.glname, post_snapshot_delta_data.glname) AS glname,
+             COALESCE(summary_snapshot_baseline_data.assetowner, post_snapshot_delta_data.assetowner, 0) AS assetowner,
              COALESCE(summary_snapshot_baseline_data.debitamount, 0) + COALESCE(post_snapshot_delta_data.debitamount, 0) AS debitamount,
              COALESCE(summary_snapshot_baseline_data.creditamount, 0) + COALESCE(post_snapshot_delta_data.creditamount, 0) AS creditamount
       FROM summary_snapshot_baseline_data