odoo-addon-account-financial-report 15.0.2.13.0__py3-none-any.whl → 15.0.3.0.0__py3-none-any.whl

odoo/addons/account_financial_report/README.rst

@@ -7,7 +7,7 @@ Account Financial Reports
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:3121efa26eabd1f91b11d7831fa71ec8e51fb667c9557da6cb7a42856be2766a
+   !! source digest: sha256:7a729cad2177a2d79dea23692b620f65ca49b3f28348bb0f191cd074fdb4bf41
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

odoo/addons/account_financial_report/__manifest__.py

@@ -6,7 +6,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     "name": "Account Financial Reports",
-    "version": "15.0.2.13.0",
+    "version": "15.0.3.0.0",
     "category": "Reporting",
     "summary": "OCA Financial Reports",
     "author": "Camptocamp,"

odoo/addons/account_financial_report/i18n/account_financial_report.pot

@@ -330,6 +330,7 @@ msgstr ""
 #: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:0
 #: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
 #: code:addons/account_financial_report/report/open_items_xlsx.py:0
+#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__grouped_by__analytic_account
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_move_lines
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines_header
@@ -916,6 +917,7 @@ msgstr ""
 #. module: account_financial_report
 #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__grouped_by
 #: model:ir.model.fields,field_description:account_financial_report.field_open_items_report_wizard__grouped_by
+#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__grouped_by
 msgid "Grouped By"
 msgstr ""
 
@@ -1581,6 +1583,13 @@ msgstr ""
 msgid "Starting account in a range"
 msgstr ""
 
+#. module: account_financial_report
+#: code:addons/account_financial_report/report/trial_balance.py:0
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
+#, python-format
+msgid "TOTAL"
+msgstr ""
+
 #. module: account_financial_report
 #: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
@@ -1729,7 +1738,9 @@ msgid "To:"
 msgstr ""
 
 #. module: account_financial_report
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_account_ending_cumul
+#, python-format
 msgid "Total"
 msgstr ""
 
@@ -1861,6 +1872,12 @@ msgstr ""
 msgid "With Account Name"
 msgstr ""
 
+#. module: account_financial_report
+#: code:addons/account_financial_report/report/trial_balance.py:0
+#, python-format
+msgid "Without analytic account"
+msgstr ""
+
 #. module: account_financial_report
 #: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
 #: code:addons/account_financial_report/report/general_ledger_xlsx.py:0

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

@@ -18,9 +18,9 @@
         <!-- Defines global variables used by internal layout -->
         <t t-set="title">
             Trial Balance -
-            <t t-raw="company_name" />
+            <t t-out="company_name" />
             -
-            <t t-raw="currency_name" />
+            <t t-out="currency_name" />
         </t>
         <t t-set="company_name" t-value="Company_Name" />
         <!--       <t t-set="res_company" t-value="company_id"/>-->
@@ -28,7 +28,7 @@
             <div class="row">
                 <h4
                     class="mt0"
-                    t-esc="title or 'Odoo Report'"
+                    t-out="title or 'Odoo Report'"
                     style="text-align: center;"
                 />
             </div>
@@ -36,43 +36,94 @@
             <t t-call="account_financial_report.report_trial_balance_filters" />
             <div class="act_as_table list_table" style="margin-top: 10px;" />
             <!-- Display account lines -->
+            <t t-set="aml_domain_extra" t-value="[]" />
             <t t-if="not show_partner_details">
-                <div class="act_as_table data_table" style="width: 100%;">
-                    <!-- Display account header -->
-                    <t
-                        t-call="account_financial_report.report_trial_balance_lines_header"
-                    />
-                    <!-- Display each lines -->
-                    <t t-foreach="trial_balance" t-as="balance">
-                        <!-- Adapt -->
-                        <t t-set="style" t-value="'font-size:12px;'" />
-                            <!-- Different style for account group -->
-                        <t t-if="show_hierarchy">
-                                                    <t
-                                t-if="balance['type'] == 'group_type'"
-                            >
+                <t t-if="trial_balance_grouped">
+                    <t t-foreach="trial_balance_grouped" t-as="grouped_item">
+                        <div class="act_as_table data_table" style="width: 100%;">
+                            <div class="act_as_thead">
+                                <div class="act_as_row labels">
+                                    <div class="act_as_cell" style="width: 100%;">
+                                        <t t-esc="grouped_item['name']" />
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <t
+                            t-set="aml_domain_extra"
+                            t-if="grouped_item['id'] > 0"
+                            t-value="[('analytic_account_id', '=', grouped_item['id'])]"
+                        />
+                        <t
+                            t-set="aml_domain_extra"
+                            t-else=""
+                            t-value="[('analytic_account_id', '=', False)]"
+                        />
+                        <div class="act_as_table data_table" style="width: 100%;">
+                            <t
+                                t-call="account_financial_report.report_trial_balance_lines_header"
+                            />
+                            <!-- Display each lines -->
+                            <t t-foreach="grouped_item['account_data']" t-as="balance">
+                                <!-- Adapt -->
+                                <t t-set="style" t-value="'font-size:12px;'" />
                                 <t
-                                    t-set="style"
-                                    t-value="style + 'font-weight: bold; color: blue;'"
+                                    t-call="account_financial_report.report_trial_balance_line"
                                 />
                             </t>
-                        </t>
-                        <t t-if="show_hierarchy and limit_hierarchy_level">
-                            <t
-                                t-if="show_hierarchy_level > balance['level'] and (not hide_parent_hierarchy_level or (show_hierarchy_level - 1) == balance['level'])"
-                            >
+                        </div>
+                        <!-- Display footer with totals !-->
+                        <t t-set="balance" t-value="grouped_item" />
+                        <t
+                            t-call="account_financial_report.report_trial_balance_account_footer"
+                        />
+                    </t>
+                    <!-- TOTAL !-->
+                    <t t-if="grouped_by">
+                        <t t-set="balance" t-value="total_amount_grouped" />
+                        <t
+                            t-call="account_financial_report.report_trial_balance_account_footer"
+                        />
+                    </t>
+                </t>
+                <t t-else="">
+                    <div class="act_as_table data_table" style="width: 100%;">
+                        <!-- Display account header -->
+                        <t
+                            t-call="account_financial_report.report_trial_balance_lines_header"
+                        />
+                        <!-- Display each lines -->
+                        <t t-foreach="trial_balance" t-as="balance">
+                            <!-- Adapt -->
+                            <t t-set="style" t-value="'font-size:12px;'" />
+                            <!-- Different style for account group -->
+                            <t t-if="show_hierarchy">
+                                                        <t
+                                    t-if="balance['type'] == 'group_type'"
+                                >
+                                    <t
+                                        t-set="style"
+                                        t-value="style + 'font-weight: bold; color: blue;'"
+                                    />
+                                </t>
+                            </t>
+                            <t t-if="show_hierarchy and limit_hierarchy_level">
+                                <t
+                                    t-if="show_hierarchy_level > balance['level'] and (not hide_parent_hierarchy_level or (show_hierarchy_level - 1) == balance['level'])"
+                                >
+                                    <t
+                                        t-call="account_financial_report.report_trial_balance_line"
+                                    />
+                                </t>
+                            </t>
+                            <t t-else="">
                                 <t
                                     t-call="account_financial_report.report_trial_balance_line"
                                 />
                             </t>
                         </t>
-                        <t t-else="">
-                            <t
-                                t-call="account_financial_report.report_trial_balance_line"
-                            />
-                        </t>
-                    </t>
-                </div>
+                    </div>
+                </t>
             </t>
             <!-- Display partner lines -->
             <t t-if="show_partner_details">
@@ -92,8 +143,8 @@
                                 view-type="form"
                             >
                                         <t
-                                    t-raw="accounts_data[account_id]['code']"
-                                /> - <t t-raw="accounts_data[account_id]['name']" />
+                                    t-out="accounts_data[account_id]['code']"
+                                /> - <t t-out="accounts_data[account_id]['name']" />
                             </span>
                         </div>
                         <div class="act_as_table data_table" style="width: 100%;">
@@ -139,9 +190,9 @@
             <div class="act_as_row">
                 <div class="act_as_cell">
                     From:
-                    <span t-esc="date_from" t-options="{'widget': 'date'}" />
+                    <span t-out="date_from" t-options="{'widget': 'date'}" />
                     To
-                    <span t-esc="date_to" t-options="{'widget': 'date'}" />
+                    <span t-out="date_to" t-options="{'widget': 'date'}" />
                 </div>
                 <div class="act_as_cell">
                     <t t-if="only_posted_moves">All posted entries</t>
@@ -154,7 +205,7 @@
                 <div class="act_as_cell">
                     <t t-if="limit_hierarchy_level">
                         Level
-                        <span t-esc="show_hierarchy_level" />
+                        <span t-out="show_hierarchy_level" />
                     </t>
                     <t t-if="not limit_hierarchy_level">No limit</t>
                 </div>
@@ -220,7 +271,7 @@
                             res-model="account.account"
                             view-type="form"
                         >
-                            <t t-esc="balance['code']" />
+                            <t t-out="balance['code']" />
                         </span>
                     </div>
                     <!--            ## Account/Partner-->
@@ -230,7 +281,7 @@
                             res-model="account.account"
                             view-type="form"
                         >
-                            <t t-esc="balance['name']" />
+                            <t t-out="balance['name']" />
                         </span>
                     </div>
                 </t>
@@ -242,7 +293,7 @@
                             res-model="account.group"
                             view-type="form"
                         >
-                            <t t-raw="balance['code']" />
+                            <t t-out="balance['code']" />
                         </span>
                     </div>
                     <div class="act_as_cell left" t-att-style="style">
@@ -252,7 +303,7 @@
                             res-model="account.group"
                             view-type="form"
                         >
-                            <t t-esc="balance['name']" />
+                            <t t-out="balance['name']" />
                         </span>
                     </div>
                 </t>
@@ -265,7 +316,7 @@
                         res-model="res.partner"
                         view-type="form"
                     >
-                        <t t-esc="partners_data[partner_id]['name']" />
+                        <t t-out="partners_data[partner_id]['name']" />
                     </span>
                 </div>
             </t>
@@ -279,11 +330,11 @@
                                ('date', '&lt;', date_from)]"
                         />
                         <span
-                            t-att-domain="domain+aml_domain_common"
+                            t-att-domain="domain+aml_domain_common+aml_domain_extra"
                             res-model="account.move.line"
                         >
                             <t
-                                t-esc="balance['initial_balance']"
+                                t-out="balance['initial_balance']"
                                 t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
                             />
                         </span>
@@ -299,7 +350,7 @@
                             res-model="account.move.line"
                         >
                             <t
-                                t-raw="balance['initial_balance']"
+                                t-out="balance['initial_balance']"
                                 t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
                             />
                         </span>
@@ -317,7 +368,7 @@
                         res-model="account.move.line"
                     >
                         <t
-                            t-raw="total_amount[account_id][partner_id]['initial_balance']"
+                            t-out="total_amount[account_id][partner_id]['initial_balance']"
                             t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
                         />
                     </span>
@@ -335,11 +386,11 @@
                                          ('debit', '&lt;&gt;', 0)]"
                         />
                         <span
-                            t-att-domain="domain+aml_domain_common"
+                            t-att-domain="domain+aml_domain_common+aml_domain_extra"
                             res-model="account.move.line"
                         >
                             <t
-                                t-esc="balance['debit']"
+                                t-out="balance['debit']"
                                 t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
                             />
                         </span>
@@ -357,7 +408,7 @@
                             res-model="account.move.line"
                         >
                             <t
-                                t-raw="balance['debit']"
+                                t-out="balance['debit']"
                                 t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
                             />
                         </span>
@@ -377,7 +428,7 @@
                         res-model="account.move.line"
                     >
                         <t
-                            t-raw="total_amount[account_id][partner_id]['debit']"
+                            t-out="total_amount[account_id][partner_id]['debit']"
                             t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
                         />
                     </span>
@@ -395,11 +446,11 @@
                                          ('credit', '&lt;&gt;', 0)]"
                         />
                         <span
-                            t-att-domain="domain+aml_domain_common"
+                            t-att-domain="domain+aml_domain_common+aml_domain_extra"
                             res-model="account.move.line"
                         >
                             <t
-                                t-esc="balance['credit']"
+                                t-out="balance['credit']"
                                 t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
                             />
                         </span>
@@ -417,7 +468,7 @@
                             res-model="account.move.line"
                         >
                             <t
-                                t-raw="balance['credit']"
+                                t-out="balance['credit']"
                                 t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
                             />
                         </span>
@@ -437,7 +488,7 @@
                         res-model="account.move.line"
                     >
                         <t
-                            t-raw="total_amount[account_id][partner_id]['credit']"
+                            t-out="total_amount[account_id][partner_id]['credit']"
                             t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
                         />
                     </span>
@@ -455,11 +506,11 @@
                                     ('balance', '&lt;&gt;', 0)]"
                         />
                         <span
-                            t-att-domain="domain+aml_domain_common"
+                            t-att-domain="domain+aml_domain_common+aml_domain_extra"
                             res-model="account.move.line"
                         >
                             <t
-                                t-esc="balance['balance']"
+                                t-out="balance['balance']"
                                 t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
                             />
                         </span>
@@ -476,7 +527,7 @@
                             res-model="account.move.line"
                         >
                             <t
-                                t-raw="balance['balance']"
+                                t-out="balance['balance']"
                                 t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
                             />
                         </span>
@@ -496,7 +547,7 @@
                         res-model="account.move.line"
                     >
                         <t
-                            t-raw="total_amount[account_id][partner_id]['balance']"
+                            t-out="total_amount[account_id][partner_id]['balance']"
                             t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
                         />
                     </span>
@@ -512,11 +563,11 @@
                                          ('date', '&lt;=', date_to)]"
                         />
                         <span
-                            t-att-domain="domain+aml_domain_common"
+                            t-att-domain="domain+aml_domain_common+aml_domain_extra"
                             res-model="account.move.line"
                         >
                             <t
-                                t-esc="balance['ending_balance']"
+                                t-out="balance['ending_balance']"
                                 t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
                             />
                         </span>
@@ -531,7 +582,7 @@
                             res-model="account.move.line"
                         >
                             <t
-                                t-raw="balance['ending_balance']"
+                                t-out="balance['ending_balance']"
                                 t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
                             />
                         </span>
@@ -549,7 +600,7 @@
                         res-model="account.move.line"
                     >
                         <t
-                            t-esc="total_amount[account_id][partner_id]['ending_balance']"
+                            t-out="total_amount[account_id][partner_id]['ending_balance']"
                             t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
                         />
                     </span>
@@ -566,11 +617,11 @@
                                     t-value="[('account_id', '=', balance['id'])]"
                                 />
                                 <span
-                                    t-att-domain="domain+aml_domain_common"
+                                    t-att-domain="domain+aml_domain_common+aml_domain_extra"
                                     res-model="account.move.line"
                                 >
                                     <t
-                                        t-esc="balance['initial_currency_balance']"
+                                        t-out="balance['initial_currency_balance']"
                                         t-options="{'widget': 'monetary', 'display_currency': balance['currency_id']}"
                                     />
                                 </span>
@@ -582,7 +633,7 @@
                                 <!--                                       t-att-data-res-model="'account.move.line'"-->
                                 <!--                                       class="o_account_financial_reports_web_action_monetary_multi"-->
                                 <!--                                       t-att-style="style">-->
-                                <!--                                    <t t-att-style="style" t-raw="line.initial_balance_foreign_currency" t-options="{'widget': 'monetary', 'display_currency': line.currency_id}"/></a>-->
+                                <!--                                    <t t-att-style="style" t-out="line.initial_balance_foreign_currency" t-options="{'widget': 'monetary', 'display_currency': line.currency_id}"/></a>-->
                                 <!--                                </span>-->
                                 <!--                            </t>-->
                             </div>
@@ -603,7 +654,7 @@
                                     res-model="account.move.line"
                                 >
                                     <t
-                                        t-raw="total_amount[account_id][partner_id]['initial_currency_balance']"
+                                        t-out="total_amount[account_id][partner_id]['initial_currency_balance']"
                                         t-options="{'widget': 'monetary', 'display_currency': total_amount[account_id]['currency_id']}"
                                     />
                                 </span>
@@ -621,11 +672,11 @@
                                     t-value="[('account_id', '=', balance['id'])]"
                                 />
                                 <span
-                                    t-att-domain="domain+aml_domain_common"
+                                    t-att-domain="domain+aml_domain_common+aml_domain_extra"
                                     res-model="account.move.line"
                                 >
                                     <t
-                                        t-raw="balance['ending_currency_balance']"
+                                        t-out="balance['ending_currency_balance']"
                                         t-options="{'widget': 'monetary', 'display_currency': balance['currency_id']}"
                                     />
                                 </span>
@@ -637,7 +688,7 @@
                                 <!--                                       t-att-data-res-model="'account.move.line'"-->
                                 <!--                                       class="o_account_financial_reports_web_action_monetary_multi"-->
                                 <!--                                       t-att-style="style">-->
-                                <!--                                    <t t-att-style="style" t-raw="line.final_balance_foreign_currency" t-options="{'widget': 'monetary', 'display_currency': line.currency_id}"/></a>-->
+                                <!--                                    <t t-att-style="style" t-out="line.final_balance_foreign_currency" t-options="{'widget': 'monetary', 'display_currency': line.currency_id}"/></a>-->
                                 <!--                                </span>-->
                                 <!--                            </t>-->
                             </div>
@@ -658,7 +709,7 @@
                                     res-model="account.move.line"
                                 >
                                     <t
-                                        t-raw="total_amount[account_id][partner_id]['ending_currency_balance']"
+                                        t-out="total_amount[account_id][partner_id]['ending_currency_balance']"
                                         t-options="{'widget': 'monetary', 'display_currency': total_amount[account_id]['currency_id']}"
                                     />
                                 </span>
@@ -702,7 +753,7 @@
     <!--                           t-att-data-res-model="res_model"-->
     <!--                           class="o_account_financial_reports_web_action"-->
     <!--                           t-att-style="style">-->
-    <!--                            <t t-att-style="style" t-raw="account.code"/> - <t t-att-style="style" t-raw="account.name"/></a>-->
+    <!--                            <t t-att-style="style" t-out="account.code"/> - <t t-att-style="style" t-out="account.name"/></a>-->
     <!--                    </span>-->
     <!--                </div>-->
     <!--                &lt;!&ndash;## Initial balance&ndash;&gt;-->
@@ -715,7 +766,7 @@
     <!--                           t-att-data-res-model="'account.move.line'"-->
     <!--                           class="o_account_financial_reports_web_action_monetary_multi"-->
     <!--                           t-att-style="style">-->
-    <!--                        <t t-att-style="style" t-raw="account.initial_balance" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/></a>-->
+    <!--                        <t t-att-style="style" t-out="account.initial_balance" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/></a>-->
     <!--                    </span>-->
     <!--                </div>-->
     <!--                &lt;!&ndash;## Debit&ndash;&gt;-->
@@ -730,7 +781,7 @@
     <!--                           t-att-data-res-model="'account.move.line'"-->
     <!--                           class="o_account_financial_reports_web_action_monetary_multi"-->
     <!--                           t-att-style="style">-->
-    <!--                            <t t-att-style="style" t-raw="account.debit" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/></a>-->
+    <!--                            <t t-att-style="style" t-out="account.debit" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/></a>-->
     <!--                    </span>-->
     <!--                </div>-->
     <!--                &lt;!&ndash;## Credit&ndash;&gt;-->
@@ -745,7 +796,7 @@
     <!--                           t-att-data-res-model="'account.move.line'"-->
     <!--                           class="o_account_financial_reports_web_action_monetary_multi"-->
     <!--                           t-att-style="style">-->
-    <!--                            <t t-att-style="style" t-raw="account.credit" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/></a>-->
+    <!--                            <t t-att-style="style" t-out="account.credit" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/></a>-->
     <!--                    </span>-->
     <!--                </div>-->
     <!--                &lt;!&ndash;## Period Balance &ndash;&gt;-->
@@ -760,7 +811,7 @@
     <!--                           t-att-data-res-model="'account.move.line'"-->
     <!--                           class="o_account_financial_reports_web_action_monetary_multi"-->
     <!--                           t-att-style="style">-->
-    <!--                            <t t-att-style="style" t-raw="account.period_balance" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/></a>-->
+    <!--                            <t t-att-style="style" t-out="account.period_balance" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/></a>-->
     <!--                    </span>-->
     <!--                </div>-->
     <!--                &lt;!&ndash;## Ending balance&ndash;&gt;-->
@@ -772,7 +823,7 @@
     <!--                           t-att-data-res-model="'account.move.line'"-->
     <!--                           class="o_account_financial_reports_web_action_monetary_multi"-->
     <!--                           t-att-style="style" >-->
-    <!--                            <t t-att-style="style" t-raw="account.final_balance" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/></a>-->
+    <!--                            <t t-att-style="style" t-out="account.final_balance" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/></a>-->
     <!--                    </span>-->
     <!--                </div>-->
     <!--                <t t-if="foreign_currency">-->
@@ -793,7 +844,7 @@
     <!--                                   t-att-data-res-model="'account.move.line'"-->
     <!--                                   class="o_account_financial_reports_web_action_monetary_multi"-->
     <!--                                   t-att-style="style">-->
-    <!--                                <t t-att-style="style" t-raw="account.initial_balance_foreign_currency" t-options="{'widget': 'monetary', 'display_currency': account.account_id.currency_id}"/></a>-->
+    <!--                                <t t-att-style="style" t-out="account.initial_balance_foreign_currency" t-options="{'widget': 'monetary', 'display_currency': account.account_id.currency_id}"/></a>-->
     <!--                            </span>-->
     <!--                        </div>-->
     <!--                        <div class="act_as_cell amount" style="width: 8.86%;">-->
@@ -804,7 +855,7 @@
     <!--                                   t-att-data-res-model="'account.move.line'"-->
     <!--                                   class="o_account_financial_reports_web_action_monetary_multi"-->
     <!--                                   t-att-style="style" >-->
-    <!--                                    <t t-att-style="style" t-raw="account.final_balance_foreign_currency" t-options="{'widget': 'monetary', 'display_currency': account.account_id.currency_id}"/></a>-->
+    <!--                                    <t t-att-style="style" t-out="account.final_balance_foreign_currency" t-options="{'widget': 'monetary', 'display_currency': account.account_id.currency_id}"/></a>-->
     <!--                            </span>-->
     <!--                        </div>-->
     <!--                    </t>-->
@@ -823,44 +874,101 @@
             <div class="act_as_row labels" style="font-weight: bold;">
                 <!--## date-->
                 <div class="act_as_cell first_column" style="width: 33%;">
-                    <span t-esc="accounts_data[account_id]['code']" />
-                    -
-                    <span t-esc="accounts_data[account_id]['name']" />
+                    <t
+                        t-if="grouped_by and balance['type'] in ('analytic_account_type', 'total')"
+                    >
+                        <span t-out="balance['name']" />
+                    </t>
+                    <t t-else="">
+                        <span t-out="accounts_data[account_id]['code']" />
+                        -
+                        <span t-out="accounts_data[account_id]['name']" />
+                    </t>
                 </div>
                 <!--## Initial Balance-->
                 <div class="act_as_cell amount" style="width: 9%;">
-                    <span
-                        t-esc="total_amount[account_id]['initial_balance']"
-                        t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
-                    />
+                    <t
+                        t-if="grouped_by and balance['type'] in ('analytic_account_type', 'total')"
+                    >
+                        <span
+                            t-out="balance['initial_balance']"
+                            t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
+                        />
+                    </t>
+                    <t t-else="">
+                        <span
+                            t-out="total_amount[account_id]['initial_balance']"
+                            t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
+                        />
+                    </t>
                 </div>
                 <!--## Debit-->
                 <div class="act_as_cell amount" style="width: 9%;">
-                    <span
-                        t-esc="total_amount[account_id]['debit']"
-                        t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
-                    />
+                    <t
+                        t-if="grouped_by and balance['type'] in ('analytic_account_type', 'total')"
+                    >
+                        <span
+                            t-out="balance['debit']"
+                            t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
+                        />
+                    </t>
+                    <t t-else="">
+                        <span
+                            t-out="total_amount[account_id]['debit']"
+                            t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
+                        />
+                    </t>
                 </div>
                 <!--## Credit-->
                 <div class="act_as_cell amount" style="width: 9%;">
-                    <span
-                        t-esc="total_amount[account_id]['credit']"
-                        t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
-                    />
+                    <t
+                        t-if="grouped_by and balance['type'] in ('analytic_account_type', 'total')"
+                    >
+                        <span
+                            t-out="balance['credit']"
+                            t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
+                        />
+                    </t>
+                    <t t-else="">
+                        <span
+                            t-out="total_amount[account_id]['credit']"
+                            t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
+                        />
+                    </t>
                 </div>
                 <!--## Period balance-->
                 <div class="act_as_cell amount" style="width: 9%;">
-                    <span
-                        t-esc="total_amount[account_id]['balance']"
-                        t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
-                    />
+                    <t
+                        t-if="grouped_by and balance['type'] in ('analytic_account_type', 'total')"
+                    >
+                        <span
+                            t-out="balance['balance']"
+                            t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
+                        />
+                    </t>
+                    <t t-else="">
+                        <span
+                            t-out="total_amount[account_id]['balance']"
+                            t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
+                        />
+                    </t>
                 </div>
                 <!--## Ending balance-->
                 <div class="act_as_cell amount" style="width: 9%;">
-                    <span
-                        t-esc="total_amount[account_id]['ending_balance']"
-                        t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
-                    />
+                    <t
+                        t-if="grouped_by and balance['type'] in ('analytic_account_type', 'total')"
+                    >
+                        <span
+                            t-out="balance['ending_balance']"
+                            t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
+                        />
+                    </t>
+                    <t t-else="">
+                        <span
+                            t-out="total_amount[account_id]['ending_balance']"
+                            t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
+                        />
+                    </t>
                 </div>
                 <t t-if="foreign_currency">
                     <!--## amount_total_due_currency-->

odoo/addons/account_financial_report/report/trial_balance.py

@@ -192,10 +192,31 @@ class TrialBalanceReport(models.AbstractModel):
             total_amount[acc_id]["debit"] = tb["debit"]
             total_amount[acc_id]["balance"] = tb["balance"]
             total_amount[acc_id]["initial_balance"] = 0.0
+            if "__context" in tb and "group_by" in tb["__context"]:
+                group_by = tb["__context"]["group_by"][0]
+                gb_data = {}
+                tb_grouped = self.env["account.move.line"].read_group(
+                    domain=tb["__domain"],
+                    fields=[group_by, "debit", "credit", "balance", "amount_currency"],
+                    groupby=[group_by],
+                )
+                for tb2 in tb_grouped:
+                    gb_id = tb2[group_by][0] if tb2[group_by] else 0
+                    gb_data[gb_id] = self._prepare_total_amount(tb2, foreign_currency)
+                    gb_data[gb_id]["credit"] = tb2["credit"]
+                    gb_data[gb_id]["debit"] = tb2["debit"]
+                    gb_data[gb_id]["balance"] = tb2["balance"]
+                    gb_data[gb_id]["initial_balance"] = 0.0
+                total_amount[acc_id]["group_by"] = group_by
+                total_amount[acc_id]["group_by_data"] = gb_data
         for tb in tb_initial_acc:
             acc_id = tb["account_id"]
             if acc_id not in total_amount.keys():
                 total_amount[acc_id] = self._prepare_total_amount(tb, foreign_currency)
+                total_amount[acc_id]["group_by_data"] = {}
+                total_amount[acc_id]["group_by_data"][0] = self._prepare_total_amount(
+                    tb, foreign_currency
+                )
             else:
                 total_amount[acc_id]["initial_balance"] = tb["balance"]
                 total_amount[acc_id]["ending_balance"] += tb["balance"]
@@ -206,6 +227,28 @@ class TrialBalanceReport(models.AbstractModel):
                     total_amount[acc_id]["ending_currency_balance"] += round(
                         tb["amount_currency"], 2
                     )
+                if "group_by_data" in tb:
+                    for gb_key in list(tb["group_by_data"]):
+                        tb2 = tb["group_by_data"][gb_key]
+                        if "group_by_data" in total_amount[acc_id]:
+                            if gb_key not in total_amount[acc_id]["group_by_data"]:
+                                total_amount[acc_id]["group_by_data"][
+                                    gb_key
+                                ] = self._prepare_total_amount(tb2, foreign_currency)
+                            else:
+                                total_amount[acc_id]["group_by_data"][gb_key][
+                                    "initial_balance"
+                                ] = tb2["balance"]
+                                total_amount[acc_id]["group_by_data"][gb_key][
+                                    "ending_balance"
+                                ] += tb2["balance"]
+                                if foreign_currency:
+                                    total_amount[acc_id]["group_by_data"][gb_key][
+                                        "initial_currency_balance"
+                                    ] = round(tb2["amount_currency"], 2)
+                                    total_amount[acc_id]["group_by_data"][gb_key][
+                                        "ending_currency_balance"
+                                    ] += round(tb2["amount_currency"], 2)
         return total_amount
 
     @api.model
@@ -308,6 +351,7 @@ class TrialBalanceReport(models.AbstractModel):
         for account_id in accounts_to_remove:
             del total_amount[account_id]
 
+    # flake8: noqa: C901
     @api.model
     def _get_data(
         self,
@@ -323,6 +367,7 @@ class TrialBalanceReport(models.AbstractModel):
         hide_account_at_0,
         unaffected_earnings_account,
         fy_start_date,
+        grouped_by,
     ):
         accounts_domain = [("company_id", "=", company_id)]
         if account_ids:
@@ -336,6 +381,9 @@ class TrialBalanceReport(models.AbstractModel):
             tb_initial_acc.append(
                 {"account_id": account.id, "balance": 0.0, "amount_currency": 0.0}
             )
+        groupby_fields = ["account_id"]
+        if grouped_by:
+            groupby_fields.append("analytic_account_id")
         initial_domain_bs = self._get_initial_balances_bs_ml_domain(
             account_ids,
             journal_ids,
@@ -348,7 +396,7 @@ class TrialBalanceReport(models.AbstractModel):
         tb_initial_acc_bs = self.env["account.move.line"].read_group(
             domain=initial_domain_bs,
             fields=["account_id", "balance", "amount_currency"],
-            groupby=["account_id"],
+            groupby=groupby_fields,
         )
         initial_domain_pl = self._get_initial_balances_pl_ml_domain(
             account_ids,
@@ -363,7 +411,7 @@ class TrialBalanceReport(models.AbstractModel):
         tb_initial_acc_pl = self.env["account.move.line"].read_group(
             domain=initial_domain_pl,
             fields=["account_id", "balance", "amount_currency"],
-            groupby=["account_id"],
+            groupby=groupby_fields,
         )
         tb_initial_acc_rg = tb_initial_acc_bs + tb_initial_acc_pl
         for account_rg in tb_initial_acc_rg:
@@ -377,6 +425,22 @@ class TrialBalanceReport(models.AbstractModel):
             if element:
                 element[0]["balance"] += account_rg["balance"]
                 element[0]["amount_currency"] += account_rg["amount_currency"]
+                if "__context" in account_rg and "group_by" in account_rg["__context"]:
+                    group_by = account_rg["__context"]["group_by"][0]
+                    gb_data = {}
+                    account_rg_grouped = self.env["account.move.line"].read_group(
+                        domain=account_rg["__domain"],
+                        fields=[group_by, "balance", "amount_currency"],
+                        groupby=[group_by],
+                    )
+                    for a_rg2 in account_rg_grouped:
+                        gb_id = a_rg2[group_by][0] if a_rg2[group_by] else 0
+                        gb_data[gb_id] = {
+                            "balance": a_rg2["balance"],
+                            "amount_currency": a_rg2["amount_currency"],
+                        }
+                    element[0]["group_by"] = group_by
+                    element[0]["group_by_data"] = gb_data
         if hide_account_at_0:
             tb_initial_acc = [p for p in tb_initial_acc if p["balance"] != 0]
 
@@ -393,7 +457,7 @@ class TrialBalanceReport(models.AbstractModel):
         tb_period_acc = self.env["account.move.line"].read_group(
             domain=period_domain,
             fields=["account_id", "debit", "credit", "balance", "amount_currency"],
-            groupby=["account_id"],
+            groupby=groupby_fields,
         )
 
         if show_partner_details:
@@ -450,8 +514,22 @@ class TrialBalanceReport(models.AbstractModel):
                 total_amount[unaffected_id]["debit"] = 0.0
                 total_amount[unaffected_id]["ending_balance"] = 0.0
                 if foreign_currency:
+                    total_amount[unaffected_id]["amount_currency"] = 0
                     total_amount[unaffected_id]["initial_currency_balance"] = 0.0
                     total_amount[unaffected_id]["ending_currency_balance"] = 0.0
+            if grouped_by:
+                total_amount[unaffected_id]["group_by"] = grouped_by
+                total_amount[unaffected_id]["group_by_data"] = {}
+                # Fix to prevent side effects
+                if (
+                    foreign_currency
+                    and "amount_currency" not in total_amount[unaffected_id]
+                ):
+                    total_amount[unaffected_id]["amount_currency"] = 0
+                group_by_data_item = self._prepare_total_amount(
+                    total_amount[unaffected_id], foreign_currency
+                )
+                total_amount[unaffected_id]["group_by_data"][0] = group_by_data_item
         accounts_data = self._get_accounts_data(accounts_ids)
         (
             pl_initial_balance,
@@ -476,8 +554,88 @@ class TrialBalanceReport(models.AbstractModel):
                 total_amount[unaffected_id][
                     "initial_currency_balance"
                 ] += pl_initial_currency_balance
+            if grouped_by:
+                total_amount[unaffected_id]["group_by_data"][0][
+                    "ending_balance"
+                ] = total_amount[unaffected_id]["ending_balance"]
+                total_amount[unaffected_id]["group_by_data"][0][
+                    "initial_balance"
+                ] = total_amount[unaffected_id]["initial_balance"]
+                if foreign_currency:
+                    total_amount[unaffected_id]["group_by_data"][0][
+                        "ending_currency_balance"
+                    ] = total_amount[unaffected_id]["ending_currency_balance"]
+                    total_amount[unaffected_id]["group_by_data"][0][
+                        "initial_currency_balance"
+                    ] = total_amount[unaffected_id]["initial_currency_balance"]
         return total_amount, accounts_data, partners_data
 
+    def _get_data_grouped(self, total_amount, accounts_data, foreign_currency):
+        """Get the data grouped by analytical account instead of as used
+        "without grouping".
+        """
+        trial_balance = {}
+        total_amount_grouped = {"type": "total", "name": _("TOTAL")}
+        f_names = [
+            "credit",
+            "debit",
+            "balance",
+            "initial_balance",
+            "ending_balance",
+            "initial_currency_balance",
+            "ending_currency_balance",
+        ]
+        for f_name in f_names:
+            total_amount_grouped[f_name] = 0
+        for a_id in list(total_amount.keys()):
+            for key in list(total_amount[a_id]["group_by_data"].keys()):
+                total_amount_item2 = total_amount[a_id]["group_by_data"][key]
+                if key not in trial_balance:
+                    trial_balance[key] = {}
+                    for f_name in f_names:
+                        if f_name in total_amount_item2:
+                            trial_balance[key][f_name] = 0
+                    trial_balance[key]["account_data"] = {}
+                for f_name in f_names:
+                    if f_name in total_amount_item2:
+                        trial_balance[key][f_name] += total_amount_item2[f_name]
+                # Prepare data_item
+                data_item = total_amount_item2
+                data_item["type"] = "account_type"
+                data_item["id"] = a_id
+                data_item["name"] = accounts_data[a_id]["name"]
+                data_item["code"] = accounts_data[a_id]["code"]
+                if foreign_currency:
+                    data_item["currency_id"] = accounts_data[a_id]["currency_id"]
+                    data_item["currency_name"] = accounts_data[a_id]["currency_name"]
+                trial_balance[key]["account_data"][a_id] = data_item
+        analytic_account_ids = list(trial_balance.keys())
+        aa_data = {}
+        aaa_model = self.env["account.analytic.account"].with_context(active_test=False)
+        analytic_accounts = aaa_model.search_read(
+            domain=[("id", "in", analytic_account_ids)],
+            fields=["display_name"],
+        )
+        for aa in analytic_accounts:
+            aa_data[aa["id"]] = aa
+        for aa_id in analytic_account_ids:
+            trial_balance[aa_id]["id"] = aa_id
+            trial_balance[aa_id]["type"] = "analytic_account_type"
+            trial_balance[aa_id]["name"] = (
+                aa_data[aa_id]["display_name"]
+                if aa_id in aa_data
+                else _("Without analytic account")
+            )
+            account_data_item = list(trial_balance[aa_id]["account_data"].values())
+            account_data_item = sorted(account_data_item, key=lambda k: k["code"])
+            trial_balance[aa_id]["account_data"] = account_data_item
+            for f_name in f_names:
+                if f_name in trial_balance[aa_id]:
+                    total_amount_grouped[f_name] += trial_balance[aa_id][f_name]
+        trial_balance = list(trial_balance.values())
+        trial_balance = sorted(trial_balance, key=lambda k: k["name"])
+        return trial_balance, total_amount_grouped
+
     def _get_hierarchy_groups(self, group_ids, groups_data, foreign_currency):
         for group_id in group_ids:
             parent_id = groups_data[group_id]["parent_id"]
@@ -650,6 +808,7 @@ class TrialBalanceReport(models.AbstractModel):
         only_posted_moves = data["only_posted_moves"]
         unaffected_earnings_account = data["unaffected_earnings_account"]
         fy_start_date = data["fy_start_date"]
+        grouped_by = data["grouped_by"]
         total_amount, accounts_data, partners_data = self._get_data(
             account_ids,
             journal_ids,
@@ -663,7 +822,14 @@ class TrialBalanceReport(models.AbstractModel):
             hide_account_at_0,
             unaffected_earnings_account,
             fy_start_date,
+            grouped_by,
         )
+        trial_balance_grouped = False
+        total_amount_grouped = False
+        if grouped_by:
+            trial_balance_grouped, total_amount_grouped = self._get_data_grouped(
+                total_amount, accounts_data, foreign_currency
+            )
         trial_balance = []
         if not show_partner_details:
             for account_id in accounts_data.keys():
@@ -674,6 +840,16 @@ class TrialBalanceReport(models.AbstractModel):
                         "debit": total_amount[account_id]["debit"],
                         "balance": total_amount[account_id]["balance"],
                         "ending_balance": total_amount[account_id]["ending_balance"],
+                        "group_by": (
+                            total_amount[account_id]["group_by"]
+                            if "group_by" in total_amount[account_id]
+                            else False
+                        ),
+                        "group_by_data": (
+                            total_amount[account_id]["group_by_data"]
+                            if "group_by_data" in total_amount[account_id]
+                            else False
+                        ),
                         "type": "account_type",
                     }
                 )
@@ -727,8 +903,11 @@ class TrialBalanceReport(models.AbstractModel):
             "show_hierarchy": show_hierarchy,
             "hide_parent_hierarchy_level": data["hide_parent_hierarchy_level"],
             "trial_balance": trial_balance,
+            "trial_balance_grouped": trial_balance_grouped,
             "total_amount": total_amount,
+            "total_amount_grouped": total_amount_grouped,
             "accounts_data": accounts_data,
             "partners_data": partners_data,
             "show_hierarchy_level": show_hierarchy_level,
+            "grouped_by": grouped_by,
         }

odoo/addons/account_financial_report/report/trial_balance_xlsx.py

@@ -166,7 +166,9 @@ class TrialBalanceXslx(models.AbstractModel):
             "report.account_financial_report.trial_balance"
         ]._get_report_values(report, data)
         trial_balance = res_data["trial_balance"]
+        trial_balance_grouped = res_data["trial_balance_grouped"]
         total_amount = res_data["total_amount"]
+        total_amount_grouped = res_data["total_amount_grouped"]
         partners_data = res_data["partners_data"]
         accounts_data = res_data["accounts_data"]
         show_hierarchy = res_data["show_hierarchy"]
@@ -175,22 +177,40 @@ class TrialBalanceXslx(models.AbstractModel):
         foreign_currency = res_data["foreign_currency"]
         limit_hierarchy_level = res_data["limit_hierarchy_level"]
         hide_parent_hierarchy_level = res_data["hide_parent_hierarchy_level"]
+        grouped_by = res_data["grouped_by"]
         if not show_partner_details:
-            # Display array header for account lines
-            self.write_array_header(report_data)
-
-        # For each account
-        if not show_partner_details:
-            for balance in trial_balance:
-                if show_hierarchy and limit_hierarchy_level:
-                    if show_hierarchy_level > balance["level"] and (
-                        not hide_parent_hierarchy_level
-                        or (show_hierarchy_level - 1) == balance["level"]
-                    ):
-                        # Display account lines
+            if grouped_by:
+                # For each grouped
+                for grouped_item in trial_balance_grouped:
+                    self.write_array_title(grouped_item["name"], report_data)
+                    # Display array header for account lines
+                    self.write_array_header(report_data)
+                    # For each account
+                    for balance in grouped_item["account_data"]:
+                        self.write_line_from_dict(balance, report_data)
+                    # Footer with totals
+                    grouped_item["code"] = ""
+                    grouped_item["currency_id"] = False
+                    self.write_account_footer(grouped_item, _("Total"), report_data)
+                    report_data["row_pos"] += 1
+                # Last line with totals
+                total_amount_grouped["currency_id"] = False
+                total_amount_grouped["code"] = ""
+                self.write_account_footer(total_amount_grouped, _("TOTAL"), report_data)
+            else:
+                # Display array header for account lines
+                self.write_array_header(report_data)
+                # For each account
+                for balance in trial_balance:
+                    if show_hierarchy and limit_hierarchy_level:
+                        if show_hierarchy_level > balance["level"] and (
+                            not hide_parent_hierarchy_level
+                            or (show_hierarchy_level - 1) == balance["level"]
+                        ):
+                            # Display account lines
+                            self.write_line_from_dict(balance, report_data)
+                    else:
                         self.write_line_from_dict(balance, report_data)
-                else:
-                    self.write_line_from_dict(balance, report_data)
         else:
             for account_id in total_amount:
                 # Write account title

odoo/addons/account_financial_report/static/description/index.html

@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:3121efa26eabd1f91b11d7831fa71ec8e51fb667c9557da6cb7a42856be2766a
+!! source digest: sha256:7a729cad2177a2d79dea23692b620f65ca49b3f28348bb0f191cd074fdb4bf41
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/account-financial-reporting/tree/15.0/account_financial_report"><img alt="OCA/account-financial-reporting" src="https://img.shields.io/badge/github-OCA%2Faccount--financial--reporting-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/account-financial-reporting-15-0/account-financial-reporting-15-0-account_financial_report"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/account-financial-reporting&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module adds a set of financial reports. They are accessible under

odoo/addons/account_financial_report/wizard/trial_balance_wizard.py

@@ -67,6 +67,15 @@ class TrialBalanceReportWizard(models.TransientModel):
         comodel_name="account.account",
         help="Ending account in a range",
     )
+    grouped_by = fields.Selection(
+        selection=[("analytic_account", "Analytic Account")], default=False
+    )
+
+    @api.onchange("grouped_by")
+    def onchange_grouped_by(self):
+        if self.grouped_by == "analytic_account":
+            self.show_partner_details = False
+            self.show_hierarchy = False
 
     @api.onchange("account_code_from", "account_code_to")
     def on_change_account_range(self):
@@ -201,6 +210,7 @@ class TrialBalanceReportWizard(models.TransientModel):
         """Handle partners change."""
         if self.show_partner_details:
             self.receivable_accounts_only = self.payable_accounts_only = True
+            self.grouped_by = False
         else:
             self.receivable_accounts_only = self.payable_accounts_only = False
 
@@ -258,6 +268,7 @@ class TrialBalanceReportWizard(models.TransientModel):
             "show_partner_details": self.show_partner_details,
             "unaffected_earnings_account": self.unaffected_earnings_account.id,
             "account_financial_report_lang": self.env.lang,
+            "grouped_by": self.grouped_by,
         }
 
     def _export(self, report_type):

odoo/addons/account_financial_report/wizard/trial_balance_wizard_view.xml

@@ -25,11 +25,18 @@
                         </group>
                         <group name="other_filters">
                             <field name="target_move" widget="radio" />
+                            <field
+                                name="grouped_by"
+                                groups="analytic.group_analytic_accounting"
+                            />
                             <field name="hide_account_at_0" />
-                            <field name="show_partner_details" />
+                            <field
+                                name="show_partner_details"
+                                attrs="{'invisible':[('grouped_by','!=',False)]}"
+                            />
                             <field
                                 name="show_hierarchy"
-                                attrs="{'invisible':[('show_partner_details','=',True)]}"
+                                attrs="{'invisible':['|', ('show_partner_details','=',True),('grouped_by','!=',False)]}"
                             />
                             <field
                                 name="limit_hierarchy_level"

{odoo_addon_account_financial_report-15.0.2.13.0.dist-info → odoo_addon_account_financial_report-15.0.3.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-account_financial_report
-Version: 15.0.2.13.0
+Version: 15.0.3.0.0
 Summary: OCA Financial Reports
 Home-page: https://github.com/OCA/account-financial-reporting
 Author: Camptocamp,initOS GmbH,redCOR AG,ForgeFlow,Odoo Community Association (OCA)
@@ -24,7 +24,7 @@ Account Financial Reports
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:3121efa26eabd1f91b11d7831fa71ec8e51fb667c9557da6cb7a42856be2766a
+   !! source digest: sha256:7a729cad2177a2d79dea23692b620f65ca49b3f28348bb0f191cd074fdb4bf41
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

{odoo_addon_account_financial_report-15.0.2.13.0.dist-info → odoo_addon_account_financial_report-15.0.3.0.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
-odoo/addons/account_financial_report/README.rst,sha256=nwsLqm4dE3XeDfGonvCs6AgoblSVhF2M-17uVWrIRU4,6889
+odoo/addons/account_financial_report/README.rst,sha256=a-YYNhmZ_7H1t7XgluNtLlch7SVLImSe0eDPv5maRyE,6889
 odoo/addons/account_financial_report/__init__.py,sha256=YoL8hk5QxSifbFJL7gPzpOSk-3zB1OSHJBXyZK25G6Q,187
-odoo/addons/account_financial_report/__manifest__.py,sha256=khQP_6tzGsbjcoJK9wWt6Y_tqkkbNfb2XFmCC_sOVAg,2308
+odoo/addons/account_financial_report/__manifest__.py,sha256=G05L8B5x61L7mQ_4Ld95CKR0C_m4a2Paniq4TETkEbk,2307
 odoo/addons/account_financial_report/menuitems.xml,sha256=k20N6cNRlDsnPhc378MVs7jwzJhbbJQ2k-P3WdsmF_M,1206
 odoo/addons/account_financial_report/reports.xml,sha256=c2KamS250rNzHUInjNwC0G2dhwiIqtYgbked51PtmVw,9254
-odoo/addons/account_financial_report/i18n/account_financial_report.pot,sha256=6iqE5_K5jkKvTdP_azbWriMLqkyTzoCPZ9gkGJntJDU,84679
+odoo/addons/account_financial_report/i18n/account_financial_report.pot,sha256=ypCilq5ysJuqD-s7BUd2sop_UtJTD86WVpSGdUobVYI,85393
 odoo/addons/account_financial_report/i18n/ar.po,sha256=7pgMgE8RLP1lAX8EfbTrrmRnBm65aCB-nNcvID0vs4Q,92468
 odoo/addons/account_financial_report/i18n/ca.po,sha256=LzR1WTsoZmU4Bisu0f-YBMCRQFvP2w9qQFKV65A3i9M,89308
 odoo/addons/account_financial_report/i18n/da.po,sha256=voBEBQsebZ00a6ThQ4AdXbY4rJtPrAvMkf1TQGNiyc0,88540
@@ -46,8 +46,8 @@ odoo/addons/account_financial_report/report/journal_ledger.py,sha256=j83-QCAONs7
 odoo/addons/account_financial_report/report/journal_ledger_xlsx.py,sha256=Pp7iDkBjSk0BqZkSPAiKI2hBHNcjKYjZoBxuL_ENz5E,10126
 odoo/addons/account_financial_report/report/open_items.py,sha256=7iIrnkCLuH17Lx0I98Nvt0KfYpcyhVcNRSJMr9i_PS8,13788
 odoo/addons/account_financial_report/report/open_items_xlsx.py,sha256=a4HMQ97VkwTO_8tnxyzFIIlLkawaG1HBXnujgYUI_Ug,15119
-odoo/addons/account_financial_report/report/trial_balance.py,sha256=ERrdWkQugXtRX_4lURibQCdPsW_52ggbyLOrMDSSTrg,30737
-odoo/addons/account_financial_report/report/trial_balance_xlsx.py,sha256=phPDqy4pXbd94oFmwjPNe_XKoMCgcTXPE6HOkGJJDko,12060
+odoo/addons/account_financial_report/report/trial_balance.py,sha256=TNfnjUD0TLXmDvcj6cUHDK60EfOdtLj4PAh9zh346tg,40093
+odoo/addons/account_financial_report/report/trial_balance_xlsx.py,sha256=iGn0bVz63eMNL6Xdnjk8r4JdZrX2ojnEm9E0BaOcDoY,13278
 odoo/addons/account_financial_report/report/vat_report.py,sha256=mRr8zk3sTVvz7CFHQAzDL4Eexqzt7X6JVOEPD2axumM,10163
 odoo/addons/account_financial_report/report/vat_report_xlsx.py,sha256=aa0dLzYdywjmO63ONRYUBTpSGmsPfEjX60CkUbULuo8,2317
 odoo/addons/account_financial_report/report/templates/aged_partner_balance.xml,sha256=WNaWvMoBR74v6SGj13Tp6Eydxd-zk93Yf3x0dnRIj28,43416
@@ -55,12 +55,12 @@ odoo/addons/account_financial_report/report/templates/general_ledger.xml,sha256=
 odoo/addons/account_financial_report/report/templates/journal_ledger.xml,sha256=qPupJ-t85k2_H-o12pwOyvpYCpROBkVpSsGaib3mGkI,21619
 odoo/addons/account_financial_report/report/templates/layouts.xml,sha256=gCejPAn8GLrySSve8pGcs0fY5nr48C3mmyuoEJVZkJ4,1526
 odoo/addons/account_financial_report/report/templates/open_items.xml,sha256=OxyVnVzPa0UKGNuV2uqgWh7RxMwsWu8OzQbcIV0iDaE,22821
-odoo/addons/account_financial_report/report/templates/trial_balance.xml,sha256=q-ShNar7AifnJpSzhkv5OYmc-ydkF9ub_VlsLnOVKPI,47168
+odoo/addons/account_financial_report/report/templates/trial_balance.xml,sha256=u4MvCt5y7uCMCJajpm81miLD6e22w7sSBVIiC6xU86o,52685
 odoo/addons/account_financial_report/report/templates/vat_report.xml,sha256=F5hQzdM8NTuLW04mT6SMjbdush5r7C81_RXa7NByfAY,8128
 odoo/addons/account_financial_report/security/ir.model.access.csv,sha256=S1VQLLwLeaOeAMYGqtoOqHUaZVrvDUVE4Z-0-SRjSGQ,1134
 odoo/addons/account_financial_report/security/security.xml,sha256=gpNJnzruXfeYskn26FqY9U04FiuTf8vgLCKEGY8PADM,422
 odoo/addons/account_financial_report/static/description/icon.png,sha256=WW-eOIjW5-jo7tgBieNv6K2DUKMoHFSVctnp0htstHI,15230
-odoo/addons/account_financial_report/static/description/index.html,sha256=h-S5aP201xgBXNNAyVl1VZweTto393bkxwCzaBfhvjo,19748
+odoo/addons/account_financial_report/static/description/index.html,sha256=vnhIUbULmQnNjLhbBYoCjpvvyTuKJQa6t5Z9kmXglsI,19748
 odoo/addons/account_financial_report/static/src/css/report.css,sha256=y0CysZUK3afkYSHgBaMi_qmh8da3XXEZwJDjRBg6HqQ,2335
 odoo/addons/account_financial_report/static/src/css/report_html.css,sha256=I1kX1RsThtjGNLOaNJEWCvMnB9iAFW6nGkcyFYZzJoA,135
 odoo/addons/account_financial_report/static/src/js/action_manager_report.js,sha256=g8aZkSRMgNcFzQ4f_3mmeKl7oNnoap_cDUxuyGxMT4M,1608
@@ -94,11 +94,11 @@ odoo/addons/account_financial_report/wizard/journal_ledger_wizard.py,sha256=CA44
 odoo/addons/account_financial_report/wizard/journal_ledger_wizard_view.xml,sha256=s3go3x-VSCcr1xNAE3Lzj1FnymyS76hxzazuWtNc91k,2957
 odoo/addons/account_financial_report/wizard/open_items_wizard.py,sha256=JUOLiUNl6jyGDQACf70hqsBykN5Bax8pGSOTQk2beu8,8247
 odoo/addons/account_financial_report/wizard/open_items_wizard_view.xml,sha256=B6AEXvVHm02J5Dz75SirpdszyqdPDtpB_7AvSW2X7nE,5226
-odoo/addons/account_financial_report/wizard/trial_balance_wizard.py,sha256=hFaHYfWsbJiKZczJJyUhcyuDuvLx69KEePV1zOvVLcE,10652
-odoo/addons/account_financial_report/wizard/trial_balance_wizard_view.xml,sha256=7oNGPs3s8DVw3movVGe2ryRUNl1MtN7O76UH8zaFFtI,7048
+odoo/addons/account_financial_report/wizard/trial_balance_wizard.py,sha256=rq4knziPEVaMM2Jl0jXB1q_Zt4HKzTmZ2jeWVAewEEE,11052
+odoo/addons/account_financial_report/wizard/trial_balance_wizard_view.xml,sha256=kzsselPX_jYDWQEbDSXIS5K2vKuyzjTZMdinH0976c0,7413
 odoo/addons/account_financial_report/wizard/vat_report_wizard.py,sha256=pJATDNWLcEWvctby5e5yvv4Kz7YDfCTi7YZP7slA8a4,3424
 odoo/addons/account_financial_report/wizard/vat_report_wizard_view.xml,sha256=T3P81O4csDGP7Jmf7eAtmbIIldja3IoXbBmweMMt8vA,2330
-odoo_addon_account_financial_report-15.0.2.13.0.dist-info/METADATA,sha256=asj72Mnp-ahD1pArLMdBltsaKsIZ2pc14gWo6Okx8z0,7566
-odoo_addon_account_financial_report-15.0.2.13.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-odoo_addon_account_financial_report-15.0.2.13.0.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
-odoo_addon_account_financial_report-15.0.2.13.0.dist-info/RECORD,,
+odoo_addon_account_financial_report-15.0.3.0.0.dist-info/METADATA,sha256=AK6ULSkVXmGbjU2Gw4sD2zG37007n3dXRmbxD3N5sSs,7565
+odoo_addon_account_financial_report-15.0.3.0.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+odoo_addon_account_financial_report-15.0.3.0.0.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
+odoo_addon_account_financial_report-15.0.3.0.0.dist-info/RECORD,,