From 852f7f80c9665c30f1e389be15ce44cf05666ad3 Mon Sep 17 00:00:00 2001
From: "abraham.menyhart" <abraham.menyhart@dpc.hu>
Date: Fri, 23 Jun 2023 12:15:27 +0200
Subject: [PATCH] FINERACT-1724: Liquibase script : trial balance summary
 report with asset owner

---
 .../db/changelog/tenant/changelog-tenant.xml  |  2 +
 ...trial_balance_summary_with_asset_owner.xml | 52 +++++++++++++++++++
 ...1_transaction_summary_with_asset_owner.xml | 52 +++++++++++++++++++
 .../integrationtests/client/ReportsTest.java  |  2 +-
 4 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 fineract-provider/src/main/resources/db/changelog/tenant/parts/0110_trial_balance_summary_with_asset_owner.xml
 create mode 100644 fineract-provider/src/main/resources/db/changelog/tenant/parts/0111_transaction_summary_with_asset_owner.xml

diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml b/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml
index c943bd419..dc7d64fd6 100644
--- a/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml
+++ b/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml
@@ -129,4 +129,6 @@
     <include file="parts/0107_add_configuration_charges_accrual_date.xml" relativeToChangelogFile="true" />
     <include file="parts/0108_precondition_check_cob_loan_account_lock.xml" relativeToChangelogFile="true" />
     <include file="parts/0109_spring_batch_5_upgrade.xml" relativeToChangelogFile="true" />
+    <include file="parts/0110_trial_balance_summary_with_asset_owner.xml" relativeToChangelogFile="true" />
+    <include file="parts/0111_transaction_summary_with_asset_owner.xml" relativeToChangelogFile="true" />
 </databaseChangeLog>
diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/parts/0110_trial_balance_summary_with_asset_owner.xml b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0110_trial_balance_summary_with_asset_owner.xml
new file mode 100644
index 000000000..f5f64b2f9
--- /dev/null
+++ b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0110_trial_balance_summary_with_asset_owner.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership. The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    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="1">
+        <insert tableName="stretchy_report">
+            <column name="report_name" value="Trial Balance Summary Report with Asset Owner"/>
+            <column name="report_type" value="Table"/>
+            <column name="report_subtype"/>
+            <column name="report_category" value="Accounting"/>
+            <column name="report_sql"
+                    value="select * from(SELECT distinct '${endDate}' AS postingdate, loan.pname AS product, loan.gl_code AS glacct, loan.glname AS description, COALESCE( (select external_id from m_external_asset_owner where id = loan.assetowner),'self') as assetowner, loan.openingbalance AS beginningbalance, (loan.debitamount * 1) AS debitmovement, (loan.creditamount *-1) AS creditmovement, ( loan.openingbalance + loan.debitamount - loan.creditamount) AS endingbalance FROM ( SELECT distinct COALESCE(g.pname,loanproduct.productname) pname, COALESCE(g.gl_code,loanproduct.glcode) gl_code, COALESCE(g.glname,loanproduct.glname) glname, COALESCE(debits.assetowner,loanproduct.assetowner) assetowner, COALESCE(debits.debitamount, 0) - COALESCE(debits.creditamount, 0) AS openingbalance, COALESCE(loanproduct.debitamount, 0) AS debitamount, COALESCE(loanproduct.creditamount, 0) AS creditamount FROM ( SELECT distinct ag.gl_code,ag.id, pl.NAME AS pname, ag.NAME AS glname FROM acc_gl_account ag JOIN acc_product_mapping am ON am.gl_account_id = ag.id AND am.product_type = 1 JOIN m_product_loan pl ON pl.id = am.product_id ) g LEFT JOIN ( SELECT lp.NAME AS productname, acc_gl_account.gl_code AS glcode, acc_gl_account.NAME AS glname, case when aw.owner_id is null then 0 else aw.owner_id end assetowner, Sum( CASE WHEN acc_gl_journal_entry.type_enum = 2 THEN amount ELSE 0 END ) AS debitamount, Sum( CASE WHEN acc_gl_journal_entry.type_enum = 1 THEN amount ELSE 0 END ) AS creditamount FROM acc_gl_account JOIN acc_gl_journal_entry ON acc_gl_account.id = acc_gl_journal_entry.account_id JOIN m_loan m ON m.id = acc_gl_journal_entry.entity_id JOIN m_product_loan lp ON lp.id = m.product_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 AND acc_gl_journal_entry.manual_entry = false AND acc_gl_journal_entry.submitted_on_date &lt; '${endDate}' AND ( acc_gl_journal_entry.office_id = ${officeId} ) GROUP BY productname, glcode, glname, assetowner ORDER BY glcode ) debits ON g.gl_code = debits.glcode AND debits.productname = g.pname left JOIN ( SELECT lp.NAME AS productname, account_id, acc_gl_account.gl_code AS glcode, acc_gl_account.NAME AS glname, case when aw.owner_id is null then 0 else aw.owner_id end assetowner, sum( CASE WHEN acc_gl_journal_entry.type_enum = 2 THEN amount ELSE 0 END ) AS debitamount, sum( CASE WHEN acc_gl_journal_entry.type_enum = 1 THEN amount ELSE 0 END ) AS creditamount FROM acc_gl_journal_entry JOIN acc_gl_account ON acc_gl_account.id = acc_gl_journal_entry.account_id JOIN m_loan m ON m.id = acc_gl_journal_entry.entity_id JOIN m_product_loan lp ON lp.id = m.product_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 AND acc_gl_journal_entry.manual_entry = false AND acc_gl_journal_entry.submitted_on_date = '${endDate}' AND ( acc_gl_journal_entry.office_id = ${officeId} ) GROUP BY productname, account_id, glcode, glname, assetowner ORDER BY glcode ) loanproduct ON g.gl_code = loanproduct.glcode AND loanproduct.productname = g.pname and debits.assetowner = loanproduct.assetowner union SELECT distinct COALESCE(g.pname,loanproduct.productname) pname, COALESCE(g.gl_code,loanproduct.glcode) gl_code, COALESCE(g.glname,loanproduct.glname) glname, COALESCE(debits.assetowner,loanproduct.assetowner) assetowner, COALESCE(debits.debitamount, 0) - COALESCE(debits.creditamount, 0) AS openingbalance, COALESCE(loanproduct.debitamount, 0) AS debitamount, COALESCE(loanproduct.creditamount, 0) AS creditamount FROM ( SELECT distinct ag.gl_code,ag.id, pl.NAME AS pname, ag.NAME AS glname FROM acc_gl_account ag JOIN acc_product_mapping am ON am.gl_account_id = ag.id AND am.product_type = 1 JOIN m_product_loan pl ON pl.id = am.product_id ) g LEFT JOIN ( SELECT lp.NAME AS productname, acc_gl_account.gl_code AS glcode, acc_gl_account.NAME AS glname, case when aw.owner_id is null then 0 else aw.owner_id end assetowner, Sum( CASE WHEN acc_gl_journal_entry.type_enum = 2 THEN amount ELSE 0 END ) AS debitamount, Sum( CASE WHEN acc_gl_journal_entry.type_enum = 1 THEN amount ELSE 0 END ) AS creditamount FROM acc_gl_account JOIN acc_gl_journal_entry ON acc_gl_account.id = acc_gl_journal_entry.account_id JOIN m_loan m ON m.id = acc_gl_journal_entry.entity_id JOIN m_product_loan lp ON lp.id = m.product_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 AND acc_gl_journal_entry.manual_entry = false AND acc_gl_journal_entry.submitted_on_date &lt; '${endDate}' AND ( acc_gl_journal_entry.office_id = ${officeId} ) GROUP BY productname, glcode, glname, assetowner ORDER BY glcode ) debits ON g.gl_code = debits.glcode AND debits.productname = g.pname right JOIN ( SELECT lp.NAME AS productname, account_id, acc_gl_account.gl_code AS glcode, acc_gl_account.NAME AS glname, case when aw.owner_id is null then 0 else aw.owner_id end assetowner, sum( CASE WHEN acc_gl_journal_entry.type_enum = 2 THEN amount ELSE 0 END ) AS debitamount, sum( CASE WHEN acc_gl_journal_entry.type_enum = 1 THEN amount ELSE 0 END ) AS creditamount FROM acc_gl_journal_entry JOIN acc_gl_account ON acc_gl_account.id = acc_gl_journal_entry.account_id JOIN m_loan m ON m.id = acc_gl_journal_entry.entity_id JOIN m_product_loan lp ON lp.id = m.product_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 AND acc_gl_journal_entry.manual_entry = false AND acc_gl_journal_entry.submitted_on_date = '${endDate}' AND ( acc_gl_journal_entry.office_id = ${officeId} ) GROUP BY productname, account_id, glcode, glname, assetowner ORDER BY glcode ) loanproduct ON g.gl_code = loanproduct.glcode AND loanproduct.productname = g.pname and debits.assetowner = loanproduct.assetowner )loan)a WHERE a.endingbalance != 0 OR a.debitmovement != 0 OR a.creditmovement != 0"/>
+            <column name="description" value="Trial Balance Summary Report with Asset Owner"/>
+            <column name="core_report" valueBoolean="false"/>
+            <column name="use_report" valueBoolean="true"/>
+            <column name="self_service_user_report" valueBoolean="false"/>
+        </insert>
+    </changeSet>
+
+    <changeSet author="fineract" id="2">
+        <insert tableName="stretchy_report_parameter">
+            <column name="report_id" valueComputed="(select id from stretchy_report where report_name = 'Trial Balance Summary Report with Asset Owner')"/>
+            <column name="parameter_id" valueComputed="(select id from stretchy_parameter where parameter_variable  = 'endDate')"/>
+            <column name="report_parameter_name" value="officeId"/>
+        </insert>
+        <insert tableName="stretchy_report_parameter">
+            <column name="report_id" valueComputed="(select id from stretchy_report where report_name = 'Trial Balance Summary Report with Asset Owner')"/>
+            <column name="parameter_id" valueComputed="(select id from stretchy_parameter where parameter_variable  = 'officeId')"/>
+            <column name="report_parameter_name" value="endDate"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>
diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/parts/0111_transaction_summary_with_asset_owner.xml b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0111_transaction_summary_with_asset_owner.xml
new file mode 100644
index 000000000..21295f096
--- /dev/null
+++ b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0111_transaction_summary_with_asset_owner.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership. The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    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="1">
+        <insert tableName="stretchy_report">
+            <column name="report_name" value="Transaction Summary Report with Asset Owner"/>
+            <column name="report_type" value="Table"/>
+            <column name="report_subtype"/>
+            <column name="report_category" value="Accounting"/>
+            <column name="report_sql"
+                    value="SELECT '${endDate}' AS TransactionDate, a.product AS Product, case when a.transaction_type = 99999 then 'Asset Transfer' else(SELECT enum_message_property FROM r_enum_value WHERE enum_name = 'transaction_type_enum' and enum_id = a.transaction_type) end as TransactionType_Name, (select value from m_payment_type where id = a.payment_type_id) as PaymentType_Name, a.chargetype as chargetype, a.reversal_indicator AS Reversed, a.Allocation_Type AS Allocation_Type, '' AS Chargeoff_ReasonCode, case when a.transaction_type = 99999 then sum(a.amount) * + 1 when a.transaction_type IN (2, 23, 21, 22, 24, 4, 5, 8, 6, 27, 9, 26) AND a.reversal_indicator = false then sum(a.amount) * -1 when a.transaction_type IN (2, 23, 21, 22, 24, 4, 5, 8, 6, 27, 9, 26) AND a.reversal_indicator = true then sum(a.amount) * + 1 when a.transaction_type IN (1, 10, 25, 20) AND a.reversal_indicator = false then sum(a.amount) * + 1 when a.transaction_type IN (1, 10, 25, 20) AND a.reversal_indicator = true then sum(a.amount) * -1 end AS Transaction_Amount, (select external_id from m_external_asset_owner where id =a.asset_owner_id) AS Asset_owner_id FROM (SELECT '${endDate}' AS transactiondate, t.id, l.name AS product, t.transaction_type_enum AS transaction_type, d.payment_type_id, '' as chargetype, false AS reversal_indicator, ' Principal' AS Allocation_Type, CASE when t.transaction_type_enum in (1) then (case when t.amount is null then 0 else t.amount end) else (case when t.principal_portion_derived is null then 0 else t.principal_portion_derived end) end amount, case when e.status = 'ACTIVE' and '${endDate}' &gt;= e.effective_date_from and '${endDate}' &lt;= e.effective_date_to then e.owner_id end as asset_owner_id FROM m_loan_transaction t JOIN m_loan m ON m.id = t.loan_id JOIN m_product_loan l ON l.id = m.product_id left join m_payment_detail d on d.id = t.payment_detail_id left join m_external_asset_owner_transfer e ON e.loan_id = t.loan_id WHERE t.submitted_on_date = '${endDate}' and t.transaction_type_enum not in (10, 26) and (t.office_id = ${officeId}) UNION ALL SELECT '${endDate}' AS transactiondate, t.id, l.name AS product, t.transaction_type_enum AS transaction_type, d.payment_type_id, '' as chargetype, false AS reversal_indicator, ' Interest' AS Allocation_Type, case when t.interest_portion_derived is null then 0 else t.interest_portion_derived end AS amount, case when e.status = 'ACTIVE' and '${endDate}' &gt;= e.effective_date_from and '${endDate}' &lt;= e.effective_date_to then e.owner_id end as asset_owner_id FROM m_loan_transaction t JOIN m_loan m ON m.id = t.loan_id JOIN m_product_loan l ON l.id = m.product_id left join m_payment_detail d on d.id = t.payment_detail_id left join m_external_asset_owner_transfer e ON e.loan_id = t.loan_id WHERE t.submitted_on_date = '${endDate}' and t.transaction_type_enum not in (10, 26) and (t.office_id = ${officeId}) UNION ALL SELECT '${endDate}' AS transactiondate, t.id, l.name AS product, t.transaction_type_enum AS transaction_type, d.payment_type_id, '' as chargetype, false AS reversal_indicator, ' Fees' AS Allocation_Type, case when t.fee_charges_portion_derived is null then 0 else t.fee_charges_portion_derived end as amount, case when e.status = 'ACTIVE' and '${endDate}' &gt;= e.effective_date_from and '${endDate}' &lt;= e.effective_date_to then e.owner_id end as asset_owner_id FROM m_loan_transaction t JOIN m_loan m ON m.id = t.loan_id JOIN m_product_loan l ON l.id = m.product_id left join m_payment_detail d on d.id = t.payment_detail_id left join m_external_asset_owner_transfer e ON e.loan_id = t.loan_id WHERE t.submitted_on_date = '${endDate}' and t.transaction_type_enum not in (10, 26) and (t.office_id = ${officeId}) UNION ALL SELECT '${endDate}' AS transactiondate, t.id, l.name AS product, t.transaction_type_enum AS transaction_type, d.payment_type_id, '' as chargetype, false AS reversal_indicator, ' Penalty' AS Allocation_Type, case when t.penalty_charges_portion_derived is null then 0 else t.penalty_charges_portion_derived end as amount, case when e.status = 'ACTIVE' and '${endDate}' &gt;= e.effective_date_from and '${endDate}' &lt;= e.effective_date_to then e.owner_id end as asset_owner_id FROM m_loan_transaction t JOIN m_loan m ON m.id = t.loan_id JOIN m_product_loan l ON l.id = m.product_id left join m_payment_detail d on d.id = t.payment_detail_id left join m_external_asset_owner_transfer e ON e.loan_id = t.loan_id WHERE t.submitted_on_date = '${endDate}' and t.transaction_type_enum not in (10, 26) and (t.office_id = ${officeId}) UNION ALL SELECT '${endDate}' AS transactiondate, t.id, l.name AS product, t.transaction_type_enum AS transaction_type, d.payment_type_id, '' as chargetype, false AS reversal_indicator, ' Unallocated Credit (UNC)' AS Allocation_Type, case when t.overpayment_portion_derived is null then 0 else t.overpayment_portion_derived end as amount, case when e.status = 'ACTIVE' and '${endDate}' &gt;= e.effective_date_from and '${endDate}' &lt;= e.effective_date_to then e.owner_id end as asset_owner_id FROM m_loan_transaction t JOIN m_loan m ON m.id = t.loan_id JOIN m_product_loan l ON l.id = m.product_id left join m_payment_detail d on d.id = t.payment_detail_id left join m_external_asset_owner_transfer e ON e.loan_id = t.loan_id WHERE t.submitted_on_date = '${endDate}' and t.transaction_type_enum not in (10, 26) and (t.office_id = ${officeId}) UNION ALL SELECT '${endDate}' AS transactiondate, t.id, l.name AS product, t.transaction_type_enum AS transaction_type, null, mc.name, false AS reversal_indicator, ' Fees' AS Allocation_Type, case when pd.amount is null then 0 else pd.amount end as amount, case when e.status = 'ACTIVE' and '${endDate}' &gt;= e.effective_date_from and '${endDate}' &lt;= e.effective_date_to then e.owner_id end as asset_owner_id FROM m_loan_transaction t JOIN m_loan m ON m.id = t.loan_id JOIN m_product_loan l ON l.id = m.product_id join m_loan_charge_paid_by pd on pd.loan_transaction_id = t.id join m_loan_charge c on c.id = pd.loan_charge_id join m_charge mc on mc.id = c.charge_id and mc.is_penalty = false left join m_external_asset_owner_transfer e ON e.loan_id = t.loan_id WHERE t.submitted_on_date = '${endDate}' and t.transaction_type_enum = 10 and t.is_reversed = false and (t.office_id = ${officeId}) UNION ALL SELECT '${endDate}' AS transactiondate, t.id, l.name AS product, t.transaction_type_enum AS transaction_type, null, mc.name, false AS reversal_indicator, ' Penalty' AS Allocation_Type, case when pd.amount is null then 0 else pd.amount end as amount, case when e.status = 'ACTIVE' and '${endDate}' &gt;= e.effective_date_from and '${endDate}' &lt;= e.effective_date_to then e.owner_id end as asset_owner_id FROM m_loan_transaction t JOIN m_loan m ON m.id = t.loan_id JOIN m_product_loan l ON l.id = m.product_id join m_loan_charge_paid_by pd on pd.loan_transaction_id = t.id join m_loan_charge c on c.id = pd.loan_charge_id join m_charge mc on mc.id = c.charge_id and mc.is_penalty = true left join m_external_asset_owner_transfer e ON e.loan_id = t.loan_id WHERE t.submitted_on_date = '${endDate}' and t.transaction_type_enum = 10 and t.is_reversed = false and (t.office_id = ${officeId}) UNION ALL SELECT '${endDate}' AS transactiondate, t.id, l.name AS product, t.transaction_type_enum AS transaction_type, null, '' as chargetype, false AS reversal_indicator, ' Interest' AS Allocation_Type, case when t.interest_portion_derived is null then 0 else t.interest_portion_derived end AS amount, case when e.status = 'ACTIVE' and '${endDate}' &gt;= e.effective_date_from and '${endDate}' &lt;= e.effective_date_to then e.owner_id end as asset_owner_id FROM m_loan_transaction t JOIN m_loan m ON m.id = t.loan_id JOIN m_product_loan l ON l.id = m.product_id left join m_external_asset_owner_transfer e ON e.loan_id = t.loan_id WHERE t.submitted_on_date = '${endDate}' and t.transaction_type_enum = 10 and t.is_reversed = false and (t.office_id = ${officeId}) UNION ALL SELECT '${endDate}' AS transactiondate, t.id, l.name AS product, t.transaction_type_enum AS transaction_type, d.payment_type_id, mc.name, false AS reversal_indicator, ' Fees' AS Allocation_Type, case when pd.amount is null then 0 else pd.amount end as amount, case when e.status = 'ACTIVE' and '${endDate}' &gt;= e.effective_date_from and '${endDate}' &lt;= e.effective_date_to then e.owner_id end as asset_owner_id FROM m_loan_transaction t JOIN m_loan m ON m.id = t.loan_id JOIN m_product_loan l ON l.id = m.product_id join m_loan_charge_paid_by pd on pd.loan_transaction_id = t.id join m_loan_charge c on c.id = pd.loan_charge_id join m_charge mc on mc.id = c.charge_id and mc.is_penalty = false left join m_payment_detail d on d.id = t.payment_detail_id left join m_external_asset_owner_transfer e ON e.loan_id = t.loan_id WHERE t.submitted_on_date = '${endDate}' and t.transaction_type_enum = 26 and (t.office_id = ${officeId}) UNION ALL SELECT '${endDate}' AS transactiondate, t.id, l.name AS product, t.transaction_type_enum AS transaction_type, d.payment_type_id, mc.name, false AS reversal_indicator, ' Penalty' AS Allocation_Type, case when pd.amount is null then 0 else pd.amount end AS amount, case when e.status = 'ACTIVE' and '${endDate}' &gt;= e.effective_date_from and '${endDate}' &lt;= e.effective_date_to then e.owner_id end as asset_owner_id FROM m_loan_transaction t JOIN m_loan m ON m.id = t.loan_id JOIN m_product_loan l ON l.id = m.product_id join m_loan_charge_paid_by pd on pd.loan_transaction_id = t.id join m_loan_charge c on c.id = pd.loan_charge_id join m_charge mc on mc.id = c.charge_id and mc.is_penalty = true left join m_payment_detail d on d.id = t.payment_detail_id left join m_external_asset_owner_transfer e ON e.loan_id = t.loan_id WHERE t.submitted_on_date = '${endDate}' and t.transaction_type_enum = 26 and (t.office_id = ${officeId}) UNION ALL SELECT '${endDate}' AS transactiondate, t.id, l.name AS product, t.transaction_type_enum AS transaction_type, d.payment_type_id, '' as chargetype, false AS reversal_indicator, ' Interest' AS Allocation_Type, case when t.interest_portion_derived is null then 0 else t.interest_portion_derived end AS amount, case when e.status = 'ACTIVE' and '${endDate}' &gt;= e.effective_date_from and '${endDate}' &lt;= e.effective_date_to then e.owner_id end as asset_owner_id FROM m_loan_transaction t JOIN m_loan m ON m.id = t.loan_id JOIN m_product_loan l ON l.id = m.product_id left join m_payment_detail d on d.id = t.payment_detail_id left join m_external_asset_owner_transfer e ON e.loan_id = t.loan_id WHERE t.submitted_on_date = '${endDate}' and t.transaction_type_enum = 26 and (t.office_id = ${officeId}) UNION ALL SELECT '${endDate}' AS transactiondate, t.id, l.name AS product, t.transaction_type_enum AS transaction_type, d.payment_type_id, '' as chargetype, false AS reversal_indicator, ' Principal' AS Allocation_Type, case when t.principal_portion_derived is null then 0 else t.principal_portion_derived end AS amount, case when e.status = 'ACTIVE' and '${endDate}' &gt;= e.effective_date_from and '${endDate}' &lt;= e.effective_date_to then e.owner_id end as asset_owner_id FROM m_loan_transaction t JOIN m_loan m ON m.id = t.loan_id JOIN m_product_loan l ON l.id = m.product_id left join m_payment_detail d on d.id = t.payment_detail_id left join m_external_asset_owner_transfer e ON e.loan_id = t.loan_id WHERE t.submitted_on_date = '${endDate}' and t.transaction_type_enum = 26 and (t.office_id = ${officeId}) UNION ALL SELECT '${endDate}' AS transactiondate, t.id, l.name AS product, t.transaction_type_enum AS transaction_type, d.payment_type_id, '' as chargetype, false AS reversal_indicator, ' Unallocated Credit (UNC)' AS Allocation_Type, case when t.overpayment_portion_derived is null then 0 else t.overpayment_portion_derived end AS amount, case when e.status = 'ACTIVE' and '${endDate}' &gt;= e.effective_date_from and '${endDate}' &lt;= e.effective_date_to then e.owner_id end as asset_owner_id FROM m_loan_transaction t JOIN m_loan m ON m.id = t.loan_id JOIN m_product_loan l ON l.id = m.product_id left join m_payment_detail d on d.id = t.payment_detail_id left join m_external_asset_owner_transfer e ON e.loan_id = t.loan_id WHERE t.submitted_on_date = '${endDate}' and t.transaction_type_enum = 26 and (t.office_id = ${officeId}) UNION ALL SELECT '${endDate}' AS transactiondate, t.id, l.name AS product, t.transaction_type_enum AS transaction_type, d.payment_type_id, '' as chargetype, true AS reversal_indicator, ' Principal' AS Allocation_Type, CASE when t.transaction_type_enum in (1) then (case when t.amount is null then 0 else t.amount end) else (case when t.principal_portion_derived is null then 0 else t.principal_portion_derived end) end amount, case when e.status = 'ACTIVE' and '${endDate}' &gt;= e.effective_date_from and '${endDate}' &lt;= e.effective_date_to then e.owner_id end as asset_owner_id FROM m_loan_transaction t JOIN m_loan m ON m.id = t.loan_id JOIN m_product_loan l ON l.id = m.product_id left join m_payment_detail d on d.id = t.payment_detail_id left join m_external_asset_owner_transfer e ON e.loan_id = t.loan_id WHERE t.reversed_on_date = '${endDate}' and t.transaction_type_enum not in (10, 26) and (t.office_id = ${officeId}) UNION ALL SELECT '${endDate}' AS transactiondate, t.id, l.name AS product, t.transaction_type_enum AS transaction_type, d.payment_type_id, '' as chargetype, true AS reversal_indicator, ' Interest' AS Allocation_Type, case when t.interest_portion_derived is null then 0 else t.interest_portion_derived end AS amount, case when e.status = 'ACTIVE' and '${endDate}' &gt;= e.effective_date_from and '${endDate}' &lt;= e.effective_date_to then e.owner_id end as asset_owner_id FROM m_loan_transaction t JOIN m_loan m ON m.id = t.loan_id JOIN m_product_loan l ON l.id = m.product_id left join m_payment_detail d on d.id = t.payment_detail_id left join m_external_asset_owner_transfer e ON e.loan_id = t.loan_id WHERE t.reversed_on_date = '${endDate}' and t.transaction_type_enum not in (10, 26) and (t.office_id = ${officeId}) UNION ALL SELECT '${endDate}' AS transactiondate, t.id, l.name AS product, t.transaction_type_enum AS transaction_type, d.payment_type_id, '' as chargetype, true AS reversal_indicator, ' Fees' AS Allocation_Type, case when t.fee_charges_portion_derived is null then 0 else t.fee_charges_portion_derived end as amount, case when e.status = 'ACTIVE' and '${endDate}' &gt;= e.effective_date_from and '${endDate}' &lt;= e.effective_date_to then e.owner_id end as asset_owner_id FROM m_loan_transaction t JOIN m_loan m ON m.id = t.loan_id JOIN m_product_loan l ON l.id = m.product_id left join m_payment_detail d on d.id = t.payment_detail_id left join m_external_asset_owner_transfer e ON e.loan_id = t.loan_id WHERE t.reversed_on_date = '${endDate}' and t.transaction_type_enum not in (10, 26) and (t.office_id = ${officeId}) UNION ALL SELECT '${endDate}' AS transactiondate, t.id, l.name AS product, t.transaction_type_enum AS transaction_type, d.payment_type_id, '' as chargetype, true AS reversal_indicator, ' Penalty' AS Allocation_Type, case when t.penalty_charges_portion_derived is null then 0 else t.penalty_charges_portion_derived end as amount, case when e.status = 'ACTIVE' and '${endDate}' &gt;= e.effective_date_from and '${endDate}' &lt;= e.effective_date_to then e.owner_id end as asset_owner_id FROM m_loan_transaction t JOIN m_loan m ON m.id = t.loan_id JOIN m_product_loan l ON l.id = m.product_id left join m_payment_detail d on d.id = t.payment_detail_id left join m_external_asset_owner_transfer e ON e.loan_id = t.loan_id WHERE t.reversed_on_date = '${endDate}' and t.transaction_type_enum not in (10, 26) and (t.office_id = ${officeId}) UNION ALL SELECT '${endDate}' AS transactiondate, t.id, l.name AS product, t.transaction_type_enum AS transaction_type, d.payment_type_id, '' as chargetype, true AS reversal_indicator, ' Unallocated Credit (UNC)' AS Allocation_Type, case when t.overpayment_portion_derived is null then 0 else t.overpayment_portion_derived end as amount, case when e.status = 'ACTIVE' and '${endDate}' &gt;= e.effective_date_from and '${endDate}' &lt;= e.effective_date_to then e.owner_id end as asset_owner_id FROM m_loan_transaction t JOIN m_loan m ON m.id = t.loan_id JOIN m_product_loan l ON l.id = m.product_id left join m_payment_detail d on d.id = t.payment_detail_id left join m_external_asset_owner_transfer e ON e.loan_id = t.loan_id WHERE t.reversed_on_date = '${endDate}' and t.transaction_type_enum not in (10, 26) and (t.office_id = ${officeId}) UNION ALL SELECT '${endDate}' AS transactiondate, t.id, l.name AS product, t.transaction_type_enum AS transaction_type, null, mc.name, true AS reversal_indicator, ' Fees' AS Allocation_Type, case when pd.amount is null then 0 else pd.amount end as amount, case when e.status = 'ACTIVE' and '${endDate}' &gt;= e.effective_date_from and '${endDate}' &lt;= e.effective_date_to then e.owner_id end as asset_owner_id FROM m_loan_transaction t JOIN m_loan m ON m.id = t.loan_id JOIN m_product_loan l ON l.id = m.product_id join m_loan_charge_paid_by pd on pd.loan_transaction_id = t.id join m_loan_charge c on c.id = pd.loan_charge_id join m_charge mc on mc.id = c.charge_id and mc.is_penalty = false left join m_external_asset_owner_transfer e ON e.loan_id = t.loan_id WHERE t.reversed_on_date = '${endDate}' and t.transaction_type_enum = 10 and t.is_reversed = true and (t.office_id = ${officeId}) UNION ALL SELECT '${endDate}' AS transactiondate, t.id, l.name AS product, t.transaction_type_enum AS transaction_type, null, mc.name, true AS reversal_indicator, ' Penalty' AS Allocation_Type, case when pd.amount is null then 0 else pd.amount end as amount, case when e.status = 'ACTIVE' and '${endDate}' &gt;= e.effective_date_from and '${endDate}' &lt;= e.effective_date_to then e.owner_id end as asset_owner_id FROM m_loan_transaction t JOIN m_loan m ON m.id = t.loan_id JOIN m_product_loan l ON l.id = m.product_id join m_loan_charge_paid_by pd on pd.loan_transaction_id = t.id join m_loan_charge c on c.id = pd.loan_charge_id join m_charge mc on mc.id = c.charge_id and mc.is_penalty = true left join m_external_asset_owner_transfer e ON e.loan_id = t.loan_id WHERE t.reversed_on_date = '${endDate}' and t.transaction_type_enum = 10 and t.is_reversed = true and (t.office_id = ${officeId}) UNION ALL SELECT '${endDate}' AS transactiondate, t.id, l.name AS product, t.transaction_type_enum AS transaction_type, null, '' as chargetype, true AS reversal_indicator, ' Interest' AS Allocation_Type, case when t.interest_portion_derived is null then 0 else t.interest_portion_derived end AS amount, case when e.status = 'ACTIVE' and '${endDate}' &gt;= e.effective_date_from and '${endDate}' &lt;= e.effective_date_to then e.owner_id end as asset_owner_id FROM m_loan_transaction t JOIN m_loan m ON m.id = t.loan_id JOIN m_product_loan l ON l.id = m.product_id left join m_external_asset_owner_transfer e ON e.loan_id = t.loan_id WHERE t.reversed_on_date = '${endDate}' and t.transaction_type_enum = 10 and t.is_reversed = true and (t.office_id = ${officeId}) UNION ALL SELECT '${endDate}' AS transactiondate, t.id, l.name AS product, t.transaction_type_enum AS transaction_type, d.payment_type_id, mc.name, true AS reversal_indicator, ' Fees' AS Allocation_Type, case when pd.amount is null then 0 else pd.amount end as amount, case when e.status = 'ACTIVE' and '${endDate}' &gt;= e.effective_date_from and '${endDate}' &lt;= e.effective_date_to then e.owner_id end as asset_owner_id FROM m_loan_transaction t JOIN m_loan m ON m.id = t.loan_id JOIN m_product_loan l ON l.id = m.product_id join m_loan_charge_paid_by pd on pd.loan_transaction_id = t.id join m_loan_charge c on c.id = pd.loan_charge_id join m_charge mc on mc.id = c.charge_id and mc.is_penalty = false left join m_payment_detail d on d.id = t.payment_detail_id left join m_external_asset_owner_transfer e ON e.loan_id = t.loan_id WHERE t.reversed_on_date = '${endDate}' and t.transaction_type_enum = 26 and (t.office_id = ${officeId}) UNION ALL SELECT '${endDate}' AS transactiondate, t.id, l.name AS product, t.transaction_type_enum AS transaction_type, d.payment_type_id, mc.name, true AS reversal_indicator, ' Penalty' AS Allocation_Type, case when pd.amount is null then 0 else pd.amount end AS amount, case when e.status = 'ACTIVE' and '${endDate}' &gt;= e.effective_date_from and '${endDate}' &lt;= e.effective_date_to then e.owner_id end as asset_owner_id FROM m_loan_transaction t JOIN m_loan m ON m.id = t.loan_id JOIN m_product_loan l ON l.id = m.product_id join m_loan_charge_paid_by pd on pd.loan_transaction_id = t.id join m_loan_charge c on c.id = pd.loan_charge_id join m_charge mc on mc.id = c.charge_id and mc.is_penalty = true left join m_payment_detail d on d.id = t.payment_detail_id left join m_external_asset_owner_transfer e ON e.loan_id = t.loan_id WHERE t.reversed_on_date = '${endDate}' and t.transaction_type_enum = 26 and (t.office_id = ${officeId}) UNION ALL SELECT '${endDate}' AS transactiondate, t.id, l.name AS product, t.transaction_type_enum AS transaction_type, d.payment_type_id, '' as chargetype, true AS reversal_indicator, ' Interest' AS Allocation_Type, case when t.interest_portion_derived is null then 0 else t.interest_portion_derived end AS amount, case when e.status = 'ACTIVE' and '${endDate}' &gt;= e.effective_date_from and '${endDate}' &lt;= e.effective_date_to then e.owner_id end as asset_owner_id FROM m_loan_transaction t JOIN m_loan m ON m.id = t.loan_id JOIN m_product_loan l ON l.id = m.product_id left join m_payment_detail d on d.id = t.payment_detail_id left join m_external_asset_owner_transfer e ON e.loan_id = t.loan_id WHERE t.reversed_on_date = '${endDate}' and t.transaction_type_enum = 26 and (t.office_id = ${officeId}) UNION ALL SELECT '${endDate}' AS transactiondate, t.id, l.name AS product, t.transaction_type_enum AS transaction_type, d.payment_type_id, '' as chargetype, true AS reversal_indicator, ' Principal' AS Allocation_Type, case when t.principal_portion_derived is null then 0 else t.principal_portion_derived end AS amount, case when e.status = 'ACTIVE' and '${endDate}' &gt;= e.effective_date_from and '${endDate}' &lt;= e.effective_date_to then e.owner_id end as asset_owner_id FROM m_loan_transaction t JOIN m_loan m ON m.id = t.loan_id JOIN m_product_loan l ON l.id = m.product_id left join m_payment_detail d on d.id = t.payment_detail_id left join m_external_asset_owner_transfer e ON e.loan_id = t.loan_id WHERE t.reversed_on_date = '${endDate}' and t.transaction_type_enum = 26 and (t.office_id = ${officeId}) UNION ALL SELECT '${endDate}' AS transactiondate, t.id, l.name AS product, t.transaction_type_enum AS transaction_type, d.payment_type_id, '' as chargetype, true AS reversal_indicator, ' Unallocated Credit (UNC)' AS Allocation_Type, case when t.overpayment_portion_derived is null then 0 else t.overpayment_portion_derived end AS amount, case when e.status = 'ACTIVE' and '${endDate}' &gt;= e.effective_date_from and '${endDate}' &lt;= e.effective_date_to then e.owner_id end as asset_owner_id FROM m_loan_transaction t JOIN m_loan m ON m.id = t.loan_id JOIN m_product_loan l ON l.id = m.product_id left join m_payment_detail d on d.id = t.payment_detail_id left join m_external_asset_owner_transfer e ON e.loan_id = t.loan_id WHERE t.reversed_on_date = '${endDate}' and t.transaction_type_enum = 26 and (t.office_id = ${officeId}) UNION ALL SELECT '${endDate}' AS transactiondate, t.id, p.name AS product, 99999 AS transaction_type, null, '' AS chargetype, false AS reversal_indicator, 'Principal' AS Allocation_type, dt.principal_outstanding_derived AS amount, t.owner_id AS asset_owner_id FROM m_external_asset_owner_transfer t JOIN m_loan l on l.id = t.loan_id join m_client c on c.id = l.client_id JOIN m_product_loan p ON p.id = l.product_id JOIN m_external_asset_owner_transfer_details dt ON dt.asset_owner_transfer_id = t.id WHERE t.status = 'ACTIVE' and c.office_id = ${officeId} UNION ALL SELECT '${endDate}' AS transactiondate, t.id, p.name AS product, 99999 AS transaction_type, null, '' AS chargetype, false AS reversal_indicator, 'Interest' AS Allocation_type, dt.interest_outstanding_derived AS amount, t.owner_id AS asset_owner_id FROM m_external_asset_owner_transfer t JOIN m_loan l on l.id = t.loan_id join m_client c on c.id = l.client_id JOIN m_product_loan p ON p.id = l.product_id JOIN m_external_asset_owner_transfer_details dt ON dt.asset_owner_transfer_id = t.id WHERE t.status = 'ACTIVE' and c.office_id = ${officeId} UNION ALL SELECT '${endDate}' AS transactiondate, t.id, p.name AS product, 99999 AS transaction_type, null, '' AS chargetype, false AS reversal_indicator, 'Fee' AS Allocation_type, dt.fee_charges_outstanding_derived AS amount, t.owner_id AS asset_owner_id FROM m_external_asset_owner_transfer t JOIN m_loan l on l.id = t.loan_id join m_client c on c.id = l.client_id JOIN m_product_loan p ON p.id = l.product_id JOIN m_external_asset_owner_transfer_details dt ON dt.asset_owner_transfer_id = t.id WHERE t.status = 'ACTIVE' and c.office_id = ${officeId} UNION ALL SELECT '${endDate}' AS transactiondate, t.id, p.name AS product, 99999 AS transaction_type, null, '' AS chargetype, false AS reversal_indicator, 'Penalty' AS Allocation_type, dt.penalty_charges_outstanding_derived AS amount, t.owner_id AS asset_owner_id FROM m_external_asset_owner_transfer t JOIN m_loan l on l.id = t.loan_id join m_client c on c.id = l.client_id JOIN m_product_loan p ON p.id = l.product_id JOIN m_external_asset_owner_transfer_details dt ON dt.asset_owner_transfer_id = t.id WHERE t.status = 'ACTIVE' and c.office_id = ${officeId} UNION ALL SELECT '${endDate}' AS transactiondate, t.id, p.name AS product, 99999 AS transaction_type, null, '' AS chargetype, false AS reversal_indicator, 'Principal' AS Allocation_type, dt.principal_outstanding_derived AS amount, null AS asset_owner_id FROM m_external_asset_owner_transfer t JOIN m_loan l on l.id = t.loan_id join m_client c on c.id = l.client_id JOIN m_product_loan p ON p.id = l.product_id JOIN m_external_asset_owner_transfer_details dt ON dt.asset_owner_transfer_id = t.id WHERE t.status = 'BUYBACK' and c.office_id = ${officeId} UNION ALL SELECT '${endDate}' AS transactiondate, t.id, p.name AS product, 99999 AS transaction_type, null, '' AS chargetype, false AS reversal_indicator, 'Interest' AS Allocation_type, dt.interest_outstanding_derived AS amount, null AS asset_owner_id FROM m_external_asset_owner_transfer t JOIN m_loan l on l.id = t.loan_id join m_client c on c.id = l.client_id JOIN m_product_loan p ON p.id = l.product_id JOIN m_external_asset_owner_transfer_details dt ON dt.asset_owner_transfer_id = t.id WHERE t.status = 'BUYBACK' and c.office_id = ${officeId} UNION ALL SELECT '${endDate}' AS transactiondate, t.id, p.name AS product, 99999 AS transaction_type, null, '' AS chargetype, false AS reversal_indicator, 'Fee' AS Allocation_type, dt.fee_charges_outstanding_derived AS amount, null AS asset_owner_id FROM m_external_asset_owner_transfer t JOIN m_loan l on l.id = t.loan_id join m_client c on c.id = l.client_id JOIN m_product_loan p ON p.id = l.product_id JOIN m_external_asset_owner_transfer_details dt ON dt.asset_owner_transfer_id = t.id WHERE t.status = 'BUYBACK' and c.office_id = ${officeId} UNION ALL SELECT '${endDate}' AS transactiondate, t.id, p.name AS product, 999 AS transaction_type, null, '' AS chargetype, false AS reversal_indicator, 'Penalty' AS Allocation_type, dt.penalty_charges_outstanding_derived AS amount, null AS asset_owner_id FROM m_external_asset_owner_transfer t JOIN m_loan l on l.id = t.loan_id join m_client c on c.id = l.client_id JOIN m_product_loan p ON p.id = l.product_id JOIN m_external_asset_owner_transfer_details dt ON dt.asset_owner_transfer_id = t.id WHERE t.status = 'BUYBACK' and c.office_id = ${officeId})a GROUP BY a.transactiondate, a.product, a.transaction_type, a.payment_type_id, a.chargetype, a.reversal_indicator, a.Allocation_Type, a.asset_owner_id order by 1, 2, 3, 4, 5, 6, 7"/>
+            <column name="description" value=""/>
+            <column name="core_report" valueBoolean="false"/>
+            <column name="use_report" valueBoolean="true"/>
+            <column name="self_service_user_report" valueBoolean="false"/>
+        </insert>
+    </changeSet>
+
+    <changeSet author="fineract" id="2">
+        <insert tableName="stretchy_report_parameter">
+            <column name="report_id" valueComputed="(select id from stretchy_report where report_name = 'Transaction Summary Report with Asset Owner')"/>
+            <column name="parameter_id" valueComputed="(select id from stretchy_parameter where parameter_variable  = 'endDate')"/>
+            <column name="report_parameter_name" value="officeId"/>
+        </insert>
+        <insert tableName="stretchy_report_parameter">
+            <column name="report_id" valueComputed="(select id from stretchy_report where report_name = 'Transaction Summary Report with Asset Owner')"/>
+            <column name="parameter_id" valueComputed="(select id from stretchy_parameter where parameter_variable  = 'officeId')"/>
+            <column name="report_parameter_name" value="endDate"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ReportsTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ReportsTest.java
index 86f91c589..4dcd5cb6e 100644
--- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ReportsTest.java
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ReportsTest.java
@@ -43,7 +43,7 @@ public class ReportsTest extends IntegrationTest {
 
     @Test
     void listReports() {
-        assertThat(ok(fineract().reports.retrieveReportList())).hasSize(126);
+        assertThat(ok(fineract().reports.retrieveReportList())).hasSize(128);
     }
 
     @Test