From 0c1d4fd003ed98b687124199c25aad7a4ae1a4eb Mon Sep 17 00:00:00 2001
From: RisvanaCybro <risvana@cybrosys.info>
Date: Mon, 20 May 2024 15:45:11 +0530
Subject: [PATCH] May 20: [FIX] Bug Fixed 'dynamic_accounts_report'

---
 dynamic_accounts_report/__manifest__.py       |   2 +-
 dynamic_accounts_report/doc/RELEASE_NOTES.md  |   5 +
 .../report/balance_sheet_report_templates.xml | 185 +++++-----
 .../static/src/css/accounts_report.css        |   6 +-
 .../static/src/js/tax_report.js               |  24 +-
 .../static/src/js/trial_balance.js            |   8 +-
 .../src/xml/aged_payable_report_views.xml     |   2 +-
 .../src/xml/aged_receivable_report_views.xml  |   2 +-
 .../static/src/xml/balance_sheet_template.xml |   5 +-
 .../static/src/xml/bank_flow_templates.xml    |   2 +-
 .../static/src/xml/cash_flow_templates.xml    |   2 +-
 .../static/src/xml/general_ledger_view.xml    |   2 +-
 .../static/src/xml/partner_ledger_view.xml    | 329 +++++++++---------
 .../src/xml/profit_and_loss_templates.xml     |   2 +-
 .../static/src/xml/tax_report_views.xml       |   2 +-
 .../static/src/xml/trial_balance_view.xml     |   2 +-
 16 files changed, 299 insertions(+), 281 deletions(-)

diff --git a/dynamic_accounts_report/__manifest__.py b/dynamic_accounts_report/__manifest__.py
index 813126115..44e08206e 100644
--- a/dynamic_accounts_report/__manifest__.py
+++ b/dynamic_accounts_report/__manifest__.py
@@ -21,7 +21,7 @@
 ################################################################################
 {
     'name': 'Odoo17 Dynamic Accounting Reports',
-    'version': '17.0.1.0.1',
+    'version': '17.0.1.0.0',
     'category': 'Accounting',
     'summary': "Odoo 17 Accounting Financial Reports,Dynamic Accounting Reports, Dynamic Financial Reports,Dynamic Report Odoo17, Odoo17,Financial Reports, Odoo17 Accounting,Accounting, Odoo Apps",
     'description': "This module creates dynamic Accounting General Ledger, Trial"
diff --git a/dynamic_accounts_report/doc/RELEASE_NOTES.md b/dynamic_accounts_report/doc/RELEASE_NOTES.md
index 8ad751f80..5e3d79f6d 100644
--- a/dynamic_accounts_report/doc/RELEASE_NOTES.md
+++ b/dynamic_accounts_report/doc/RELEASE_NOTES.md
@@ -4,3 +4,8 @@
 #### Version 17.0.1.0.0
 #### ADD
 - Initial commit for Dynamic Accounts  Reports
+
+#### 19.04.2024
+#### Version 17.0.1.0.1
+##### BUG FIX
+- Updated the scrolling issue of General Ledger
diff --git a/dynamic_accounts_report/report/balance_sheet_report_templates.xml b/dynamic_accounts_report/report/balance_sheet_report_templates.xml
index 73c7744c7..4496a513e 100644
--- a/dynamic_accounts_report/report/balance_sheet_report_templates.xml
+++ b/dynamic_accounts_report/report/balance_sheet_report_templates.xml
@@ -74,33 +74,54 @@
                                     </th>
                                 </t>
                             </tr>
-                            <t t-foreach="data['datas'][0]['asset_cash'][0]"
-                               t-as="datas" t-key="datas_index">
-                                <t t-if="datas['amount'] != '0.00'">
-                                    <tr style="border-bottom: 1px solid gainsboro;">
-                                        <th colspan="6"
-                                            style="font-weight: normal;">
-                                            <span style="margin-left: 8%;">
-                                                <t t-esc="datas['name']"/>
-                                            </span>
-                                        </th>
-                                        <!-- Assuming you want to iterate over all values to display -->
+                            <t t-foreach="data['datas']" t-as="value"
+                               t-key="value_index">
+                                <t t-if="value_index == 0">
+                                    <t t-foreach="value['asset_cash'][0]"
+                                       t-as="datas" t-key="datas_index">
+                                        <t t-set="account_name"
+                                           t-value="datas['name']"/>
+                                        <t t-set="account_value" t-value="0"/>
                                         <t t-foreach="data['datas']"
-                                           t-as="values" t-key="values_index">
+                                           t-as="values"
+                                           t-key="values_index">
                                             <t t-foreach="values['asset_cash'][0]"
-                                               t-as="account"
-                                               t-key="account_index">
-                                                <t t-if="account['name'] == datas['name']">
-                                                    <th class="text-end"
-                                                        style="font-weight: normal;">
-                                                        <span>
-                                                            <t t-esc="account['amount']"/>
-                                                        </span>
-                                                    </th>
+                                               t-as="datas" t-key="datas_index">
+                                                <t t-if="account_name == datas['name']">
+                                                    <t t-if="datas['amount'] != '0.00'">
+                                                        <t t-set="account_value"
+                                                           t-value="1"/>
+                                                    </t>
                                                 </t>
                                             </t>
                                         </t>
-                                    </tr>
+                                        <t t-if="account_value == 1">
+                                            <tr style="border-bottom: 1px solid gainsboro;">
+                                                <th colspan="6"
+                                                    style="font-weight: normal;">
+                                                    <span style="margin-left: 8%;">
+                                                        <t t-esc="datas['name']"/>
+                                                    </span>
+                                                </th>
+                                                <t t-foreach="data['datas']"
+                                                   t-as="values"
+                                                   t-key="values_index">
+                                                    <t t-foreach="values['asset_cash'][0]"
+                                                       t-as="datas"
+                                                       t-key="datas_index">
+                                                        <t t-if="account_name == datas['name']">
+                                                            <th class="text-end"
+                                                                style="font-weight: normal;">
+                                                                <span>
+                                                                    <t t-esc="datas['amount']"/>
+                                                                </span>
+                                                            </th>
+                                                        </t>
+                                                    </t>
+                                                </t>
+                                            </tr>
+                                        </t>
+                                    </t>
                                 </t>
                             </t>
                             <tr style="border-bottom: 1px solid gainsboro;">
@@ -141,6 +162,12 @@
                                         </t>
                                         <t t-if="account_value == 1">
                                             <tr style="border-bottom: 1px solid gainsboro;">
+                                                <th colspan="6"
+                                                    style="font-weight: normal;">
+                                                    <span style="margin-left: 8%;">
+                                                        <t t-esc="datas['name']"/>
+                                                    </span>
+                                                </th>
                                                 <t t-foreach="data['datas']"
                                                    t-as="values"
                                                    t-key="values_index">
@@ -148,12 +175,6 @@
                                                        t-as="datas"
                                                        t-key="datas_index">
                                                         <t t-if="account_name == datas['name']">
-                                                            <th colspan="6"
-                                                                style="font-weight: normal;">
-                                                                <span style="margin-left: 8%;">
-                                                                    <t t-esc="datas['name']"/>
-                                                                </span>
-                                                            </th>
                                                             <th class="text-end"
                                                                 style="font-weight: normal;">
                                                                 <span>
@@ -207,6 +228,12 @@
                                         </t>
                                         <t t-if="account_value == 1">
                                             <tr style="border-bottom: 1px solid gainsboro;">
+                                                <th colspan="6"
+                                                    style="font-weight: normal;">
+                                                    <span style="margin-left: 8%;">
+                                                        <t t-esc="datas['name']"/>
+                                                    </span>
+                                                </th>
                                                 <t t-foreach="data['datas']"
                                                    t-as="values"
                                                    t-key="values_index">
@@ -214,12 +241,6 @@
                                                        t-as="datas"
                                                        t-key="datas_index">
                                                         <t t-if="account_name == datas['name']">
-                                                            <th colspan="6"
-                                                                style="font-weight: normal;">
-                                                                <span style="margin-left: 8%;">
-                                                                    <t t-esc="datas['name']"/>
-                                                                </span>
-                                                            </th>
                                                             <th class="text-end"
                                                                 style="font-weight: normal;">
                                                                 <span>
@@ -272,6 +293,12 @@
                                         </t>
                                         <t t-if="account_value == 1">
                                             <tr style="border-bottom: 1px solid gainsboro;">
+                                                <th colspan="6"
+                                                    style="font-weight: normal;">
+                                                    <span style="margin-left: 8%;">
+                                                        <t t-esc="datas['name']"/>
+                                                    </span>
+                                                </th>
                                                 <t t-foreach="data['datas']"
                                                    t-as="values"
                                                    t-key="values_index">
@@ -279,12 +306,6 @@
                                                        t-as="datas"
                                                        t-key="datas_index">
                                                         <t t-if="account_name == datas['name']">
-                                                            <th colspan="6"
-                                                                style="font-weight: normal;">
-                                                                <span style="margin-left: 8%;">
-                                                                    <t t-esc="datas['name']"/>
-                                                                </span>
-                                                            </th>
                                                             <th class="text-end"
                                                                 style="font-weight: normal;">
                                                                 <span>
@@ -353,6 +374,12 @@
                                         </t>
                                         <t t-if="account_value == 1">
                                             <tr style="border-bottom: 1px solid gainsboro;">
+                                                <th colspan="6"
+                                                    style="font-weight: normal;">
+                                                    <span style="margin-left: 8%;">
+                                                        <t t-esc="datas['name']"/>
+                                                    </span>
+                                                </th>
                                                 <t t-foreach="data['datas']"
                                                    t-as="values"
                                                    t-key="values_index">
@@ -360,12 +387,6 @@
                                                        t-as="datas"
                                                        t-key="datas_index">
                                                         <t t-if="account_name == datas['name']">
-                                                            <th colspan="6"
-                                                                style="font-weight: normal;">
-                                                                <span style="margin-left: 8%;">
-                                                                    <t t-esc="datas['name']"/>
-                                                                </span>
-                                                            </th>
                                                             <th class="text-end"
                                                                 style="font-weight: normal;">
                                                                 <span>
@@ -419,6 +440,12 @@
                                         </t>
                                         <t t-if="account_value == 1">
                                             <tr style="border-bottom: 1px solid gainsboro;">
+                                                <th colspan="6"
+                                                    style="font-weight: normal;">
+                                                    <span style="margin-left: 8%;">
+                                                        <t t-esc="datas['name']"/>
+                                                    </span>
+                                                </th>
                                                 <t t-foreach="data['datas']"
                                                    t-as="values"
                                                    t-key="values_index">
@@ -426,12 +453,6 @@
                                                        t-as="datas"
                                                        t-key="datas_index">
                                                         <t t-if="account_name == datas['name']">
-                                                            <th colspan="6"
-                                                                style="font-weight: normal;">
-                                                                <span style="margin-left: 8%;">
-                                                                    <t t-esc="datas['name']"/>
-                                                                </span>
-                                                            </th>
                                                             <th class="text-end"
                                                                 style="font-weight: normal;">
                                                                 <span>
@@ -516,6 +537,12 @@
                                         </t>
                                         <t t-if="account_value == 1">
                                             <tr style="border-bottom: 1px solid gainsboro;">
+                                                <th colspan="6"
+                                                    style="font-weight: normal;">
+                                                    <span style="margin-left: 8%;">
+                                                        <t t-esc="datas['name']"/>
+                                                    </span>
+                                                </th>
                                                 <t t-foreach="data['datas']"
                                                    t-as="values"
                                                    t-key="values_index">
@@ -523,12 +550,6 @@
                                                        t-as="datas"
                                                        t-key="datas_index">
                                                         <t t-if="account_name == datas['name']">
-                                                            <th colspan="6"
-                                                                style="font-weight: normal;">
-                                                                <span style="margin-left: 8%;">
-                                                                    <t t-esc="datas['name']"/>
-                                                                </span>
-                                                            </th>
                                                             <th class="text-end"
                                                                 style="font-weight: normal;">
                                                                 <span>
@@ -581,6 +602,12 @@
                                         </t>
                                         <t t-if="account_value == 1">
                                             <tr style="border-bottom: 1px solid gainsboro;">
+                                                <th colspan="6"
+                                                    style="font-weight: normal;">
+                                                    <span style="margin-left: 8%;">
+                                                        <t t-esc="datas['name']"/>
+                                                    </span>
+                                                </th>
                                                 <t t-foreach="data['datas']"
                                                    t-as="values"
                                                    t-key="values_index">
@@ -588,12 +615,6 @@
                                                        t-as="datas"
                                                        t-key="datas_index">
                                                         <t t-if="account_name == datas['name']">
-                                                            <th colspan="6"
-                                                                style="font-weight: normal;">
-                                                                <span style="margin-left: 8%;">
-                                                                    <t t-esc="datas['name']"/>
-                                                                </span>
-                                                            </th>
                                                             <th class="text-end"
                                                                 style="font-weight: normal;">
                                                                 <span>
@@ -662,6 +683,12 @@
                                         </t>
                                         <t t-if="account_value == 1">
                                             <tr style="border-bottom: 1px solid gainsboro;">
+                                                <th colspan="6"
+                                                    style="font-weight: normal;">
+                                                    <span style="margin-left: 8%;">
+                                                        <t t-esc="datas['name']"/>
+                                                    </span>
+                                                </th>
                                                 <t t-foreach="data['datas']"
                                                    t-as="values"
                                                    t-key="values_index">
@@ -669,12 +696,6 @@
                                                        t-as="datas"
                                                        t-key="datas_index">
                                                         <t t-if="account_name == datas['name']">
-                                                            <th colspan="6"
-                                                                style="font-weight: normal;">
-                                                                <span style="margin-left: 8%;">
-                                                                    <t t-esc="datas['name']"/>
-                                                                </span>
-                                                            </th>
                                                             <th class="text-end"
                                                                 style="font-weight: normal;">
                                                                 <span>
@@ -775,6 +796,12 @@
                                         </t>
                                         <t t-if="account_value == 1">
                                             <tr style="border-bottom: 1px solid gainsboro;">
+                                                <th colspan="6"
+                                                    style="font-weight: normal;">
+                                                    <span style="margin-left: 8%;">
+                                                        <t t-esc="datas['name']"/>
+                                                    </span>
+                                                </th>
                                                 <t t-foreach="data['datas']"
                                                    t-as="values"
                                                    t-key="values_index">
@@ -782,12 +809,6 @@
                                                        t-as="datas"
                                                        t-key="datas_index">
                                                         <t t-if="account_name == datas['name']">
-                                                            <th colspan="6"
-                                                                style="font-weight: normal;">
-                                                                <span style="margin-left: 8%;">
-                                                                    <t t-esc="datas['name']"/>
-                                                                </span>
-                                                            </th>
                                                             <th class="text-end"
                                                                 style="font-weight: normal;">
                                                                 <span>
@@ -856,6 +877,12 @@
                                         </t>
                                         <t t-if="account_value == 1">
                                             <tr style="border-bottom: 1px solid gainsboro;">
+                                                <th colspan="6"
+                                                    style="font-weight: normal;">
+                                                    <span style="margin-left: 8%;">
+                                                        <t t-esc="datas['name']"/>
+                                                    </span>
+                                                </th>
                                                 <t t-foreach="data['datas']"
                                                    t-as="values"
                                                    t-key="values_index">
@@ -863,12 +890,6 @@
                                                        t-as="datas"
                                                        t-key="datas_index">
                                                         <t t-if="account_name == datas['name']">
-                                                            <th colspan="6"
-                                                                style="font-weight: normal;">
-                                                                <span style="margin-left: 8%;">
-                                                                    <t t-esc="datas['name']"/>
-                                                                </span>
-                                                            </th>
                                                             <th class="text-end"
                                                                 style="font-weight: normal;">
                                                                 <span>
diff --git a/dynamic_accounts_report/static/src/css/accounts_report.css b/dynamic_accounts_report/static/src/css/accounts_report.css
index 583bc064c..9e8790356 100644
--- a/dynamic_accounts_report/static/src/css/accounts_report.css
+++ b/dynamic_accounts_report/static/src/css/accounts_report.css
@@ -6,6 +6,6 @@
 	margin-left: 2px;
 	margin-right: 2px;
 }
-
-
-
+html .o_web_client > .o_action_manager {
+         overflow:scroll;
+}
diff --git a/dynamic_accounts_report/static/src/js/tax_report.js b/dynamic_accounts_report/static/src/js/tax_report.js
index 39c712d79..1b08486e8 100644
--- a/dynamic_accounts_report/static/src/js/tax_report.js
+++ b/dynamic_accounts_report/static/src/js/tax_report.js
@@ -82,20 +82,16 @@ class TaxReport extends owl.Component {
             const lastIndex = this.state.date_viewed.length - 1;
             this.state.date_viewed.splice(0, lastIndex);
         }
-        if (val && val.target.name === 'start_date') {
-            this.state.date_viewed = []
-            this.state.date_viewed.push('From' + ' ' + this.formatDate(this.start_date.el.value) + ' ' + 'To' + ' ' + this.formatDate(this.end_date.el.value))
-            this.state.date_range = {
-                ...this.state.date_range,
-                start_date: val.target.value
-            };
-        } else if (val && val.target.name === 'end_date') {
-            this.state.date_viewed = []
-            this.state.date_viewed.push('From' + ' ' + this.formatDate(this.start_date.el.value) + 'To' + ' ' + this.formatDate(this.end_date.el.value))
-            this.state.date_range = {
-                ...this.state.date_range,
-                end_date: val.target.value
-            };
+        if (val.target.name === 'start_date') {
+                this.state.date_range = {
+                    ...this.state.date_range,
+                    start_date: val.target.value
+                };
+        } else if (val.target.name === 'end_date') {
+                this.state.date_range = {
+                    ...this.state.date_range,
+                    end_date: val.target.value
+                };
         } else if (val && val.target.attributes["data-value"].value == 'month') {
             this.start_date.el.value = today.startOf('month').toFormat('yyyy-MM-dd')
             this.end_date.el.value = today.endOf('month').toFormat('yyyy-MM-dd')
diff --git a/dynamic_accounts_report/static/src/js/trial_balance.js b/dynamic_accounts_report/static/src/js/trial_balance.js
index 1a1c37784..cf292bea6 100644
--- a/dynamic_accounts_report/static/src/js/trial_balance.js
+++ b/dynamic_accounts_report/static/src/js/trial_balance.js
@@ -101,16 +101,12 @@ class TrialBalance extends owl.Component {
             }
         }
         else {
-            if (val && val.target.name === 'start_date') {
-                this.state.date_viewed = []
-                this.state.date_viewed.push('From' + ' ' + this.formatDate(this.start_date.el.value) + ' ' + 'To' + ' ' + this.formatDate(this.end_date.el.value))
+            if (val.target.name === 'start_date') {
                 this.state.date_range = {
                     ...this.state.date_range,
                     start_date: val.target.value
                 };
-            } else if (val && val.target.name === 'end_date') {
-                this.state.date_viewed = []
-                this.state.date_viewed.push('From' + ' ' + this.formatDate(this.start_date.el.value) + 'To' + ' ' + this.formatDate(this.end_date.el.value))
+            } else if (val.target.name === 'end_date') {
                 this.state.date_range = {
                     ...this.state.date_range,
                     end_date: val.target.value
diff --git a/dynamic_accounts_report/static/src/xml/aged_payable_report_views.xml b/dynamic_accounts_report/static/src/xml/aged_payable_report_views.xml
index f961280b7..a974a02a3 100644
--- a/dynamic_accounts_report/static/src/xml/aged_payable_report_views.xml
+++ b/dynamic_accounts_report/static/src/xml/aged_payable_report_views.xml
@@ -117,7 +117,7 @@
             </div>
             <br/>
             <div>
-                <div class="table_style" style="height: 650px; overflow-y: scroll;">
+                <div class="table_style">
                     <!-- Table View -->
                     <div class="table_view_gl" style="right:20px;width:100%;"
                          t-ref="table_view_gl">
diff --git a/dynamic_accounts_report/static/src/xml/aged_receivable_report_views.xml b/dynamic_accounts_report/static/src/xml/aged_receivable_report_views.xml
index 79ab902a7..e731c89e6 100644
--- a/dynamic_accounts_report/static/src/xml/aged_receivable_report_views.xml
+++ b/dynamic_accounts_report/static/src/xml/aged_receivable_report_views.xml
@@ -117,7 +117,7 @@
             </div>
             <br/>
             <div>
-                <div class="table_style" style="height: 650px; overflow-y: scroll;">
+                <div class="table_style">
                     <!-- Table View -->
                     <div class="table_view_gl" style="right:20px;width:100%;"
                          t-ref="table_view_gl">
diff --git a/dynamic_accounts_report/static/src/xml/balance_sheet_template.xml b/dynamic_accounts_report/static/src/xml/balance_sheet_template.xml
index 6dabd8819..43b5e6788 100644
--- a/dynamic_accounts_report/static/src/xml/balance_sheet_template.xml
+++ b/dynamic_accounts_report/static/src/xml/balance_sheet_template.xml
@@ -301,7 +301,7 @@
             <br/>
             <div>
                 <!-- Table View -->
-                <div class="table_view_dfr" style="height: 650px; overflow-y: scroll;">
+                <div class="table_view_dfr">
                     <div class="table_main_view">
                         <table cellspacing="0" width="100%">
                             <t t-if="state.data">
@@ -1147,7 +1147,8 @@
                                     <t t-else="">
                                         <tr class="border-bottom border-gainsboro">
                                             <th colspan="9">
-                                                <span class="ms-4">Current Liabilities
+                                                <span class="ms-4">Plus
+                                                    Non-current Assets
                                                 </span>
                                             </th>
                                         </tr>
diff --git a/dynamic_accounts_report/static/src/xml/bank_flow_templates.xml b/dynamic_accounts_report/static/src/xml/bank_flow_templates.xml
index d6bb8724f..f058ba079 100644
--- a/dynamic_accounts_report/static/src/xml/bank_flow_templates.xml
+++ b/dynamic_accounts_report/static/src/xml/bank_flow_templates.xml
@@ -173,7 +173,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="table_style" style="height: 650px; overflow-y: scroll;">
+                <div class="table_style">
                     <div class="table_view_gl" style="right:20px;width:100%"
                          t-ref="table_view_gl">
                         <div>
diff --git a/dynamic_accounts_report/static/src/xml/cash_flow_templates.xml b/dynamic_accounts_report/static/src/xml/cash_flow_templates.xml
index f46152e46..456b3f945 100644
--- a/dynamic_accounts_report/static/src/xml/cash_flow_templates.xml
+++ b/dynamic_accounts_report/static/src/xml/cash_flow_templates.xml
@@ -175,7 +175,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="table_style" style="height: 650px; overflow-y: scroll;">
+                <div class="table_style">
                     <div class="table_view_gl" style="right:20px;width:100%;"
                          t-ref="table_view_gl">
                         <div>
diff --git a/dynamic_accounts_report/static/src/xml/general_ledger_view.xml b/dynamic_accounts_report/static/src/xml/general_ledger_view.xml
index 652e3ec68..8a84f16a1 100644
--- a/dynamic_accounts_report/static/src/xml/general_ledger_view.xml
+++ b/dynamic_accounts_report/static/src/xml/general_ledger_view.xml
@@ -249,7 +249,7 @@
             </div>
             <br/>
             <div>
-                <div class="table_view_gl" style="right:20px;height: 650px; overflow-y: scroll;"
+                <div class="table_view_gl" style="right:20px;"
                      t-ref="table_view_gl">
                     <div>
                         <div class="table_main_view">
diff --git a/dynamic_accounts_report/static/src/xml/partner_ledger_view.xml b/dynamic_accounts_report/static/src/xml/partner_ledger_view.xml
index 4a93f58af..003cf5fa5 100644
--- a/dynamic_accounts_report/static/src/xml/partner_ledger_view.xml
+++ b/dynamic_accounts_report/static/src/xml/partner_ledger_view.xml
@@ -194,7 +194,7 @@
                 </div>
             </div>
             <br/>
-            <div class="table_style" style="height: 650px; overflow-y: scroll;">
+            <div class="table_style">
                 <div class="table_view_pl" style="right:20px;width:100%;"
                      t-ref="table_view_pl">
                     <div>
@@ -218,190 +218,189 @@
                                 </thead>
                                 <!-- Table Body -->
                                 <tbody t-ref="tbody">
-                                        <!-- Iterate over partners -->
-                                        <t t-if="state.partners">
-                                            <t t-set="i" t-value="0"/>
-                                            <t t-foreach="state.partners"
-                                               t-as="partner"
-                                               t-key="partner_index">
-                                                <t t-set="i" t-value="i + 1"/>
-                                                <tr class="border-bottom border-dark border-gainsboro">
-                                                    <th>
-                                                        <div data-bs-toggle="collapse"
-                                                             t-attf-href="#partner-{{i}}"
-                                                             aria-expanded="false"
-                                                             t-attf-aria-controls="partner-{{i}}"
-                                                             class="ms-3 collapsed">
-                                                            <a class="btn header o_heading">
-                                                                <span class="toggle-icon">
-                                                                    <i class="fa fa-caret-down"/>
+                                    <!-- Iterate over partners -->
+                                    <t t-if="state.partners">
+                                        <t t-set="i" t-value="0"/>
+                                        <t t-foreach="state.partners"
+                                           t-as="partner"
+                                           t-key="partner_index">
+                                            <t t-set="i" t-value="i + 1"/>
+                                            <tr class="border-bottom border-dark border-gainsboro">
+                                                <th>
+                                                    <div data-bs-toggle="collapse"
+                                                         t-attf-href="#partner-{{i}}"
+                                                         aria-expanded="false"
+                                                         t-attf-aria-controls="partner-{{i}}"
+                                                         class="ms-3 collapsed">
+                                                        <a class="btn header o_heading">
+                                                            <span class="toggle-icon">
+                                                                <i class="fa fa-caret-down"/>
+                                                            </span>
+                                                            <t t-if="partner != 'false'">
+                                                                <t t-esc="partner"/>
+                                                            </t>
+                                                            <t t-else="">
+                                                                <span>Unknown
+                                                                    Partner
                                                                 </span>
-                                                                <t t-if="partner != 'false'">
-                                                                    <t t-esc="partner"/>
-                                                                </t>
-                                                                <t t-else="">
-                                                                    <span>
-                                                                        Unknown
-                                                                        Partner
-                                                                    </span>
-                                                                </t>
+                                                            </t>
+                                                        </a>
+                                                    </div>
+                                                </th>
+                                                <th colspan="5">
+                                                    <!-- Open Partner Button -->
+                                                    <button t-att-data-id="state.total[partner]['partner_id']"
+                                                            class="o_journal"
+                                                            t-on-click="openPartner">
+                                                        <i class="fa fa-arrow-right"/>
+                                                        Open
+                                                    </button>
+                                                    <!-- Journal Items Button -->
+                                                    <button t-att-data-id="state.total[partner]['partner_id']"
+                                                            class="o_journal"
+                                                            t-on-click="gotoJournalItem">
+                                                        <i class="fa fa-arrow-right"/>
+                                                        Journal Items
+                                                    </button>
+                                                </th>
+                                                <th/>
+                                                <th/>
+                                                <th/>
+                                                <th/>
+                                                <th/>
+                                                <th>
+                                                    <span>
+                                                        <t t-if="state.total[partner]['total_debit']"
+                                                           t-esc="state.total[partner]['currency_id']"/>
+                                                        <t t-if="state.total[partner]['total_debit']"
+                                                           t-esc="state.total[partner]['total_debit']"/>
+                                                    </span>
+                                                </th>
+                                                <th>
+                                                    <span>
+                                                        <t t-if="state.total[partner]['total_credit']"
+                                                           t-esc="state.total[partner]['currency_id']"/>
+                                                        <t t-if="state.total[partner]['total_credit']"
+                                                           t-esc="state.total[partner]['total_credit']"/>
+                                                    </span>
+                                                </th>
+                                                <th/>
+                                                <th>
+                                                    <span class="fw-bolder">
+                                                        <t t-esc="state.total[partner]['currency_id']"/>
+                                                        <t t-esc="(state.total[partner]['total_debit'] - state.total[partner]['total_credit']).toFixed(2)"/>
+                                                    </span>
+                                                </th>
+                                            </tr>
+                                            <!-- Iterate over partner's value list -->
+                                            <t t-foreach="state.data[partner]"
+                                               t-as="valuelist"
+                                               t-key="valuelist_index">
+                                                <t t-log="valuelist"/>
+                                                <tr class="border-bottom border-gainsboro collapse"
+                                                    t-attf-id="partner-{{i}}"
+                                                    t-att-data-id="valuelist[0]['move_id'][0]">
+                                                    <th colspan="6">
+                                                        <span style="gap: 12px;display: flex;">
+                                                            <t t-esc="valuelist[0]['date']"/>
+                                                            <a type="button"
+                                                               class="dropdown-toggle"
+                                                               data-bs-toggle="dropdown">
                                                             </a>
-                                                        </div>
+                                                            <div class="dropdown-menu  journals">
+                                                                <button t-att-data-id="valuelist[0]['move_id'][0]"
+                                                                        type="button"
+                                                                        t-on-click="gotoJournalEntry"
+                                                                        style="border: none;
+                                                                            background-color: inherit;
+                                                                            padding: 4px 8px;
+                                                                            font-size: 16px;
+                                                                            cursor: pointer;
+                                                                            display: inline-block;">
+                                                                    View
+                                                                    Journal
+                                                                    Entry
+                                                                </button>
+                                                                <div role="separator"
+                                                                     class="dropdown-divider"/>
+                                                            </div>
+                                                        </span>
+                                                    </th>
+                                                    <th>
+                                                        <span>
+                                                            <t t-esc="valuelist[0]['jrnl']"/>
+                                                        </span>
                                                     </th>
-                                                    <th colspan="5">
-                                                        <!-- Open Partner Button -->
-                                                        <button t-att-data-id="state.total[partner]['partner_id']"
-                                                                class="o_journal"
-                                                                t-on-click="openPartner">
-                                                            <i class="fa fa-arrow-right"/>
-                                                            Open
-                                                        </button>
-                                                        <!-- Journal Items Button -->
-                                                        <button t-att-data-id="state.total[partner]['partner_id']"
-                                                                class="o_journal"
-                                                                t-on-click="gotoJournalItem">
-                                                            <i class="fa fa-arrow-right"/>
-                                                            Journal Items
-                                                        </button>
+                                                    <th>
+                                                        <span>
+                                                            <t t-esc="valuelist[0]['code']"/>
+                                                        </span>
+                                                    </th>
+                                                    <th>
+                                                        <span>
+                                                            <t t-if="valuelist[0]['move_name']"
+                                                               t-esc="valuelist[0]['move_name']"/>
+                                                        </span>
+                                                    </th>
+                                                    <th>
+                                                        <span>
+                                                            <t t-if="valuelist[0]['date_maturity']"
+                                                               t-esc="valuelist[0]['date_maturity']"/>
+                                                        </span>
                                                     </th>
-                                                    <th/>
-                                                    <th/>
-                                                    <th/>
-                                                    <th/>
-                                                    <th/>
                                                     <th>
                                                         <span>
-                                                            <t t-if="state.total[partner]['total_debit']"
+                                                            <t t-if="valuelist[0]['matching_number']"
+                                                               t-esc="valuelist[0]['matching_number']"/>
+                                                        </span>
+                                                    </th>
+                                                    <th>
+                                                        <span>
+                                                            <t t-if="valuelist[0]['debit']"
                                                                t-esc="state.total[partner]['currency_id']"/>
-                                                            <t t-if="state.total[partner]['total_debit']"
-                                                               t-esc="state.total[partner]['total_debit']"/>
+                                                            <t t-if="valuelist[0]['debit']"
+                                                               t-esc="valuelist[0]['debit']"/>
                                                         </span>
                                                     </th>
                                                     <th>
                                                         <span>
-                                                            <t t-if="state.total[partner]['total_credit']"
+                                                            <t t-if="valuelist[0]['credit']"
                                                                t-esc="state.total[partner]['currency_id']"/>
-                                                            <t t-if="state.total[partner]['total_credit']"
-                                                               t-esc="state.total[partner]['total_credit']"/>
+                                                            <t t-if="valuelist[0]['credit']"
+                                                               t-esc="valuelist[0]['credit']"/>
                                                         </span>
                                                     </th>
-                                                    <th/>
                                                     <th>
-                                                        <span class="fw-bolder">
-                                                            <t t-esc="state.total[partner]['currency_id']"/>
-                                                            <t t-esc="(state.total[partner]['total_debit'] - state.total[partner]['total_credit']).toFixed(2)"/>
+                                                        <span>
+                                                            <t t-if="valuelist[0]['amount_currency']"
+                                                               t-esc="state.total[partner]['currency_id']"/>
+                                                            <t t-if="valuelist[0]['amount_currency']"
+                                                               t-esc="valuelist[0]['amount_currency']"/>
                                                         </span>
                                                     </th>
                                                 </tr>
-                                                <!-- Iterate over partner's value list -->
-                                                <t t-foreach="state.data[partner]"
-                                                   t-as="valuelist"
-                                                   t-key="valuelist_index">
-                                                    <t t-log="valuelist"/>
-                                                    <tr class="border-bottom border-gainsboro collapse"
-                                                        t-attf-id="partner-{{i}}"
-                                                        t-att-data-id="valuelist[0]['move_id'][0]">
-                                                        <th colspan="6">
-                                                            <span style="gap: 12px;display: flex;">
-                                                                <t t-esc="valuelist[0]['date']"/>
-                                                                <a type="button"
-                                                                   class="dropdown-toggle"
-                                                                   data-bs-toggle="dropdown">
-                                                                </a>
-                                                                <div class="dropdown-menu  journals">
-                                                                    <button t-att-data-id="valuelist[0]['move_id'][0]"
-                                                                            type="button"
-                                                                            t-on-click="gotoJournalEntry"
-                                                                            style="border: none;
-                                                                            background-color: inherit;
-                                                                            padding: 4px 8px;
-                                                                            font-size: 16px;
-                                                                            cursor: pointer;
-                                                                            display: inline-block;">
-                                                                        View
-                                                                        Journal
-                                                                        Entry
-                                                                    </button>
-                                                                    <div role="separator"
-                                                                         class="dropdown-divider"/>
-                                                                </div>
-                                                            </span>
-                                                        </th>
-                                                        <th>
-                                                            <span>
-                                                                <t t-esc="valuelist[0]['jrnl']"/>
-                                                            </span>
-                                                        </th>
-                                                        <th>
-                                                            <span>
-                                                                <t t-esc="valuelist[0]['code']"/>
-                                                            </span>
-                                                        </th>
-                                                        <th>
-                                                            <span>
-                                                                <t t-if="valuelist[0]['move_name']"
-                                                                   t-esc="valuelist[0]['move_name']"/>
-                                                            </span>
-                                                        </th>
-                                                        <th>
-                                                            <span>
-                                                                <t t-if="valuelist[0]['date_maturity']"
-                                                                   t-esc="valuelist[0]['date_maturity']"/>
-                                                            </span>
-                                                        </th>
-                                                        <th>
-                                                            <span>
-                                                                <t t-if="valuelist[0]['matching_number']"
-                                                                   t-esc="valuelist[0]['matching_number']"/>
-                                                            </span>
-                                                        </th>
-                                                        <th>
-                                                            <span>
-                                                                <t t-if="valuelist[0]['debit']"
-                                                                   t-esc="state.total[partner]['currency_id']"/>
-                                                                <t t-if="valuelist[0]['debit']"
-                                                                   t-esc="valuelist[0]['debit']"/>
-                                                            </span>
-                                                        </th>
-                                                        <th>
-                                                            <span>
-                                                                <t t-if="valuelist[0]['credit']"
-                                                                   t-esc="state.total[partner]['currency_id']"/>
-                                                                <t t-if="valuelist[0]['credit']"
-                                                                   t-esc="valuelist[0]['credit']"/>
-                                                            </span>
-                                                        </th>
-                                                        <th>
-                                                            <span>
-                                                                <t t-if="valuelist[0]['amount_currency']"
-                                                                   t-esc="state.total[partner]['currency_id']"/>
-                                                                <t t-if="valuelist[0]['amount_currency']"
-                                                                   t-esc="valuelist[0]['amount_currency']"/>
-                                                            </span>
-                                                        </th>
-                                                    </tr>
-                                                </t>
                                             </t>
                                         </t>
-                                        <tr>
-                                            <th/>
-                                            <th colspan="10" class="o_heading">
-                                                Total
-                                            </th>
-                                            <th class="o_heading">
-                                                <t t-esc="state.currency"/>
-                                                <t t-out="state.total_debit"/>
-                                            </th>
-                                            <th class="o_heading">
-                                                <t t-esc="state.currency"/>
-                                                <t t-out="state.total_credit"/>
-                                            </th>
-                                            <th/>
-                                            <th class="o_heading">
-                                                <t t-esc="state.currency"/>
-                                                <t t-out="(state.total_debit - state.total_credit).toFixed(2)"/>
-                                            </th>
-                                        </tr>
+                                    </t>
+                                    <tr>
+                                        <th/>
+                                        <th colspan="10" class="o_heading">
+                                            Total
+                                        </th>
+                                        <th class="o_heading">
+                                            <t t-esc="state.currency"/>
+                                            <t t-out="state.total_debit"/>
+                                        </th>
+                                        <th class="o_heading">
+                                            <t t-esc="state.currency"/>
+                                            <t t-out="state.total_credit"/>
+                                        </th>
+                                        <th/>
+                                        <th class="o_heading">
+                                            <t t-esc="state.currency"/>
+                                            <t t-out="(state.total_debit - state.total_credit).toFixed(2)"/>
+                                        </th>
+                                    </tr>
                                 </tbody>
                             </table>
                         </div>
diff --git a/dynamic_accounts_report/static/src/xml/profit_and_loss_templates.xml b/dynamic_accounts_report/static/src/xml/profit_and_loss_templates.xml
index 017e1b715..f7a0b5de7 100644
--- a/dynamic_accounts_report/static/src/xml/profit_and_loss_templates.xml
+++ b/dynamic_accounts_report/static/src/xml/profit_and_loss_templates.xml
@@ -294,7 +294,7 @@
             </div>
             <br/>
             <div>
-                <div class="table_view_dfr" style="height: 650px; overflow-y: scroll;">
+                <div class="table_view_dfr">
                     <div>
                         <div class="table_main_view">
                             <table cellspacing="0" width="100%">
diff --git a/dynamic_accounts_report/static/src/xml/tax_report_views.xml b/dynamic_accounts_report/static/src/xml/tax_report_views.xml
index 8ffa32ace..dc10e0a9d 100644
--- a/dynamic_accounts_report/static/src/xml/tax_report_views.xml
+++ b/dynamic_accounts_report/static/src/xml/tax_report_views.xml
@@ -248,7 +248,7 @@
             </div>
             <div>
                 <!-- Table View -->
-                <div class="table_view_gl" style="right:20px;height: 650px; overflow-y: scroll;"
+                <div class="table_view_gl" style="right:20px;"
                      t-ref="table_view_gl">
                     <div>
                         <div class="table_main_view">
diff --git a/dynamic_accounts_report/static/src/xml/trial_balance_view.xml b/dynamic_accounts_report/static/src/xml/trial_balance_view.xml
index 7055e5b3d..920d00cd5 100644
--- a/dynamic_accounts_report/static/src/xml/trial_balance_view.xml
+++ b/dynamic_accounts_report/static/src/xml/trial_balance_view.xml
@@ -266,7 +266,7 @@
                     </div>
                 </div>
             </div>
-            <div class="table_style" style="height: 650px; overflow-y: scroll;">
+            <div class="table_style">
                 <!-- Table View -->
                 <div class="table_view_gl" style="right:20px;width:100%;"
                      t-ref="table_view_gl">