odoo-addon-account-financial-report 15.0.1.1.0.1__py3-none-any.whl → 18.0.1.4.4.3__py3-none-any.whl

odoo/addons/account_financial_report/report/templates/general_ledger.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <template id="general_ledger">
-        <t t-call="web.html_container">
+        <t t-call="account_financial_report.html_container">
             <t t-foreach="docs" t-as="o">
                 <t t-call="account_financial_report.internal_layout">
                     <t t-call="account_financial_report.report_general_ledger_base" />
@@ -16,15 +16,15 @@
         <!-- Defines global variables used by internal layout -->
         <t t-set="title">
             General Ledger -
-            <t t-raw="company_name" />
+            <t t-out="company_name" />
             -
-            <t t-raw="currency_name" />
+            <t t-out="currency_name" />
         </t>
         <div class="page">
             <div class="row">
                 <h4
                     class="mt0"
-                    t-esc="title or 'Odoo Report'"
+                    t-out="title or 'Odoo Report'"
                     style="text-align: center;"
                 />
             </div>
@@ -35,48 +35,42 @@
                     <!-- Display account header -->
                     <div class="act_as_table list_table" style="margin-top: 10px;" />
                     <div class="act_as_caption account_title" style="width: 100%">
-                        <span
-                            t-esc="o._get_atr_from_dict(account['id'], accounts_data, 'code')"
-                        />
+                        <span t-out="account['code']" />
                         -
-                        <span
-                            t-esc="o._get_atr_from_dict(account['id'], accounts_data, 'name')"
-                        />
+                        <span t-out="account['name']" />
                     </div>
-                    <t t-if="not account['partners']">
+                    <t t-if="'list_grouped' not in account">
                         <!-- Display account move lines without partner regroup -->
                         <t t-set="type" t-value='"account_type"' />
                         <t
                             t-call="account_financial_report.report_general_ledger_lines"
                         >
-                            <t t-set="account_or_partner_object" t-value="account" />
+                            <t t-set="account_or_group_item_object" t-value="account" />
                         </t>
                         <!-- Display account footer -->
                         <t
                             t-call="account_financial_report.report_general_ledger_ending_cumul"
                         >
-                            <t t-set="account_or_partner_object" t-value="account" />
+                            <t t-set="account_or_group_item_object" t-value="account" />
                             <t t-set="type" t-value='"account_type"' />
                         </t>
                     </t>
-                    <t t-if="account['partners']">
+                    <t t-if="'list_grouped' in account">
                         <!-- Display account partners -->
-                        <t t-foreach="account['list_partner']" t-as="partner">
-                            <t t-set="type" t-value='"partner_type"' />
+                        <t t-foreach="account['list_grouped']" t-as="group_item">
+                            <t t-set="type" t-value='"grouped_type"' />
                             <div class="page_break">
                                 <!-- Display partner header -->
                                 <div class="act_as_caption account_title">
-                                    <span
-                                        t-esc="o._get_atr_from_dict(partner['id'], partners_data, 'name')"
-                                    />
+                                    <span t-out="group_item['name']" />
                                 </div>
                                 <!-- Display partner move lines -->
                                 <t
                                     t-call="account_financial_report.report_general_ledger_lines"
                                 >
                                     <t
-                                        t-set="account_or_partner_object"
-                                        t-value="partner"
+                                        t-set="account_or_group_item_object"
+                                        t-value="group_item"
                                     />
                                 </t>
                                 <!-- Display partner footer -->
@@ -84,10 +78,10 @@
                                     t-call="account_financial_report.report_general_ledger_ending_cumul"
                                 >
                                     <t
-                                        t-set="account_or_partner_object"
-                                        t-value="partner"
+                                        t-set="account_or_group_item_object"
+                                        t-value="group_item"
                                     />
-                                    <t t-set="type" t-value='"partner_type"' />
+                                    <t t-set="type" t-value='"grouped_type"' />
                                 </t>
                             </div>
                         </t>
@@ -97,7 +91,7 @@
                                 t-call="account_financial_report.report_general_ledger_ending_cumul"
                             >
                                 <t
-                                    t-set="account_or_partner_object"
+                                    t-set="account_or_group_item_object"
                                     t-value="account"
                                 />
                                 <t t-set="type" t-value='"account_type"' />
@@ -115,14 +109,13 @@
                 <div class="act_as_cell">Target moves filter</div>
                 <div class="act_as_cell">Account balance at 0 filter</div>
                 <div class="act_as_cell">Centralize filter</div>
-                <div class="act_as_cell">Show analytic tags</div>
             </div>
             <div class="act_as_row">
                 <div class="act_as_cell">
                     From:
-                    <span t-esc="date_from" />
+                    <span t-out="date_from" />
                     To:
-                    <span t-esc="date_to" />
+                    <span t-out="date_to" />
                 </div>
                 <div class="act_as_cell">
                     <t t-if="only_posted_moves">All posted entries</t>
@@ -136,10 +129,6 @@
                     <t t-if="centralize">Yes</t>
                     <t t-if="not centralize">No</t>
                 </div>
-                <div class="act_as_cell">
-                    <t t-if="show_analytic_tags">Yes</t>
-                    <t t-if="not show_analytic_tags">No</t>
-                </div>
             </div>
         </div>
     </template>
@@ -170,7 +159,7 @@
                     <t t-if="show_cost_center">
                         <!--## cost_center-->
                         <div class="act_as_cell" style="width: 8.03%;">
-                            Analytic Account
+                            Analytic Distribution
                         </div>
                     </t>
                     <t t-if="show_analytic_tags">
@@ -188,11 +177,14 @@
                         Cumul. Bal.
                     </div>
                     <t t-if="foreign_currency">
-                        <!--## currency_name-->
-                        <div class="act_as_cell" style="width: 2.08%;">Cur.</div>
                         <!--## amount_currency-->
-                        <div class="act_as_cell amount" style="width: 5.19%;">
-                            Amount cur.
+                        <div
+                            class="act_as_cell amount"
+                            style="width: 3.63%;"
+                        >Amount cur.
+                        </div>
+                        <!--## amount_currency cumulated-->
+                        <div class="act_as_cell amount" style="width: 3.63%;">Cumul cur.
                         </div>
                     </t>
                 </div>
@@ -212,7 +204,13 @@
                 <!--## partner-->
                 <div class="act_as_cell" />
                 <!--## ref - label-->
-                <div class="act_as_cell amount">Initial balance</div>
+                <div class="act_as_cell amount">
+                    <t t-if='type == "account_type"'>Initial balance</t>
+                    <t t-if='type == "grouped_type"'>
+                        <t t-if="'partners' in account">Partner initial balance</t>
+                        <t t-if="'taxes' in account">Tax initial balance</t>
+                    </t>
+                </div>
                 <t t-if="show_cost_center">
                     <!--## cost_center-->
                     <div class="act_as_cell" />
@@ -223,66 +221,64 @@
                 </t>
                 <!--## matching_number-->
                 <div class="act_as_cell" />
+                <t
+                    t-set="misc_domain"
+                    t-value="[('account_id', '=', account['id']),('date', '&lt;', date_from)]"
+                />
+                <t
+                    t-set="misc_grouped_domain"
+                    t-value="[('partner_id', '=', account_or_group_item_object['id'])]"
+                    t-if="'partners' in account"
+                />
+                <t t-set="misc_grouped_domain" t-value="[]" t-else="" />
                 <!--## debit-->
                 <div class="act_as_cell amount">
+                    <t t-set="debit_domain" t-value="[('debit', '&lt;&gt;', 0)]" />
                     <t t-if="type == 'account_type'">
-                        <t
-                            t-set="domain"
-                            t-value="[('account_id', '=', account['id']),
-                                     ('date', '&lt;', date_from),
-                                     ('debit', '&lt;&gt;', 0)]"
-                        />
-                        <span t-att-domain="domain" res-model="account.move.line">
+                        <span
+                            t-att-domain="misc_domain+debit_domain"
+                            res-model="account.move.line"
+                        >
                             <t
-                                t-raw="account_or_partner_object['init_bal']['debit']"
-                                t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
+                                t-out="account_or_group_item_object['init_bal']['debit']"
+                                t-options="{'widget': 'monetary', 'display_currency': company_currency}"
                             />
                         </span>
                     </t>
-                    <t t-if="type == 'partner_type'">
-                        <t
-                            t-set="domain"
-                            t-value="[('account_id', '=', account['id']),
-                                     ('partner_id', '=', partner['id']),
-                                     ('date', '&lt;', date_from),
-                                     ('debit', '&lt;&gt;', 0)]"
-                        />
-                        <span t-att-domain="domain" res-model="account.move.line">
+                    <t t-if="type == 'grouped_type'">
+                        <span
+                            t-att-domain="misc_domain+debit_domain+misc_grouped_domain"
+                            res-model="account.move.line"
+                        >
                             <t
-                                t-raw="account_or_partner_object['init_bal']['debit']"
-                                t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
+                                t-out="account_or_group_item_object['init_bal']['debit']"
+                                t-options="{'widget': 'monetary', 'display_currency': company_currency}"
                             />
                         </span>
                     </t>
                 </div>
                 <!--## credit-->
                 <div class="act_as_cell amount">
+                    <t t-set="credit_domain" t-value="[('credit', '&lt;&gt;', 0)]" />
                     <t t-if="type == 'account_type'">
-                        <t
-                            t-set="domain"
-                            t-value="[('account_id', '=',  account['id']),
-                                     ('date', '&lt;', date_from),
-                                     ('credit', '&lt;&gt;', 0)]"
-                        />
-                        <span t-att-domain="domain" res-model="account.move.line">
+                        <span
+                            t-att-domain="misc_domain+credit_domain"
+                            res-model="account.move.line"
+                        >
                             <t
-                                t-raw="account_or_partner_object['init_bal']['credit']"
-                                t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
+                                t-out="account_or_group_item_object['init_bal']['credit']"
+                                t-options="{'widget': 'monetary', 'display_currency': company_currency}"
                             />
                         </span>
                     </t>
-                    <t t-if="type == 'partner_type'">
-                        <t
-                            t-set="domain"
-                            t-value="[('account_id', '=', account['id']),
-                                     ('partner_id', '=', partner['id']),
-                                     ('date', '&lt;', date_from),
-                                     ('credit', '&lt;&gt;', 0)]"
-                        />
-                        <span t-att-domain="domain" res-model="account.move.line">
+                    <t t-if="type == 'grouped_type'">
+                        <span
+                            t-att-domain="misc_domain+credit_domain+misc_grouped_domain"
+                            res-model="account.move.line"
+                        >
                             <t
-                                t-raw="account_or_partner_object['init_bal']['credit']"
-                                t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
+                                t-out="account_or_group_item_object['init_bal']['credit']"
+                                t-options="{'widget': 'monetary', 'display_currency': company_currency}"
                             />
                         </span>
                     </t>
@@ -290,88 +286,89 @@
                 <!--## balance cumulated-->
                 <div class="act_as_cell amount">
                     <t t-if="type == 'account_type'">
-                        <t
-                            t-set="domain"
-                            t-value="[('account_id', '=', account['id']),
-                                     ('date', '&lt;', date_from)]"
-                        />
-                        <span t-att-domain="domain" res-model="account.move.line">
+                        <span t-att-domain="misc_domain" res-model="account.move.line">
                             <t
-                                t-raw="account_or_partner_object['init_bal']['balance']"
-                                t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
+                                t-out="account_or_group_item_object['init_bal']['balance']"
+                                t-options="{'widget': 'monetary', 'display_currency': company_currency}"
                             />
                         </span>
                     </t>
-                    <t t-if="type == 'partner_type'">
-                        <t
-                            t-set="domain"
-                            t-value="[('account_id', '=', account['id']),
-                                     ('partner_id', '=', partner['id']),
-                                     ('date', '&lt;', date_from)]"
-                        />
-                        <span t-att-domain="domain" res-model="account.move.line">
+                    <t t-if="type == 'grouped_type'">
+                        <span
+                            t-att-domain="misc_domain+misc_grouped_domain"
+                            res-model="account.move.line"
+                        >
                             <t
-                                t-raw="account_or_partner_object['init_bal']['balance']"
-                                t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
+                                t-out="account_or_group_item_object['init_bal']['balance']"
+                                t-options="{'widget': 'monetary', 'display_currency': company_currency}"
                             />
                         </span>
                     </t>
                 </div>
                 <t t-if="foreign_currency">
-                    <t
-                        t-if="o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')"
-                    >
-                        <div class="act_as_cell amount" style="width: 2.08%;">
-                            <span
-                                t-esc="o._get_atr_from_dict(account['id'], accounts_data, 'currency_name')"
-                            />
+                    <t t-if="account['currency_id']">
+                        <t
+                            t-set="account_currency"
+                            t-value="currency_model.browse(account['currency_id'])"
+                        />
+                        <div class="act_as_cell amount" style="width: 3.63%;">
+                            <t t-if="type == 'account_type'">
+                                <span
+                                    t-att-domain="misc_domain"
+                                    res-model="account.move.line"
+                                >
+                                    <t
+                                        t-out="account_or_group_item_object['init_bal']['bal_curr']"
+                                        t-options="{'widget': 'monetary', 'display_currency': account_currency}"
+                                    />
+                                </span>
+                            </t>
+                            <t t-if="type == 'grouped_type'">
+                                <span
+                                    t-att-domain="misc_domain+misc_grouped_domain"
+                                    res-model="account.move.line"
+                                >
+                                    <t
+                                        t-out="account_or_group_item_object['init_bal']['bal_curr']"
+                                        t-options="{'widget': 'monetary', 'display_currency': account_currency}"
+                                    />
+                                </span>
+                            </t>
                         </div>
-                        <div class="act_as_cell amount" style="width: 5.19%;">
+                        <div class="act_as_cell amount" style="width: 3.63%;">
                             <t t-if="type == 'account_type'">
-                                <t
-                                    t-set="domain"
-                                    t-value="[('account_id', '=', account['id']),
-                                             ('date', '&lt;', o.date_from)]"
-                                />
                                 <span
-                                    t-att-domain="domain"
+                                    t-att-domain="misc_domain"
                                     res-model="account.move.line"
                                 >
                                     <t
-                                        t-raw="account_or_partner_object['init_bal']['bal_curr']"
-                                        t-options="{'widget': 'monetary', 'display_currency': o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')}"
+                                        t-out="account_or_group_item_object['init_bal']['bal_curr']"
+                                        t-options="{'widget': 'monetary', 'display_currency': account_currency}"
                                     />
                                 </span>
                             </t>
-                            <t t-if="type == 'partner_type'">
-                                <t
-                                    t-set="domain"
-                                    t-value="[('account_id', '=', account['id']),
-                                             ('partner_id', '=', partner['id']),
-                                             ('date', '&lt;', o.date_from)]"
-                                />
+                            <t t-if="type == 'grouped_type'">
                                 <span
-                                    t-att-domain="domain"
+                                    t-att-domain="misc_domain+misc_grouped_domain"
                                     res-model="account.move.line"
                                 >
                                     <t
-                                        t-raw="account_or_partner_object['init_bal']['bal_curr']"
-                                        t-options="{'widget': 'monetary', 'display_currency': o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')}"
+                                        t-out="account_or_group_item_object['init_bal']['bal_curr']"
+                                        t-options="{'widget': 'monetary', 'display_currency': account_currency}"
                                     />
                                 </span>
                             </t>
                         </div>
                     </t>
-                    <t
-                        t-if="not o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')"
-                    >
-                        <div class="act_as_cell" style="width: 2.08%;" />
-                        <div class="act_as_cell" style="width: 5.19%;" />
+                    <t t-if="not account['currency_id']">
+                        <div class="act_as_cell" style="width: 3.63%;" />
+                        <div class="act_as_cell" style="width: 3.63%;" />
                     </t>
                 </t>
             </div>
             <!-- Display each lines -->
-            <t t-foreach="account_or_partner_object['move_lines']" t-as="line">
+            <t t-set="total_bal_curr" t-value="0" />
+            <t t-foreach="account_or_group_item_object['move_lines']" t-as="line">
                 <!-- # lines or centralized lines -->
                 <div class="act_as_row lines">
                     <!--## date-->
@@ -384,7 +381,7 @@
                                 view-type="form"
                             >
                                 <t
-                                    t-esc="line['date']"
+                                    t-out="line['date']"
                                     t-options="{'widget': 'date'}"
                                 />
                             </span>
@@ -393,7 +390,7 @@
                             <span>
                                 <!--## We don't use t-field because it throws an error on click -->
                                 <t
-                                    t-esc="line['date']"
+                                    t-out="line['date']"
                                     t-options="{'widget': 'date'}"
                                 />
                             </span>
@@ -407,7 +404,7 @@
                                 res-model="account.move"
                                 view-type="form"
                             >
-                                <t t-raw="line['entry']" />
+                                <t t-out="line['entry']" />
                             </span>
                         </t>
                     </div>
@@ -419,7 +416,7 @@
                             view-type="form"
                         >
                             <t
-                                t-raw="o._get_atr_from_dict(line['journal_id'], journals_data, 'code')"
+                                t-out="o._get_atr_from_dict(line['journal_id'], journals_data, 'code')"
                             />
                         </span>
                     </div>
@@ -430,9 +427,7 @@
                             res-model="account.account"
                             view-type="form"
                         >
-                            <t
-                                t-raw="o._get_atr_from_dict(account['id'], accounts_data, 'code')"
-                            />
+                            <t t-out="account['code']" />
                         </span>
                     </div>
                     <!--## taxes-->
@@ -440,10 +435,13 @@
                         <t t-if="taxes_data and line['tax_ids']">
                             <t t-foreach="line['tax_ids']" t-as="tax_id">
                                 <span
-                                    t-esc="o._get_atr_from_dict(tax_id, taxes_data, 'tax_name')"
+                                    t-out="o._get_atr_from_dict(tax_id, taxes_data, 'tax_name')"
                                 />
                             </t>
                         </t>
+                        <t t-if="line['tax_line_id']">
+                            <span t-out="line['tax_line_id'][1]" />
+                        </t>
                     </div>
                     <!--## partner-->
                     <div class="act_as_cell left">
@@ -453,7 +451,7 @@
                                 res-model="res.partner"
                                 view-type="form"
                             >
-                                <t t-raw="line['partner_name']" />
+                                <t t-out="line['partner_name']" />
                             </span>
                         </t>
                     </div>
@@ -465,26 +463,49 @@
                                 res-model="account.move.line"
                                 view-type="form"
                             >
-                                <t t-raw="line['ref_label']" />
+                                <t
+                                    t-out="limit_text(line['ref_label'], 'label_text_limit')"
+                                />
                             </span>
                         </t>
                         <t t-else="">
                             <span>
-                                <t t-raw="line['ref_label']" />
+                                <t
+                                    t-out="limit_text(line['ref_label'], 'label_text_limit')"
+                                />
                             </span>
                         </t>
                     </div>
                     <!--## cost_center-->
                     <t t-if="show_cost_center">
                         <div class="act_as_cell left">
-                            <t t-if="line['analytic_account_id']">
-                                <span
-                                    t-att-res-id="line['analytic_account_id']"
-                                    res-model="account.analytic.account"
-                                    view-type="form"
-                                >
-                                    <t t-raw="line['analytic_account']" />
-                                </span>
+                            <t
+                                t-foreach="line['analytic_distribution']"
+                                t-as="analytic_id"
+                            >
+                                <div>
+                                    <t
+                                        t-foreach="analytic_id.split(',')"
+                                        t-as="analytic_account_id"
+                                    >
+                                        <span
+                                            t-att-res-id="analytic_account_id"
+                                            res-model="account.analytic.account"
+                                            view-type="form"
+                                        >
+                                            <t
+                                                t-out="o._get_atr_from_dict(int(analytic_account_id), analytic_data, 'name')"
+                                            />
+                                            <t
+                                                t-if="int(line['analytic_distribution'][analytic_id]) &lt; 100"
+                                            >
+                                                <t
+                                                t-out="int(line['analytic_distribution'][analytic_id])"
+                                            />%
+                                            </t>
+                                        </span>
+                                    </t>
+                                </div>
                             </t>
                         </div>
                     </t>
@@ -494,7 +515,7 @@
                             <t t-if="line['tag_ids']">
                                 <t t-foreach="line['tag_ids']" t-as="tag_id">
                                     <span
-                                        t-esc="o._get_atr_from_dict(tag_id, tags_data, 'name')"
+                                        t-out="o._get_atr_from_dict(tag_id, tags_data, 'name')"
                                     />
                                 </t>
                             </t>
@@ -508,7 +529,7 @@
                                 res-model="account.full.reconcile"
                                 view-type="form"
                             >
-                                <t t-raw="line['rec_name']" />
+                                <t t-out="line['rec_name']" />
                             </span>
                         </t>
                     </div>
@@ -521,7 +542,7 @@
                                 view-type="form"
                             >
                                 <t
-                                    t-raw="line['debit']"
+                                    t-out="line['debit']"
                                     t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
                                 />
                             </span>
@@ -529,7 +550,7 @@
                         <t t-else="">
                             <span>
                                 <t
-                                    t-raw="line['debit']"
+                                    t-out="line['debit']"
                                     t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
                                 />
                             </span>
@@ -544,7 +565,7 @@
                                 view-type="form"
                             >
                                 <t
-                                    t-raw="line['credit']"
+                                    t-out="line['credit']"
                                     t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
                                 />
                             </span>
@@ -552,7 +573,7 @@
                         <t t-else="">
                             <span>
                                 <t
-                                    t-raw="line['credit']"
+                                    t-out="line['credit']"
                                     t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
                                 />
                             </span>
@@ -567,7 +588,7 @@
                                 view-type="form"
                             >
                                 <t
-                                    t-raw="line['balance']"
+                                    t-out="line['balance']"
                                     t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
                                 />
                             </span>
@@ -575,7 +596,7 @@
                         <t t-else="">
                             <span>
                                 <t
-                                    t-raw="line['balance']"
+                                    t-out="line['balance']"
                                     t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
                                 />
                             </span>
@@ -583,26 +604,43 @@
                     </div>
                     <t t-if="foreign_currency">
                         <t t-if="line['currency_id']">
-                            <!--## currency_name-->
-                            <div class="act_as_cell amount" style="width: 2.08%;">
-                                <span t-esc="line['currency_id'][1]" />
-                            </div>
+                            <t
+                                t-set="line_currency"
+                                t-value="currency_model.browse(line['currency_id'][0])"
+                            />
+                            <t
+                                t-set="total_bal_curr"
+                                t-value="total_bal_curr + line['bal_curr']"
+                                t-if="line_currency!=company_currency"
+                            />
                             <!--## amount_currency-->
-                            <div class="act_as_cell amount" style="width: 5.19%;">
+                            <div class="act_as_cell amount" style="width: 3.63%;">
                                 <span
                                     t-att-res-id="line['id']"
                                     res-model="account.move.line"
                                     view-type="form"
-                                >
-                                    <t t-raw="line['bal_curr']" />
-                                </span>
+                                    t-out="line['bal_curr']"
+                                    t-options="{'widget': 'monetary', 'display_currency': line_currency}"
+                                    t-if="line_currency!=company_currency"
+                                />
+                            </div>
+                            <!--## amount_currency cumulated-->
+                            <div class="act_as_cell amount" style="width: 3.63%;">
+                                <span
+                                    t-att-res-id="line['id']"
+                                    res-model="account.move.line"
+                                    view-type="form"
+                                    t-out="total_bal_curr"
+                                    t-options="{'widget': 'monetary', 'display_currency': line_currency}"
+                                    t-if="line_currency!=company_currency"
+                                />
                             </div>
                         </t>
                         <t t-if="not line['currency_id']">
-                            <!--## currency_name-->
-                            <div class="act_as_cell amount" style="width: 2.08%;" />
                             <!--## amount_currency-->
-                            <div class="act_as_cell amount" style="width: 5.19%;" />
+                            <div class="act_as_cell amount" style="width: 3.63%;" />
+                            <!--## amount_currency cumulated-->
+                            <div class="act_as_cell amount" style="width: 3.63%;" />
                         </t>
                     </t>
                 </div>
@@ -616,22 +654,18 @@
                 <!--## date-->
                 <t t-if='type == "account_type"'>
                     <div class="act_as_cell first_column" style="width: 41.32%;">
-                        <span
-                            t-esc="o._get_atr_from_dict(account['id'], accounts_data, 'code')"
-                        />
+                        <span t-out="account['code']" />
                         -
-                        <span
-                            t-esc="o._get_atr_from_dict(account['id'], accounts_data, 'name')"
-                        />
+                        <span t-out="account['name']" />
                     </div>
-                    <div class="act_as_cell right" style="width: 16.9%;">
-                        Ending balance
+                    <div class="act_as_cell right" style="width: 16.9%;">Ending balance
                     </div>
                 </t>
-                <t t-if='type == "partner_type"'>
+                <t t-if='type == "grouped_type"'>
                     <div class="act_as_cell first_column" style="width: 41.32%;" />
                     <div class="act_as_cell right" style="width: 16.9%;">
-                        Partner ending balance
+                        <t t-if="'partners' in account">Partner ending balance</t>
+                        <t t-if="'taxes' in account">Tax ending balance</t>
                     </div>
                 </t>
                 <t t-if="show_cost_center">
@@ -647,83 +681,109 @@
                 <!--## debit-->
                 <div class="act_as_cell amount" style="width: 8.02%;">
                     <span
-                        t-esc="account_or_partner_object['fin_bal']['debit']"
-                        t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
+                        t-out="account_or_group_item_object['fin_bal']['debit']"
+                        t-options="{'widget': 'monetary', 'display_currency': company_currency}"
                     />
                 </div>
                 <!--## credit-->
                 <div class="act_as_cell amount" style="width: 8.02%;">
                     <span
-                        t-esc="account_or_partner_object['fin_bal']['credit']"
-                        t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
+                        t-out="account_or_group_item_object['fin_bal']['credit']"
+                        t-options="{'widget': 'monetary', 'display_currency': company_currency}"
                     />
                 </div>
                 <!--## balance cumulated-->
                 <div class="act_as_cell amount" style="width: 8.02%;">
                     <span
-                        t-esc="account_or_partner_object['fin_bal']['balance']"
-                        t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
+                        t-out="account_or_group_item_object['fin_bal']['balance']"
+                        t-options="{'widget': 'monetary', 'display_currency': company_currency}"
                     />
                 </div>
                 <!--## currency_name + amount_currency-->
+                <t
+                    t-set="misc_domain"
+                    t-value="[('account_id', '=', account['id']),('date', '&lt;', date_from)]"
+                />
+                <t
+                    t-set="misc_grouped_domain"
+                    t-value="[('partner_id', '=', account_or_group_item_object['id'])]"
+                    t-if="'partners' in account"
+                />
+                <t t-set="misc_grouped_domain" t-value="[]" t-else="" />
                 <t t-if="foreign_currency">
-                    <t
-                        t-if="o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')"
-                    >
-                        <div class="act_as_cell amount" style="width: 2.08%;">
-                            <span
-                                t-esc="o._get_atr_from_dict(account['id'], accounts_data, 'currency_name')"
-                            />
+                    <t t-if="account['fin_bal_currency_id']">
+                        <t
+                            t-set="account_currency"
+                            t-value="currency_model.browse(account['fin_bal_currency_id'])"
+                        />
+                        <div class="act_as_cell amount" style="width: 3.63%;">
+                            <t t-if="type == 'account_type'">
+                                <span>
+                                    <a
+                                        t-att-data-t-att-domain="misc_domain"
+                                        t-att-data-res-model="'account.move.line'"
+                                        class="o_account_financial_reports_web_action_monetary_multi"
+                                        style="color: black;"
+                                    >
+                                        <t
+                                            t-out="account_or_group_item_object['fin_bal']['bal_curr']"
+                                            t-options="{'widget': 'monetary', 'display_currency': account_currency}"
+                                        />
+                                    </a>
+                                </span>
+                            </t>
+                            <t t-if="type == 'grouped_type'">
+                                <span>
+                                    <a
+                                        t-att-data-t-att-domain="misc_domain+misc_grouped_domain"
+                                        t-att-data-res-model="'account.move.line'"
+                                        class="o_account_financial_reports_web_action_monetary_multi"
+                                        style="color: black;"
+                                    >
+                                        <t
+                                            t-out="account_or_group_item_object['fin_bal']['bal_curr']"
+                                            t-options="{'widget': 'monetary', 'display_currency': account_currency}"
+                                        />
+                                    </a>
+                                </span>
+                            </t>
                         </div>
-                        <div class="act_as_cell amount" style="width: 5.19%;">
+                        <div class="act_as_cell amount" style="width: 3.63%;">
                             <t t-if="type == 'account_type'">
-                                <t
-                                    t-set="domain"
-                                    t-value="[('account_id', '=', account['id']),
-                                             ('date', '&lt;', date_from)]"
-                                />
                                 <span>
                                     <a
-                                        t-att-data-t-att-domain="domain"
+                                        t-att-data-t-att-domain="misc_domain"
                                         t-att-data-res-model="'account.move.line'"
                                         class="o_account_financial_reports_web_action_monetary_multi"
                                         style="color: black;"
                                     >
                                         <t
-                                            t-raw="account_or_partner_object['fin_bal']['bal_curr']"
-                                            t-options="{'widget': 'monetary', 'display_currency': o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')}"
+                                            t-out="account_or_group_item_object['fin_bal']['bal_curr']"
+                                            t-options="{'widget': 'monetary', 'display_currency': account_currency}"
                                         />
                                     </a>
                                 </span>
                             </t>
-                            <t t-if="type == 'partner_type'">
-                                <t
-                                    t-set="domain"
-                                    t-value="[('account_id', '=', account['id']),
-                                             ('partner_id', '=', partner['id']),
-                                             ('date', '&lt;', date_from)]"
-                                />
+                            <t t-if="type == 'grouped_type'">
                                 <span>
                                     <a
-                                        t-att-data-t-att-domain="domain"
+                                        t-att-data-t-att-domain="misc_domain+misc_grouped_domain"
                                         t-att-data-res-model="'account.move.line'"
                                         class="o_account_financial_reports_web_action_monetary_multi"
                                         style="color: black;"
                                     >
                                         <t
-                                            t-raw="account_or_partner_object['fin_bal']['bal_curr']"
-                                            t-options="{'widget': 'monetary', 'display_currency': o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')}"
+                                            t-out="account_or_group_item_object['fin_bal']['bal_curr']"
+                                            t-options="{'widget': 'monetary', 'display_currency': account_currency}"
                                         />
                                     </a>
                                 </span>
                             </t>
                         </div>
                     </t>
-                    <t
-                        t-if="not o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')"
-                    >
-                        <div class="act_as_cell amount" style="width: 2.08%;" />
-                        <div class="act_as_cell amount" style="width: 5.19%;" />
+                    <t t-if="not account['currency_id']">
+                        <div class="act_as_cell amount" style="width: 3.63%;" />
+                        <div class="act_as_cell amount" style="width: 3.63%;" />
                     </t>
                 </t>
             </div>