You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ad...@apache.org on 2026/03/02 20:11:26 UTC

(fineract) branch develop updated: FINERACT-2481: Remove Pentaho reports from initial data

This is an automated email from the ASF dual-hosted git repository.

adamsaghy pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git


The following commit(s) were added to refs/heads/develop by this push:
     new 83667e41b4 FINERACT-2481: Remove Pentaho reports from initial data
83667e41b4 is described below

commit 83667e41b45268bb27d82a8ca61e7525c83ffe0f
Author: Ashhar Ahmad Khan <14...@users.noreply.github.com>
AuthorDate: Thu Feb 19 03:33:06 2026 +0530

    FINERACT-2481: Remove Pentaho reports from initial data
    
    Remove deprecated Pentaho report and permission entries from initial Liquibase data.
    
    Changes:
    - Removed 44 Pentaho reports from stretchy_report table
    - Removed 26 Pentaho permissions from m_permission table
    - Fixed 52 instances of 'falsee' typo → 'false'
    - Added validCheckSum=ANY to modified changeSets (id=24, 41-mysql, 1-postgresql)
    - Applied to both 0002_initial_data.xml (MySQL/MariaDB) and 0003_postgresql_specific_initial_data.xml (PostgreSQL)
    
    Impact:
    - New deployments: No Pentaho data included (clean slate)
    - Existing deployments: Unaffected (non-destructive approach)
    - Total changes: -1310 lines, +46 lines
---
 .../changelog/tenant/parts/0002_initial_data.xml   | 3478 +++++---------------
 .../0003_postgresql_specific_initial_data.xml      |  582 +---
 .../integrationtests/client/ReportsTest.java       |    4 +-
 3 files changed, 847 insertions(+), 3217 deletions(-)

diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/parts/0002_initial_data.xml b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0002_initial_data.xml
index a4037a9fae..3e5d5c5157 100644
--- a/fineract-provider/src/main/resources/db/changelog/tenant/parts/0002_initial_data.xml
+++ b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0002_initial_data.xml
@@ -3461,6 +3461,7 @@
         </insert>
     </changeSet>
     <changeSet author="fineract" id="24">
+        <validCheckSum>ANY</validCheckSum>
         <insert tableName="m_permission">
             <column name="id" valueNumeric="1"/>
             <column name="grouping" value="special"/>
@@ -7821,86 +7822,6 @@
             <column name="action_name" value="UPDATESAVINGSOFFICER"/>
             <column name="can_maker_checker" valueBoolean="true"/>
         </insert>
-        <insert tableName="m_permission">
-            <column name="id" valueNumeric="568"/>
-            <column name="grouping" value="report"/>
-            <column name="code" value="READ_Active Loans - Summary(Pentaho)"/>
-            <column name="entity_name" value="Active Loans - Summary(Pentaho)"/>
-            <column name="action_name" value="READ"/>
-            <column name="can_maker_checker" valueBoolean="false"/>
-        </insert>
-        <insert tableName="m_permission">
-            <column name="id" valueNumeric="569"/>
-            <column name="grouping" value="report"/>
-            <column name="code" value="READ_Active Loans by Disbursal Period(Pentaho)"/>
-            <column name="entity_name" value="Active Loans by Disbursal Period(Pentaho)"/>
-            <column name="action_name" value="READ"/>
-            <column name="can_maker_checker" valueBoolean="false"/>
-        </insert>
-        <insert tableName="m_permission">
-            <column name="id" valueNumeric="570"/>
-            <column name="grouping" value="report"/>
-            <column name="code" value="READ_Active Loans in last installment Summary(Pentaho)"/>
-            <column name="entity_name" value="Active Loans in last installment Summary(Pentaho)"/>
-            <column name="action_name" value="READ"/>
-            <column name="can_maker_checker" valueBoolean="false"/>
-        </insert>
-        <insert tableName="m_permission">
-            <column name="id" valueNumeric="571"/>
-            <column name="grouping" value="report"/>
-            <column name="code" value="READ_Active Loans in last installment(Pentaho)"/>
-            <column name="entity_name" value="Active Loans in last installment(Pentaho)"/>
-            <column name="action_name" value="READ"/>
-            <column name="can_maker_checker" valueBoolean="false"/>
-        </insert>
-        <insert tableName="m_permission">
-            <column name="id" valueNumeric="572"/>
-            <column name="grouping" value="report"/>
-            <column name="code" value="READ_Active Loans Passed Final Maturity Summary(Pentaho)"/>
-            <column name="entity_name" value="Active Loans Passed Final Maturity Summary(Pentaho)"/>
-            <column name="action_name" value="READ"/>
-            <column name="can_maker_checker" valueBoolean="false"/>
-        </insert>
-        <insert tableName="m_permission">
-            <column name="id" valueNumeric="573"/>
-            <column name="grouping" value="report"/>
-            <column name="code" value="READ_Active Loans Passed Final Maturity(Pentaho)"/>
-            <column name="entity_name" value="Active Loans Passed Final Maturity(Pentaho)"/>
-            <column name="action_name" value="READ"/>
-            <column name="can_maker_checker" valueBoolean="false"/>
-        </insert>
-        <insert tableName="m_permission">
-            <column name="id" valueNumeric="574"/>
-            <column name="grouping" value="report"/>
-            <column name="code" value="READ_Aging Detail(Pentaho)"/>
-            <column name="entity_name" value="Aging Detail(Pentaho)"/>
-            <column name="action_name" value="READ"/>
-            <column name="can_maker_checker" valueBoolean="false"/>
-        </insert>
-        <insert tableName="m_permission">
-            <column name="id" valueNumeric="575"/>
-            <column name="grouping" value="report"/>
-            <column name="code" value="READ_Aging Summary (Arrears in Months)(Pentaho)"/>
-            <column name="entity_name" value="Aging Summary (Arrears in Months)(Pentaho)"/>
-            <column name="action_name" value="READ"/>
-            <column name="can_maker_checker" valueBoolean="false"/>
-        </insert>
-        <insert tableName="m_permission">
-            <column name="id" valueNumeric="576"/>
-            <column name="grouping" value="report"/>
-            <column name="code" value="READ_Aging Summary (Arrears in Weeks)(Pentaho)"/>
-            <column name="entity_name" value="Aging Summary (Arrears in Weeks)(Pentaho)"/>
-            <column name="action_name" value="READ"/>
-            <column name="can_maker_checker" valueBoolean="false"/>
-        </insert>
-        <insert tableName="m_permission">
-            <column name="id" valueNumeric="577"/>
-            <column name="grouping" value="report"/>
-            <column name="code" value="READ_Client Listing(Pentaho)"/>
-            <column name="entity_name" value="Client Listing(Pentaho)"/>
-            <column name="action_name" value="READ"/>
-            <column name="can_maker_checker" valueBoolean="false"/>
-        </insert>
         <insert tableName="m_permission">
             <column name="id" valueNumeric="578"/>
             <column name="grouping" value="report"/>
@@ -7909,14 +7830,6 @@
             <column name="action_name" value="READ"/>
             <column name="can_maker_checker" valueBoolean="false"/>
         </insert>
-        <insert tableName="m_permission">
-            <column name="id" valueNumeric="579"/>
-            <column name="grouping" value="report"/>
-            <column name="code" value="READ_Client Loans Listing(Pentaho)"/>
-            <column name="entity_name" value="Client Loans Listing(Pentaho)"/>
-            <column name="action_name" value="READ"/>
-            <column name="can_maker_checker" valueBoolean="false"/>
-        </insert>
         <insert tableName="m_permission">
             <column name="id" valueNumeric="580"/>
             <column name="grouping" value="report"/>
@@ -7981,30 +7894,6 @@
             <column name="action_name" value="READ"/>
             <column name="can_maker_checker" valueBoolean="false"/>
         </insert>
-        <insert tableName="m_permission">
-            <column name="id" valueNumeric="588"/>
-            <column name="grouping" value="report"/>
-            <column name="code" value="READ_Expected Payments By Date - Basic(Pentaho)"/>
-            <column name="entity_name" value="Expected Payments By Date - Basic(Pentaho)"/>
-            <column name="action_name" value="READ"/>
-            <column name="can_maker_checker" valueBoolean="false"/>
-        </insert>
-        <insert tableName="m_permission">
-            <column name="id" valueNumeric="589"/>
-            <column name="grouping" value="report"/>
-            <column name="code" value="READ_Funds Disbursed Between Dates Summary by Office(Pentaho)"/>
-            <column name="entity_name" value="Funds Disbursed Between Dates Summary by Office(Pentaho)"/>
-            <column name="action_name" value="READ"/>
-            <column name="can_maker_checker" valueBoolean="false"/>
-        </insert>
-        <insert tableName="m_permission">
-            <column name="id" valueNumeric="590"/>
-            <column name="grouping" value="report"/>
-            <column name="code" value="READ_Funds Disbursed Between Dates Summary(Pentaho)"/>
-            <column name="entity_name" value="Funds Disbursed Between Dates Summary(Pentaho)"/>
-            <column name="action_name" value="READ"/>
-            <column name="can_maker_checker" valueBoolean="false"/>
-        </insert>
         <insert tableName="m_permission">
             <column name="id" valueNumeric="591"/>
             <column name="grouping" value="report"/>
@@ -8029,38 +7918,6 @@
             <column name="action_name" value="READ"/>
             <column name="can_maker_checker" valueBoolean="false"/>
         </insert>
-        <insert tableName="m_permission">
-            <column name="id" valueNumeric="594"/>
-            <column name="grouping" value="report"/>
-            <column name="code" value="READ_Loans Awaiting Disbursal Summary by Month(Pentaho)"/>
-            <column name="entity_name" value="Loans Awaiting Disbursal Summary by Month(Pentaho)"/>
-            <column name="action_name" value="READ"/>
-            <column name="can_maker_checker" valueBoolean="false"/>
-        </insert>
-        <insert tableName="m_permission">
-            <column name="id" valueNumeric="595"/>
-            <column name="grouping" value="report"/>
-            <column name="code" value="READ_Loans Awaiting Disbursal Summary(Pentaho)"/>
-            <column name="entity_name" value="Loans Awaiting Disbursal Summary(Pentaho)"/>
-            <column name="action_name" value="READ"/>
-            <column name="can_maker_checker" valueBoolean="false"/>
-        </insert>
-        <insert tableName="m_permission">
-            <column name="id" valueNumeric="596"/>
-            <column name="grouping" value="report"/>
-            <column name="code" value="READ_Loans Awaiting Disbursal(Pentaho)"/>
-            <column name="entity_name" value="Loans Awaiting Disbursal(Pentaho)"/>
-            <column name="action_name" value="READ"/>
-            <column name="can_maker_checker" valueBoolean="false"/>
-        </insert>
-        <insert tableName="m_permission">
-            <column name="id" valueNumeric="597"/>
-            <column name="grouping" value="report"/>
-            <column name="code" value="READ_Loans Pending Approval(Pentaho)"/>
-            <column name="entity_name" value="Loans Pending Approval(Pentaho)"/>
-            <column name="action_name" value="READ"/>
-            <column name="can_maker_checker" valueBoolean="false"/>
-        </insert>
         <insert tableName="m_permission">
             <column name="id" valueNumeric="598"/>
             <column name="grouping" value="report"/>
@@ -8085,46 +7942,6 @@
             <column name="action_name" value="READ"/>
             <column name="can_maker_checker" valueBoolean="false"/>
         </insert>
-        <insert tableName="m_permission">
-            <column name="id" valueNumeric="601"/>
-            <column name="grouping" value="report"/>
-            <column name="code" value="READ_Obligation Met Loans Details(Pentaho)"/>
-            <column name="entity_name" value="Obligation Met Loans Details(Pentaho)"/>
-            <column name="action_name" value="READ"/>
-            <column name="can_maker_checker" valueBoolean="false"/>
-        </insert>
-        <insert tableName="m_permission">
-            <column name="id" valueNumeric="602"/>
-            <column name="grouping" value="report"/>
-            <column name="code" value="READ_Obligation Met Loans Summary(Pentaho)"/>
-            <column name="entity_name" value="Obligation Met Loans Summary(Pentaho)"/>
-            <column name="action_name" value="READ"/>
-            <column name="can_maker_checker" valueBoolean="false"/>
-        </insert>
-        <insert tableName="m_permission">
-            <column name="id" valueNumeric="603"/>
-            <column name="grouping" value="report"/>
-            <column name="code" value="READ_Portfolio at Risk by Branch(Pentaho)"/>
-            <column name="entity_name" value="Portfolio at Risk by Branch(Pentaho)"/>
-            <column name="action_name" value="READ"/>
-            <column name="can_maker_checker" valueBoolean="false"/>
-        </insert>
-        <insert tableName="m_permission">
-            <column name="id" valueNumeric="604"/>
-            <column name="grouping" value="report"/>
-            <column name="code" value="READ_Portfolio at Risk(Pentaho)"/>
-            <column name="entity_name" value="Portfolio at Risk(Pentaho)"/>
-            <column name="action_name" value="READ"/>
-            <column name="can_maker_checker" valueBoolean="false"/>
-        </insert>
-        <insert tableName="m_permission">
-            <column name="id" valueNumeric="605"/>
-            <column name="grouping" value="report"/>
-            <column name="code" value="READ_Rescheduled Loans(Pentaho)"/>
-            <column name="entity_name" value="Rescheduled Loans(Pentaho)"/>
-            <column name="action_name" value="READ"/>
-            <column name="can_maker_checker" valueBoolean="false"/>
-        </insert>
         <insert tableName="m_permission">
             <column name="id" valueNumeric="606"/>
             <column name="grouping" value="report"/>
@@ -8133,22 +7950,6 @@
             <column name="action_name" value="READ"/>
             <column name="can_maker_checker" valueBoolean="false"/>
         </insert>
-        <insert tableName="m_permission">
-            <column name="id" valueNumeric="607"/>
-            <column name="grouping" value="report"/>
-            <column name="code" value="READ_TxnRunningBalances(Pentaho)"/>
-            <column name="entity_name" value="TxnRunningBalances(Pentaho)"/>
-            <column name="action_name" value="READ"/>
-            <column name="can_maker_checker" valueBoolean="false"/>
-        </insert>
-        <insert tableName="m_permission">
-            <column name="id" valueNumeric="608"/>
-            <column name="grouping" value="report"/>
-            <column name="code" value="READ_Written-Off Loans(Pentaho)"/>
-            <column name="entity_name" value="Written-Off Loans(Pentaho)"/>
-            <column name="action_name" value="READ"/>
-            <column name="can_maker_checker" valueBoolean="false"/>
-        </insert>
         <insert tableName="m_permission">
             <column name="id" valueNumeric="609"/>
             <column name="grouping" value="configuration"/>
@@ -8597,14 +8398,6 @@
             <column name="action_name" value="READ"/>
             <column name="can_maker_checker" valueBoolean="false"/>
         </insert>
-        <insert tableName="m_permission">
-            <column name="id" valueNumeric="665"/>
-            <column name="grouping" value="report"/>
-            <column name="code" value="READ_Staff Assignment History"/>
-            <column name="entity_name" value="Staff Assignment History(Pentaho)"/>
-            <column name="action_name" value="READ"/>
-            <column name="can_maker_checker" valueBoolean="false"/>
-        </insert>
         <insert tableName="m_permission">
             <column name="id" valueNumeric="666"/>
             <column name="grouping" value="externalservices"/>
@@ -12686,6 +12479,7 @@
         </insert>
     </changeSet>
     <changeSet author="fineract" id="41-mysql" context="mysql">
+        <validCheckSum>ANY</validCheckSum>
         <insert tableName="stretchy_report">
             <column name="id" valueNumeric="1"/>
             <column name="report_name" value="Client Listing"/>
@@ -12872,42 +12666,6 @@
             <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="48"/>
-            <column name="report_name" value="Balance Sheet"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Accounting"/>
-            <column name="report_sql"/>
-            <column name="description" value="Balance Sheet"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="49"/>
-            <column name="report_name" value="Income Statement"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Accounting"/>
-            <column name="report_sql"/>
-            <column name="description" value="Profit and Loss Statement"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="50"/>
-            <column name="report_name" value="Trial Balance"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Accounting"/>
-            <column name="report_sql"/>
-            <column name="description" value="Trial Balance Report"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
         <insert tableName="stretchy_report">
             <column name="id" valueNumeric="51"/>
             <column name="report_name" value="Written-Off Loans"/>
@@ -13039,30 +12797,6 @@
             <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="91"/>
-            <column name="report_name" value="Loan Account Schedule"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql"/>
-            <column name="description"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="92"/>
-            <column name="report_name" value="Branch Expected Cash Flow"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql"/>
-            <column name="description"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
         <insert tableName="stretchy_report">
             <column name="id" valueNumeric="93"/>
             <column name="report_name" value="Expected Payments By Date - Basic"/>
@@ -13076,18 +12810,6 @@
             <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="94"/>
-            <column name="report_name" value="Expected Payments By Date - Formatted"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql"/>
-            <column name="description"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
         <insert tableName="stretchy_report">
             <column name="id" valueNumeric="96"/>
             <column name="report_name" value="GroupSummaryCounts"/>
@@ -13098,7 +12820,7 @@
                     value="&#10;/*&#10;Active Client is a client linked to the 'group' via m_group_client&#10;and with an active 'status_enum'.)&#10;Active Borrowers - Borrower may be a client or a 'group'&#10;*/&#10;select x.*&#10;from m_office o,&#10;m_group g,&#10;&#10;(select a.activeClients,&#10;(b.activeClientLoans + c.activeGroupLoans) as activeLoans,&#10;b.activeClientLoans, c.activeGroupLoans,&#10;(b.activeClientBorrowers + c.activeGroupBorrowers) as activeBorrowers,&#10;b.activ [...]
             <column name="description" value="Utility query for getting group summary count details for a group_id"/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -13112,7 +12834,7 @@
             <column name="description"
                     value="Utility query for getting group summary currency amount details for a group_id"/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -13126,7 +12848,7 @@
             <column name="description"
                     value="Running Balance Txn report for Individual Lending.&#10;Suitable for small MFI's.  Larger could use it using the branch or other parameters.&#10;Basically, suck it and see if its quick enough for you out-of-te box or whether it needs performance work in your situation.&#10;"/>
             <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -13139,7 +12861,7 @@
                     value="&#10;select ifnull(cur.display_symbol, l.currency_code) as Currency,&#10;/*This query will return more than one entry if more than one currency is used */&#10;count(distinct(c.id)) as activeClients, count(*) as activeLoans,&#10;sum(l.principal_disbursed_derived) as disbursedAmount,&#10;sum(l.principal_outstanding_derived) as loanOutstandingAmount,&#10;round((sum(l.principal_outstanding_derived) * 100) /  sum(l.principal_disbursed_derived),2) as loanOutstandingP [...]
             <column name="description" value="Field Agent Statistics"/>
             <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -13152,7 +12874,7 @@
                     value="&#10;select pgm.id, pgm.display_name as `name`, sts.enum_message_property as status&#10; from m_group pgm&#10; join m_office o on o.id = pgm.office_id&#10;            and o.hierarchy like concat('${currentUserHierarchy}', '%')&#10; left join r_enum_value sts on sts.enum_name = 'status_enum' and sts.enum_id = pgm.status_enum&#10; where pgm.staff_id = ${staffId}&#10;"/>
             <column name="description" value="List of Field Agent Programs"/>
             <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -13165,7 +12887,7 @@
                     value="&#10; select l.id as loanId, l.account_no as loanAccountNo, c.id as clientId, c.account_no as clientAccountNo,&#10; pgm.display_name as programName,&#10;&#10;(select count(*)&#10;from m_loan cy&#10;where cy.group_id = pgm.id and cy.client_id =c.id&#10;and cy.disbursedon_date &lt;= l.disbursedon_date) as loanCycleNo,&#10;&#10;c.display_name as clientDisplayName,&#10; ifnull(cur.display_symbol, l.currency_code) as Currency,&#10;ifnull(l.principal_repaid_derived,0 [...]
             <column name="description" value="List of Loans in a Program"/>
             <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -13178,7 +12900,7 @@
                     value="&#10; select s.id, s.display_name,&#10;s.firstname, s.lastname, s.organisational_role_enum,&#10;s.organisational_role_parent_staff_id,&#10;sp.display_name as `organisational_role_parent_staff_display_name`&#10;from m_staff s&#10;join m_staff sp on s.organisational_role_parent_staff_id = sp.id&#10;where s.organisational_role_parent_staff_id = ${staffId}&#10;"/>
             <column name="description" value="Get Next Level Down Staff"/>
             <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -13191,7 +12913,7 @@
                     value="&#10;select ifnull(cur.display_symbol, l.currency_code) as Currency,&#10;/*This query will return more than one entry if more than one currency is used */&#10;count(distinct(c.id)) as activeClients, count(*) as activeLoans,&#10;sum(l.principal_disbursed_derived) as disbursedAmount,&#10;sum(l.principal_outstanding_derived) as loanOutstandingAmount,&#10;round((sum(l.principal_outstanding_derived) * 100) /  sum(l.principal_disbursed_derived),2) as loanOutstandingP [...]
             <column name="description" value="Coordinator Statistics"/>
             <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -13204,7 +12926,7 @@
                     value="&#10;select ifnull(cur.display_symbol, l.currency_code) as Currency,&#10;/*This query will return more than one entry if more than one currency is used */&#10;count(distinct(c.id)) as activeClients, count(*) as activeLoans,&#10;sum(l.principal_disbursed_derived) as disbursedAmount,&#10;sum(l.principal_outstanding_derived) as loanOutstandingAmount,&#10;round((sum(l.principal_outstanding_derived) * 100) /  sum(l.principal_disbursed_derived),2) as loanOutstandingP [...]
             <column name="description" value="Branch Manager Statistics"/>
             <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -13217,7 +12939,7 @@
                     value="&#10;select ifnull(cur.display_symbol, l.currency_code) as Currency,&#10;/*This query will return more than one entry if more than one currency is used */&#10;count(distinct(c.id)) as activeClients, count(*) as activeLoans,&#10;sum(l.principal_disbursed_derived) as disbursedAmount,&#10;sum(l.principal_outstanding_derived) as loanOutstandingAmount,&#10;round((sum(l.principal_outstanding_derived) * 100) /  sum(l.principal_disbursed_derived),2) as loanOutstandingP [...]
             <column name="description" value="Program DirectorStatistics"/>
             <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -13230,7 +12952,7 @@
                     value="&#10;select ifnull(cur.display_symbol, l.currency_code) as Currency,&#10;/*This query will return more than one entry if more than one currency is used */&#10;count(distinct(c.id)) as activeClients, count(*) as activeLoans,&#10;sum(l.principal_disbursed_derived) as disbursedAmount,&#10;sum(l.principal_outstanding_derived) as loanOutstandingAmount,&#10;round((sum(l.principal_outstanding_derived) * 100) /  sum(l.principal_disbursed_derived),2) as loanOutstandingP [...]
             <column name="description" value="Program Statistics"/>
             <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -13243,7 +12965,7 @@
                     value="SELECT x.* FROM m_client c, m_office o, &#10;(&#10;       SELECT a.loanCycle, a.activeLoans, b.lastLoanAmount, d.activeSavings, d.totalSavings FROM &#10;&#9;(SELECT IFNULL(MAX(l.loan_counter),0) AS loanCycle, COUNT(l.id) AS activeLoans FROM m_loan l WHERE l.loan_status_id=300 AND l.client_id=${clientId}) a, &#10;&#9;(SELECT count(l.id), IFNULL(l.principal_amount,0) AS 'lastLoanAmount' FROM m_loan l WHERE l.client_id=${clientId} AND l.disbursedon_date = (SELECT  [...]
             <column name="description" value="Utility query for getting the client summary details"/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -13256,7 +12978,7 @@
                     value="SELECT lp.name AS 'productName', MAX(l.loan_product_counter) AS 'loanProductCycle' FROM m_loan l JOIN m_product_loan lp ON l.product_id=lp.id WHERE lp.include_in_borrower_cycle=1 AND l.loan_product_counter IS NOT NULL AND l.client_id=${clientId} GROUP BY l.product_id"/>
             <column name="description" value="Utility query for getting the client loan cycle details"/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -13270,2820 +12992,1344 @@
             <column name="description"
                     value="Utility query for getting group or center saving summary details for a group_id"/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="118"/>
-            <column name="report_name" value="Savings Transactions"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Savings"/>
-            <column name="report_sql"/>
-            <column name="description"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="119"/>
-            <column name="report_name" value="Client Savings Summary"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Savings"/>
-            <column name="report_sql"/>
-            <column name="description"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
+            <column name="id" valueNumeric="148"/>
+            <column name="report_name" value="GroupNamesByStaff"/>
+            <column name="report_type" value="Table"/>
+            <column name="report_subtype" value=""/>
+            <column name="report_category" value=""/>
+            <column name="report_sql"
+                    value="Select gr.id as id, gr.display_name as name from m_group gr where gr.level_id=1 and gr.staff_id = ${staffId}"/>
+            <column name="description" value=""/>
+            <column name="core_report" valueBoolean="true"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="120"/>
-            <column name="report_name" value="Active Loans - Details(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
+            <column name="id" valueNumeric="149"/>
+            <column name="report_name" value="ClientTrendsByDay"/>
+            <column name="report_type" value="Table"/>
+            <column name="report_subtype" value=""/>
+            <column name="report_category" value="Client"/>
+            <column name="report_sql"
+                    value="SELECT &#9;COUNT(cl.id) AS count, &#10;&#9;&#9;cl.activation_date AS days&#10;FROM m_office of &#10;&#9;LEFT JOIN m_client cl on of.id = cl.office_id&#10;WHERE of.hierarchy like concat((select ino.hierarchy from m_office ino where ino.id = ${officeId}),&quot;%&quot; ) &#10;&#9;AND (cl.activation_date BETWEEN DATE_SUB(CURDATE(), INTERVAL 12 DAY) AND DATE(NOW()- INTERVAL 1 DAY))&#10;GROUP BY days"/>
+            <column name="description" value="Retrieves the number of clients joined in last 12 days"/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="121"/>
-            <column name="report_name" value="Active Loans - Summary(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
+            <column name="id" valueNumeric="150"/>
+            <column name="report_name" value="ClientTrendsByWeek"/>
+            <column name="report_type" value="Table"/>
+            <column name="report_subtype" value=""/>
+            <column name="report_category" value="Client"/>
+            <column name="report_sql"
+                    value="SELECT &#9;COUNT(cl.id) AS count, &#10;&#9;&#9;WEEK(cl.activation_date) AS Weeks&#10;FROM m_office of &#10;&#9;LEFT JOIN m_client cl on of.id = cl.office_id&#10;WHERE of.hierarchy like concat((select ino.hierarchy from m_office ino where ino.id = ${officeId}),&quot;%&quot; ) &#10;&#9;AND (cl.activation_date BETWEEN DATE_SUB(CURDATE(), INTERVAL 12 WEEK) AND DATE(NOW()))&#10;GROUP BY Weeks"/>
+            <column name="description" value=""/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="122"/>
-            <column name="report_name" value="Active Loans by Disbursal Period(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
+            <column name="id" valueNumeric="151"/>
+            <column name="report_name" value="ClientTrendsByMonth"/>
+            <column name="report_type" value="Table"/>
+            <column name="report_subtype" value=""/>
+            <column name="report_category" value="Client"/>
+            <column name="report_sql"
+                    value="SELECT &#9;COUNT(cl.id) AS count, &#10;&#9;&#9;MONTHNAME(cl.activation_date) AS Months&#10;FROM m_office of &#10;&#9;LEFT JOIN m_client cl on of.id = cl.office_id&#10;WHERE of.hierarchy like concat((select ino.hierarchy from m_office ino where ino.id = ${officeId}),&quot;%&quot; ) &#10;&#9;AND (cl.activation_date BETWEEN DATE_SUB(CURDATE(), INTERVAL 12 MONTH) AND DATE(NOW()))&#10;GROUP BY Months"/>
+            <column name="description" value=""/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="123"/>
-            <column name="report_name" value="Active Loans in last installment Summary(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
+            <column name="id" valueNumeric="152"/>
+            <column name="report_name" value="LoanTrendsByDay"/>
+            <column name="report_type" value="Table"/>
+            <column name="report_subtype" value=""/>
             <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
+            <column name="report_sql"
+                    value="SELECT &#9;COUNT(ln.id) AS lcount, &#10;&#9;&#9;ln.disbursedon_date AS days&#10;FROM m_office of &#10;&#9;LEFT JOIN m_client cl on of.id = cl.office_id&#10;&#9;LEFT JOIN m_loan ln on cl.id = ln.client_id&#10;WHERE of.hierarchy like concat((select ino.hierarchy from m_office ino where ino.id = ${officeId}),&quot;%&quot; ) &#10;&#9;AND (ln.disbursedon_date BETWEEN DATE_SUB(CURDATE(), INTERVAL 12 DAY) AND DATE(NOW()- INTERVAL 1 DAY))&#10;GROUP BY days"/>
+            <column name="description" value="Retrieves Number of loans disbursed for last 12 days"/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="124"/>
-            <column name="report_name" value="Active Loans in last installment(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
+            <column name="id" valueNumeric="153"/>
+            <column name="report_name" value="LoanTrendsByWeek"/>
+            <column name="report_type" value="Table"/>
+            <column name="report_subtype" value=""/>
             <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
+            <column name="report_sql"
+                    value="SELECT &#9;COUNT(ln.id) AS lcount, &#10;&#9;&#9;WEEK(ln.disbursedon_date) AS Weeks&#10;FROM m_office of &#10;&#9;LEFT JOIN m_client cl on of.id = cl.office_id&#10;&#9;LEFT JOIN m_loan ln on cl.id = ln.client_id&#10;WHERE of.hierarchy like concat((select ino.hierarchy from m_office ino where ino.id = ${officeId}),&quot;%&quot; ) &#10;&#9;AND (ln.disbursedon_date BETWEEN DATE_SUB(CURDATE(), INTERVAL 12 WEEK) AND DATE(NOW()))&#10;GROUP BY Weeks"/>
+            <column name="description" value=""/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="125"/>
-            <column name="report_name" value="Active Loans Passed Final Maturity Summary(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
+            <column name="id" valueNumeric="154"/>
+            <column name="report_name" value="LoanTrendsByMonth"/>
+            <column name="report_type" value="Table"/>
+            <column name="report_subtype" value=""/>
             <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
+            <column name="report_sql"
+                    value="SELECT &#9;COUNT(ln.id) AS lcount, &#10;&#9;&#9;MONTHNAME(ln.disbursedon_date) AS Months&#10;FROM m_office of &#10;&#9;LEFT JOIN m_client cl on of.id = cl.office_id&#10;&#9;LEFT JOIN m_loan ln on cl.id = ln.client_id&#10;WHERE of.hierarchy like concat((select ino.hierarchy from m_office ino where ino.id = ${officeId}),&quot;%&quot; ) &#10;&#9;AND (ln.disbursedon_date BETWEEN DATE_SUB(CURDATE(), INTERVAL 12 MONTH) AND DATE(NOW()))&#10;GROUP BY Months"/>
+            <column name="description" value=""/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="126"/>
-            <column name="report_name" value="Active Loans Passed Final Maturity(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
+            <column name="id" valueNumeric="155"/>
+            <column name="report_name" value="Demand_Vs_Collection"/>
+            <column name="report_type" value="Table"/>
+            <column name="report_subtype" value=""/>
             <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
+            <column name="report_sql"
+                    value="select amount.AmountDue-amount.AmountPaid as AmountDue, amount.AmountPaid as AmountPaid from&#10;(SELECT &#10;(IFNULL(SUM(ls.principal_amount),0) - IFNULL(SUM(ls.principal_writtenoff_derived),0)&#10; + IFNULL(SUM(ls.interest_amount),0) - IFNULL(SUM(ls.interest_writtenoff_derived),0) &#10; - IFNULL(SUM(ls.interest_waived_derived),0)&#10; + IFNULL(SUM(ls.fee_charges_amount),0) - IFNULL(SUM(ls.fee_charges_writtenoff_derived),0) &#10; - IFNULL(SUM(ls.fee_charges_wa [...]
+            <column name="description" value="Demand Vs Collection"/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="127"/>
-            <column name="report_name" value="Aging Detail(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
+            <column name="id" valueNumeric="156"/>
+            <column name="report_name" value="Disbursal_Vs_Awaitingdisbursal"/>
+            <column name="report_type" value="Table"/>
+            <column name="report_subtype" value=""/>
             <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
+            <column name="report_sql"
+                    value="select awaitinddisbursal.amount-disbursedAmount.amount as amountToBeDisburse, disbursedAmount.amount as disbursedAmount from &#10;(&#10;SELECT &#9;COUNT(ln.id) AS noOfLoans, &#10;&#9;&#9;&#9;IFNULL(SUM(ln.principal_amount),0) AS amount&#10;FROM &#10;m_office of&#10;LEFT JOIN m_client cl ON cl.office_id = of.id&#10;LEFT JOIN m_loan ln ON cl.id = ln.client_id&#10;WHERE &#10;ln.expected_disbursedon_date = DATE(NOW()) AND &#10;(ln.loan_status_id=200 OR ln.loan_stat [...]
+            <column name="description" value="Disbursal_Vs_Awaitingdisbursal"/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="128"/>
-            <column name="report_name" value="Aging Summary (Arrears in Months)(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
+            <column name="id" valueNumeric="165"/>
+            <column name="report_name" value="Savings Accounts Dormancy Report"/>
+            <column name="report_type" value="Table"/>
             <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
+            <column name="report_category" value="Savings"/>
+            <column name="report_sql"
+                    value="select cl.display_name as 'Client Display Name',&#13;&#10;sa.account_no as 'Account Number',&#13;&#10;cl.mobile_no as 'Mobile Number',&#13;&#10;@lastdate:=(select IFNULL(max(sat.transaction_date),sa.activatedon_date) &#13;&#10;            from m_savings_account_transaction as sat &#13;&#10;            where sat.is_reversed = 0 &#13;&#10;            and sat.transaction_type_enum in (1,2) &#13;&#10;            and sat.savings_account_id = sa.id) as 'Date of Last  [...]
+            <column name="description"/>
             <column name="core_report" valueBoolean="true"/>
             <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="129"/>
-            <column name="report_name" value="Aging Summary (Arrears in Weeks)(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
+            <column name="id" valueNumeric="166"/>
+            <column name="report_name" value="Active Clients"/>
+            <column name="report_type" value="SMS"/>
+            <column name="report_subtype" value="NonTriggered"/>
+            <column name="report_category" value="Client"/>
+            <column name="report_sql"
+                    value="SELECT c.id AS &quot;id&quot;, &#13;&#10;c.firstname AS &quot;firstName&quot;,&#13;&#10;c.middlename AS &quot;middleName&quot;,&#13;&#10;c.lastname AS &quot;lastName&quot;,&#13;&#10;c.display_name AS &quot;fullName&quot;,&#13;&#10;c.mobile_no AS &quot;mobileNo&quot;, CONCAT(REPEAT(&quot;..&quot;, ((LENGTH(ounder.`hierarchy`) - LENGTH(&#13;&#10;REPLACE(ounder.`hierarchy`, '.', '')) - 1))), ounder.`name`) AS &quot;officeName&quot;, &#13;&#10;o.id AS &quot;officeN [...]
+            <column name="description" value="All clients with the status ‘Active’"/>
+            <column name="core_report" valueBoolean="false"/>
             <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="130"/>
-            <column name="report_name" value="Client Listing(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
+            <column name="id" valueNumeric="167"/>
+            <column name="report_name" value="Prospective Clients"/>
+            <column name="report_type" value="SMS"/>
+            <column name="report_subtype" value="NonTriggered"/>
             <column name="report_category" value="Client"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
+            <column name="report_sql"
+                    value="SELECT c.id AS &quot;id&quot;, &#13;&#10;c.firstname AS &quot;firstName&quot;,&#13;&#10;c.middlename AS &quot;middleName&quot;,&#13;&#10;c.lastname AS &quot;lastName&quot;,&#13;&#10;c.display_name AS &quot;fullName&quot;,&#13;&#10;c.mobile_no AS &quot;mobileNo&quot;, CONCAT(REPEAT(&quot;..&quot;, ((LENGTH(ounder.`hierarchy`) - LENGTH(&#13;&#10;REPLACE(ounder.`hierarchy`, '.', '')) - 1))), ounder.`name`) AS &quot;officeName&quot;, &#13;&#10;o.id AS &quot;officeN [...]
+            <column name="description" value="All clients with the status ‘Active’ who have never had a loan before"/>
+            <column name="core_report" valueBoolean="false"/>
             <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="131"/>
-            <column name="report_name" value="Client Loans Listing(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
+            <column name="id" valueNumeric="168"/>
+            <column name="report_name" value="Active Loan Clients"/>
+            <column name="report_type" value="SMS"/>
+            <column name="report_subtype" value="NonTriggered"/>
             <column name="report_category" value="Client"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
+            <column name="report_sql"
+                    value="SELECT &#13;&#10;c.id AS &quot;id&quot;, &#13;&#10;c.firstname AS &quot;firstName&quot;,&#13;&#10;c.middlename AS &quot;middleName&quot;,&#13;&#10;c.lastname AS &quot;lastName&quot;,&#13;&#10;c.display_name AS &quot;fullName&quot;,&#13;&#10;c.mobile_no AS &quot;mobileNo&quot;, &#13;&#10;l.principal_amount AS &quot;loanAmount&quot;, &#13;&#10;(IFNULL(l.principal_outstanding_derived, 0) + IFNULL(l.interest_outstanding_derived, 0) + IFNULL(l.fee_charges_outstandin [...]
+            <column name="description" value="All clients with an outstanding loan between cycleX and cycleY days"/>
+            <column name="core_report" valueBoolean="false"/>
             <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="132"/>
-            <column name="report_name" value="Expected Payments By Date - Basic(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
+            <column name="id" valueNumeric="169"/>
+            <column name="report_name" value="Loan in arrears"/>
+            <column name="report_type" value="SMS"/>
+            <column name="report_subtype" value="NonTriggered"/>
             <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="133"/>
-            <column name="report_name" value="Funds Disbursed Between Dates Summary by Office(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Fund"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
+            <column name="report_sql"
+                    value="SELECT &#13;&#10;mc.id AS &quot;id&quot;, &#13;&#10;mc.firstname AS &quot;firstName&quot;,&#13;&#10;mc.middlename AS &quot;middleName&quot;,&#13;&#10;mc.lastname AS &quot;lastName&quot;,&#13;&#10;mc.display_name AS &quot;fullName&quot;,&#13;&#10;mc.mobile_no AS &quot;mobileNo&quot;, &#13;&#10;ml.principal_amount AS &quot;loanAmount&quot;, &#13;&#10;(IFNULL(ml.principal_outstanding_derived, 0) + IFNULL(ml.interest_outstanding_derived, 0) + IFNULL(ml.fee_charges_ [...]
+            <column name="description"
+                    value="All clients with an outstanding loan in arrears between fromX and toY days"/>
+            <column name="core_report" valueBoolean="false"/>
             <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="134"/>
-            <column name="report_name" value="Funds Disbursed Between Dates Summary(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Fund"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
+            <column name="id" valueNumeric="170"/>
+            <column name="report_name" value="Loan payments due"/>
+            <column name="report_type" value="SMS"/>
+            <column name="report_subtype" value="NonTriggered"/>
+            <column name="report_category" value="Loan"/>
+            <column name="report_sql"
+                    value="SELECT &#13;&#10;cl.id AS &quot;id&quot;, &#13;&#10;cl.firstname AS &quot;firstName&quot;,&#13;&#10;cl.middlename AS &quot;middleName&quot;,&#13;&#10;cl.lastname AS &quot;lastName&quot;,&#13;&#10;cl.display_name AS &quot;fullName&quot;,&#13;&#10;cl.mobile_no AS &quot;mobileNo&quot;, &#13;&#10;l.principal_amount AS &quot;loanAmount&quot;,&#13;&#10;of.id AS &quot;officeNumber&quot;,&#13;&#10;(IFNULL(l.principal_outstanding_derived, 0) + IFNULL(l.interest_outstand [...]
+            <column name="description"
+                    value="All clients with an unpaid installment due on their loan between fromX and toY days"/>
+            <column name="core_report" valueBoolean="false"/>
             <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="135"/>
-            <column name="report_name" value="Loans Awaiting Disbursal Summary by Month(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
+            <column name="id" valueNumeric="171"/>
+            <column name="report_name" value="Dormant Prospects"/>
+            <column name="report_type" value="SMS"/>
+            <column name="report_subtype" value="NonTriggered"/>
+            <column name="report_category" value="Client"/>
+            <column name="report_sql"
+                    value="SELECT c.id AS &quot;id&quot;, CONCAT(REPEAT(&quot;..&quot;, ((LENGTH(ounder.`hierarchy`) - LENGTH(&#13;&#10;REPLACE(ounder.`hierarchy`, '.', '')) - 1))), ounder.`name`) AS &quot;officeName&quot;, &#13;&#10;c.firstname AS &quot;firstName&quot;,&#13;&#10;c.middlename AS &quot;middleName&quot;,&#13;&#10;c.lastname AS &quot;lastName&quot;,&#13;&#10;c.display_name AS &quot;fullName&quot;,&#13;&#10;c.mobile_no AS &quot;mobileNo&quot;,  &#13;&#10;o.id AS &quot;office [...]
+            <column name="description"
+                    value="All individuals who have not yet received a loan but were also entered into the system more than 3 months"/>
+            <column name="core_report" valueBoolean="false"/>
             <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="136"/>
-            <column name="report_name" value="Loans Awaiting Disbursal Summary(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
+            <column name="id" valueNumeric="172"/>
+            <column name="report_name" value="Active group leaders"/>
+            <column name="report_type" value="SMS"/>
+            <column name="report_subtype" value="NonTriggered"/>
+            <column name="report_category" value="Client"/>
+            <column name="report_sql"
+                    value="SELECT c.id AS &quot;id&quot;, &#13;&#10;c.firstname AS &quot;firstName&quot;,&#13;&#10;c.middlename AS &quot;middleName&quot;,&#13;&#10;c.lastname AS &quot;lastName&quot;,&#13;&#10;c.display_name AS &quot;fullName&quot;,&#13;&#10;c.mobile_no AS &quot;mobileNo&quot;, CONCAT(REPEAT(&quot;..&quot;, ((LENGTH(ounder.`hierarchy`) - LENGTH(&#13;&#10;REPLACE(ounder.`hierarchy`, '.', '')) - 1))), ounder.`name`) AS &quot;officeName&quot;, &#13;&#10;o.id AS &quot;officeN [...]
+            <column name="description" value="All active group chairmen"/>
+            <column name="core_report" valueBoolean="false"/>
             <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="137"/>
-            <column name="report_name" value="Loans Awaiting Disbursal(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
+            <column name="id" valueNumeric="173"/>
+            <column name="report_name" value="Loan payments due (Overdue Loans)"/>
+            <column name="report_type" value="SMS"/>
+            <column name="report_subtype" value="NonTriggered"/>
             <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
+            <column name="report_sql"
+                    value="SELECT &#13;&#10;mc.id AS &quot;id&quot;, &#13;&#10;mc.firstname AS &quot;firstName&quot;,&#13;&#10;mc.middlename AS &quot;middleName&quot;,&#13;&#10;mc.lastname AS &quot;lastName&quot;,&#13;&#10;mc.display_name AS &quot;fullName&quot;,&#13;&#10;mc.mobile_no AS &quot;mobileNo&quot;, &#13;&#10;ml.principal_amount AS &quot;loanAmount&quot;, &#13;&#10;(IFNULL(ml.principal_outstanding_derived, 0) + IFNULL(ml.interest_outstanding_derived, 0) + IFNULL(ml.fee_charges_ [...]
+            <column name="description"
+                    value="Loan Payments Due between fromX to toY days for clients in arrears between overdueX and overdueY days"/>
+            <column name="core_report" valueBoolean="false"/>
             <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="138"/>
-            <column name="report_name" value="Loans Pending Approval(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
+            <column name="id" valueNumeric="174"/>
+            <column name="report_name" value="Loan payments received (Active Loans)"/>
+            <column name="report_type" value="SMS"/>
+            <column name="report_subtype" value="NonTriggered"/>
             <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
+            <column name="report_sql"
+                    value="SELECT &#13;&#10;mc.id AS &quot;id&quot;, &#13;&#10;mc.firstname AS &quot;firstName&quot;,&#13;&#10;mc.middlename AS &quot;middleName&quot;,&#13;&#10;mc.lastname AS &quot;lastName&quot;,&#13;&#10;mc.display_name AS &quot;fullName&quot;,&#13;&#10;mc.mobile_no AS &quot;mobileNo&quot;, &#13;&#10;ml.principal_amount AS &quot;loanAmount&quot;, &#13;&#10;(IFNULL(ml.principal_outstanding_derived, 0) + IFNULL(ml.interest_outstanding_derived, 0) + IFNULL(ml.fee_charges_ [...]
+            <column name="description"
+                    value="Payments received in the last fromX to toY days for any loan with the status Active (on-time)"/>
+            <column name="core_report" valueBoolean="false"/>
             <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="139"/>
-            <column name="report_name" value="Obligation Met Loans Details(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
+            <column name="id" valueNumeric="175"/>
+            <column name="report_name" value="Loan payments received (Overdue Loans)"/>
+            <column name="report_type" value="SMS"/>
+            <column name="report_subtype" value="NonTriggered"/>
             <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
+            <column name="report_sql"
+                    value="SELECT &#13;&#10;ml.id AS &quot;loanId&quot;, &#13;&#10;mc.id AS &quot;id&quot;, &#13;&#10;mc.firstname AS &quot;firstName&quot;,&#13;&#10;mc.middlename AS &quot;middleName&quot;,&#13;&#10;mc.lastname AS &quot;lastName&quot;,&#13;&#10;mc.display_name AS &quot;fullName&quot;,&#13;&#10;mc.mobile_no AS &quot;mobileNo&quot;, &#13;&#10;ml.principal_amount AS &quot;loanAmount&quot;, &#13;&#10;(IFNULL(ml.principal_outstanding_derived, 0) + IFNULL(ml.interest_outstandi [...]
+            <column name="description"
+                    value="Payments received in the last fromX to toY days for any loan with the status Overdue (arrears) between overdueX and overdueY days"/>
+            <column name="core_report" valueBoolean="false"/>
             <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="140"/>
-            <column name="report_name" value="Obligation Met Loans Summary(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
+            <column name="id" valueNumeric="176"/>
+            <column name="report_name" value="Happy Birthday"/>
+            <column name="report_type" value="SMS"/>
+            <column name="report_subtype" value="NonTriggered"/>
+            <column name="report_category" value="Client"/>
+            <column name="report_sql"
+                    value="SELECT &#13;&#10;c.id AS &quot;id&quot;, &#13;&#10;c.firstname AS &quot;firstName&quot;,&#13;&#10;c.middlename AS &quot;middleName&quot;,&#13;&#10;c.lastname AS &quot;lastName&quot;,&#13;&#10;c.display_name AS &quot;fullName&quot;,&#13;&#10;c.mobile_no AS &quot;mobileNo&quot;, CONCAT(REPEAT(&quot;..&quot;, ((LENGTH(ounder.`hierarchy`) - LENGTH(&#13;&#10;REPLACE(ounder.`hierarchy`, '.', '')) - 1))), ounder.`name`) AS &quot;officeName&quot;, &#13;&#10;o.id AS &qu [...]
+            <column name="description"
+                    value="This sends a message to all clients with the status Active on their Birthday"/>
+            <column name="core_report" valueBoolean="false"/>
             <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="141"/>
-            <column name="report_name" value="Portfolio at Risk by Branch(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
+            <column name="id" valueNumeric="177"/>
+            <column name="report_name" value="Loan fully repaid"/>
+            <column name="report_type" value="SMS"/>
+            <column name="report_subtype" value="NonTriggered"/>
             <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
+            <column name="report_sql"
+                    value="SELECT &#13;&#10;c.id AS &quot;id&quot;, &#13;&#10;c.firstname AS &quot;firstName&quot;,&#13;&#10;c.middlename AS &quot;middleName&quot;,&#13;&#10;c.lastname AS &quot;lastName&quot;,&#13;&#10;c.display_name AS &quot;fullName&quot;,&#13;&#10;c.mobile_no AS &quot;mobileNo&quot;, &#13;&#10;l.principal_amount AS &quot;loanAmount&quot;,&#13;&#10;(IFNULL(l.principal_outstanding_derived, 0) + IFNULL(l.interest_outstanding_derived, 0) + IFNULL(l.fee_charges_outstanding [...]
+            <column name="description"
+                    value="All loans that have been fully repaid (Closed or Overpaid) in the last fromX to toY days"/>
+            <column name="core_report" valueBoolean="false"/>
             <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="142"/>
-            <column name="report_name" value="Portfolio at Risk(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
+            <column name="id" valueNumeric="178"/>
+            <column name="report_name" value="Loan outstanding after final instalment date"/>
+            <column name="report_type" value="SMS"/>
+            <column name="report_subtype" value="NonTriggered"/>
             <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
+            <column name="report_sql"
+                    value="SELECT &#13;&#10;c.id AS &quot;id&quot;, &#13;&#10;c.firstname AS &quot;firstName&quot;,&#13;&#10;c.middlename AS &quot;middleName&quot;,&#13;&#10;c.lastname AS &quot;lastName&quot;,&#13;&#10;c.display_name AS &quot;fullName&quot;,&#13;&#10;c.mobile_no AS &quot;mobileNo&quot;, &#13;&#10;l.principal_amount AS &quot;loanAmount&quot;,&#13;&#10;o.id AS &quot;officeNumber&quot;,&#13;&#10;(IFNULL(l.principal_outstanding_derived, 0) + IFNULL(l.interest_outstanding_der [...]
+            <column name="description"
+                    value="All active loans (with an outstanding balance) between fromX to toY days after the final instalment date on their loan schedule"/>
+            <column name="core_report" valueBoolean="false"/>
             <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="143"/>
-            <column name="report_name" value="Rescheduled Loans(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="144"/>
-            <column name="report_name" value="TxnRunningBalances(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Transaction"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="145"/>
-            <column name="report_name" value="Written-Off Loans(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="146"/>
-            <column name="report_name" value="Client Saving Transactions"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Savings"/>
-            <column name="report_sql"/>
-            <column name="description"/>
+            <column name="id" valueNumeric="179"/>
+            <column name="report_name" value="Loan Repayment"/>
+            <column name="report_type" value="SMS"/>
+            <column name="report_subtype" value="Triggered"/>
+            <column name="report_category"/>
+            <column name="report_sql"
+                    value="select ml.id as loanId,mc.id, mc.firstname, ifnull(mc.middlename,'') as middlename, mc.lastname, mc.display_name as FullName, mobile_no as mobileNo, mc.group_name as GroupName, round(ml.principal_amount, ml.currency_digits) as LoanAmount, round(ml.`total_outstanding_derived`, ml.currency_digits) as LoanOutstanding,&#10;ml.`account_no` as LoanAccountId, round(mlt.amountPaid, ml.currency_digits) as repaymentAmount&#10;FROM m_office mo&#10;JOIN m_office ounder ON  [...]
+            <column name="description" value="Loan Repayment"/>
             <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="147"/>
-            <column name="report_name" value="Client Loan Account Schedule"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql"/>
-            <column name="description"/>
+            <column name="id" valueNumeric="180"/>
+            <column name="report_name" value="Loan Approved"/>
+            <column name="report_type" value="SMS"/>
+            <column name="report_subtype" value="Triggered"/>
+            <column name="report_category"/>
+            <column name="report_sql"
+                    value="SELECT mc.id, mc.firstname, mc.middlename as middlename, mc.lastname, mc.display_name as FullName, mc.mobile_no as mobileNo, mc.group_name as GroupName, mo.name as officename, ml.id as loanId, ml.account_no as accountnumber, ml.principal_amount_proposed as loanamount, ml.annual_nominal_interest_rate as annualinterestrate FROM m_office mo JOIN m_office ounder ON ounder.hierarchy LIKE CONCAT(mo.hierarchy, '%') AND ounder.hierarchy like CONCAT('.', '%') LEFT JOIN  [...]
+            <column name="description" value="Loan and client data of approved loan"/>
             <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="148"/>
-            <column name="report_name" value="GroupNamesByStaff"/>
-            <column name="report_type" value="Table"/>
-            <column name="report_subtype" value=""/>
-            <column name="report_category" value=""/>
+            <column name="id" valueNumeric="181"/>
+            <column name="report_name" value="Loan Rejected"/>
+            <column name="report_type" value="SMS"/>
+            <column name="report_subtype" value="Triggered"/>
+            <column name="report_category"/>
             <column name="report_sql"
-                    value="Select gr.id as id, gr.display_name as name from m_group gr where gr.level_id=1 and gr.staff_id = ${staffId}"/>
-            <column name="description" value=""/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
+                    value="SELECT mc.id, mc.firstname, mc.middlename as middlename, mc.lastname, mc.display_name as FullName, mc.mobile_no as mobileNo, mc.group_name as GroupName,  mo.name as officename, ml.id as loanId, ml.account_no as accountnumber, ml.principal_amount_proposed as loanamount, ml.annual_nominal_interest_rate as annualinterestrate  FROM  m_office mo  JOIN m_office ounder ON ounder.hierarchy LIKE CONCAT(mo.hierarchy, '%')  AND ounder.hierarchy like CONCAT('.', '%')  LEFT [...]
+            <column name="description" value="Loan and client data of rejected loan"/>
+            <column name="core_report" valueBoolean="false"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="149"/>
-            <column name="report_name" value="ClientTrendsByDay"/>
-            <column name="report_type" value="Table"/>
-            <column name="report_subtype" value=""/>
+            <column name="id" valueNumeric="182"/>
+            <column name="report_name" value="Client Rejected"/>
+            <column name="report_type" value="SMS"/>
+            <column name="report_subtype" value="Triggered"/>
             <column name="report_category" value="Client"/>
             <column name="report_sql"
-                    value="SELECT &#9;COUNT(cl.id) AS count, &#10;&#9;&#9;cl.activation_date AS days&#10;FROM m_office of &#10;&#9;LEFT JOIN m_client cl on of.id = cl.office_id&#10;WHERE of.hierarchy like concat((select ino.hierarchy from m_office ino where ino.id = ${officeId}),&quot;%&quot; ) &#10;&#9;AND (cl.activation_date BETWEEN DATE_SUB(CURDATE(), INTERVAL 12 DAY) AND DATE(NOW()- INTERVAL 1 DAY))&#10;GROUP BY days"/>
-            <column name="description" value="Retrieves the number of clients joined in last 12 days"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
+                    value="SELECT c.id AS &quot;id&quot;, &#13;&#10;c.firstname AS &quot;firstName&quot;,&#13;&#10;c.middlename AS &quot;middleName&quot;,&#13;&#10;c.lastname AS &quot;lastName&quot;,&#13;&#10;c.display_name AS &quot;fullName&quot;,&#13;&#10;c.mobile_no AS &quot;mobileNo&quot;, CONCAT(REPEAT(&quot;..&quot;, ((LENGTH(ounder.`hierarchy`) - LENGTH(&#13;&#10;REPLACE(ounder.`hierarchy`, '.', '')) - 1))), ounder.`name`) AS &quot;officeName&quot;, &#13;&#10;o.id AS &quot;officeN [...]
+            <column name="description" value="Client Rejection"/>
+            <column name="core_report" valueBoolean="false"/>
+            <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="150"/>
-            <column name="report_name" value="ClientTrendsByWeek"/>
-            <column name="report_type" value="Table"/>
-            <column name="report_subtype" value=""/>
+            <column name="id" valueNumeric="183"/>
+            <column name="report_name" value="Client Activated"/>
+            <column name="report_type" value="SMS"/>
+            <column name="report_subtype" value="Triggered"/>
             <column name="report_category" value="Client"/>
             <column name="report_sql"
-                    value="SELECT &#9;COUNT(cl.id) AS count, &#10;&#9;&#9;WEEK(cl.activation_date) AS Weeks&#10;FROM m_office of &#10;&#9;LEFT JOIN m_client cl on of.id = cl.office_id&#10;WHERE of.hierarchy like concat((select ino.hierarchy from m_office ino where ino.id = ${officeId}),&quot;%&quot; ) &#10;&#9;AND (cl.activation_date BETWEEN DATE_SUB(CURDATE(), INTERVAL 12 WEEK) AND DATE(NOW()))&#10;GROUP BY Weeks"/>
-            <column name="description" value=""/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
+                    value="SELECT c.id AS &quot;id&quot;, &#13;&#10;c.firstname AS &quot;firstName&quot;,&#13;&#10;c.middlename AS &quot;middleName&quot;,&#13;&#10;c.lastname AS &quot;lastName&quot;,&#13;&#10;c.display_name AS &quot;fullName&quot;,&#13;&#10;c.mobile_no AS &quot;mobileNo&quot;, CONCAT(REPEAT(&quot;..&quot;, ((LENGTH(ounder.`hierarchy`) - LENGTH(&#13;&#10;REPLACE(ounder.`hierarchy`, '.', '')) - 1))), ounder.`name`) AS &quot;officeName&quot;, &#13;&#10;o.id AS &quot;officeN [...]
+            <column name="description" value="Client Activation"/>
+            <column name="core_report" valueBoolean="false"/>
+            <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="151"/>
-            <column name="report_name" value="ClientTrendsByMonth"/>
-            <column name="report_type" value="Table"/>
-            <column name="report_subtype" value=""/>
-            <column name="report_category" value="Client"/>
+            <column name="id" valueNumeric="184"/>
+            <column name="report_name" value="Savings Rejected"/>
+            <column name="report_type" value="SMS"/>
+            <column name="report_subtype" value="Triggered"/>
+            <column name="report_category" value="Savings"/>
             <column name="report_sql"
-                    value="SELECT &#9;COUNT(cl.id) AS count, &#10;&#9;&#9;MONTHNAME(cl.activation_date) AS Months&#10;FROM m_office of &#10;&#9;LEFT JOIN m_client cl on of.id = cl.office_id&#10;WHERE of.hierarchy like concat((select ino.hierarchy from m_office ino where ino.id = ${officeId}),&quot;%&quot; ) &#10;&#9;AND (cl.activation_date BETWEEN DATE_SUB(CURDATE(), INTERVAL 12 MONTH) AND DATE(NOW()))&#10;GROUP BY Months"/>
-            <column name="description" value=""/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
+                    value="SELECT &#13;&#10;c.id AS &quot;id&quot;,&#13;&#10;c.firstname AS &quot;firstName&quot;,&#13;&#10;c.middlename AS &quot;middleName&quot;,&#13;&#10;c.lastname AS &quot;lastName&quot;,&#13;&#10;c.display_name AS &quot;fullName&quot;,&#13;&#10;c.mobile_no AS &quot;mobileNo&quot;,&#13;&#10;s.account_no AS &quot;savingsAccountNo&quot;,&#13;&#10;ounder.id AS &quot;officeNumber&quot;,&#13;&#10;ounder.name AS &quot;officeName&quot;&#13;&#10;&#13;&#10;FROM m_office o&#13 [...]
+            <column name="description" value="Savings Rejected"/>
+            <column name="core_report" valueBoolean="false"/>
+            <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="152"/>
-            <column name="report_name" value="LoanTrendsByDay"/>
-            <column name="report_type" value="Table"/>
-            <column name="report_subtype" value=""/>
-            <column name="report_category" value="Loan"/>
+            <column name="id" valueNumeric="185"/>
+            <column name="report_name" value="Savings Activated"/>
+            <column name="report_type" value="SMS"/>
+            <column name="report_subtype" value="Triggered"/>
+            <column name="report_category" value="Savings"/>
             <column name="report_sql"
-                    value="SELECT &#9;COUNT(ln.id) AS lcount, &#10;&#9;&#9;ln.disbursedon_date AS days&#10;FROM m_office of &#10;&#9;LEFT JOIN m_client cl on of.id = cl.office_id&#10;&#9;LEFT JOIN m_loan ln on cl.id = ln.client_id&#10;WHERE of.hierarchy like concat((select ino.hierarchy from m_office ino where ino.id = ${officeId}),&quot;%&quot; ) &#10;&#9;AND (ln.disbursedon_date BETWEEN DATE_SUB(CURDATE(), INTERVAL 12 DAY) AND DATE(NOW()- INTERVAL 1 DAY))&#10;GROUP BY days"/>
-            <column name="description" value="Retrieves Number of loans disbursed for last 12 days"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
+                    value="SELECT &#13;&#10;c.id AS &quot;id&quot;,&#13;&#10;c.firstname AS &quot;firstName&quot;,&#13;&#10;c.middlename AS &quot;middleName&quot;,&#13;&#10;c.lastname AS &quot;lastName&quot;,&#13;&#10;c.display_name AS &quot;fullName&quot;,&#13;&#10;c.mobile_no AS &quot;mobileNo&quot;,&#13;&#10;s.account_no AS &quot;savingsAccountNo&quot;,&#13;&#10;ounder.id AS &quot;officeNumber&quot;,&#13;&#10;ounder.name AS &quot;officeName&quot;&#13;&#10;&#13;&#10;FROM m_office o&#13 [...]
+            <column name="description" value="Savings Activation"/>
+            <column name="core_report" valueBoolean="false"/>
+            <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="153"/>
-            <column name="report_name" value="LoanTrendsByWeek"/>
-            <column name="report_type" value="Table"/>
-            <column name="report_subtype" value=""/>
-            <column name="report_category" value="Loan"/>
+            <column name="id" valueNumeric="186"/>
+            <column name="report_name" value="Savings Deposit"/>
+            <column name="report_type" value="SMS"/>
+            <column name="report_subtype" value="Triggered"/>
+            <column name="report_category"/>
             <column name="report_sql"
-                    value="SELECT &#9;COUNT(ln.id) AS lcount, &#10;&#9;&#9;WEEK(ln.disbursedon_date) AS Weeks&#10;FROM m_office of &#10;&#9;LEFT JOIN m_client cl on of.id = cl.office_id&#10;&#9;LEFT JOIN m_loan ln on cl.id = ln.client_id&#10;WHERE of.hierarchy like concat((select ino.hierarchy from m_office ino where ino.id = ${officeId}),&quot;%&quot; ) &#10;&#9;AND (ln.disbursedon_date BETWEEN DATE_SUB(CURDATE(), INTERVAL 12 WEEK) AND DATE(NOW()))&#10;GROUP BY Weeks"/>
-            <column name="description" value=""/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
+                    value="SELECT sc.savingsId AS savingsId, sc.id AS clientId, sc.firstname, IFNULL(sc.middlename,'') AS middlename, sc.lastname, sc.display_name AS FullName, sc.mobile_no AS mobileNo,&#13;&#10;ms.`account_no` AS savingsAccountNo, ROUND(mst.amountPaid, ms.currency_digits) AS depositAmount, ms.account_balance_derived AS balance, &#13;&#10;mst.transactionDate AS transactionDate&#13;&#10;FROM m_office mo&#13;&#10;JOIN m_office ounder ON ounder.hierarchy LIKE CONCAT(mo.hiera [...]
+            <column name="description" value="Savings Deposit"/>
+            <column name="core_report" valueBoolean="false"/>
+            <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="154"/>
-            <column name="report_name" value="LoanTrendsByMonth"/>
-            <column name="report_type" value="Table"/>
-            <column name="report_subtype" value=""/>
-            <column name="report_category" value="Loan"/>
+            <column name="id" valueNumeric="187"/>
+            <column name="report_name" value="Savings Withdrawal"/>
+            <column name="report_type" value="SMS"/>
+            <column name="report_subtype" value="Triggered"/>
+            <column name="report_category"/>
             <column name="report_sql"
-                    value="SELECT &#9;COUNT(ln.id) AS lcount, &#10;&#9;&#9;MONTHNAME(ln.disbursedon_date) AS Months&#10;FROM m_office of &#10;&#9;LEFT JOIN m_client cl on of.id = cl.office_id&#10;&#9;LEFT JOIN m_loan ln on cl.id = ln.client_id&#10;WHERE of.hierarchy like concat((select ino.hierarchy from m_office ino where ino.id = ${officeId}),&quot;%&quot; ) &#10;&#9;AND (ln.disbursedon_date BETWEEN DATE_SUB(CURDATE(), INTERVAL 12 MONTH) AND DATE(NOW()))&#10;GROUP BY Months"/>
-            <column name="description" value=""/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
+                    value="SELECT sc.savingsId AS savingsId, sc.id AS clientId, sc.firstname, IFNULL(sc.middlename,'') AS middlename, sc.lastname, sc.display_name AS FullName, sc.mobile_no AS mobileNo,&#13;&#10;ms.`account_no` AS savingsAccountNo, ROUND(mst.amountPaid, ms.currency_digits) AS withdrawAmount, ms.account_balance_derived AS balance, &#13;&#10;mst.transactionDate AS transactionDate&#13;&#10;FROM m_office mo&#13;&#10;JOIN m_office ounder ON ounder.hierarchy LIKE CONCAT(mo.hier [...]
+            <column name="description" value="Savings Withdrawal"/>
+            <column name="core_report" valueBoolean="false"/>
+            <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="155"/>
-            <column name="report_name" value="Demand_Vs_Collection"/>
+            <column name="id" valueNumeric="188"/>
+            <column name="report_name" value="ReportCategoryList"/>
             <column name="report_type" value="Table"/>
-            <column name="report_subtype" value=""/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql"
-                    value="select amount.AmountDue-amount.AmountPaid as AmountDue, amount.AmountPaid as AmountPaid from&#10;(SELECT &#10;(IFNULL(SUM(ls.principal_amount),0) - IFNULL(SUM(ls.principal_writtenoff_derived),0)&#10; + IFNULL(SUM(ls.interest_amount),0) - IFNULL(SUM(ls.interest_writtenoff_derived),0) &#10; - IFNULL(SUM(ls.interest_waived_derived),0)&#10; + IFNULL(SUM(ls.fee_charges_amount),0) - IFNULL(SUM(ls.fee_charges_writtenoff_derived),0) &#10; - IFNULL(SUM(ls.fee_charges_wa [...]
-            <column name="description" value="Demand Vs Collection"/>
+            <column name="report_subtype"/>
+            <column name="report_category" value="(NULL)"/>
+            <column name="report_sql" value="(NULL)"/>
+            <column name="description" value="(NULL)"/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="156"/>
-            <column name="report_name" value="Disbursal_Vs_Awaitingdisbursal"/>
+            <column name="id" valueNumeric="189"/>
+            <column name="report_name" value="FullReportList"/>
             <column name="report_type" value="Table"/>
-            <column name="report_subtype" value=""/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql"
-                    value="select awaitinddisbursal.amount-disbursedAmount.amount as amountToBeDisburse, disbursedAmount.amount as disbursedAmount from &#10;(&#10;SELECT &#9;COUNT(ln.id) AS noOfLoans, &#10;&#9;&#9;&#9;IFNULL(SUM(ln.principal_amount),0) AS amount&#10;FROM &#10;m_office of&#10;LEFT JOIN m_client cl ON cl.office_id = of.id&#10;LEFT JOIN m_loan ln ON cl.id = ln.client_id&#10;WHERE &#10;ln.expected_disbursedon_date = DATE(NOW()) AND &#10;(ln.loan_status_id=200 OR ln.loan_stat [...]
-            <column name="description" value="Disbursal_Vs_Awaitingdisbursal"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="157"/>
-            <column name="report_name" value="Savings Transaction Receipt"/>
-            <column name="report_type" value="Pentaho"/>
             <column name="report_subtype"/>
-            <column name="report_category"/>
-            <column name="report_sql"/>
-            <column name="description"/>
-            <column name="core_report" valueBoolean="false"/>
+            <column name="report_category" value="(NULL)"/>
+            <column name="report_sql" value="(NULL)"/>
+            <column name="description" value="(NULL)"/>
+            <column name="core_report" valueBoolean="true"/>
             <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="158"/>
-            <column name="report_name" value="Loan Transaction Receipt"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
+            <column name="id" valueNumeric="190"/>
+            <column name="report_name" value="Loan Approved - Email"/>
+            <column name="report_type" value="Email"/>
+            <column name="report_subtype" value="Triggered"/>
             <column name="report_category"/>
-            <column name="report_sql"/>
-            <column name="description"/>
+            <column name="report_sql"
+                    value="select  ml.id as loanId,  ifnull(mc.id,mc2.id) as id,  ifnull(mc.firstname,mc2.firstname) as firstname,  &#10;ifnull(mc.middlename,ifnull(mc2.middlename,(''))) as middlename,  ifnull(mc.lastname,mc2.lastname) as lastname,  &#10;ifnull(mc.display_name,mc2.display_name) as display_name,  ifnull(mc.status_enum,mc2.status_enum) as status_enum, &#10;ifnull(mc.mobile_no,mc2.mobile_no) as mobile_no, ifnull(mg.office_id,mc2.office_id) as office_id, ifnull(mg.staff_id,m [...]
+            <column name="description" value="Loan and client data of approved loan"/>
             <column name="core_report" valueBoolean="false"/>
             <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="159"/>
-            <column name="report_name" value="Staff Assignment History"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
+            <column name="id" valueNumeric="191"/>
+            <column name="report_name" value="Loan Rejected - Email"/>
+            <column name="report_type" value="Email"/>
+            <column name="report_subtype" value="Triggered"/>
             <column name="report_category"/>
-            <column name="report_sql"/>
-            <column name="description"/>
+            <column name="report_sql"
+                    value="select  ml.id as loanId,  ifnull(mc.id,mc2.id) as id,  ifnull(mc.firstname,mc2.firstname) as firstname,  &#10;ifnull(mc.middlename,ifnull(mc2.middlename,(''))) as middlename,  ifnull(mc.lastname,mc2.lastname) as lastname,  &#10;ifnull(mc.display_name,mc2.display_name) as display_name,  ifnull(mc.status_enum,mc2.status_enum) as status_enum, &#10;ifnull(mc.mobile_no,mc2.mobile_no) as mobile_no, ifnull(mg.office_id,mc2.office_id) as office_id, ifnull(mg.staff_id,m [...]
+            <column name="description" value="Loan and client data of rejected loan"/>
             <column name="core_report" valueBoolean="false"/>
             <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="160"/>
-            <column name="report_name" value="GeneralLedgerReport"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Accounting"/>
-            <column name="report_sql"/>
-            <column name="description"/>
+            <column name="id" valueNumeric="192"/>
+            <column name="report_name" value="Loan Repayment - Email"/>
+            <column name="report_type" value="Email"/>
+            <column name="report_subtype" value="Triggered"/>
+            <column name="report_category"/>
+            <column name="report_sql"
+                    value="select  ml.id as loanId,  ifnull(mc.id,mc2.id) as id,  ifnull(mc.firstname,mc2.firstname) as firstname,  &#10;ifnull(mc.middlename,ifnull(mc2.middlename,(''))) as middlename,  ifnull(mc.lastname,mc2.lastname) as lastname,  &#10;ifnull(mc.display_name,mc2.display_name) as display_name,  ifnull(mc.status_enum,mc2.status_enum) as status_enum, &#10;ifnull(mc.mobile_no,mc2.mobile_no) as mobile_no, ifnull(mg.office_id,mc2.office_id) as office_id, ifnull(mg.staff_id,m [...]
+            <column name="description" value="Loan and client data of rejected loan"/>
             <column name="core_report" valueBoolean="false"/>
             <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="161"/>
-            <column name="report_name" value="Active Loan Summary per Branch"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql"/>
-            <column name="description"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="162"/>
-            <column name="report_name" value="Balance Outstanding"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql"/>
-            <column name="description"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="163"/>
-            <column name="report_name" value="Collection Report"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql"/>
-            <column name="description"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="164"/>
-            <column name="report_name" value="Disbursal Report"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql"/>
-            <column name="description"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="165"/>
-            <column name="report_name" value="Savings Accounts Dormancy Report"/>
-            <column name="report_type" value="Table"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Savings"/>
-            <column name="report_sql"
-                    value="select cl.display_name as 'Client Display Name',&#13;&#10;sa.account_no as 'Account Number',&#13;&#10;cl.mobile_no as 'Mobile Number',&#13;&#10;@lastdate:=(select IFNULL(max(sat.transaction_date),sa.activatedon_date) &#13;&#10;            from m_savings_account_transaction as sat &#13;&#10;            where sat.is_reversed = 0 &#13;&#10;            and sat.transaction_type_enum in (1,2) &#13;&#10;            and sat.savings_account_id = sa.id) as 'Date of Last  [...]
-            <column name="description"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="166"/>
-            <column name="report_name" value="Active Clients"/>
-            <column name="report_type" value="SMS"/>
-            <column name="report_subtype" value="NonTriggered"/>
-            <column name="report_category" value="Client"/>
-            <column name="report_sql"
-                    value="SELECT c.id AS &quot;id&quot;, &#13;&#10;c.firstname AS &quot;firstName&quot;,&#13;&#10;c.middlename AS &quot;middleName&quot;,&#13;&#10;c.lastname AS &quot;lastName&quot;,&#13;&#10;c.display_name AS &quot;fullName&quot;,&#13;&#10;c.mobile_no AS &quot;mobileNo&quot;, CONCAT(REPEAT(&quot;..&quot;, ((LENGTH(ounder.`hierarchy`) - LENGTH(&#13;&#10;REPLACE(ounder.`hierarchy`, '.', '')) - 1))), ounder.`name`) AS &quot;officeName&quot;, &#13;&#10;o.id AS &quot;officeN [...]
-            <column name="description" value="All clients with the status ‘Active’"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="167"/>
-            <column name="report_name" value="Prospective Clients"/>
-            <column name="report_type" value="SMS"/>
-            <column name="report_subtype" value="NonTriggered"/>
-            <column name="report_category" value="Client"/>
-            <column name="report_sql"
-                    value="SELECT c.id AS &quot;id&quot;, &#13;&#10;c.firstname AS &quot;firstName&quot;,&#13;&#10;c.middlename AS &quot;middleName&quot;,&#13;&#10;c.lastname AS &quot;lastName&quot;,&#13;&#10;c.display_name AS &quot;fullName&quot;,&#13;&#10;c.mobile_no AS &quot;mobileNo&quot;, CONCAT(REPEAT(&quot;..&quot;, ((LENGTH(ounder.`hierarchy`) - LENGTH(&#13;&#10;REPLACE(ounder.`hierarchy`, '.', '')) - 1))), ounder.`name`) AS &quot;officeName&quot;, &#13;&#10;o.id AS &quot;officeN [...]
-            <column name="description" value="All clients with the status ‘Active’ who have never had a loan before"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="168"/>
-            <column name="report_name" value="Active Loan Clients"/>
-            <column name="report_type" value="SMS"/>
-            <column name="report_subtype" value="NonTriggered"/>
-            <column name="report_category" value="Client"/>
-            <column name="report_sql"
-                    value="SELECT &#13;&#10;c.id AS &quot;id&quot;, &#13;&#10;c.firstname AS &quot;firstName&quot;,&#13;&#10;c.middlename AS &quot;middleName&quot;,&#13;&#10;c.lastname AS &quot;lastName&quot;,&#13;&#10;c.display_name AS &quot;fullName&quot;,&#13;&#10;c.mobile_no AS &quot;mobileNo&quot;, &#13;&#10;l.principal_amount AS &quot;loanAmount&quot;, &#13;&#10;(IFNULL(l.principal_outstanding_derived, 0) + IFNULL(l.interest_outstanding_derived, 0) + IFNULL(l.fee_charges_outstandin [...]
-            <column name="description" value="All clients with an outstanding loan between cycleX and cycleY days"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="169"/>
-            <column name="report_name" value="Loan in arrears"/>
-            <column name="report_type" value="SMS"/>
-            <column name="report_subtype" value="NonTriggered"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql"
-                    value="SELECT &#13;&#10;mc.id AS &quot;id&quot;, &#13;&#10;mc.firstname AS &quot;firstName&quot;,&#13;&#10;mc.middlename AS &quot;middleName&quot;,&#13;&#10;mc.lastname AS &quot;lastName&quot;,&#13;&#10;mc.display_name AS &quot;fullName&quot;,&#13;&#10;mc.mobile_no AS &quot;mobileNo&quot;, &#13;&#10;ml.principal_amount AS &quot;loanAmount&quot;, &#13;&#10;(IFNULL(ml.principal_outstanding_derived, 0) + IFNULL(ml.interest_outstanding_derived, 0) + IFNULL(ml.fee_charges_ [...]
-            <column name="description"
-                    value="All clients with an outstanding loan in arrears between fromX and toY days"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="170"/>
-            <column name="report_name" value="Loan payments due"/>
-            <column name="report_type" value="SMS"/>
-            <column name="report_subtype" value="NonTriggered"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql"
-                    value="SELECT &#13;&#10;cl.id AS &quot;id&quot;, &#13;&#10;cl.firstname AS &quot;firstName&quot;,&#13;&#10;cl.middlename AS &quot;middleName&quot;,&#13;&#10;cl.lastname AS &quot;lastName&quot;,&#13;&#10;cl.display_name AS &quot;fullName&quot;,&#13;&#10;cl.mobile_no AS &quot;mobileNo&quot;, &#13;&#10;l.principal_amount AS &quot;loanAmount&quot;,&#13;&#10;of.id AS &quot;officeNumber&quot;,&#13;&#10;(IFNULL(l.principal_outstanding_derived, 0) + IFNULL(l.interest_outstand [...]
-            <column name="description"
-                    value="All clients with an unpaid installment due on their loan between fromX and toY days"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="171"/>
-            <column name="report_name" value="Dormant Prospects"/>
-            <column name="report_type" value="SMS"/>
-            <column name="report_subtype" value="NonTriggered"/>
-            <column name="report_category" value="Client"/>
-            <column name="report_sql"
-                    value="SELECT c.id AS &quot;id&quot;, CONCAT(REPEAT(&quot;..&quot;, ((LENGTH(ounder.`hierarchy`) - LENGTH(&#13;&#10;REPLACE(ounder.`hierarchy`, '.', '')) - 1))), ounder.`name`) AS &quot;officeName&quot;, &#13;&#10;c.firstname AS &quot;firstName&quot;,&#13;&#10;c.middlename AS &quot;middleName&quot;,&#13;&#10;c.lastname AS &quot;lastName&quot;,&#13;&#10;c.display_name AS &quot;fullName&quot;,&#13;&#10;c.mobile_no AS &quot;mobileNo&quot;,  &#13;&#10;o.id AS &quot;office [...]
-            <column name="description"
-                    value="All individuals who have not yet received a loan but were also entered into the system more than 3 months"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="172"/>
-            <column name="report_name" value="Active group leaders"/>
-            <column name="report_type" value="SMS"/>
-            <column name="report_subtype" value="NonTriggered"/>
-            <column name="report_category" value="Client"/>
-            <column name="report_sql"
-                    value="SELECT c.id AS &quot;id&quot;, &#13;&#10;c.firstname AS &quot;firstName&quot;,&#13;&#10;c.middlename AS &quot;middleName&quot;,&#13;&#10;c.lastname AS &quot;lastName&quot;,&#13;&#10;c.display_name AS &quot;fullName&quot;,&#13;&#10;c.mobile_no AS &quot;mobileNo&quot;, CONCAT(REPEAT(&quot;..&quot;, ((LENGTH(ounder.`hierarchy`) - LENGTH(&#13;&#10;REPLACE(ounder.`hierarchy`, '.', '')) - 1))), ounder.`name`) AS &quot;officeName&quot;, &#13;&#10;o.id AS &quot;officeN [...]
-            <column name="description" value="All active group chairmen"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="173"/>
-            <column name="report_name" value="Loan payments due (Overdue Loans)"/>
-            <column name="report_type" value="SMS"/>
-            <column name="report_subtype" value="NonTriggered"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql"
-                    value="SELECT &#13;&#10;mc.id AS &quot;id&quot;, &#13;&#10;mc.firstname AS &quot;firstName&quot;,&#13;&#10;mc.middlename AS &quot;middleName&quot;,&#13;&#10;mc.lastname AS &quot;lastName&quot;,&#13;&#10;mc.display_name AS &quot;fullName&quot;,&#13;&#10;mc.mobile_no AS &quot;mobileNo&quot;, &#13;&#10;ml.principal_amount AS &quot;loanAmount&quot;, &#13;&#10;(IFNULL(ml.principal_outstanding_derived, 0) + IFNULL(ml.interest_outstanding_derived, 0) + IFNULL(ml.fee_charges_ [...]
-            <column name="description"
-                    value="Loan Payments Due between fromX to toY days for clients in arrears between overdueX and overdueY days"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="174"/>
-            <column name="report_name" value="Loan payments received (Active Loans)"/>
-            <column name="report_type" value="SMS"/>
-            <column name="report_subtype" value="NonTriggered"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql"
-                    value="SELECT &#13;&#10;mc.id AS &quot;id&quot;, &#13;&#10;mc.firstname AS &quot;firstName&quot;,&#13;&#10;mc.middlename AS &quot;middleName&quot;,&#13;&#10;mc.lastname AS &quot;lastName&quot;,&#13;&#10;mc.display_name AS &quot;fullName&quot;,&#13;&#10;mc.mobile_no AS &quot;mobileNo&quot;, &#13;&#10;ml.principal_amount AS &quot;loanAmount&quot;, &#13;&#10;(IFNULL(ml.principal_outstanding_derived, 0) + IFNULL(ml.interest_outstanding_derived, 0) + IFNULL(ml.fee_charges_ [...]
-            <column name="description"
-                    value="Payments received in the last fromX to toY days for any loan with the status Active (on-time)"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="175"/>
-            <column name="report_name" value="Loan payments received (Overdue Loans)"/>
-            <column name="report_type" value="SMS"/>
-            <column name="report_subtype" value="NonTriggered"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql"
-                    value="SELECT &#13;&#10;ml.id AS &quot;loanId&quot;, &#13;&#10;mc.id AS &quot;id&quot;, &#13;&#10;mc.firstname AS &quot;firstName&quot;,&#13;&#10;mc.middlename AS &quot;middleName&quot;,&#13;&#10;mc.lastname AS &quot;lastName&quot;,&#13;&#10;mc.display_name AS &quot;fullName&quot;,&#13;&#10;mc.mobile_no AS &quot;mobileNo&quot;, &#13;&#10;ml.principal_amount AS &quot;loanAmount&quot;, &#13;&#10;(IFNULL(ml.principal_outstanding_derived, 0) + IFNULL(ml.interest_outstandi [...]
-            <column name="description"
-                    value="Payments received in the last fromX to toY days for any loan with the status Overdue (arrears) between overdueX and overdueY days"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="176"/>
-            <column name="report_name" value="Happy Birthday"/>
-            <column name="report_type" value="SMS"/>
-            <column name="report_subtype" value="NonTriggered"/>
-            <column name="report_category" value="Client"/>
-            <column name="report_sql"
-                    value="SELECT &#13;&#10;c.id AS &quot;id&quot;, &#13;&#10;c.firstname AS &quot;firstName&quot;,&#13;&#10;c.middlename AS &quot;middleName&quot;,&#13;&#10;c.lastname AS &quot;lastName&quot;,&#13;&#10;c.display_name AS &quot;fullName&quot;,&#13;&#10;c.mobile_no AS &quot;mobileNo&quot;, CONCAT(REPEAT(&quot;..&quot;, ((LENGTH(ounder.`hierarchy`) - LENGTH(&#13;&#10;REPLACE(ounder.`hierarchy`, '.', '')) - 1))), ounder.`name`) AS &quot;officeName&quot;, &#13;&#10;o.id AS &qu [...]
-            <column name="description"
-                    value="This sends a message to all clients with the status Active on their Birthday"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="177"/>
-            <column name="report_name" value="Loan fully repaid"/>
-            <column name="report_type" value="SMS"/>
-            <column name="report_subtype" value="NonTriggered"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql"
-                    value="SELECT &#13;&#10;c.id AS &quot;id&quot;, &#13;&#10;c.firstname AS &quot;firstName&quot;,&#13;&#10;c.middlename AS &quot;middleName&quot;,&#13;&#10;c.lastname AS &quot;lastName&quot;,&#13;&#10;c.display_name AS &quot;fullName&quot;,&#13;&#10;c.mobile_no AS &quot;mobileNo&quot;, &#13;&#10;l.principal_amount AS &quot;loanAmount&quot;,&#13;&#10;(IFNULL(l.principal_outstanding_derived, 0) + IFNULL(l.interest_outstanding_derived, 0) + IFNULL(l.fee_charges_outstanding [...]
-            <column name="description"
-                    value="All loans that have been fully repaid (Closed or Overpaid) in the last fromX to toY days"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="178"/>
-            <column name="report_name" value="Loan outstanding after final instalment date"/>
-            <column name="report_type" value="SMS"/>
-            <column name="report_subtype" value="NonTriggered"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql"
-                    value="SELECT &#13;&#10;c.id AS &quot;id&quot;, &#13;&#10;c.firstname AS &quot;firstName&quot;,&#13;&#10;c.middlename AS &quot;middleName&quot;,&#13;&#10;c.lastname AS &quot;lastName&quot;,&#13;&#10;c.display_name AS &quot;fullName&quot;,&#13;&#10;c.mobile_no AS &quot;mobileNo&quot;, &#13;&#10;l.principal_amount AS &quot;loanAmount&quot;,&#13;&#10;o.id AS &quot;officeNumber&quot;,&#13;&#10;(IFNULL(l.principal_outstanding_derived, 0) + IFNULL(l.interest_outstanding_der [...]
-            <column name="description"
-                    value="All active loans (with an outstanding balance) between fromX to toY days after the final instalment date on their loan schedule"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="179"/>
-            <column name="report_name" value="Loan Repayment"/>
-            <column name="report_type" value="SMS"/>
-            <column name="report_subtype" value="Triggered"/>
-            <column name="report_category"/>
-            <column name="report_sql"
-                    value="select ml.id as loanId,mc.id, mc.firstname, ifnull(mc.middlename,'') as middlename, mc.lastname, mc.display_name as FullName, mobile_no as mobileNo, mc.group_name as GroupName, round(ml.principal_amount, ml.currency_digits) as LoanAmount, round(ml.`total_outstanding_derived`, ml.currency_digits) as LoanOutstanding,&#10;ml.`account_no` as LoanAccountId, round(mlt.amountPaid, ml.currency_digits) as repaymentAmount&#10;FROM m_office mo&#10;JOIN m_office ounder ON  [...]
-            <column name="description" value="Loan Repayment"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="180"/>
-            <column name="report_name" value="Loan Approved"/>
-            <column name="report_type" value="SMS"/>
-            <column name="report_subtype" value="Triggered"/>
-            <column name="report_category"/>
-            <column name="report_sql"
-                    value="SELECT mc.id, mc.firstname, mc.middlename as middlename, mc.lastname, mc.display_name as FullName, mc.mobile_no as mobileNo, mc.group_name as GroupName, mo.name as officename, ml.id as loanId, ml.account_no as accountnumber, ml.principal_amount_proposed as loanamount, ml.annual_nominal_interest_rate as annualinterestrate FROM m_office mo JOIN m_office ounder ON ounder.hierarchy LIKE CONCAT(mo.hierarchy, '%') AND ounder.hierarchy like CONCAT('.', '%') LEFT JOIN  [...]
-            <column name="description" value="Loan and client data of approved loan"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="181"/>
-            <column name="report_name" value="Loan Rejected"/>
-            <column name="report_type" value="SMS"/>
-            <column name="report_subtype" value="Triggered"/>
-            <column name="report_category"/>
-            <column name="report_sql"
-                    value="SELECT mc.id, mc.firstname, mc.middlename as middlename, mc.lastname, mc.display_name as FullName, mc.mobile_no as mobileNo, mc.group_name as GroupName,  mo.name as officename, ml.id as loanId, ml.account_no as accountnumber, ml.principal_amount_proposed as loanamount, ml.annual_nominal_interest_rate as annualinterestrate  FROM  m_office mo  JOIN m_office ounder ON ounder.hierarchy LIKE CONCAT(mo.hierarchy, '%')  AND ounder.hierarchy like CONCAT('.', '%')  LEFT [...]
-            <column name="description" value="Loan and client data of rejected loan"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="182"/>
-            <column name="report_name" value="Client Rejected"/>
-            <column name="report_type" value="SMS"/>
-            <column name="report_subtype" value="Triggered"/>
-            <column name="report_category" value="Client"/>
-            <column name="report_sql"
-                    value="SELECT c.id AS &quot;id&quot;, &#13;&#10;c.firstname AS &quot;firstName&quot;,&#13;&#10;c.middlename AS &quot;middleName&quot;,&#13;&#10;c.lastname AS &quot;lastName&quot;,&#13;&#10;c.display_name AS &quot;fullName&quot;,&#13;&#10;c.mobile_no AS &quot;mobileNo&quot;, CONCAT(REPEAT(&quot;..&quot;, ((LENGTH(ounder.`hierarchy`) - LENGTH(&#13;&#10;REPLACE(ounder.`hierarchy`, '.', '')) - 1))), ounder.`name`) AS &quot;officeName&quot;, &#13;&#10;o.id AS &quot;officeN [...]
-            <column name="description" value="Client Rejection"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="183"/>
-            <column name="report_name" value="Client Activated"/>
-            <column name="report_type" value="SMS"/>
-            <column name="report_subtype" value="Triggered"/>
-            <column name="report_category" value="Client"/>
-            <column name="report_sql"
-                    value="SELECT c.id AS &quot;id&quot;, &#13;&#10;c.firstname AS &quot;firstName&quot;,&#13;&#10;c.middlename AS &quot;middleName&quot;,&#13;&#10;c.lastname AS &quot;lastName&quot;,&#13;&#10;c.display_name AS &quot;fullName&quot;,&#13;&#10;c.mobile_no AS &quot;mobileNo&quot;, CONCAT(REPEAT(&quot;..&quot;, ((LENGTH(ounder.`hierarchy`) - LENGTH(&#13;&#10;REPLACE(ounder.`hierarchy`, '.', '')) - 1))), ounder.`name`) AS &quot;officeName&quot;, &#13;&#10;o.id AS &quot;officeN [...]
-            <column name="description" value="Client Activation"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="184"/>
-            <column name="report_name" value="Savings Rejected"/>
-            <column name="report_type" value="SMS"/>
-            <column name="report_subtype" value="Triggered"/>
-            <column name="report_category" value="Savings"/>
-            <column name="report_sql"
-                    value="SELECT &#13;&#10;c.id AS &quot;id&quot;,&#13;&#10;c.firstname AS &quot;firstName&quot;,&#13;&#10;c.middlename AS &quot;middleName&quot;,&#13;&#10;c.lastname AS &quot;lastName&quot;,&#13;&#10;c.display_name AS &quot;fullName&quot;,&#13;&#10;c.mobile_no AS &quot;mobileNo&quot;,&#13;&#10;s.account_no AS &quot;savingsAccountNo&quot;,&#13;&#10;ounder.id AS &quot;officeNumber&quot;,&#13;&#10;ounder.name AS &quot;officeName&quot;&#13;&#10;&#13;&#10;FROM m_office o&#13 [...]
-            <column name="description" value="Savings Rejected"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="185"/>
-            <column name="report_name" value="Savings Activated"/>
-            <column name="report_type" value="SMS"/>
-            <column name="report_subtype" value="Triggered"/>
-            <column name="report_category" value="Savings"/>
-            <column name="report_sql"
-                    value="SELECT &#13;&#10;c.id AS &quot;id&quot;,&#13;&#10;c.firstname AS &quot;firstName&quot;,&#13;&#10;c.middlename AS &quot;middleName&quot;,&#13;&#10;c.lastname AS &quot;lastName&quot;,&#13;&#10;c.display_name AS &quot;fullName&quot;,&#13;&#10;c.mobile_no AS &quot;mobileNo&quot;,&#13;&#10;s.account_no AS &quot;savingsAccountNo&quot;,&#13;&#10;ounder.id AS &quot;officeNumber&quot;,&#13;&#10;ounder.name AS &quot;officeName&quot;&#13;&#10;&#13;&#10;FROM m_office o&#13 [...]
-            <column name="description" value="Savings Activation"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="186"/>
-            <column name="report_name" value="Savings Deposit"/>
-            <column name="report_type" value="SMS"/>
-            <column name="report_subtype" value="Triggered"/>
-            <column name="report_category"/>
-            <column name="report_sql"
-                    value="SELECT sc.savingsId AS savingsId, sc.id AS clientId, sc.firstname, IFNULL(sc.middlename,'') AS middlename, sc.lastname, sc.display_name AS FullName, sc.mobile_no AS mobileNo,&#13;&#10;ms.`account_no` AS savingsAccountNo, ROUND(mst.amountPaid, ms.currency_digits) AS depositAmount, ms.account_balance_derived AS balance, &#13;&#10;mst.transactionDate AS transactionDate&#13;&#10;FROM m_office mo&#13;&#10;JOIN m_office ounder ON ounder.hierarchy LIKE CONCAT(mo.hiera [...]
-            <column name="description" value="Savings Deposit"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="187"/>
-            <column name="report_name" value="Savings Withdrawal"/>
-            <column name="report_type" value="SMS"/>
-            <column name="report_subtype" value="Triggered"/>
-            <column name="report_category"/>
-            <column name="report_sql"
-                    value="SELECT sc.savingsId AS savingsId, sc.id AS clientId, sc.firstname, IFNULL(sc.middlename,'') AS middlename, sc.lastname, sc.display_name AS FullName, sc.mobile_no AS mobileNo,&#13;&#10;ms.`account_no` AS savingsAccountNo, ROUND(mst.amountPaid, ms.currency_digits) AS withdrawAmount, ms.account_balance_derived AS balance, &#13;&#10;mst.transactionDate AS transactionDate&#13;&#10;FROM m_office mo&#13;&#10;JOIN m_office ounder ON ounder.hierarchy LIKE CONCAT(mo.hier [...]
-            <column name="description" value="Savings Withdrawal"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="188"/>
-            <column name="report_name" value="ReportCategoryList"/>
-            <column name="report_type" value="Table"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="(NULL)"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="189"/>
-            <column name="report_name" value="FullReportList"/>
-            <column name="report_type" value="Table"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="(NULL)"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="190"/>
-            <column name="report_name" value="Loan Approved - Email"/>
-            <column name="report_type" value="Email"/>
-            <column name="report_subtype" value="Triggered"/>
-            <column name="report_category"/>
-            <column name="report_sql"
-                    value="select  ml.id as loanId,  ifnull(mc.id,mc2.id) as id,  ifnull(mc.firstname,mc2.firstname) as firstname,  &#10;ifnull(mc.middlename,ifnull(mc2.middlename,(''))) as middlename,  ifnull(mc.lastname,mc2.lastname) as lastname,  &#10;ifnull(mc.display_name,mc2.display_name) as display_name,  ifnull(mc.status_enum,mc2.status_enum) as status_enum, &#10;ifnull(mc.mobile_no,mc2.mobile_no) as mobile_no, ifnull(mg.office_id,mc2.office_id) as office_id, ifnull(mg.staff_id,m [...]
-            <column name="description" value="Loan and client data of approved loan"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="191"/>
-            <column name="report_name" value="Loan Rejected - Email"/>
-            <column name="report_type" value="Email"/>
-            <column name="report_subtype" value="Triggered"/>
-            <column name="report_category"/>
-            <column name="report_sql"
-                    value="select  ml.id as loanId,  ifnull(mc.id,mc2.id) as id,  ifnull(mc.firstname,mc2.firstname) as firstname,  &#10;ifnull(mc.middlename,ifnull(mc2.middlename,(''))) as middlename,  ifnull(mc.lastname,mc2.lastname) as lastname,  &#10;ifnull(mc.display_name,mc2.display_name) as display_name,  ifnull(mc.status_enum,mc2.status_enum) as status_enum, &#10;ifnull(mc.mobile_no,mc2.mobile_no) as mobile_no, ifnull(mg.office_id,mc2.office_id) as office_id, ifnull(mg.staff_id,m [...]
-            <column name="description" value="Loan and client data of rejected loan"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="192"/>
-            <column name="report_name" value="Loan Repayment - Email"/>
-            <column name="report_type" value="Email"/>
-            <column name="report_subtype" value="Triggered"/>
-            <column name="report_category"/>
-            <column name="report_sql"
-                    value="select  ml.id as loanId,  ifnull(mc.id,mc2.id) as id,  ifnull(mc.firstname,mc2.firstname) as firstname,  &#10;ifnull(mc.middlename,ifnull(mc2.middlename,(''))) as middlename,  ifnull(mc.lastname,mc2.lastname) as lastname,  &#10;ifnull(mc.display_name,mc2.display_name) as display_name,  ifnull(mc.status_enum,mc2.status_enum) as status_enum, &#10;ifnull(mc.mobile_no,mc2.mobile_no) as mobile_no, ifnull(mg.office_id,mc2.office_id) as office_id, ifnull(mg.staff_id,m [...]
-            <column name="description" value="Loan and client data of rejected loan"/>
-            <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="42">
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="1"/>
-            <column name="report_id" valueNumeric="1"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="2"/>
-            <column name="report_id" valueNumeric="2"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="3"/>
-            <column name="report_id" valueNumeric="2"/>
-            <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="4"/>
-            <column name="report_id" valueNumeric="2"/>
-            <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="5"/>
-            <column name="report_id" valueNumeric="2"/>
-            <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="6"/>
-            <column name="report_id" valueNumeric="2"/>
-            <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="7"/>
-            <column name="report_id" valueNumeric="2"/>
-            <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="8"/>
-            <column name="report_id" valueNumeric="5"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="9"/>
-            <column name="report_id" valueNumeric="5"/>
-            <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="10"/>
-            <column name="report_id" valueNumeric="5"/>
-            <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="11"/>
-            <column name="report_id" valueNumeric="5"/>
-            <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="12"/>
-            <column name="report_id" valueNumeric="5"/>
-            <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="13"/>
-            <column name="report_id" valueNumeric="5"/>
-            <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="14"/>
-            <column name="report_id" valueNumeric="6"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="15"/>
-            <column name="report_id" valueNumeric="6"/>
-            <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="16"/>
-            <column name="report_id" valueNumeric="6"/>
-            <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="17"/>
-            <column name="report_id" valueNumeric="6"/>
-            <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="18"/>
-            <column name="report_id" valueNumeric="6"/>
-            <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="19"/>
-            <column name="report_id" valueNumeric="6"/>
-            <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="20"/>
-            <column name="report_id" valueNumeric="7"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="21"/>
-            <column name="report_id" valueNumeric="7"/>
-            <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="22"/>
-            <column name="report_id" valueNumeric="7"/>
-            <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="23"/>
-            <column name="report_id" valueNumeric="7"/>
-            <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="24"/>
-            <column name="report_id" valueNumeric="7"/>
-            <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="25"/>
-            <column name="report_id" valueNumeric="7"/>
-            <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="26"/>
-            <column name="report_id" valueNumeric="8"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="27"/>
-            <column name="report_id" valueNumeric="8"/>
-            <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="28"/>
-            <column name="report_id" valueNumeric="8"/>
-            <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="29"/>
-            <column name="report_id" valueNumeric="8"/>
-            <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="30"/>
-            <column name="report_id" valueNumeric="8"/>
-            <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="31"/>
-            <column name="report_id" valueNumeric="11"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="32"/>
-            <column name="report_id" valueNumeric="11"/>
-            <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="33"/>
-            <column name="report_id" valueNumeric="11"/>
-            <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="34"/>
-            <column name="report_id" valueNumeric="11"/>
-            <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="35"/>
-            <column name="report_id" valueNumeric="11"/>
-            <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="36"/>
-            <column name="report_id" valueNumeric="11"/>
-            <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="37"/>
-            <column name="report_id" valueNumeric="11"/>
-            <column name="parameter_id" valueNumeric="100"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="38"/>
-            <column name="report_id" valueNumeric="12"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="39"/>
-            <column name="report_id" valueNumeric="12"/>
-            <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="40"/>
-            <column name="report_id" valueNumeric="12"/>
-            <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="41"/>
-            <column name="report_id" valueNumeric="12"/>
-            <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="42"/>
-            <column name="report_id" valueNumeric="12"/>
-            <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="43"/>
-            <column name="report_id" valueNumeric="12"/>
-            <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="44"/>
-            <column name="report_id" valueNumeric="13"/>
-            <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="45"/>
-            <column name="report_id" valueNumeric="13"/>
-            <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="46"/>
-            <column name="report_id" valueNumeric="13"/>
-            <column name="parameter_id" valueNumeric="3"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="47"/>
-            <column name="report_id" valueNumeric="13"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="48"/>
-            <column name="report_id" valueNumeric="13"/>
-            <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="49"/>
-            <column name="report_id" valueNumeric="13"/>
-            <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="50"/>
-            <column name="report_id" valueNumeric="13"/>
-            <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="51"/>
-            <column name="report_id" valueNumeric="13"/>
-            <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="52"/>
-            <column name="report_id" valueNumeric="13"/>
-            <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="53"/>
-            <column name="report_id" valueNumeric="14"/>
-            <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="54"/>
-            <column name="report_id" valueNumeric="14"/>
-            <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="55"/>
-            <column name="report_id" valueNumeric="14"/>
-            <column name="parameter_id" valueNumeric="3"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="56"/>
-            <column name="report_id" valueNumeric="14"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="57"/>
-            <column name="report_id" valueNumeric="14"/>
-            <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="58"/>
-            <column name="report_id" valueNumeric="14"/>
-            <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="59"/>
-            <column name="report_id" valueNumeric="14"/>
-            <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="60"/>
-            <column name="report_id" valueNumeric="14"/>
-            <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="61"/>
-            <column name="report_id" valueNumeric="14"/>
-            <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="62"/>
-            <column name="report_id" valueNumeric="15"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="63"/>
-            <column name="report_id" valueNumeric="15"/>
-            <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="64"/>
-            <column name="report_id" valueNumeric="15"/>
-            <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="65"/>
-            <column name="report_id" valueNumeric="15"/>
-            <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="66"/>
-            <column name="report_id" valueNumeric="15"/>
-            <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="67"/>
-            <column name="report_id" valueNumeric="15"/>
-            <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="68"/>
-            <column name="report_id" valueNumeric="15"/>
-            <column name="parameter_id" valueNumeric="100"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="69"/>
-            <column name="report_id" valueNumeric="16"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="70"/>
-            <column name="report_id" valueNumeric="16"/>
-            <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="71"/>
-            <column name="report_id" valueNumeric="16"/>
-            <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="72"/>
-            <column name="report_id" valueNumeric="16"/>
-            <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="73"/>
-            <column name="report_id" valueNumeric="16"/>
-            <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="74"/>
-            <column name="report_id" valueNumeric="16"/>
-            <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="75"/>
-            <column name="report_id" valueNumeric="16"/>
-            <column name="parameter_id" valueNumeric="100"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="76"/>
-            <column name="report_id" valueNumeric="20"/>
-            <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="77"/>
-            <column name="report_id" valueNumeric="20"/>
-            <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="78"/>
-            <column name="report_id" valueNumeric="20"/>
-            <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="79"/>
-            <column name="report_id" valueNumeric="20"/>
-            <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="80"/>
-            <column name="report_id" valueNumeric="21"/>
-            <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="81"/>
-            <column name="report_id" valueNumeric="21"/>
-            <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="82"/>
-            <column name="report_id" valueNumeric="21"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="83"/>
-            <column name="report_id" valueNumeric="21"/>
-            <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="84"/>
-            <column name="report_id" valueNumeric="21"/>
-            <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="85"/>
-            <column name="report_id" valueNumeric="48"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="branch"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="86"/>
-            <column name="report_id" valueNumeric="48"/>
-            <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name" value="date"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="87"/>
-            <column name="report_id" valueNumeric="49"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="branch"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="88"/>
-            <column name="report_id" valueNumeric="49"/>
-            <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name" value="fromDate"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="89"/>
-            <column name="report_id" valueNumeric="49"/>
-            <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name" value="toDate"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="90"/>
-            <column name="report_id" valueNumeric="50"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="branch"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="91"/>
-            <column name="report_id" valueNumeric="50"/>
-            <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name" value="fromDate"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="92"/>
-            <column name="report_id" valueNumeric="50"/>
-            <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name" value="toDate"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="93"/>
-            <column name="report_id" valueNumeric="51"/>
-            <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="94"/>
-            <column name="report_id" valueNumeric="51"/>
-            <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="95"/>
-            <column name="report_id" valueNumeric="51"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="96"/>
-            <column name="report_id" valueNumeric="51"/>
-            <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="97"/>
-            <column name="report_id" valueNumeric="51"/>
-            <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="98"/>
-            <column name="report_id" valueNumeric="52"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="99"/>
-            <column name="report_id" valueNumeric="53"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="100"/>
-            <column name="report_id" valueNumeric="53"/>
-            <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="101"/>
-            <column name="report_id" valueNumeric="54"/>
-            <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="102"/>
-            <column name="report_id" valueNumeric="54"/>
-            <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="103"/>
-            <column name="report_id" valueNumeric="54"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="104"/>
-            <column name="report_id" valueNumeric="54"/>
-            <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="105"/>
-            <column name="report_id" valueNumeric="54"/>
-            <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="106"/>
-            <column name="report_id" valueNumeric="55"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="107"/>
-            <column name="report_id" valueNumeric="55"/>
-            <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="108"/>
-            <column name="report_id" valueNumeric="55"/>
-            <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="109"/>
-            <column name="report_id" valueNumeric="55"/>
-            <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="110"/>
-            <column name="report_id" valueNumeric="55"/>
-            <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="111"/>
-            <column name="report_id" valueNumeric="55"/>
-            <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="112"/>
-            <column name="report_id" valueNumeric="56"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="113"/>
-            <column name="report_id" valueNumeric="56"/>
-            <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="114"/>
-            <column name="report_id" valueNumeric="56"/>
-            <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="115"/>
-            <column name="report_id" valueNumeric="56"/>
-            <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="116"/>
-            <column name="report_id" valueNumeric="56"/>
-            <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="117"/>
-            <column name="report_id" valueNumeric="56"/>
-            <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="118"/>
-            <column name="report_id" valueNumeric="56"/>
-            <column name="parameter_id" valueNumeric="100"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="119"/>
-            <column name="report_id" valueNumeric="57"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="120"/>
-            <column name="report_id" valueNumeric="57"/>
-            <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="121"/>
-            <column name="report_id" valueNumeric="57"/>
-            <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="122"/>
-            <column name="report_id" valueNumeric="57"/>
-            <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="123"/>
-            <column name="report_id" valueNumeric="57"/>
-            <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="124"/>
-            <column name="report_id" valueNumeric="57"/>
-            <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="125"/>
-            <column name="report_id" valueNumeric="58"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="126"/>
-            <column name="report_id" valueNumeric="58"/>
-            <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="127"/>
-            <column name="report_id" valueNumeric="58"/>
-            <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="128"/>
-            <column name="report_id" valueNumeric="58"/>
-            <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="129"/>
-            <column name="report_id" valueNumeric="58"/>
-            <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="130"/>
-            <column name="report_id" valueNumeric="58"/>
-            <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="131"/>
-            <column name="report_id" valueNumeric="58"/>
-            <column name="parameter_id" valueNumeric="100"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="132"/>
-            <column name="report_id" valueNumeric="59"/>
-            <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="133"/>
-            <column name="report_id" valueNumeric="59"/>
-            <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="134"/>
-            <column name="report_id" valueNumeric="59"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name"/>
+    </changeSet>
+    <changeSet author="fineract" id="42">
+        <insert tableName="stretchy_report_parameter">
+            <column name="id" valueNumeric="1"/>
+            <column name="report_id" valueNumeric="1"/>
+            <column name="parameter_id" valueNumeric="5"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="135"/>
-            <column name="report_id" valueNumeric="59"/>
-            <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="136"/>
-            <column name="report_id" valueNumeric="59"/>
-            <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="137"/>
-            <column name="report_id" valueNumeric="59"/>
-            <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="138"/>
-            <column name="report_id" valueNumeric="59"/>
-            <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="139"/>
-            <column name="report_id" valueNumeric="59"/>
-            <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="140"/>
-            <column name="report_id" valueNumeric="61"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="141"/>
-            <column name="report_id" valueNumeric="61"/>
-            <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="142"/>
-            <column name="report_id" valueNumeric="92"/>
-            <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name" value="fromDate"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="143"/>
-            <column name="report_id" valueNumeric="92"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="selectOffice"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="144"/>
-            <column name="report_id" valueNumeric="92"/>
-            <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name" value="toDate"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="145"/>
-            <column name="report_id" valueNumeric="93"/>
-            <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="146"/>
-            <column name="report_id" valueNumeric="93"/>
-            <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="147"/>
-            <column name="report_id" valueNumeric="93"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="148"/>
-            <column name="report_id" valueNumeric="93"/>
-            <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="149"/>
-            <column name="report_id" valueNumeric="94"/>
-            <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name" value="endDate"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="150"/>
-            <column name="report_id" valueNumeric="94"/>
-            <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name" value="loanOfficerId"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="151"/>
-            <column name="report_id" valueNumeric="94"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="officeId"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="152"/>
-            <column name="report_id" valueNumeric="94"/>
-            <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name" value="startDate"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="256"/>
-            <column name="report_id" valueNumeric="106"/>
-            <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="257"/>
-            <column name="report_id" valueNumeric="106"/>
-            <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="258"/>
-            <column name="report_id" valueNumeric="106"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="259"/>
-            <column name="report_id" valueNumeric="106"/>
-            <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="263"/>
-            <column name="report_id" valueNumeric="118"/>
-            <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name" value="fromDate"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="264"/>
-            <column name="report_id" valueNumeric="118"/>
-            <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name" value="toDate"/>
+            <column name="id" valueNumeric="2"/>
+            <column name="report_id" valueNumeric="2"/>
+            <column name="parameter_id" valueNumeric="5"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="265"/>
-            <column name="report_id" valueNumeric="118"/>
-            <column name="parameter_id" valueNumeric="1004"/>
-            <column name="report_parameter_name" value="accountNo"/>
+            <column name="id" valueNumeric="3"/>
+            <column name="report_id" valueNumeric="2"/>
+            <column name="parameter_id" valueNumeric="6"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="266"/>
-            <column name="report_id" valueNumeric="119"/>
-            <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name" value="fromDate"/>
+            <column name="id" valueNumeric="4"/>
+            <column name="report_id" valueNumeric="2"/>
+            <column name="parameter_id" valueNumeric="10"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="267"/>
-            <column name="report_id" valueNumeric="119"/>
-            <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name" value="toDate"/>
+            <column name="id" valueNumeric="5"/>
+            <column name="report_id" valueNumeric="2"/>
+            <column name="parameter_id" valueNumeric="20"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="268"/>
-            <column name="report_id" valueNumeric="119"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="selectOffice"/>
+            <column name="id" valueNumeric="6"/>
+            <column name="report_id" valueNumeric="2"/>
+            <column name="parameter_id" valueNumeric="25"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="269"/>
-            <column name="report_id" valueNumeric="119"/>
-            <column name="parameter_id" valueNumeric="1005"/>
-            <column name="report_parameter_name" value="selectProduct"/>
+            <column name="id" valueNumeric="7"/>
+            <column name="report_id" valueNumeric="2"/>
+            <column name="parameter_id" valueNumeric="26"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="270"/>
-            <column name="report_id" valueNumeric="120"/>
+            <column name="id" valueNumeric="8"/>
+            <column name="report_id" valueNumeric="5"/>
             <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="branch"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="271"/>
-            <column name="report_id" valueNumeric="120"/>
+            <column name="id" valueNumeric="9"/>
+            <column name="report_id" valueNumeric="5"/>
             <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name" value="loanOfficer"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="272"/>
-            <column name="report_id" valueNumeric="120"/>
+            <column name="id" valueNumeric="10"/>
+            <column name="report_id" valueNumeric="5"/>
             <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name" value="currencyId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="273"/>
-            <column name="report_id" valueNumeric="120"/>
+            <column name="id" valueNumeric="11"/>
+            <column name="report_id" valueNumeric="5"/>
             <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name" value="fundId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="274"/>
-            <column name="report_id" valueNumeric="120"/>
+            <column name="id" valueNumeric="12"/>
+            <column name="report_id" valueNumeric="5"/>
             <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name" value="loanProductId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="275"/>
-            <column name="report_id" valueNumeric="120"/>
+            <column name="id" valueNumeric="13"/>
+            <column name="report_id" valueNumeric="5"/>
             <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name" value="loanPurposeId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="276"/>
-            <column name="report_id" valueNumeric="121"/>
+            <column name="id" valueNumeric="14"/>
+            <column name="report_id" valueNumeric="6"/>
             <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="Branch"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="277"/>
-            <column name="report_id" valueNumeric="121"/>
+            <column name="id" valueNumeric="15"/>
+            <column name="report_id" valueNumeric="6"/>
             <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name" value="loanOfficer"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="278"/>
-            <column name="report_id" valueNumeric="121"/>
+            <column name="id" valueNumeric="16"/>
+            <column name="report_id" valueNumeric="6"/>
             <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name" value="CurrencyId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="279"/>
-            <column name="report_id" valueNumeric="121"/>
+            <column name="id" valueNumeric="17"/>
+            <column name="report_id" valueNumeric="6"/>
             <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name" value="fundId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="280"/>
-            <column name="report_id" valueNumeric="121"/>
+            <column name="id" valueNumeric="18"/>
+            <column name="report_id" valueNumeric="6"/>
             <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name" value="loanProductId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="281"/>
-            <column name="report_id" valueNumeric="121"/>
+            <column name="id" valueNumeric="19"/>
+            <column name="report_id" valueNumeric="6"/>
             <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name" value="loanPurposeId"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="282"/>
-            <column name="report_id" valueNumeric="121"/>
-            <column name="parameter_id" valueNumeric="100"/>
-            <column name="report_parameter_name" value="parType"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="283"/>
-            <column name="report_id" valueNumeric="122"/>
+            <column name="id" valueNumeric="20"/>
+            <column name="report_id" valueNumeric="7"/>
             <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="Branch"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="284"/>
-            <column name="report_id" valueNumeric="122"/>
+            <column name="id" valueNumeric="21"/>
+            <column name="report_id" valueNumeric="7"/>
             <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name" value="loanOfficer"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="285"/>
-            <column name="report_id" valueNumeric="122"/>
+            <column name="id" valueNumeric="22"/>
+            <column name="report_id" valueNumeric="7"/>
             <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name" value="CurrencyId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="286"/>
-            <column name="report_id" valueNumeric="122"/>
+            <column name="id" valueNumeric="23"/>
+            <column name="report_id" valueNumeric="7"/>
             <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name" value="fundId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="287"/>
-            <column name="report_id" valueNumeric="122"/>
+            <column name="id" valueNumeric="24"/>
+            <column name="report_id" valueNumeric="7"/>
             <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name" value="loanProductId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="288"/>
-            <column name="report_id" valueNumeric="122"/>
+            <column name="id" valueNumeric="25"/>
+            <column name="report_id" valueNumeric="7"/>
             <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name" value="loanPurposeId"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="289"/>
-            <column name="report_id" valueNumeric="122"/>
-            <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name" value="startDate"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="290"/>
-            <column name="report_id" valueNumeric="122"/>
-            <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name" value="endDate"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="291"/>
-            <column name="report_id" valueNumeric="123"/>
+            <column name="id" valueNumeric="26"/>
+            <column name="report_id" valueNumeric="8"/>
             <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="Branch"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="292"/>
-            <column name="report_id" valueNumeric="123"/>
+            <column name="id" valueNumeric="27"/>
+            <column name="report_id" valueNumeric="8"/>
             <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name" value="Loan Officer"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="293"/>
-            <column name="report_id" valueNumeric="123"/>
+            <column name="id" valueNumeric="28"/>
+            <column name="report_id" valueNumeric="8"/>
             <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name" value="CurrencyId"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="294"/>
-            <column name="report_id" valueNumeric="123"/>
-            <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name" value="fundId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="295"/>
-            <column name="report_id" valueNumeric="123"/>
+            <column name="id" valueNumeric="29"/>
+            <column name="report_id" valueNumeric="8"/>
             <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name" value="loanProductId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="296"/>
-            <column name="report_id" valueNumeric="123"/>
+            <column name="id" valueNumeric="30"/>
+            <column name="report_id" valueNumeric="8"/>
             <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name" value="loanPurposeId"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="297"/>
-            <column name="report_id" valueNumeric="123"/>
-            <column name="parameter_id" valueNumeric="100"/>
-            <column name="report_parameter_name" value="parType"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="298"/>
-            <column name="report_id" valueNumeric="124"/>
+            <column name="id" valueNumeric="31"/>
+            <column name="report_id" valueNumeric="11"/>
             <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="Branch"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="299"/>
-            <column name="report_id" valueNumeric="124"/>
+            <column name="id" valueNumeric="32"/>
+            <column name="report_id" valueNumeric="11"/>
             <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name" value="Loan Officer"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="300"/>
-            <column name="report_id" valueNumeric="124"/>
+            <column name="id" valueNumeric="33"/>
+            <column name="report_id" valueNumeric="11"/>
             <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name" value="CurrencyId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="301"/>
-            <column name="report_id" valueNumeric="124"/>
+            <column name="id" valueNumeric="34"/>
+            <column name="report_id" valueNumeric="11"/>
             <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name" value="fundId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="302"/>
-            <column name="report_id" valueNumeric="124"/>
+            <column name="id" valueNumeric="35"/>
+            <column name="report_id" valueNumeric="11"/>
             <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name" value="loanProductId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="303"/>
-            <column name="report_id" valueNumeric="124"/>
+            <column name="id" valueNumeric="36"/>
+            <column name="report_id" valueNumeric="11"/>
             <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name" value="loanPurposeId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="304"/>
-            <column name="report_id" valueNumeric="125"/>
+            <column name="id" valueNumeric="37"/>
+            <column name="report_id" valueNumeric="11"/>
+            <column name="parameter_id" valueNumeric="100"/>
+            <column name="report_parameter_name"/>
+        </insert>
+        <insert tableName="stretchy_report_parameter">
+            <column name="id" valueNumeric="38"/>
+            <column name="report_id" valueNumeric="12"/>
             <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="Branch"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="305"/>
-            <column name="report_id" valueNumeric="125"/>
+            <column name="id" valueNumeric="39"/>
+            <column name="report_id" valueNumeric="12"/>
             <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name" value="Loan Officer"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="306"/>
-            <column name="report_id" valueNumeric="125"/>
+            <column name="id" valueNumeric="40"/>
+            <column name="report_id" valueNumeric="12"/>
             <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name" value="CurrencyId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="307"/>
-            <column name="report_id" valueNumeric="125"/>
+            <column name="id" valueNumeric="41"/>
+            <column name="report_id" valueNumeric="12"/>
             <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name" value="fundId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="308"/>
-            <column name="report_id" valueNumeric="125"/>
+            <column name="id" valueNumeric="42"/>
+            <column name="report_id" valueNumeric="12"/>
             <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name" value="loanProductId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="309"/>
-            <column name="report_id" valueNumeric="125"/>
+            <column name="id" valueNumeric="43"/>
+            <column name="report_id" valueNumeric="12"/>
             <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name" value="loanPurposeId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="310"/>
-            <column name="report_id" valueNumeric="125"/>
-            <column name="parameter_id" valueNumeric="100"/>
-            <column name="report_parameter_name" value="parType"/>
+            <column name="id" valueNumeric="44"/>
+            <column name="report_id" valueNumeric="13"/>
+            <column name="parameter_id" valueNumeric="1"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="311"/>
-            <column name="report_id" valueNumeric="126"/>
+            <column name="id" valueNumeric="45"/>
+            <column name="report_id" valueNumeric="13"/>
+            <column name="parameter_id" valueNumeric="2"/>
+            <column name="report_parameter_name"/>
+        </insert>
+        <insert tableName="stretchy_report_parameter">
+            <column name="id" valueNumeric="46"/>
+            <column name="report_id" valueNumeric="13"/>
+            <column name="parameter_id" valueNumeric="3"/>
+            <column name="report_parameter_name"/>
+        </insert>
+        <insert tableName="stretchy_report_parameter">
+            <column name="id" valueNumeric="47"/>
+            <column name="report_id" valueNumeric="13"/>
             <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="Branch"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="312"/>
-            <column name="report_id" valueNumeric="126"/>
+            <column name="id" valueNumeric="48"/>
+            <column name="report_id" valueNumeric="13"/>
             <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name" value="Loan Officer"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="313"/>
-            <column name="report_id" valueNumeric="126"/>
+            <column name="id" valueNumeric="49"/>
+            <column name="report_id" valueNumeric="13"/>
             <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name" value="CurrencyId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="314"/>
-            <column name="report_id" valueNumeric="126"/>
+            <column name="id" valueNumeric="50"/>
+            <column name="report_id" valueNumeric="13"/>
             <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name" value="fundId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="315"/>
-            <column name="report_id" valueNumeric="126"/>
+            <column name="id" valueNumeric="51"/>
+            <column name="report_id" valueNumeric="13"/>
             <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name" value="loanProductId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="316"/>
-            <column name="report_id" valueNumeric="126"/>
+            <column name="id" valueNumeric="52"/>
+            <column name="report_id" valueNumeric="13"/>
             <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name" value="loanPurposeId"/>
+            <column name="report_parameter_name"/>
+        </insert>
+        <insert tableName="stretchy_report_parameter">
+            <column name="id" valueNumeric="53"/>
+            <column name="report_id" valueNumeric="14"/>
+            <column name="parameter_id" valueNumeric="1"/>
+            <column name="report_parameter_name"/>
+        </insert>
+        <insert tableName="stretchy_report_parameter">
+            <column name="id" valueNumeric="54"/>
+            <column name="report_id" valueNumeric="14"/>
+            <column name="parameter_id" valueNumeric="2"/>
+            <column name="report_parameter_name"/>
+        </insert>
+        <insert tableName="stretchy_report_parameter">
+            <column name="id" valueNumeric="55"/>
+            <column name="report_id" valueNumeric="14"/>
+            <column name="parameter_id" valueNumeric="3"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="317"/>
-            <column name="report_id" valueNumeric="127"/>
+            <column name="id" valueNumeric="56"/>
+            <column name="report_id" valueNumeric="14"/>
             <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="Branch"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="318"/>
-            <column name="report_id" valueNumeric="128"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="Branch"/>
+            <column name="id" valueNumeric="57"/>
+            <column name="report_id" valueNumeric="14"/>
+            <column name="parameter_id" valueNumeric="6"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="319"/>
-            <column name="report_id" valueNumeric="128"/>
+            <column name="id" valueNumeric="58"/>
+            <column name="report_id" valueNumeric="14"/>
             <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name" value="CurrencyId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="320"/>
-            <column name="report_id" valueNumeric="129"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="Branch"/>
+            <column name="id" valueNumeric="59"/>
+            <column name="report_id" valueNumeric="14"/>
+            <column name="parameter_id" valueNumeric="20"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="321"/>
-            <column name="report_id" valueNumeric="129"/>
-            <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name" value="CurrencyId"/>
+            <column name="id" valueNumeric="60"/>
+            <column name="report_id" valueNumeric="14"/>
+            <column name="parameter_id" valueNumeric="25"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="322"/>
-            <column name="report_id" valueNumeric="130"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="selectOffice"/>
+            <column name="id" valueNumeric="61"/>
+            <column name="report_id" valueNumeric="14"/>
+            <column name="parameter_id" valueNumeric="26"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="323"/>
-            <column name="report_id" valueNumeric="131"/>
+            <column name="id" valueNumeric="62"/>
+            <column name="report_id" valueNumeric="15"/>
             <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="Branch"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="324"/>
-            <column name="report_id" valueNumeric="131"/>
+            <column name="id" valueNumeric="63"/>
+            <column name="report_id" valueNumeric="15"/>
             <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name" value="Loan Officer"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="325"/>
-            <column name="report_id" valueNumeric="131"/>
+            <column name="id" valueNumeric="64"/>
+            <column name="report_id" valueNumeric="15"/>
             <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name" value="CurrencyId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="326"/>
-            <column name="report_id" valueNumeric="131"/>
+            <column name="id" valueNumeric="65"/>
+            <column name="report_id" valueNumeric="15"/>
             <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name" value="fundId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="327"/>
-            <column name="report_id" valueNumeric="131"/>
+            <column name="id" valueNumeric="66"/>
+            <column name="report_id" valueNumeric="15"/>
             <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name" value="loanProductId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="328"/>
-            <column name="report_id" valueNumeric="131"/>
+            <column name="id" valueNumeric="67"/>
+            <column name="report_id" valueNumeric="15"/>
             <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name" value="loanPurposeId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="329"/>
-            <column name="report_id" valueNumeric="132"/>
+            <column name="id" valueNumeric="68"/>
+            <column name="report_id" valueNumeric="15"/>
+            <column name="parameter_id" valueNumeric="100"/>
+            <column name="report_parameter_name"/>
+        </insert>
+        <insert tableName="stretchy_report_parameter">
+            <column name="id" valueNumeric="69"/>
+            <column name="report_id" valueNumeric="16"/>
             <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="Branch"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="330"/>
-            <column name="report_id" valueNumeric="132"/>
+            <column name="id" valueNumeric="70"/>
+            <column name="report_id" valueNumeric="16"/>
             <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name" value="Loan Officer"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="331"/>
-            <column name="report_id" valueNumeric="132"/>
-            <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name" value="startDate"/>
+            <column name="id" valueNumeric="71"/>
+            <column name="report_id" valueNumeric="16"/>
+            <column name="parameter_id" valueNumeric="10"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="332"/>
-            <column name="report_id" valueNumeric="132"/>
-            <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name" value="endDate"/>
+            <column name="id" valueNumeric="72"/>
+            <column name="report_id" valueNumeric="16"/>
+            <column name="parameter_id" valueNumeric="20"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="333"/>
-            <column name="report_id" valueNumeric="133"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="Branch"/>
+            <column name="id" valueNumeric="73"/>
+            <column name="report_id" valueNumeric="16"/>
+            <column name="parameter_id" valueNumeric="25"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="334"/>
-            <column name="report_id" valueNumeric="133"/>
-            <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name" value="CurrencyId"/>
+            <column name="id" valueNumeric="74"/>
+            <column name="report_id" valueNumeric="16"/>
+            <column name="parameter_id" valueNumeric="26"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="335"/>
-            <column name="report_id" valueNumeric="133"/>
-            <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name" value="fundId"/>
+            <column name="id" valueNumeric="75"/>
+            <column name="report_id" valueNumeric="16"/>
+            <column name="parameter_id" valueNumeric="100"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="336"/>
-            <column name="report_id" valueNumeric="133"/>
+            <column name="id" valueNumeric="76"/>
+            <column name="report_id" valueNumeric="20"/>
             <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name" value="startDate"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="337"/>
-            <column name="report_id" valueNumeric="133"/>
+            <column name="id" valueNumeric="77"/>
+            <column name="report_id" valueNumeric="20"/>
             <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name" value="endDate"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="338"/>
-            <column name="report_id" valueNumeric="134"/>
+            <column name="id" valueNumeric="78"/>
+            <column name="report_id" valueNumeric="20"/>
             <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name" value="CurrencyId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="339"/>
-            <column name="report_id" valueNumeric="134"/>
+            <column name="id" valueNumeric="79"/>
+            <column name="report_id" valueNumeric="20"/>
             <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name" value="fundId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="340"/>
-            <column name="report_id" valueNumeric="134"/>
+            <column name="id" valueNumeric="80"/>
+            <column name="report_id" valueNumeric="21"/>
             <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name" value="startDate"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="341"/>
-            <column name="report_id" valueNumeric="134"/>
+            <column name="id" valueNumeric="81"/>
+            <column name="report_id" valueNumeric="21"/>
             <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name" value="endDate"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="342"/>
-            <column name="report_id" valueNumeric="135"/>
+            <column name="id" valueNumeric="82"/>
+            <column name="report_id" valueNumeric="21"/>
             <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="Branch"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="343"/>
-            <column name="report_id" valueNumeric="135"/>
-            <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name" value="Loan Officer"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="344"/>
-            <column name="report_id" valueNumeric="135"/>
+            <column name="id" valueNumeric="83"/>
+            <column name="report_id" valueNumeric="21"/>
             <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name" value="CurrencyId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="345"/>
-            <column name="report_id" valueNumeric="135"/>
+            <column name="id" valueNumeric="84"/>
+            <column name="report_id" valueNumeric="21"/>
             <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name" value="fundId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="346"/>
-            <column name="report_id" valueNumeric="135"/>
-            <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name" value="loanProductId"/>
+            <column name="id" valueNumeric="93"/>
+            <column name="report_id" valueNumeric="51"/>
+            <column name="parameter_id" valueNumeric="1"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="347"/>
-            <column name="report_id" valueNumeric="135"/>
-            <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name" value="loanPurposeId"/>
+            <column name="id" valueNumeric="94"/>
+            <column name="report_id" valueNumeric="51"/>
+            <column name="parameter_id" valueNumeric="2"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="348"/>
-            <column name="report_id" valueNumeric="136"/>
+            <column name="id" valueNumeric="95"/>
+            <column name="report_id" valueNumeric="51"/>
             <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="Branch"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="349"/>
-            <column name="report_id" valueNumeric="136"/>
-            <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name" value="Loan Officer"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="350"/>
-            <column name="report_id" valueNumeric="136"/>
+            <column name="id" valueNumeric="96"/>
+            <column name="report_id" valueNumeric="51"/>
             <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name" value="CurrencyId"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="351"/>
-            <column name="report_id" valueNumeric="136"/>
-            <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name" value="fundId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="352"/>
-            <column name="report_id" valueNumeric="136"/>
+            <column name="id" valueNumeric="97"/>
+            <column name="report_id" valueNumeric="51"/>
             <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name" value="loanProductId"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="353"/>
-            <column name="report_id" valueNumeric="136"/>
-            <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name" value="loanPurposeId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="354"/>
-            <column name="report_id" valueNumeric="137"/>
+            <column name="id" valueNumeric="98"/>
+            <column name="report_id" valueNumeric="52"/>
             <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="Branch"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="355"/>
-            <column name="report_id" valueNumeric="137"/>
-            <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name" value="Loan Officer"/>
+            <column name="id" valueNumeric="99"/>
+            <column name="report_id" valueNumeric="53"/>
+            <column name="parameter_id" valueNumeric="5"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="356"/>
-            <column name="report_id" valueNumeric="137"/>
+            <column name="id" valueNumeric="100"/>
+            <column name="report_id" valueNumeric="53"/>
             <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name" value="CurrencyId"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="357"/>
-            <column name="report_id" valueNumeric="137"/>
-            <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name" value="fundId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="358"/>
-            <column name="report_id" valueNumeric="137"/>
-            <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name" value="loanProductId"/>
+            <column name="id" valueNumeric="101"/>
+            <column name="report_id" valueNumeric="54"/>
+            <column name="parameter_id" valueNumeric="1"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="359"/>
-            <column name="report_id" valueNumeric="137"/>
-            <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name" value="loanPurposeId"/>
+            <column name="id" valueNumeric="102"/>
+            <column name="report_id" valueNumeric="54"/>
+            <column name="parameter_id" valueNumeric="2"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="360"/>
-            <column name="report_id" valueNumeric="138"/>
+            <column name="id" valueNumeric="103"/>
+            <column name="report_id" valueNumeric="54"/>
             <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="Branch"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="361"/>
-            <column name="report_id" valueNumeric="138"/>
-            <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name" value="Loan Officer"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="362"/>
-            <column name="report_id" valueNumeric="138"/>
+            <column name="id" valueNumeric="104"/>
+            <column name="report_id" valueNumeric="54"/>
             <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name" value="CurrencyId"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="363"/>
-            <column name="report_id" valueNumeric="138"/>
-            <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name" value="fundId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="364"/>
-            <column name="report_id" valueNumeric="138"/>
+            <column name="id" valueNumeric="105"/>
+            <column name="report_id" valueNumeric="54"/>
             <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name" value="loanProductId"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="365"/>
-            <column name="report_id" valueNumeric="138"/>
-            <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name" value="loanPurposeId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="366"/>
-            <column name="report_id" valueNumeric="139"/>
+            <column name="id" valueNumeric="106"/>
+            <column name="report_id" valueNumeric="55"/>
             <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="Branch"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="367"/>
-            <column name="report_id" valueNumeric="139"/>
+            <column name="id" valueNumeric="107"/>
+            <column name="report_id" valueNumeric="55"/>
             <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name" value="Loan Officer"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="368"/>
-            <column name="report_id" valueNumeric="139"/>
+            <column name="id" valueNumeric="108"/>
+            <column name="report_id" valueNumeric="55"/>
             <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name" value="CurrencyId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="369"/>
-            <column name="report_id" valueNumeric="139"/>
+            <column name="id" valueNumeric="109"/>
+            <column name="report_id" valueNumeric="55"/>
             <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name" value="fundId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="370"/>
-            <column name="report_id" valueNumeric="139"/>
+            <column name="id" valueNumeric="110"/>
+            <column name="report_id" valueNumeric="55"/>
             <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name" value="loanProductId"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="371"/>
-            <column name="report_id" valueNumeric="139"/>
-            <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name" value="loanPurposeId"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="372"/>
-            <column name="report_id" valueNumeric="139"/>
-            <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name" value="startDate"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="373"/>
-            <column name="report_id" valueNumeric="139"/>
-            <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name" value="endDate"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="374"/>
-            <column name="report_id" valueNumeric="139"/>
-            <column name="parameter_id" valueNumeric="3"/>
-            <column name="report_parameter_name" value="obligDateType"/>
+            <column name="id" valueNumeric="111"/>
+            <column name="report_id" valueNumeric="55"/>
+            <column name="parameter_id" valueNumeric="26"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="375"/>
-            <column name="report_id" valueNumeric="140"/>
+            <column name="id" valueNumeric="112"/>
+            <column name="report_id" valueNumeric="56"/>
             <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="Branch"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="376"/>
-            <column name="report_id" valueNumeric="140"/>
+            <column name="id" valueNumeric="113"/>
+            <column name="report_id" valueNumeric="56"/>
             <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name" value="Loan Officer"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="377"/>
-            <column name="report_id" valueNumeric="140"/>
+            <column name="id" valueNumeric="114"/>
+            <column name="report_id" valueNumeric="56"/>
             <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name" value="CurrencyId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="378"/>
-            <column name="report_id" valueNumeric="140"/>
+            <column name="id" valueNumeric="115"/>
+            <column name="report_id" valueNumeric="56"/>
             <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name" value="fundId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="379"/>
-            <column name="report_id" valueNumeric="140"/>
+            <column name="id" valueNumeric="116"/>
+            <column name="report_id" valueNumeric="56"/>
             <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name" value="loanProductId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="380"/>
-            <column name="report_id" valueNumeric="140"/>
+            <column name="id" valueNumeric="117"/>
+            <column name="report_id" valueNumeric="56"/>
             <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name" value="loanPurposeId"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="381"/>
-            <column name="report_id" valueNumeric="140"/>
-            <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name" value="Startdate"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="382"/>
-            <column name="report_id" valueNumeric="140"/>
-            <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name" value="Enddate"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="383"/>
-            <column name="report_id" valueNumeric="140"/>
-            <column name="parameter_id" valueNumeric="3"/>
-            <column name="report_parameter_name" value="obligDateType"/>
+            <column name="id" valueNumeric="118"/>
+            <column name="report_id" valueNumeric="56"/>
+            <column name="parameter_id" valueNumeric="100"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="384"/>
-            <column name="report_id" valueNumeric="141"/>
+            <column name="id" valueNumeric="119"/>
+            <column name="report_id" valueNumeric="57"/>
             <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="Branch"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="385"/>
-            <column name="report_id" valueNumeric="141"/>
+            <column name="id" valueNumeric="120"/>
+            <column name="report_id" valueNumeric="57"/>
             <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name" value="Loan Officer"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="386"/>
-            <column name="report_id" valueNumeric="141"/>
+            <column name="id" valueNumeric="121"/>
+            <column name="report_id" valueNumeric="57"/>
             <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name" value="CurrencyId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="387"/>
-            <column name="report_id" valueNumeric="141"/>
+            <column name="id" valueNumeric="122"/>
+            <column name="report_id" valueNumeric="57"/>
             <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name" value="fundId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="388"/>
-            <column name="report_id" valueNumeric="141"/>
+            <column name="id" valueNumeric="123"/>
+            <column name="report_id" valueNumeric="57"/>
             <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name" value="loanProductId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="389"/>
-            <column name="report_id" valueNumeric="141"/>
+            <column name="id" valueNumeric="124"/>
+            <column name="report_id" valueNumeric="57"/>
             <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name" value="loanPurposeId"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="390"/>
-            <column name="report_id" valueNumeric="141"/>
-            <column name="parameter_id" valueNumeric="100"/>
-            <column name="report_parameter_name" value="parType"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="391"/>
-            <column name="report_id" valueNumeric="142"/>
+            <column name="id" valueNumeric="125"/>
+            <column name="report_id" valueNumeric="58"/>
             <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="Branch"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="392"/>
-            <column name="report_id" valueNumeric="142"/>
+            <column name="id" valueNumeric="126"/>
+            <column name="report_id" valueNumeric="58"/>
             <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name" value="loanOfficer"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="393"/>
-            <column name="report_id" valueNumeric="142"/>
+            <column name="id" valueNumeric="127"/>
+            <column name="report_id" valueNumeric="58"/>
             <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name" value="CurrencyId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="394"/>
-            <column name="report_id" valueNumeric="142"/>
+            <column name="id" valueNumeric="128"/>
+            <column name="report_id" valueNumeric="58"/>
             <column name="parameter_id" valueNumeric="20"/>
-            <column name="report_parameter_name" value="fundId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="395"/>
-            <column name="report_id" valueNumeric="142"/>
+            <column name="id" valueNumeric="129"/>
+            <column name="report_id" valueNumeric="58"/>
             <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name" value="loanProductId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="396"/>
-            <column name="report_id" valueNumeric="142"/>
+            <column name="id" valueNumeric="130"/>
+            <column name="report_id" valueNumeric="58"/>
             <column name="parameter_id" valueNumeric="26"/>
-            <column name="report_parameter_name" value="loanPurposeId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="397"/>
-            <column name="report_id" valueNumeric="142"/>
+            <column name="id" valueNumeric="131"/>
+            <column name="report_id" valueNumeric="58"/>
             <column name="parameter_id" valueNumeric="100"/>
-            <column name="report_parameter_name" value="parType"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="398"/>
-            <column name="report_id" valueNumeric="143"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="Branch"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="399"/>
-            <column name="report_id" valueNumeric="143"/>
-            <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name" value="CurrencyId"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="400"/>
-            <column name="report_id" valueNumeric="143"/>
-            <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name" value="loanProductId"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="401"/>
-            <column name="report_id" valueNumeric="143"/>
+            <column name="id" valueNumeric="132"/>
+            <column name="report_id" valueNumeric="59"/>
             <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name" value="startDate"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="402"/>
-            <column name="report_id" valueNumeric="143"/>
+            <column name="id" valueNumeric="133"/>
+            <column name="report_id" valueNumeric="59"/>
             <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name" value="endDate"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="403"/>
-            <column name="report_id" valueNumeric="144"/>
+            <column name="id" valueNumeric="134"/>
+            <column name="report_id" valueNumeric="59"/>
             <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="Branch"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="404"/>
-            <column name="report_id" valueNumeric="144"/>
+            <column name="id" valueNumeric="135"/>
+            <column name="report_id" valueNumeric="59"/>
             <column name="parameter_id" valueNumeric="6"/>
-            <column name="report_parameter_name" value="Loan Officer"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="405"/>
-            <column name="report_id" valueNumeric="144"/>
-            <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name" value="startDate"/>
+            <column name="id" valueNumeric="136"/>
+            <column name="report_id" valueNumeric="59"/>
+            <column name="parameter_id" valueNumeric="10"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="406"/>
-            <column name="report_id" valueNumeric="144"/>
-            <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name" value="endDate"/>
+            <column name="id" valueNumeric="137"/>
+            <column name="report_id" valueNumeric="59"/>
+            <column name="parameter_id" valueNumeric="20"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="407"/>
-            <column name="report_id" valueNumeric="145"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="Branch"/>
+            <column name="id" valueNumeric="138"/>
+            <column name="report_id" valueNumeric="59"/>
+            <column name="parameter_id" valueNumeric="25"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="408"/>
-            <column name="report_id" valueNumeric="145"/>
-            <column name="parameter_id" valueNumeric="10"/>
-            <column name="report_parameter_name" value="CurrencyId"/>
+            <column name="id" valueNumeric="139"/>
+            <column name="report_id" valueNumeric="59"/>
+            <column name="parameter_id" valueNumeric="26"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="409"/>
-            <column name="report_id" valueNumeric="145"/>
-            <column name="parameter_id" valueNumeric="25"/>
-            <column name="report_parameter_name" value="loanProductId"/>
+            <column name="id" valueNumeric="140"/>
+            <column name="report_id" valueNumeric="61"/>
+            <column name="parameter_id" valueNumeric="5"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="410"/>
-            <column name="report_id" valueNumeric="145"/>
+            <column name="id" valueNumeric="141"/>
+            <column name="report_id" valueNumeric="61"/>
+            <column name="parameter_id" valueNumeric="10"/>
+            <column name="report_parameter_name"/>
+        </insert>
+        <insert tableName="stretchy_report_parameter">
+            <column name="id" valueNumeric="145"/>
+            <column name="report_id" valueNumeric="93"/>
             <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name" value="startDate"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="411"/>
-            <column name="report_id" valueNumeric="145"/>
+            <column name="id" valueNumeric="146"/>
+            <column name="report_id" valueNumeric="93"/>
             <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name" value="endDate"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="412"/>
-            <column name="report_id" valueNumeric="146"/>
-            <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name" value="startDate"/>
+            <column name="id" valueNumeric="147"/>
+            <column name="report_id" valueNumeric="93"/>
+            <column name="parameter_id" valueNumeric="5"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="413"/>
-            <column name="report_id" valueNumeric="146"/>
-            <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name" value="endDate"/>
+            <column name="id" valueNumeric="148"/>
+            <column name="report_id" valueNumeric="93"/>
+            <column name="parameter_id" valueNumeric="6"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="414"/>
-            <column name="report_id" valueNumeric="146"/>
-            <column name="parameter_id" valueNumeric="1004"/>
-            <column name="report_parameter_name" value="accountNo"/>
+            <column name="id" valueNumeric="256"/>
+            <column name="report_id" valueNumeric="106"/>
+            <column name="parameter_id" valueNumeric="2"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="415"/>
-            <column name="report_id" valueNumeric="147"/>
-            <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name" value="startDate"/>
+            <column name="id" valueNumeric="257"/>
+            <column name="report_id" valueNumeric="106"/>
+            <column name="parameter_id" valueNumeric="6"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="416"/>
-            <column name="report_id" valueNumeric="147"/>
-            <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name" value="endDate"/>
+            <column name="id" valueNumeric="258"/>
+            <column name="report_id" valueNumeric="106"/>
+            <column name="parameter_id" valueNumeric="5"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="417"/>
-            <column name="report_id" valueNumeric="147"/>
-            <column name="parameter_id" valueNumeric="1004"/>
-            <column name="report_parameter_name" value="selectLoan"/>
+            <column name="id" valueNumeric="259"/>
+            <column name="report_id" valueNumeric="106"/>
+            <column name="parameter_id" valueNumeric="1"/>
+            <column name="report_parameter_name"/>
         </insert>
         <insert tableName="stretchy_report_parameter">
             <column name="id" valueNumeric="418"/>
@@ -16133,96 +14379,6 @@
             <column name="parameter_id" valueNumeric="5"/>
             <column name="report_parameter_name" value=""/>
         </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="426"/>
-            <column name="report_id" valueNumeric="157"/>
-            <column name="parameter_id" valueNumeric="1006"/>
-            <column name="report_parameter_name" value="transactionId"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="427"/>
-            <column name="report_id" valueNumeric="158"/>
-            <column name="parameter_id" valueNumeric="1006"/>
-            <column name="report_parameter_name" value="transactionId"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="428"/>
-            <column name="report_id" valueNumeric="159"/>
-            <column name="parameter_id" valueNumeric="1007"/>
-            <column name="report_parameter_name" value="centerId"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="429"/>
-            <column name="report_id" valueNumeric="160"/>
-            <column name="parameter_id" valueNumeric="1008"/>
-            <column name="report_parameter_name" value="account"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="430"/>
-            <column name="report_id" valueNumeric="160"/>
-            <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name" value="fromDate"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="431"/>
-            <column name="report_id" valueNumeric="160"/>
-            <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name" value="toDate"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="432"/>
-            <column name="report_id" valueNumeric="160"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="branch"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="433"/>
-            <column name="report_id" valueNumeric="162"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="branch"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="434"/>
-            <column name="report_id" valueNumeric="162"/>
-            <column name="parameter_id" valueNumeric="1009"/>
-            <column name="report_parameter_name" value="ondate"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="435"/>
-            <column name="report_id" valueNumeric="163"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="branch"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="436"/>
-            <column name="report_id" valueNumeric="163"/>
-            <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name" value="fromDate"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="437"/>
-            <column name="report_id" valueNumeric="163"/>
-            <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name" value="toDate"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="438"/>
-            <column name="report_id" valueNumeric="164"/>
-            <column name="parameter_id" valueNumeric="5"/>
-            <column name="report_parameter_name" value="branch"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="439"/>
-            <column name="report_id" valueNumeric="164"/>
-            <column name="parameter_id" valueNumeric="1"/>
-            <column name="report_parameter_name" value="fromDate"/>
-        </insert>
-        <insert tableName="stretchy_report_parameter">
-            <column name="id" valueNumeric="440"/>
-            <column name="report_id" valueNumeric="164"/>
-            <column name="parameter_id" valueNumeric="2"/>
-            <column name="report_parameter_name" value="toDate"/>
-        </insert>
         <insert tableName="stretchy_report_parameter">
             <column name="id" valueNumeric="441"/>
             <column name="report_id" valueNumeric="165"/>
diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/parts/0003_postgresql_specific_initial_data.xml b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0003_postgresql_specific_initial_data.xml
index 96e19ebe8c..f9b257816e 100644
--- a/fineract-provider/src/main/resources/db/changelog/tenant/parts/0003_postgresql_specific_initial_data.xml
+++ b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0003_postgresql_specific_initial_data.xml
@@ -23,6 +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.1.xsd">
     <changeSet author="fineract" id="1-postgresql" context="postgresql">
+        <validCheckSum>ANY</validCheckSum>
         <insert tableName="stretchy_parameter">
             <column name="id" valueNumeric="1"/>
             <column name="parameter_name" value="startDateSelect"/>
@@ -474,6 +475,7 @@
         </insert>
     </changeSet>
     <changeSet author="fineract" id="2-postgresql" context="postgresql">
+        <validCheckSum>ANY</validCheckSum>
         <insert tableName="stretchy_report">
             <column name="id" valueNumeric="1"/>
             <column name="report_name" value="Client Listing"/>
@@ -642,42 +644,6 @@
             <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="48"/>
-            <column name="report_name" value="Balance Sheet"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Accounting"/>
-            <column name="report_sql"/>
-            <column name="description" value="Balance Sheet"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="49"/>
-            <column name="report_name" value="Income Statement"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Accounting"/>
-            <column name="report_sql"/>
-            <column name="description" value="Profit and Loss Statement"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="50"/>
-            <column name="report_name" value="Trial Balance"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Accounting"/>
-            <column name="report_sql"/>
-            <column name="description" value="Trial Balance Report"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
         <insert tableName="stretchy_report">
             <column name="id" valueNumeric="51"/>
             <column name="report_name" value="Written-Off Loans"/>
@@ -798,30 +764,6 @@
             <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="91"/>
-            <column name="report_name" value="Loan Account Schedule"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql"/>
-            <column name="description"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="92"/>
-            <column name="report_name" value="Branch Expected Cash Flow"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql"/>
-            <column name="description"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
         <insert tableName="stretchy_report">
             <column name="id" valueNumeric="93"/>
             <column name="report_name" value="Expected Payments By Date - Basic"/>
@@ -834,18 +776,6 @@
             <column name="use_report" valueBoolean="true"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="94"/>
-            <column name="report_name" value="Expected Payments By Date - Formatted"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql"/>
-            <column name="description"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
         <insert tableName="stretchy_report">
             <column name="id" valueNumeric="96"/>
             <column name="report_name" value="GroupSummaryCounts"/>
@@ -855,7 +785,7 @@
             <column name="report_sql" value="SELECT    x.* FROM      m_office o,&#10;          m_group g,&#10;          (&#10;                    SELECT    a.activeclients,&#10;                              (b.activeclientloans + c.activegrouploans) AS activeloans,&#10;                              b.activeclientloans,&#10;                              c.activegrouploans,&#10;                              (b.activeclientborrowers + c.activegroupborrowers) AS activeborrowers,&#10;         [...]
             <column name="description" value="Utility query for getting group summary count details for a group_id"/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -867,7 +797,7 @@
             <column name="report_sql" value="&#10;SELECT    Coalesce(cur.display_symbol, l.currency_code)  AS currency,&#10;          Coalesce(Sum(l.principal_disbursed_derived),0) AS totaldisbursedamount,&#10;          Coalesce(Sum(l.principal_outstanding_derived),0) AS totalloanoutstandingamount,&#10;          Count(laa.loan_id) AS overdueloans,&#10;          Coalesce(Sum(laa.total_overdue_derived), 0)  AS totalloanoverdueamount&#10;FROM      m_group topgroup JOIN      m_office o ON    [...]
             <column name="description" value="Utility query for getting group summary currency amount details for a group_id"/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -879,7 +809,7 @@
             <column name="report_sql" value="select DATE ${startDate} AS &quot;Transaction Date&quot;, 'Opening Balance' AS &quot;Transaction Type&quot;, null AS &quot;Office&quot;, null AS &quot;Loan Officer&quot;, null AS &quot;Loan Account No&quot;, null AS &quot;Loan Product&quot;, null AS &quot;Currency&quot;, null AS &quot;Client Account No&quot;, null AS &quot;Client&quot;, null AS &quot;Principal&quot;, null AS &quot;Interest&quot;, COALESCE(round(sum(CASE WHEN txn.transaction_ty [...]
             <column name="description" value="Running Balance Txn report for Individual Lending.&#10;Suitable for small MFI's.  Larger could use it using the branch or other parameters.&#10;Basically, suck it and see if its quick enough for you out-of-te box or whether it needs performance work in your situation.&#10;"/>
             <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -891,7 +821,7 @@
             <column name="report_sql" value="select COALESCE(cur.display_symbol, l.currency_code) as Currency, /*This query will return more than one entry if more than one currency is used */ count(distinct(c.id)) as activeClients, count(*) as activeLoans, sum(l.principal_disbursed_derived) as disbursedAmount, sum(l.principal_outstanding_derived) as loanOutstandingAmount, round((sum(l.principal_outstanding_derived) * 100) / sum(l.principal_disbursed_derived),2) as loanOutstandingPC, sum [...]
             <column name="description" value="Field Agent Statistics"/>
             <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -903,7 +833,7 @@
             <column name="report_sql" value="select pgm.id, pgm.display_name as name, sts.enum_message_property as status  from m_group pgm  join m_office o on o.id = pgm.office_id AND o.hierarchy like concat('${currentUserHierarchy}', '%') left join r_enum_value sts on sts.enum_name = 'status_enum' and sts.enum_id = pgm.status_enum  where pgm.staff_id = ${staffId}"/>
             <column name="description" value="List of Field Agent Programs"/>
             <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -915,7 +845,7 @@
             <column name="report_sql" value="select l.id as loanId, l.account_no as loanAccountNo, c.id as clientId, c.account_no as clientAccountNo, pgm.display_name as programName,  (select count(*) from m_loan cy where cy.group_id = pgm.id and cy.client_id =c.id and cy.disbursedon_date &lt;= l.disbursedon_date) as loanCycleNo,  c.display_name as clientDisplayName, COALESCE(cur.display_symbol, l.currency_code) as Currency, COALESCE(l.principal_repaid_derived,0.0) as loanRepaidAmount, C [...]
             <column name="description" value="List of Loans in a Program"/>
             <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -927,7 +857,7 @@
             <column name="report_sql" value="select s.id, s.display_name, s.firstname, s.lastname, s.organisational_role_enum,&#10;s.organisational_role_parent_staff_id,&#10;sp.display_name AS &quot;organisational_role_parent_staff_display_name&quot;&#10;from m_staff s&#10;join m_staff sp on s.organisational_role_parent_staff_id = sp.id&#10;where s.organisational_role_parent_staff_id = ${staffId}"/>
             <column name="description" value="Get Next Level Down Staff"/>
             <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -939,7 +869,7 @@
             <column name="report_sql" value="select COALESCE(cur.display_symbol, l.currency_code) as Currency, /*This query will return more than one entry if more than one currency is used */ count(distinct(c.id)) as activeClients, count(*) as activeLoans, sum(l.principal_disbursed_derived) as disbursedAmount, sum(l.principal_outstanding_derived) as loanOutstandingAmount, round((sum(l.principal_outstanding_derived) * 100) / sum(l.principal_disbursed_derived),2) as loanOutstandingPC, sum [...]
             <column name="description" value="Coordinator Statistics"/>
             <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -951,7 +881,7 @@
             <column name="report_sql" value="SELECT    Coalesce(cur.display_symbol, l.currency_code)  AS currency, Count(DISTINCT(c.id))  AS activeclients, Count(*) AS activeloans, Sum(l.principal_disbursed_derived) AS disbursedamount, Sum(l.principal_outstanding_derived) AS loanoutstandingamount, Round((Sum(l.principal_outstanding_derived) * 100) / Sum(l.principal_disbursed_derived),2) AS loanoutstandingpc, Sum(Coalesce(lpa.principal_in_advance_derived,0.0))  AS loanpaidinadvance, sum(  [...]
             <column name="description" value="Branch Manager Statistics"/>
             <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -963,7 +893,7 @@
             <column name="report_sql" value="SELECT    Coalesce(cur.display_symbol, l.currency_code) AS currency, /*This query will return more than one entry if more than one currency is used */ Count(DISTINCT(c.id))  AS activeclients, Count(*) AS activeloans, Sum(l.principal_disbursed_derived) AS disbursedamount, Sum(l.principal_outstanding_derived) AS loanoutstandingamount, Round((Sum(l.principal_outstanding_derived) * 100) / Sum(l.principal_disbursed_derived),2) AS loanoutstandingpc, [...]
             <column name="description" value="Program DirectorStatistics"/>
             <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -975,7 +905,7 @@
             <column name="report_sql" value="select COALESCE(cur.display_symbol, l.currency_code) as Currency, /*This query will return more than one entry if more than one currency is used */ count(distinct(c.id)) as activeClients, count(*) as activeLoans, sum(l.principal_disbursed_derived) as disbursedAmount, sum(l.principal_outstanding_derived) as loanOutstandingAmount, round((sum(l.principal_outstanding_derived) * 100) / sum(l.principal_disbursed_derived),2) as loanOutstandingPC, sum [...]
             <column name="description" value="Program Statistics"/>
             <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -987,7 +917,7 @@
             <column name="report_sql" value="SELECT x.* FROM m_client c, m_office o, (SELECT a.loanCycle, a.activeLoans, b.lastLoanAmount, d.activeSavings, d.totalSavings FROM (SELECT COALESCE(MAX(l.loan_counter),0) AS loanCycle, COUNT(l.id) AS activeLoans FROM m_loan l WHERE l.loan_status_id=300 AND l.client_id=${clientId}) a, (SELECT count(l.id), COALESCE(l.principal_amount,0) AS lastLoanAmount FROM m_loan l WHERE l.client_id=${clientId} AND l.disbursedon_date = (SELECT COALESCE(MAX(di [...]
             <column name="description" value="Utility query for getting the client summary details"/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -999,7 +929,7 @@
             <column name="report_sql" value="SELECT lp.name AS &quot;productName&quot;, MAX(l.loan_product_counter) AS &quot;loanProductCycle&quot; FROM m_loan l JOIN m_product_loan lp ON l.product_id=lp.id WHERE lp.include_in_borrower_cycle=true AND l.loan_product_counter IS NOT NULL AND l.client_id=${clientId} GROUP BY lp.id"/>
             <column name="description" value="Utility query for getting the client loan cycle details"/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -1011,367 +941,7 @@
             <column name="report_sql" value="select COALESCE(cur.display_symbol, sa.currency_code) as currency, count(sa.id) as totalSavingAccounts, COALESCE(sum(sa.account_balance_derived),0) as totalSavings from m_group topgroup join m_office o on o.id = topgroup.office_id and o.hierarchy like concat('${currentUserHierarchy}', '%') join m_group g on g.hierarchy like concat(topgroup.hierarchy, '%') join m_savings_account sa on sa.group_id = g.id left join m_currency cur on cur.code = sa [...]
             <column name="description" value="Utility query for getting group or center saving summary details for a group_id"/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="118"/>
-            <column name="report_name" value="Savings Transactions"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Savings"/>
-            <column name="report_sql"/>
-            <column name="description"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="119"/>
-            <column name="report_name" value="Client Savings Summary"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Savings"/>
-            <column name="report_sql"/>
-            <column name="description"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="120"/>
-            <column name="report_name" value="Active Loans - Details(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="121"/>
-            <column name="report_name" value="Active Loans - Summary(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="122"/>
-            <column name="report_name" value="Active Loans by Disbursal Period(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="123"/>
-            <column name="report_name" value="Active Loans in last installment Summary(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="124"/>
-            <column name="report_name" value="Active Loans in last installment(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="125"/>
-            <column name="report_name" value="Active Loans Passed Final Maturity Summary(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="126"/>
-            <column name="report_name" value="Active Loans Passed Final Maturity(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="127"/>
-            <column name="report_name" value="Aging Detail(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="128"/>
-            <column name="report_name" value="Aging Summary (Arrears in Months)(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="129"/>
-            <column name="report_name" value="Aging Summary (Arrears in Weeks)(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="130"/>
-            <column name="report_name" value="Client Listing(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Client"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="131"/>
-            <column name="report_name" value="Client Loans Listing(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Client"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="132"/>
-            <column name="report_name" value="Expected Payments By Date - Basic(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="133"/>
-            <column name="report_name" value="Funds Disbursed Between Dates Summary by Office(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Fund"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="134"/>
-            <column name="report_name" value="Funds Disbursed Between Dates Summary(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Fund"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="135"/>
-            <column name="report_name" value="Loans Awaiting Disbursal Summary by Month(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="136"/>
-            <column name="report_name" value="Loans Awaiting Disbursal Summary(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="137"/>
-            <column name="report_name" value="Loans Awaiting Disbursal(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="138"/>
-            <column name="report_name" value="Loans Pending Approval(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="139"/>
-            <column name="report_name" value="Obligation Met Loans Details(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="140"/>
-            <column name="report_name" value="Obligation Met Loans Summary(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="141"/>
-            <column name="report_name" value="Portfolio at Risk by Branch(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="142"/>
-            <column name="report_name" value="Portfolio at Risk(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="143"/>
-            <column name="report_name" value="Rescheduled Loans(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="144"/>
-            <column name="report_name" value="TxnRunningBalances(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Transaction"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="145"/>
-            <column name="report_name" value="Written-Off Loans(Pentaho)"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql" value="(NULL)"/>
-            <column name="description" value="(NULL)"/>
-            <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="146"/>
-            <column name="report_name" value="Client Saving Transactions"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Savings"/>
-            <column name="report_sql"/>
-            <column name="description"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="147"/>
-            <column name="report_name" value="Client Loan Account Schedule"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql"/>
-            <column name="description"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -1383,7 +953,7 @@
             <column name="report_sql" value="SELECT gr.id AS id, gr.display_name AS name FROM   m_group gr WHERE  gr.level_id=1 AND    gr.staff_id = ${staffId}"/>
             <column name="description" value=""/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -1395,7 +965,7 @@
             <column name="report_sql" value="SELECT COUNT(cl.id) AS count, cl.activation_date AS days FROM m_office of LEFT JOIN m_client cl on of.id = cl.office_id WHERE of.hierarchy like concat((select ino.hierarchy from m_office ino where ino.id = '${officeId}'),'%' ) AND (cl.activation_date BETWEEN (CURRENT_DATE - 12 * INTERVAL '1 day') AND NOW()) GROUP BY days"/>
             <column name="description" value="Retrieves the number of clients joined in last 12 days"/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -1407,7 +977,7 @@
             <column name="report_sql" value="SELECT COUNT(cl.id) AS count, EXTRACT(WEEK FROM cl.activation_date) AS Weeks FROM m_office of LEFT JOIN m_client cl on of.id = cl.office_id WHERE of.hierarchy like concat((select ino.hierarchy from m_office ino where ino.id = '${officeId}'),'%' ) AND (cl.activation_date BETWEEN (CURRENT_DATE - 12 * INTERVAL '1 WEEK') AND NOW()) GROUP BY Weeks"/>
             <column name="description" value=""/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -1419,7 +989,7 @@
             <column name="report_sql" value="SELECT    Count(cl.id)  AS count, to_char(cl.activation_date, 'Month') AS &quot;Months&quot; FROM      m_office of LEFT JOIN m_client cl ON        of.id = cl.office_id WHERE     of.hierarchy LIKE Concat( ( SELECT ino.hierarchy FROM   m_office ino WHERE  ino.id = '${officeId}'),'%' ) AND       ( cl.activation_date BETWEEN (CURRENT_DATE - 12 * INTERVAL '1 MONTH') AND       DATE_TRUNC('day', now())) GROUP BY  &quot;Months&quot;"/>
             <column name="description" value=""/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -1431,7 +1001,7 @@
             <column name="report_sql" value="SELECT COUNT(ln.id) AS lcount, ln.disbursedon_date AS days FROM m_office of LEFT JOIN m_client cl on of.id = cl.office_id LEFT JOIN m_loan ln on cl.id = ln.client_id WHERE of.hierarchy like concat((select ino.hierarchy from m_office ino where ino.id = '${officeId}'),'%' ) AND (ln.disbursedon_date BETWEEN (CURRENT_DATE - 12 * INTERVAL '1 day') AND NOW()) GROUP BY days"/>
             <column name="description" value="Retrieves Number of loans disbursed for last 12 days"/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -1443,7 +1013,7 @@
             <column name="report_sql" value="SELECT COUNT(ln.id) AS lcount, EXTRACT(WEEK FROM ln.disbursedon_date) AS Weeks FROM m_office of LEFT JOIN m_client cl on of.id = cl.office_id LEFT JOIN m_loan ln on cl.id = ln.client_id WHERE of.hierarchy like concat((select ino.hierarchy from m_office ino where ino.id = '${officeId}'),'%' ) AND (ln.disbursedon_date BETWEEN (CURRENT_DATE - 12 * INTERVAL '1 week') AND NOW()) GROUP BY Weeks"/>
             <column name="description" value=""/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -1455,7 +1025,7 @@
             <column name="report_sql" value="SELECT COUNT(ln.id) AS lcount, EXTRACT(MONTH FROM ln.disbursedon_date) AS &quot;Months&quot; FROM m_office of LEFT JOIN m_client cl on of.id = cl.office_id LEFT JOIN m_loan ln on cl.id = ln.client_id WHERE of.hierarchy like concat((select ino.hierarchy from m_office ino where ino.id = '${officeId}'),'%' ) AND (ln.disbursedon_date BETWEEN (CURRENT_DATE - 12 * INTERVAL '1 month') AND NOW()) GROUP BY &quot;Months&quot;"/>
             <column name="description" value=""/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -1467,7 +1037,7 @@
             <column name="report_sql" value="select amount.AmountDue-amount.AmountPaid as AmountDue, amount.AmountPaid as AmountPaid from (SELECT (COALESCE(SUM(ls.principal_amount),0) - COALESCE(SUM(ls.principal_writtenoff_derived),0)  + COALESCE(SUM(ls.interest_amount),0) - COALESCE(SUM(ls.interest_writtenoff_derived),0)   - COALESCE(SUM(ls.interest_waived_derived),0) + COALESCE(SUM(ls.fee_charges_amount),0) - COALESCE(SUM(ls.fee_charges_writtenoff_derived),0) - COALESCE(SUM(ls.fee_char [...]
             <column name="description" value="Demand Vs Collection"/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -1479,103 +1049,7 @@
             <column name="report_sql" value="SELECT awaitinddisbursal.amount-disbursedAmount.amount as amountToBeDisburse, disbursedAmount.amount as disbursedAmount FROM (SELECT COUNT(ln.id) AS noOfLoans, COALESCE(SUM(ln.principal_amount),0) AS amount FROM m_office of LEFT JOIN m_client cl ON cl.office_id = of.id LEFT JOIN m_loan ln ON cl.id = ln.client_id WHERE ln.expected_disbursedon_date = DATE_TRUNC('day', NOW()) AND (ln.loan_status_id=200 OR ln.loan_status_id=300) AND of.hierarchy l [...]
             <column name="description" value="Disbursal_Vs_Awaitingdisbursal"/>
             <column name="core_report" valueBoolean="true"/>
-            <column name="use_report" valueBoolean="falsee"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="157"/>
-            <column name="report_name" value="Savings Transaction Receipt"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category"/>
-            <column name="report_sql"/>
-            <column name="description"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="158"/>
-            <column name="report_name" value="Loan Transaction Receipt"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category"/>
-            <column name="report_sql"/>
-            <column name="description"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="159"/>
-            <column name="report_name" value="Staff Assignment History"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category"/>
-            <column name="report_sql"/>
-            <column name="description"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="160"/>
-            <column name="report_name" value="GeneralLedgerReport"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Accounting"/>
-            <column name="report_sql"/>
-            <column name="description"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="161"/>
-            <column name="report_name" value="Active Loan Summary per Branch"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql"/>
-            <column name="description"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="162"/>
-            <column name="report_name" value="Balance Outstanding"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql"/>
-            <column name="description"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="163"/>
-            <column name="report_name" value="Collection Report"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql"/>
-            <column name="description"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
-            <column name="self_service_user_report" valueBoolean="false"/>
-        </insert>
-        <insert tableName="stretchy_report">
-            <column name="id" valueNumeric="164"/>
-            <column name="report_name" value="Disbursal Report"/>
-            <column name="report_type" value="Pentaho"/>
-            <column name="report_subtype"/>
-            <column name="report_category" value="Loan"/>
-            <column name="report_sql"/>
-            <column name="description"/>
-            <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="true"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -1755,7 +1229,7 @@
             <column name="report_sql" value="select ml.id as loanId, mc.id, mc.firstname, COALESCE(mc.middlename, '') as middlename, mc.lastname, mc.display_name as FullName, mobile_no as mobileNo, mc.group_name as GroupName, round(ml.principal_amount, ml.currency_digits) as LoanAmount, round(ml.&quot;total_outstanding_derived&quot;, ml.currency_digits) as LoanOutstanding, ml.&quot;account_no&quot; as LoanAccountId, round(mlt.amountPaid, ml.currency_digits) as repaymentAmount FROM m_offi [...]
             <column name="description" value="Loan Repayment"/>
             <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -1767,7 +1241,7 @@
             <column name="report_sql" value="SELECT mc.id, mc.firstname, mc.middlename as middlename, mc.lastname, mc.display_name as FullName, mc.mobile_no as mobileNo, mc.group_name as GroupName, mo.name as officename, ml.id as loanId, ml.account_no as accountnumber, ml.principal_amount_proposed as loanamount, ml.annual_nominal_interest_rate as annualinterestrate FROM m_office mo JOIN m_office ounder ON ounder.hierarchy LIKE CONCAT(mo.hierarchy, '%') AND ounder.hierarchy like CONCAT('. [...]
             <column name="description" value="Loan and client data of approved loan"/>
             <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
@@ -1779,7 +1253,7 @@
             <column name="report_sql" value="SELECT mc.id, mc.firstname, mc.middlename as middlename, mc.lastname, mc.display_name as FullName, mc.mobile_no as mobileNo, mc.group_name as GroupName,  mo.name as officename, ml.id as loanId, ml.account_no as accountnumber, ml.principal_amount_proposed as loanamount, ml.annual_nominal_interest_rate as annualinterestrate  FROM m_office mo  JOIN m_office ounder ON ounder.hierarchy LIKE CONCAT(mo.hierarchy, '%')  AND ounder.hierarchy like CONCA [...]
             <column name="description" value="Loan and client data of rejected loan"/>
             <column name="core_report" valueBoolean="false"/>
-            <column name="use_report" valueBoolean="falsee"/>
+            <column name="use_report" valueBoolean="false"/>
             <column name="self_service_user_report" valueBoolean="false"/>
         </insert>
         <insert tableName="stretchy_report">
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 4d3ad68ce1..4b0adb69ce 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
@@ -48,7 +48,7 @@ public class ReportsTest extends IntegrationTest {
 
     @Test
     void listReports() {
-        assertThat(ok(fineractClient().reports.retrieveReportList())).hasSize(128);
+        assertThat(ok(fineractClient().reports.retrieveReportList())).hasSize(84);
     }
 
     @Test
@@ -83,7 +83,7 @@ public class ReportsTest extends IntegrationTest {
                 () -> ok(fineractClient().reportsRun.runReportGetFile("Expected Payments By Date - Formatted", Map.of("R_endDate",
                         "2013-04-30", "R_loanOfficerId", "-1", "R_officeId", "1", "R_startDate", "2013-04-16", "output-type", "PDF"),
                         false)));
-        assertEquals(503, exception.getResponse().code());
+        assertEquals(404, exception.getResponse().code());
     }
 
     @Test