From ba75f7b93b13f7c4a1c2fe5bdf8718fb6db226fe Mon Sep 17 00:00:00 2001
From: Adam Saghy <adamsaghy@gmail.com>
Date: Fri, 22 Jul 2022 22:24:58 +0200
Subject: [PATCH] Fix general ledger report

---
 .../tenant/parts/0018_pentaho_reports_to_table.xml          | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/parts/0018_pentaho_reports_to_table.xml b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0018_pentaho_reports_to_table.xml
index 8c5b1c802..7c1e64e6a 100644
--- a/fineract-provider/src/main/resources/db/changelog/tenant/parts/0018_pentaho_reports_to_table.xml
+++ b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0018_pentaho_reports_to_table.xml
@@ -244,4 +244,10 @@
             <column name="report_parameter_name" value="toDate"/>
         </insert>
     </changeSet>
+    <changeSet id="2" author="fineract" 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 date('${startDate}') and date('${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>
+    </changeSet>
 </databaseChangeLog>