CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 46 Packages Projects Releases Wiki Activity

FINERACT-2326: Fix Trial Balance Summary with asset owner report

Browse Source
This commit is contained in:
Adam Saghy
2025-10-08 17:05:02 +02:00
parent c9c9e9f835
commit b692248a8a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/resources/db/changelog/tenant/parts/0202_trial_balance_summary_with_asset_owner_journal_entry_aggregation.xml
+6 -3
View File
@@ -23,7 +23,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> 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"> <update tableName="stretchy_report">
<column name="report_sql" value="WITH retained_earning AS ( <column name="report_sql" value="WITH retained_earning AS (
SELECT DISTINCT '${endDate}' AS postingdate, SELECT DISTINCT '${endDate}' AS postingdate,
@@ -57,7 +57,7 @@
JOIN m_product_loan lp ON lp.id = ags.product_id JOIN m_product_loan lp ON lp.id = ags.product_id
WHERE ags.entity_type_enum = 1 WHERE ags.entity_type_enum = 1
AND ags.manual_entry = false 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}) AND (ags.office_id = ${officeId})
GROUP BY productname, glcode, glname, assetowner 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 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 WHERE acc_gl_journal_entry.entity_type_enum = 1
AND acc_gl_journal_entry.manual_entry = false 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.submitted_on_date &lt; '${endDate}'
AND (acc_gl_journal_entry.office_id = ${officeId}) AND (acc_gl_journal_entry.office_id = ${officeId})
GROUP BY productname, glcode, glname, assetowner GROUP BY productname, glcode, glname, assetowner