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/journal_ledger.xml

@@ -3,7 +3,7 @@
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 <odoo>
     <template id="journal_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_journal_ledger_base" />
@@ -17,9 +17,9 @@
         <t t-set="display_account_name" t-value="with_account_name" />
         <t t-set="title">
             Journal Ledger -
-            <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" />
         <div class="page">
@@ -105,7 +105,7 @@
             </t>
         </t>
         <t t-else="">
-           <t t-if="not with_auto_sequence">
+            <t t-if="not with_auto_sequence">
                 <t t-set="account_column_style">
                     width: 23.78%;
                 </t>
@@ -198,12 +198,8 @@
                 </b>
             </div>
             <t t-if="display_currency">
-                <div class="act_as_cell" name="currency_name">
-
-                </div>
-                <div class="act_as_cell amount" name="amount_currency">
-
-                </div>
+                <div class="act_as_cell" name="currency_name" />
+                <div class="act_as_cell amount" name="amount_currency" />
             </t>
         </div>
         <div style="width: 100%" />
@@ -256,8 +252,8 @@
             <span t-if="display_account_name">
                 -
                 <span
-                    t-esc="o._get_atr_from_dict(move_line['account_id'], account_ids_data, 'name')"
-                />
+                t-esc="o._get_atr_from_dict(move_line['account_id'], account_ids_data, 'name')"
+            />
             </span>
         </div>
         <div class="act_as_cell left" name="partner">
@@ -267,7 +263,10 @@
             />
         </div>
         <div class="act_as_cell left" name="label">
-            <span t-if="move_line['label']" t-esc="move_line['label']" />
+            <span
+                t-if="move_line['label']"
+                t-esc="limit_text(move_line['label'], 'label_text_limit')"
+            />
             <span t-if="not move_line['label']">/</span>
         </div>
         <div class="act_as_cell left" name="taxes">
@@ -280,7 +279,7 @@
                 t-value="o._get_data_from_dict(move_line['move_line_id'], move_line_ids_taxes_data)"
             />
             <span
-                t-esc="o._get_ml_tax_description(move_line, tax_line_dat, move_line_ids_taxes_dat)"
+                t-esc="limit_text(o._get_ml_tax_description(move_line, tax_line_dat, move_line_ids_taxes_dat), 'label_text_limit')"
             />
         </div>
         <div class="act_as_cell amount" name="debit">
@@ -302,14 +301,13 @@
         <t t-if="display_currency">
             <div class="act_as_cell" name="currency_name">
                 <t t-if="move_line['currency_id']">
-                    <span t-esc="currency_ids_data.get(move_line['currency_id'], '')" />
+                    <span
+                        t-esc="currency_ids_data.get(move_line['currency_id'], '').get('name', '')"
+                    />
                 </t>
             </div>
             <div class="act_as_cell amount" name="amount_currency">
-                <t
-                    t-if="move_line['amount_currency']"
-                    t-options="{'widget': 'float', 'precision': 2}"
-                >
+                <t t-if="move_line['amount_currency']">
                     <span
                         t-esc="move_line['amount_currency']"
                         t-options="{'widget': 'float', 'precision': 2}"
@@ -444,77 +442,73 @@
         <div class="act_as_table data_table" style="width: 100%;">
             10
             <div class="act_as_row labels">
-                <div
-                    class="act_as_cell first_column"
-                    name="name"
-                    style="width: 30.97%;"
-                />
-                <div class="act_as_cell" name="description" style="width: 13.27%;" />
-                <div class="act_as_cell" name="base_debit" style="width: 9.29%;">
+            <div class="act_as_cell first_column" name="name" style="width: 30.97%;" />
+            <div class="act_as_cell" name="description" style="width: 13.27%;" />
+            <div class="act_as_cell" name="base_debit" style="width: 9.29%;">
                     Debit
                 </div>
-                <div class="act_as_cell" name="base_credit" style="width: 9.29%;">
+            <div class="act_as_cell" name="base_credit" style="width: 9.29%;">
                     Credit
                 </div>
-                <div class="act_as_cell" name="base_balance" style="width: 9.29%;">
+            <div class="act_as_cell" name="base_balance" style="width: 9.29%;">
                     Balance
                 </div>
-                <div class="act_as_cell" name="tax_debit" style="width: 9.29%;">
+            <div class="act_as_cell" name="tax_debit" style="width: 9.29%;">
                     Debit
                 </div>
-                <div class="act_as_cell" name="tax_credit" style="width: 9.29%;">
+            <div class="act_as_cell" name="tax_credit" style="width: 9.29%;">
                     Credit
                 </div>
-                <div class="act_as_cell" name="tax_balance" style="width: 9.29%;">
+            <div class="act_as_cell" name="tax_balance" style="width: 9.29%;">
                     Balance
                 </div>
-            </div>
+        </div>
             <t t-foreach="ReportTaxLines" t-as="tax_line">
-                <div class="act_as_row lines">
-                    <div class="act_as_cell left" name="tax_name">
-                        <span t-esc="tax_line['tax_name']" />
-                    </div>
-                    <div class="act_as_cell left" name="tax_code">
-                        <span t-esc="tax_line['tax_code']" />
-                    </div>
-                    <div class="act_as_cell amount" name="base_debit">
-                        <span
-                            t-esc="tax_line['base_debit']"
-                            t-options="{'widget': 'float', 'precision': 2}"
-                        />
-                    </div>
-                    <div class="act_as_cell amount" name="base_credit">
-                        <span
-                            t-esc="tax_line['base_credit']"
-                            t-options="{'widget': 'float', 'precision': 2}"
-                        />
-                    </div>
-                    <div class="act_as_cell amount" name="base_balance">
-                        <span
-                            t-esc="tax_line['base_balance']"
-                            t-options="{'widget': 'float', 'precision': 2}"
-                        />
-                    </div>
-                    <div class="act_as_cell amount" name="tax_debit">
-                        <span
-                            t-esc="tax_line['tax_debit']"
-                            t-options="{'widget': 'float', 'precision': 2}"
-                        />
-                    </div>
-                    <div class="act_as_cell amount" name="tax_credit">
-                        <span
-                            t-esc="tax_line['tax_credit']"
-                            t-options="{'widget': 'float', 'precision': 2}"
-                        />
-                    </div>
-                    <div class="act_as_cell amount" name="tax_balance">
-                        <span
-                            t-esc="tax_line['tax_balance']"
-                            t-options="{'widget': 'float', 'precision': 2}"
-                        />
-                    </div>
+            <div class="act_as_row lines">
+                <div class="act_as_cell left" name="tax_name">
+                    <span t-esc="tax_line['tax_name']" />
                 </div>
-            </t>
+                <div class="act_as_cell left" name="tax_code">
+                    <span t-esc="tax_line['tax_code']" />
+                </div>
+                <div class="act_as_cell amount" name="base_debit">
+                    <span
+                        t-esc="tax_line['base_debit']"
+                        t-options="{'widget': 'float', 'precision': 2}"
+                    />
+                </div>
+                <div class="act_as_cell amount" name="base_credit">
+                    <span
+                        t-esc="tax_line['base_credit']"
+                        t-options="{'widget': 'float', 'precision': 2}"
+                    />
+                </div>
+                <div class="act_as_cell amount" name="base_balance">
+                    <span
+                        t-esc="tax_line['base_balance']"
+                        t-options="{'widget': 'float', 'precision': 2}"
+                    />
+                </div>
+                <div class="act_as_cell amount" name="tax_debit">
+                    <span
+                        t-esc="tax_line['tax_debit']"
+                        t-options="{'widget': 'float', 'precision': 2}"
+                    />
+                </div>
+                <div class="act_as_cell amount" name="tax_credit">
+                    <span
+                        t-esc="tax_line['tax_credit']"
+                        t-options="{'widget': 'float', 'precision': 2}"
+                    />
+                </div>
+                <div class="act_as_cell amount" name="tax_balance">
+                    <span
+                        t-esc="tax_line['tax_balance']"
+                        t-options="{'widget': 'float', 'precision': 2}"
+                    />
+                </div>
+            </div>
+        </t>
         </div>
     </template>
 </odoo>

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

@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
+    <template id="account_financial_report.html_container">
+        <t t-call-assets="web.assets_backend" />
+        <link
+            href="/account_financial_report/static/src/css/report_html.css"
+            rel="stylesheet"
+        />
+        <t t-set="body_classname" t-value="'container'" />
+        <t t-call="web.report_layout">
+            <t t-out="0" />
+        </t>
+    </template>
     <template id="account_financial_report.internal_layout">
         <div class="article o_account_financial_reports_page">
             <link
@@ -12,7 +23,7 @@
             <div class="row">
                 <div class="col-6 custom_footer">
                     <span
-                        t-esc="context_timestamp(datetime.datetime.now()).strftime('%Y-%m-%d %H:%M')"
+                        t-out="context_timestamp(datetime.datetime.now()).strftime('%Y-%m-%d %H:%M')"
                     />
                 </div>
                 <div class="col-6 text-right custom_footer">

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <template id="open_items">
-        <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_open_items_base" />
@@ -9,15 +9,16 @@
             </t>
         </t>
     </template>
+
     <template id="account_financial_report.report_open_items_base">
         <!-- Saved flag fields into variables, used to define columns display -->
         <t t-set="foreign_currency" t-value="foreign_currency" />
         <!-- Defines global variables used by internal layout -->
         <t t-set="title">
             Open Items -
-            <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" />
         <div class="page">
@@ -28,51 +29,87 @@
                     style="text-align: center;"
                 />
             </div>
-            <!-- Display filters -->
-            <t t-call="account_financial_report.report_open_items_filters" />
-            <t t-foreach="Open_Items.keys()" t-as="account_id">
-                <!-- Display account header -->
-                <div class="act_as_table list_table" style="margin-top: 10px;" />
-                <div class="account_title" style="width: 100%;">
-                    <span t-esc="accounts_data[account_id]['code']" />
-                    -
-                    <span t-esc="accounts_data[account_id]['name']" />
-                </div>
-                <t t-if="not show_partner_details">
-                    <div class="act_as_table data_table" style="width: 100%;">
-                        <t
-                            t-call="account_financial_report.report_open_items_lines_header"
-                        />
-                        <!-- Display account move lines -->
-                        <t t-foreach="Open_Items[account_id]" t-as="line">
-                            <t
-                                t-call="account_financial_report.report_open_items_lines"
-                            />
-                        </t>
+            <t t-if="grouped_by == 'salesperson' and show_partner_details">
+                <t t-foreach="partners_data.keys()" t-as="partner_id">
+                    <t t-call="account_financial_report.report_open_items_filters" />
+                    <div class="act_as_caption account_title">
+                        <span t-esc="partners_data[partner_id]['name']" />
                     </div>
-                </t>
-                <t t-if="show_partner_details">
-                    <div class="page_break">
-                        <!-- Display account partners -->
-                        <t t-foreach="Open_Items[account_id]" t-as="partner_id">
-                            <div class="act_as_caption account_title">
-                                <span t-esc="partners_data[partner_id]['name']" />
+                    <t t-foreach="Open_Items.keys()" t-as="account_id">
+                        <t t-if="partner_id in Open_Items[account_id]">
+                            <div
+                                class="act_as_table list_table"
+                                style="margin-top: 10px;"
+                            />
+                            <div class="account_title" style="width: 100%;">
+                                <span t-esc="accounts_data[account_id]['code']" />
+                                -
+                                <span t-esc="accounts_data[account_id]['name']" />
                             </div>
-                            <div class="act_as_table data_table" style="width: 100%;">
-                                <!-- Display partner header -->
+
+                            <t t-if="Open_Items[account_id]">
                                 <t
-                                    t-call="account_financial_report.report_open_items_lines_header"
+                                    t-set="partner_totals"
+                                    t-value="o._calculate_amounts_by_partner(account_id,Open_Items[account_id][partner_id])"
                                 />
-                                <!-- Display partner move lines -->
                                 <t
-                                    t-foreach="Open_Items[account_id][partner_id]"
-                                    t-as="line"
+                                    t-foreach="partner_totals.get(account_id, {})"
+                                    t-as="partner_id_key"
                                 >
-                                    <t
-                                        t-call="account_financial_report.report_open_items_lines"
-                                    />
+                                    <t t-set="has_lines" t-value="False" />
+                                    <div
+                                        class="act_as_table data_table"
+                                        style="width: 100%;"
+                                    >
+                                        <t
+                                            t-foreach="Open_Items[account_id][partner_id]"
+                                            t-as="line"
+                                        >
+                                            <t
+                                                t-if="line['partner_id'] == partner_id_key"
+                                            >
+                                                <t t-set="has_lines" t-value="True" />
+                                            </t>
+                                        </t>
+                                        <t t-if="has_lines">
+                                            <!-- Display partner header -->
+                                            <t
+                                                t-call="account_financial_report.report_open_items_lines_header"
+                                            />
+                                        </t>
+                                        <t
+                                            t-foreach="Open_Items[account_id][partner_id]"
+                                            t-as="line"
+                                        >
+                                            <t
+                                                t-if="line['partner_id'] == partner_id_key"
+                                            >
+                                                <!-- Display partner move lines -->
+                                                <t
+                                                    t-call="account_financial_report.report_open_items_lines"
+                                                />
+                                            </t>
+                                        </t>
+                                    </div>
+                                    <!-- Check if there were any lines displayed for the partner -->
+                                    <t t-if="has_lines">
+                                        <!-- Calculate and display subtotal for current partner_id -->
+                                        <t
+                                            t-call="account_financial_report.report_open_items_ending_cumul"
+                                        >
+                                            <t
+                                                t-set="currency_id"
+                                                t-value="accounts_data[account_id]['currency_name']"
+                                            />
+                                            <t
+                                                t-set="type"
+                                                t-value="'partner_subtotal_type'"
+                                            />
+                                        </t>
+                                    </t>
                                 </t>
-                            </div>
+                            </t>
+                            <!-- Display account footer -->
                             <t
                                 t-call="account_financial_report.report_open_items_ending_cumul"
                             >
@@ -87,23 +124,92 @@
                                 <t t-set="type" t-value='"partner_type"' />
                             </t>
                         </t>
-                    </div>
+                    </t>
+                    <div style="page-break-after: always;" />
                 </t>
-                <!-- Display account footer -->
-                <t t-call="account_financial_report.report_open_items_ending_cumul">
-                    <t
-                        t-set="account_or_partner_id"
-                        t-value="accounts_data[account_id]"
-                    />
-                    <t
-                        t-set="currency_id"
-                        t-value="accounts_data[account_id]['currency_name']"
-                    />
-                    <t t-set="type" t-value='"account_type"' />
+            </t>
+            <t t-else="">
+                <!-- Display filters -->
+                <t t-call="account_financial_report.report_open_items_filters" />
+                <t t-foreach="Open_Items.keys()" t-as="account_id">
+                    <!-- Display account header -->
+                    <div class="act_as_table list_table" style="margin-top: 10px;" />
+                    <div class="account_title" style="width: 100%;">
+                        <span t-esc="accounts_data[account_id]['code']" />
+                        -
+                        <span t-esc="accounts_data[account_id]['name']" />
+                    </div>
+                    <t t-if="not show_partner_details">
+                        <div class="act_as_table data_table" style="width: 100%;">
+                            <t
+                                t-call="account_financial_report.report_open_items_lines_header"
+                            />
+                            <!-- Display account move lines -->
+                            <t t-foreach="Open_Items[account_id]" t-as="line">
+                                <t
+                                    t-call="account_financial_report.report_open_items_lines"
+                                />
+                            </t>
+                        </div>
+                    </t>
+                    <t t-if="show_partner_details">
+                        <div class="page_break">
+                            <!-- Display account partners -->
+                            <t t-foreach="Open_Items[account_id]" t-as="partner_id">
+                                <div class="act_as_caption account_title">
+                                    <span t-esc="partners_data[partner_id]['name']" />
+                                </div>
+                                <div
+                                    class="act_as_table data_table"
+                                    style="width: 100%;"
+                                >
+                                    <!-- Display partner header -->
+                                    <t
+                                        t-call="account_financial_report.report_open_items_lines_header"
+                                    />
+                                    <!-- Display partner move lines -->
+                                    <t
+                                        t-foreach="Open_Items[account_id][partner_id]"
+                                        t-as="line"
+                                    >
+                                        <t
+                                            t-call="account_financial_report.report_open_items_lines"
+                                        />
+                                    </t>
+                                </div>
+                                <t
+                                    t-call="account_financial_report.report_open_items_ending_cumul"
+                                >
+                                    <t
+                                        t-set="account_or_partner_id"
+                                        t-value="partners_data[partner_id]"
+                                    />
+                                    <t
+                                        t-set="currency_id"
+                                        t-value="accounts_data[account_id]['currency_name']"
+                                    />
+                                    <t t-set="type" t-value='"partner_type"' />
+                                </t>
+                            </t>
+                        </div>
+                    </t>
+                    <!-- Display account footer -->
+                    <t t-call="account_financial_report.report_open_items_ending_cumul">
+                        <t
+                            t-set="account_or_partner_id"
+                            t-value="accounts_data[account_id]"
+                        />
+                        <t
+                            t-set="currency_id"
+                            t-value="accounts_data[account_id]['currency_name']"
+                        />
+                        <t t-set="type" t-value='"account_type"' />
+                    </t>
                 </t>
             </t>
         </div>
     </template>
+
     <template id="account_financial_report.report_open_items_filters">
         <div class="act_as_table data_table" style="width: 100%;">
             <div class="act_as_row labels">
@@ -174,7 +280,7 @@
         <div class="act_as_row lines">
             <!--## date-->
             <div class="act_as_cell left">
-                <span t-raw="line['date'].strftime('%d/%m/%Y')" />
+                <span t-out="line['date'].strftime('%d/%m/%Y')" />
             </div>
             <!--## move-->
             <div class="act_as_cell left">
@@ -219,7 +325,7 @@
             </div>
             <!--## ref - label-->
             <div class="act_as_cell left">
-                <span t-esc="line['ref_label']" />
+                <span t-esc="limit_text(line['ref_label'], 'label_text_limit')" />
             </div>
             <!--## date_due-->
             <div class="act_as_cell left">
@@ -294,6 +400,20 @@
                         Partner ending balance
                     </div>
                 </t>
+                <t t-if='type == "partner_subtotal_type"'>
+                    <div class="act_as_cell first_column" style="width: 36.34%;" />
+                    <t
+                        t-set="partner"
+                        t-value="env['res.partner'].browse(partner_id_key)"
+                    />
+                    <t t-if="partner">
+                        <span t-esc="partner.name" />
+                    </t>
+                    <div class="act_as_cell right" style="width: 28.66%;">
+                        Ending
+                        balance
+                    </div>
+                </t>
                 <!--## date_due-->
                 <div class="act_as_cell" style="width: 6.47%;" />
                 <!--## amount_total_due-->
@@ -312,6 +432,12 @@
                             t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
                         />
                     </t>
+                    <t t-if='type == "partner_subtotal_type"'>
+                        <span
+                            t-esc="partner_totals[account_id][partner_id_key]['residual']"
+                            t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
+                        />
+                    </t>
                 </div>
                 <!--## amount_total_due_currency + amount_residual_currency -->
                 <t t-if="foreign_currency">