From b8ebc3967e288cf00f1ee3f71ed2840679e9c0b5 Mon Sep 17 00:00:00 2001
From: Dhaval Maniyar <dhavalmaniyar@Dhavals-MacBook-Pro.local>
Date: Tue, 23 Aug 2022 18:46:56 +0530
Subject: [PATCH] FINERACT-1695: Accounting report not able to fetch the data
 in table format

---
 .../db/changelog/tenant/changelog-tenant.xml  |  1 +
 .../parts/0042_table_report_query_fix.xml     | 40 +++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 fineract-provider/src/main/resources/db/changelog/tenant/parts/0042_table_report_query_fix.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 1630472f8..8d9911947 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
@@ -61,4 +61,5 @@
     <include file="parts/0039_add_loan_account_locks.xml" relativeToChangelogFile="true"/>
     <include file="parts/0040_add_delinquency_tags_job.xml" relativeToChangelogFile="true"/>
     <include file="parts/0041_add_update_business_step_permission.xml" relativeToChangelogFile="true"/>
+    <include file="parts/0042_table_report_query_fix.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>
diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/parts/0042_table_report_query_fix.xml b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0042_table_report_query_fix.xml
new file mode 100644
index 000000000..81447a840
--- /dev/null
+++ b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0042_table_report_query_fix.xml
@@ -0,0 +1,40 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<!--
+
+    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.1.xsd">
+    <changeSet author="fineract" id="1-mysql" context="mysql">
+        <update tableName="stretchy_report">
+            <column name="report_sql" value = "select details.edate entry_date, sum(details.debit_amount) debit_amount, sum(details.credit_amount) credit_amount, details.description, ifnull(opb.openingbalance, 0) openingbalance, if(details.manual_entry = 1, details.id, '0system') transtype, if (actype in (1, 5), (sum(details.debit_amount) - sum(details.credit_amount)), (sum(details.credit_amount) - sum(details.debit_amount))) as cumulative_sum from ( select a.account_id acid1 , concat(gl.gl_code, '-', gl.name) as report_header , gl.classification_enum actype , gl.gl_code as reportid , j1.entry_date edate , concat(gl1.gl_code, '-', gl1.name) as account_name , if (j1.type_enum = 1, j1.amount, 0) as debit_amount , if (j1.type_enum = 2, j1.amount , 0) as credit_amount , j1.id , j1.office_id , j1.transaction_id , j1.type_enum , j1.office_running_balance as aftertxn , j1.description as description , j1.transaction_id as transactionid , a.manual_entry from acc_gl_journal_entry j1 inner join ( select distinct je.transaction_id tid, je.account_id, je.manual_entry from m_office o left join m_office ounder on ounder.hierarchy like concat(o.hierarchy, '%') inner join acc_gl_journal_entry je on je.office_id = ounder.id where je.account_id = ${GLAccountNO} and o.id = ${officeId} and je.entry_date between '${startDate}' and '${endDate}')a on a.tid = j1.transaction_id and j1.account_id &lt;&gt; ${GLAccountNO} left join acc_gl_account gl on gl.id = a.account_id left join acc_gl_account gl1 on gl1.id = j1.account_id order by j1.entry_date, j1.id) details left join ( select je.account_id acid2, if(aga1.classification_enum in (1, 5), (sum(if(je.type_enum = 2, ifnull(je.amount, 0), 0))- sum(if(je.type_enum = 1, ifnull(je.amount, 0), 0))), (sum(if(je.type_enum = 1, ifnull(je.amount, 0), 0))- sum(if(je.type_enum = 2, ifnull(je.amount, 0), 0)))) openingbalance from m_office o left join m_office ounder on ounder.hierarchy like concat(o.hierarchy, '%') left join acc_gl_journal_entry je on je.office_id = ounder.id left join acc_gl_account aga1 on aga1.id = je.account_id where je.entry_date &lt;= DATE_SUB('${startDate}', INTERVAL 2 day) and je.office_running_balance is not null and (o.id = ${officeId}) and je.account_id = ${GLAccountNO} group by je.account_id)opb on opb.acid2 = details.acid1 left join ( select name branchname from m_office mo where mo.id = 1 )branch on details.office_id = ${officeId} group by details.edate, details.acid1, details.report_header, details.reportid, details.account_name, branch.branchname , transtype, details.description, openingbalance"/>
+            <where>report_name='GeneralLedgerReport Table'</where>
+        </update>
+        <update tableName="stretchy_report">
+            <column name="report_sql" value = "(select * from ( select debits.glcode as 'glcode', debits.name as 'name',  'Expense'as IncomeOrExpense, (ifnull(debits.debitamount,0)-ifnull(credits.creditamount,0)) as 'balance' from (select acc_gl_account.gl_code as 'glcode',name,sum(amount) as 'debitamount' from acc_gl_journal_entry,acc_gl_account where acc_gl_account.id = acc_gl_journal_entry.account_id and acc_gl_journal_entry.type_enum=2 and acc_gl_account.classification_enum in (5) and acc_gl_journal_entry.entry_date between date('${startDate}') and date('${endDate}') and (acc_gl_journal_entry.office_id= ${officeId} or ${officeId}=1) group by gl_code order by glcode) debits LEFT OUTER JOIN (select acc_gl_account.gl_code as 'glcode',name,sum(amount) as 'creditamount' from acc_gl_journal_entry,acc_gl_account where acc_gl_account.id = acc_gl_journal_entry.account_id and acc_gl_journal_entry.type_enum=1 and acc_gl_account.classification_enum in (5) and acc_gl_journal_entry.entry_date between date('${startDate}') and date('${endDate}') and (acc_gl_journal_entry.office_id= ${officeId} or ${officeId}=1) group by gl_code) credits on debits.glcode=credits.glcode union select credits.glcode as 'glcode', credits.name as 'name',  'Expense'as IncomeOrExpense, (ifnull(debits.debitamount,0)-ifnull(credits.creditamount,0)) as 'balance' from (select acc_gl_account.gl_code as 'glcode',name,sum(amount) as 'debitamount' from acc_gl_journal_entry,acc_gl_account where acc_gl_account.id = acc_gl_journal_entry.account_id and acc_gl_journal_entry.type_enum=2 and acc_gl_account.classification_enum in (5) and acc_gl_journal_entry.entry_date between date('${startDate}') and date('${endDate}') and (acc_gl_journal_entry.office_id= ${officeId} or ${officeId}=1) group by gl_code order by glcode) debits RIGHT OUTER JOIN (select acc_gl_account.gl_code as 'glcode',name as 'name',sum(amount) as 'creditamount' from acc_gl_journal_entry,acc_gl_account where acc_gl_account.id = acc_gl_journal_entry.account_id and acc_gl_journal_entry.type_enum=1 and acc_gl_account.classification_enum in (5) and acc_gl_journal_entry.entry_date between date('${startDate}') and date('${endDate}') and (acc_gl_journal_entry.office_id= ${officeId} or ${officeId}=1) group by gl_code order by glcode) credits on debits.glcode=credits.glcode)as fullouterjoinresult order by glcode) UNION  (select * from ( select debits.glcode as 'glcode',  debits.name as 'name',  'Income' as IncomeOrExpense, (ifnull(credits.creditamount,0)-ifnull(debits.debitamount,0)) as 'balance' from (select acc_gl_account.gl_code as 'glcode', name, sum(amount) as 'debitamount' from acc_gl_journal_entry,acc_gl_account where acc_gl_account.id = acc_gl_journal_entry.account_id and acc_gl_journal_entry.type_enum=2 and acc_gl_account.classification_enum in (4) and acc_gl_journal_entry.entry_date between date('${startDate}') and date('${endDate}') and (acc_gl_journal_entry.office_id= ${officeId} or ${officeId}=1) group by glcode order by glcode) debits LEFT OUTER JOIN (select acc_gl_account.gl_code as 'glcode',name,sum(amount) as 'creditamount' from acc_gl_journal_entry,acc_gl_account where acc_gl_account.id = acc_gl_journal_entry.account_id and acc_gl_journal_entry.type_enum=1 and acc_gl_account.classification_enum in (4) and acc_gl_journal_entry.entry_date between date('${startDate}') and date('${endDate}') and (acc_gl_journal_entry.office_id= ${officeId} or ${officeId}=1) group by glcode order by glcode) credits on debits.glcode=credits.glcode union select credits.glcode as 'glcode', credits.name as 'name',  'Income' as IncomeOrExpense, (ifnull(credits.creditamount,0)-ifnull(debits.debitamount,0)) as 'balance' from (select acc_gl_account.gl_code as 'glcode',name,sum(amount) as 'debitamount' from acc_gl_journal_entry,acc_gl_account where acc_gl_account.id = acc_gl_journal_entry.account_id and acc_gl_journal_entry.type_enum=2 and acc_gl_account.classification_enum in (4) and acc_gl_journal_entry.entry_date between date('${startDate}') and date('${endDate}') and (acc_gl_journal_entry.office_id= ${officeId} or ${officeId}=1) group by glcode order by glcode) debits RIGHT OUTER JOIN (select acc_gl_account.gl_code as 'glcode',name as 'name',sum(amount) as 'creditamount' from acc_gl_journal_entry,acc_gl_account where acc_gl_account.id = acc_gl_journal_entry.account_id and acc_gl_journal_entry.type_enum=1 and acc_gl_account.classification_enum in (4) and acc_gl_journal_entry.entry_date between date('${startDate}') and date('${endDate}') and (acc_gl_journal_entry.office_id= ${officeId} or ${officeId}=1) group by glcode order by glcode) credits on debits.glcode=credits.glcode)as fullouterjoinresult order by glcode)"/>
+            <where>report_name='Income Statement Table'</where>
+        </update>
+        <update tableName="stretchy_report">
+            <column name="report_sql" value = "( select debits.glcode as 'glcode', debits.name as 'name', 'Assets' as BalanceType, ( ifnull(debits.debitamount, 0)- ifnull(credits.creditamount, 0) ) as 'balance' from ( select acc_gl_account.gl_code as 'glcode', name, sum(amount) as 'debitamount' from acc_gl_journal_entry, acc_gl_account where acc_gl_account.id = acc_gl_journal_entry.account_id and acc_gl_journal_entry.type_enum = 2 and acc_gl_account.classification_enum in (1) and acc_gl_journal_entry.entry_date &lt;= date('${endDate}') and ( acc_gl_journal_entry.office_id = ${officeId} or ${officeId} = 1 ) group by glcode order by glcode ) debits LEFT OUTER JOIN ( select acc_gl_account.gl_code as 'glcode', name, sum(amount) as 'creditamount' from acc_gl_journal_entry, acc_gl_account where acc_gl_account.id = acc_gl_journal_entry.account_id and acc_gl_journal_entry.type_enum = 1 and acc_gl_account.classification_enum in (1) and acc_gl_journal_entry.entry_date &lt;= date('${endDate}') and ( acc_gl_journal_entry.office_id = ${officeId} or ${officeId} = 1 ) group by glcode order by glcode ) credits on debits.glcode = credits.glcode ) union ( select credits.glcode as 'glcode', credits.name as 'name', 'Assets' as BalanceType, ( ifnull(debits.debitamount, 0)- ifnull(credits.creditamount, 0) ) as 'balance' from ( select acc_gl_account.gl_code as 'glcode', name, sum(amount) as 'debitamount' from acc_gl_journal_entry, acc_gl_account where acc_gl_account.id = acc_gl_journal_entry.account_id and acc_gl_journal_entry.type_enum = 2 and acc_gl_account.classification_enum in (1) and acc_gl_journal_entry.entry_date &lt;= date('${endDate}') and ( acc_gl_journal_entry.office_id = ${officeId} or ${officeId} = 1 ) group by glcode order by glcode ) debits RIGHT OUTER JOIN ( select acc_gl_account.gl_code as 'glcode', name, sum(amount) as 'creditamount' from acc_gl_journal_entry, acc_gl_account where acc_gl_account.id = acc_gl_journal_entry.account_id and acc_gl_journal_entry.type_enum = 1 and acc_gl_account.classification_enum in (1) and acc_gl_journal_entry.entry_date &lt;= date('${endDate}') and ( acc_gl_journal_entry.office_id = ${officeId} or ${officeId} = 1 ) group by glcode order by glcode ) credits on debits.glcode = credits.glcode ) UNION ( select debits.glcode as 'glcode', debits.name as 'name', 'Liability' as BalanceType, ( ifnull(credits.creditamount, 0)- ifnull(debits.debitamount, 0) ) as 'balance' from ( select acc_gl_account.gl_code as 'glcode', name, sum(amount) as 'debitamount' from acc_gl_journal_entry, acc_gl_account where acc_gl_account.id = acc_gl_journal_entry.account_id and acc_gl_journal_entry.type_enum = 2 and acc_gl_account.classification_enum in (2) and acc_gl_journal_entry.entry_date &lt;= date('${endDate}') and ( acc_gl_journal_entry.office_id = ${officeId} or ${officeId} = 1 ) group by glcode order by glcode ) debits LEFT OUTER JOIN ( select acc_gl_account.gl_code as 'glcode', name, sum(amount) as 'creditamount' from acc_gl_journal_entry, acc_gl_account where acc_gl_account.id = acc_gl_journal_entry.account_id and acc_gl_journal_entry.type_enum = 1 and acc_gl_account.classification_enum in (2) and acc_gl_journal_entry.entry_date &lt;= date('${endDate}') and ( acc_gl_journal_entry.office_id = ${officeId} or ${officeId} = 1 ) group by glcode order by glcode ) credits on debits.glcode = credits.glcode ) union ( select credits.glcode as 'glcode', credits.name as 'name', 'Liability' as BalanceType, ( ifnull(credits.creditamount, 0)- ifnull(debits.debitamount, 0) ) as 'balance' from ( select acc_gl_account.gl_code as 'glcode', name, sum(amount) as 'debitamount' from acc_gl_journal_entry, acc_gl_account where acc_gl_account.id = acc_gl_journal_entry.account_id and acc_gl_journal_entry.type_enum = 2 and acc_gl_account.classification_enum in (2) and acc_gl_journal_entry.entry_date &lt;= date('${endDate}') and ( acc_gl_journal_entry.office_id = ${officeId} or ${officeId} = 1 ) group by glcode order by glcode ) debits RIGHT OUTER JOIN ( select acc_gl_account.gl_code as 'glcode', name, sum(amount) as 'creditamount' from acc_gl_journal_entry, acc_gl_account where acc_gl_account.id = acc_gl_journal_entry.account_id and acc_gl_journal_entry.type_enum = 1 and acc_gl_account.classification_enum in (2) and acc_gl_journal_entry.entry_date &lt;= date('${endDate}') and ( acc_gl_journal_entry.office_id = ${officeId} or ${officeId} = 1 ) group by glcode order by glcode ) credits on debits.glcode = credits.glcode ) UNION ( select debits.glcode as 'glcode', debits.name as 'name', 'Equity' as BalanceType, ( ifnull(credits.creditamount, 0)- ifnull(debits.debitamount, 0) ) as 'balance' from ( select acc_gl_account.gl_code as 'glcode', name, sum(amount) as 'debitamount' from acc_gl_journal_entry, acc_gl_account where acc_gl_account.id = acc_gl_journal_entry.account_id and acc_gl_journal_entry.type_enum = 2 and acc_gl_account.classification_enum in (3) and acc_gl_journal_entry.entry_date &lt;= date('${endDate}') and ( acc_gl_journal_entry.office_id = ${officeId} or ${officeId} = 1 ) group by glcode order by glcode ) debits LEFT OUTER JOIN ( select acc_gl_account.gl_code as 'glcode', name, sum(amount) as 'creditamount' from acc_gl_journal_entry, acc_gl_account where acc_gl_account.id = acc_gl_journal_entry.account_id and acc_gl_journal_entry.type_enum = 1 and acc_gl_account.classification_enum in (3) and acc_gl_journal_entry.entry_date &lt;= date('${endDate}') and ( acc_gl_journal_entry.office_id = ${officeId} or ${officeId} = 1 ) group by glcode order by glcode ) credits on debits.glcode = credits.glcode ) UNION ( select credits.glcode as 'glcode', credits.name as 'name', 'Equity' as BalanceType, ( ifnull(credits.creditamount, 0)- ifnull(debits.debitamount, 0) ) as 'balance' from ( select acc_gl_account.gl_code as 'glcode', name, sum(amount) as 'debitamount' from acc_gl_journal_entry, acc_gl_account where acc_gl_account.id = acc_gl_journal_entry.account_id and acc_gl_journal_entry.type_enum = 2 and acc_gl_account.classification_enum in (3) and acc_gl_journal_entry.entry_date &lt;= date('${endDate}') and ( acc_gl_journal_entry.office_id = ${officeId} or ${officeId} = 1 ) group by glcode order by glcode ) debits RIGHT OUTER JOIN ( select acc_gl_account.gl_code as 'glcode', name, sum(amount) as 'creditamount' from acc_gl_journal_entry, acc_gl_account where acc_gl_account.id = acc_gl_journal_entry.account_id and acc_gl_journal_entry.type_enum = 1 and acc_gl_account.classification_enum in (3) and acc_gl_journal_entry.entry_date &lt;= date('${endDate}') and ( acc_gl_journal_entry.office_id = ${officeId} or ${officeId} = 1 ) group by glcode order by glcode ) credits on debits.glcode = credits.glcode )"/>
+            <where>report_name='Balance Sheet Table'</where>
+        </update>
+    </changeSet>
+</databaseChangeLog>