From 9ae3c735c38a7526a9ed9a10bc5b5296addf194a Mon Sep 17 00:00:00 2001
From: RisvanaCybro <risvana@cybrosys.info>
Date: Sat, 18 May 2024 15:35:23 +0530
Subject: [PATCH] May 18: [FIX] Bug Fixed 'dynamic_accounts_report'

---
 dynamic_accounts_report/__manifest__.py       |   2 +-
 dynamic_accounts_report/doc/RELEASE_NOTES.md  |   5 -
 .../models/dynamic_balance_sheet_report.py    |   4 +-
 .../report/balance_sheet_report_templates.xml | 186 +++++-----
 .../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 +-
 17 files changed, 284 insertions(+), 301 deletions(-)

diff --git a/dynamic_accounts_report/__manifest__.py b/dynamic_accounts_report/__manifest__.py
index 44e08206e..813126115 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.0',
+    'version': '17.0.1.0.1',
     '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 5e3d79f6d..8ad751f80 100644
--- a/dynamic_accounts_report/doc/RELEASE_NOTES.md
+++ b/dynamic_accounts_report/doc/RELEASE_NOTES.md
@@ -4,8 +4,3 @@
 #### 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/models/dynamic_balance_sheet_report.py b/dynamic_accounts_report/models/dynamic_balance_sheet_report.py
index 23b1bfc9e..d54b9d0bd 100644
--- a/dynamic_accounts_report/models/dynamic_balance_sheet_report.py
+++ b/dynamic_accounts_report/models/dynamic_balance_sheet_report.py
@@ -303,13 +303,13 @@ class ProfitLossReport(models.TransientModel):
                     amount = sum(filtered_lines.mapped('debit')) - sum(
                         filtered_lines.mapped('credit'))
                 entries.append({
-                    'name': "{} - {}".format(account.root_id.id, account.name),
+                    'name': "{} - {}".format(account.code, account.name),
                     'amount': "{:,.2f}".format(amount),
                 })
                 total += amount
             else:
                 entries.append({
-                    'name': "{} - {}".format(account.root_id.id, account.name),
+                    'name': "{} - {}".format(account.code, account.name),
                     'amount': "{:,.2f}".format(0),
                 })
         return entries, "{:,.2f}".format(total)
diff --git a/dynamic_accounts_report/report/balance_sheet_report_templates.xml b/dynamic_accounts_report/report/balance_sheet_report_templates.xml
index 339474cdb..73c7744c7 100644
--- a/dynamic_accounts_report/report/balance_sheet_report_templates.xml
+++ b/dynamic_accounts_report/report/balance_sheet_report_templates.xml
@@ -6,6 +6,7 @@
     <template id="dynamic_accounts_report.balance_sheet">
         <t t-call="web.html_container">
             <t t-call="web.external_layout">
+
                 <t t-set="data_report_dpi" t-value="110"/>
                 <div class="page">
                     <h3>
@@ -73,54 +74,33 @@
                                     </th>
                                 </t>
                             </tr>
-                            <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'][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="values"
-                                           t-key="values_index">
+                                           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']">
-                                                    <t t-if="datas['amount'] != '0.00'">
-                                                        <t t-set="account_value"
-                                                           t-value="1"/>
-                                                    </t>
+                                               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>
                                             </t>
                                         </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">
-                                                    <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>
+                                    </tr>
                                 </t>
                             </t>
                             <tr style="border-bottom: 1px solid gainsboro;">
@@ -161,12 +141,6 @@
                                         </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">
@@ -174,6 +148,12 @@
                                                        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>
@@ -227,12 +207,6 @@
                                         </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">
@@ -240,6 +214,12 @@
                                                        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>
@@ -292,12 +272,6 @@
                                         </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">
@@ -305,6 +279,12 @@
                                                        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>
@@ -373,12 +353,6 @@
                                         </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">
@@ -386,6 +360,12 @@
                                                        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>
@@ -439,12 +419,6 @@
                                         </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">
@@ -452,6 +426,12 @@
                                                        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>
@@ -536,12 +516,6 @@
                                         </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">
@@ -549,6 +523,12 @@
                                                        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>
@@ -601,12 +581,6 @@
                                         </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">
@@ -614,6 +588,12 @@
                                                        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>
@@ -682,12 +662,6 @@
                                         </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">
@@ -695,6 +669,12 @@
                                                        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>
@@ -795,12 +775,6 @@
                                         </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">
@@ -808,6 +782,12 @@
                                                        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>
@@ -876,12 +856,6 @@
                                         </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">
@@ -889,6 +863,12 @@
                                                        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 9e8790356..583bc064c 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 1b08486e8..39c712d79 100644
--- a/dynamic_accounts_report/static/src/js/tax_report.js
+++ b/dynamic_accounts_report/static/src/js/tax_report.js
@@ -82,16 +82,20 @@ class TaxReport extends owl.Component {
             const lastIndex = this.state.date_viewed.length - 1;
             this.state.date_viewed.splice(0, lastIndex);
         }
-        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
-                };
+        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
+            };
         } 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 cf292bea6..1a1c37784 100644
--- a/dynamic_accounts_report/static/src/js/trial_balance.js
+++ b/dynamic_accounts_report/static/src/js/trial_balance.js
@@ -101,12 +101,16 @@ class TrialBalance extends owl.Component {
             }
         }
         else {
-            if (val.target.name === 'start_date') {
+            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.target.name === 'end_date') {
+            } 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
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 a974a02a3..f961280b7 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">
+                <div class="table_style" style="height: 650px; overflow-y: scroll;">
                     <!-- 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 e731c89e6..79ab902a7 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">
+                <div class="table_style" style="height: 650px; overflow-y: scroll;">
                     <!-- 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 43b5e6788..6dabd8819 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">
+                <div class="table_view_dfr" style="height: 650px; overflow-y: scroll;">
                     <div class="table_main_view">
                         <table cellspacing="0" width="100%">
                             <t t-if="state.data">
@@ -1147,8 +1147,7 @@
                                     <t t-else="">
                                         <tr class="border-bottom border-gainsboro">
                                             <th colspan="9">
-                                                <span class="ms-4">Plus
-                                                    Non-current Assets
+                                                <span class="ms-4">Current Liabilities
                                                 </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 f058ba079..d6bb8724f 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">
+                <div class="table_style" style="height: 650px; overflow-y: scroll;">
                     <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 456b3f945..f46152e46 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">
+                <div class="table_style" style="height: 650px; overflow-y: scroll;">
                     <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 8a84f16a1..652e3ec68 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;"
+                <div class="table_view_gl" style="right:20px;height: 650px; overflow-y: scroll;"
                      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 003cf5fa5..4a93f58af 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">
+            <div class="table_style" style="height: 650px; overflow-y: scroll;">
                 <div class="table_view_pl" style="right:20px;width:100%;"
                      t-ref="table_view_pl">
                     <div>
@@ -218,189 +218,190 @@
                                 </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"/>
-                                                            </span>
-                                                            <t t-if="partner != 'false'">
-                                                                <t t-esc="partner"/>
-                                                            </t>
-                                                            <t t-else="">
-                                                                <span>Unknown
-                                                                    Partner
+                                        <!-- 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>
-                                                        </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">
+                                                                <t t-if="partner != 'false'">
+                                                                    <t t-esc="partner"/>
+                                                                </t>
+                                                                <t t-else="">
+                                                                    <span>
+                                                                        Unknown
+                                                                        Partner
+                                                                    </span>
+                                                                </t>
                                                             </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>
+                                                        </div>
                                                     </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 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="valuelist[0]['matching_number']"
-                                                               t-esc="valuelist[0]['matching_number']"/>
-                                                        </span>
-                                                    </th>
-                                                    <th>
-                                                        <span>
-                                                            <t t-if="valuelist[0]['debit']"
+                                                            <t t-if="state.total[partner]['total_debit']"
                                                                t-esc="state.total[partner]['currency_id']"/>
-                                                            <t t-if="valuelist[0]['debit']"
-                                                               t-esc="valuelist[0]['debit']"/>
+                                                            <t t-if="state.total[partner]['total_debit']"
+                                                               t-esc="state.total[partner]['total_debit']"/>
                                                         </span>
                                                     </th>
                                                     <th>
                                                         <span>
-                                                            <t t-if="valuelist[0]['credit']"
+                                                            <t t-if="state.total[partner]['total_credit']"
                                                                t-esc="state.total[partner]['currency_id']"/>
-                                                            <t t-if="valuelist[0]['credit']"
-                                                               t-esc="valuelist[0]['credit']"/>
+                                                            <t t-if="state.total[partner]['total_credit']"
+                                                               t-esc="state.total[partner]['total_credit']"/>
                                                         </span>
                                                     </th>
+                                                    <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 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 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>
-                                    </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>
+                                        <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 f7a0b5de7..017e1b715 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">
+                <div class="table_view_dfr" style="height: 650px; overflow-y: scroll;">
                     <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 dc10e0a9d..8ffa32ace 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;"
+                <div class="table_view_gl" style="right:20px;height: 650px; overflow-y: scroll;"
                      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 920d00cd5..7055e5b3d 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">
+            <div class="table_style" style="height: 650px; overflow-y: scroll;">
                 <!-- Table View -->
                 <div class="table_view_gl" style="right:20px;width:100%;"
                      t-ref="table_view_gl">