odoo-addon-account-financial-report 18.0.1.2.6.3__py3-none-any.whl → 18.0.1.3.0__py3-none-any.whl

odoo/addons/account_financial_report/README.rst

@@ -11,7 +11,7 @@ Account Financial Reports
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:4c8dd71b140619ff57e872835ca14c50beb3ddda9bde30205ce9456304884adb
+   !! source digest: sha256:ecc9aa27354484eb81b4932dca2dd1cda89b3be41d684259fb8826b9098b61cf
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |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": "18.0.1.2.6",
+    "version": "18.0.1.3.0",
     "category": "Reporting",
     "summary": "OCA Financial Reports",
     "author": "Camptocamp,"

odoo/addons/account_financial_report/i18n/account_financial_report.pot

@@ -897,6 +897,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 ""
@@ -1110,10 +1111,17 @@ msgstr ""
 #. odoo-python
 #: code:addons/account_financial_report/report/general_ledger.py:0
 #: code:addons/account_financial_report/report/open_items.py:0
+#: code:addons/account_financial_report/report/open_items_xlsx.py:0
 #: code:addons/account_financial_report/report/trial_balance.py:0
 msgid "Missing Partner"
 msgstr ""
 
+#. module: account_financial_report
+#. odoo-python
+#: code:addons/account_financial_report/report/open_items.py:0
+msgid "Missing Salesperson"
+msgstr ""
+
 #. module: account_financial_report
 #: model:ir.model,name:account_financial_report.model_account_age_report_configuration_line
 msgid "Model to set interval lines for Age partner balance report"
@@ -1306,6 +1314,11 @@ msgstr ""
 msgid "Partner Initial balance"
 msgstr ""
 
+#. module: account_financial_report
+#: model:ir.model.fields.selection,name:account_financial_report.selection__open_items_report_wizard__grouped_by__salesperson
+msgid "Partner Salesperson"
+msgstr ""
+
 #. module: account_financial_report
 #. odoo-python
 #: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:0
@@ -1328,6 +1341,7 @@ msgstr ""
 
 #. module: account_financial_report
 #: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__partners
+#: model:ir.model.fields.selection,name:account_financial_report.selection__open_items_report_wizard__grouped_by__partners
 msgid "Partners"
 msgstr ""
 

odoo/addons/account_financial_report/i18n/es.po

@@ -927,6 +927,7 @@ msgstr "Agrupar por"
 
 #. 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 "Agrupado por"
@@ -1150,7 +1151,13 @@ msgstr "Línea"
 #: code:addons/account_financial_report/report/open_items.py:0
 #: code:addons/account_financial_report/report/trial_balance.py:0
 msgid "Missing Partner"
-msgstr "Falta el Socio"
+msgstr "Falta la empresa"
+
+#. module: account_financial_report
+#: code:addons/account_financial_report/report/open_items.py:0
+#, python-format
+msgid "Missing Salesperson"
+msgstr "Sin comercial"
 
 #. module: account_financial_report
 #: model:ir.model,name:account_financial_report.model_account_age_report_configuration_line
@@ -1348,6 +1355,12 @@ msgstr ""
 msgid "Partner Initial balance"
 msgstr "Saldo Inicial de empresa"
 
+#. module: account_financial_report
+#. odoo-python
+#: model:ir.model.fields.selection,name:account_financial_report.selection__open_items_report_wizard__grouped_by__salesperson
+msgid "Partner Salesperson"
+msgstr "Comercial de la empresa"
+
 #. module: account_financial_report
 #. odoo-python
 #: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:0
@@ -1370,6 +1383,7 @@ msgstr "Saldo inicial de empresa"
 
 #. module: account_financial_report
 #: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__partners
+#: model:ir.model.fields.selection,name:account_financial_report.selection__open_items_report_wizard__grouped_by__partners
 msgid "Partners"
 msgstr "Empresas"
 

odoo/addons/account_financial_report/report/open_items.py

@@ -1,5 +1,6 @@
 # © 2016 Julien Coux (Camptocamp)
 # Copyright 2020 ForgeFlow S.L. (https://www.forgeflow.com)
+# Copyright 2024 Tecnativa - Carolina Fernandez
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 import operator
@@ -66,6 +67,7 @@ class OpenItemsReport(models.AbstractModel):
         only_posted_moves,
         company_id,
         date_from,
+        grouped_by,
     ):
         domain = self._get_move_lines_domain_not_reconciled(
             company_id, account_ids, partner_ids, only_posted_moves, date_from
@@ -75,7 +77,7 @@ class OpenItemsReport(models.AbstractModel):
             domain=domain, fields=ml_fields
         )
         journals_ids = set()
-        partners_ids = set()
+        group_ids = set()
         partners_data = {}
         if date_at_object < date.today():
             (
@@ -119,29 +121,27 @@ class OpenItemsReport(models.AbstractModel):
             journals_ids.add(move_line["journal_id"][0])
             acc_id = move_line["account_id"][0]
             # Partners data
-            if move_line["partner_id"]:
-                prt_id = move_line["partner_id"][0]
-                prt_name = move_line["partner_id"][1]
+            partner = self.env["res.partner"]
+            if move_line.get("partner_id"):
+                partner = self.env["res.partner"].browse(move_line["partner_id"][0])
+            if grouped_by == "salesperson":
+                user = partner.user_id
+                group_id = user.id or 0
+                group_name = user.name or _("Missing Salesperson")
             else:
-                prt_id = 0
-                prt_name = _("Missing Partner")
-            if prt_id not in partners_ids:
-                partners_data.update({prt_id: {"id": prt_id, "name": prt_name}})
-                partners_ids.add(prt_id)
-
+                group_id = partner.id or 0
+                group_name = partner.name or _("Missing Partner")
+            if group_id not in group_ids:
+                partners_data.update({group_id: {"id": group_id, "name": group_name}})
+                group_ids.add(group_id)
             # Move line update
-            original = 0
-
             if not float_is_zero(move_line["credit"], precision_digits=2):
                 original = move_line["credit"] * (-1)
-            if not float_is_zero(move_line["debit"], precision_digits=2):
+            else:
                 original = move_line["debit"]
 
             if move_line["ref"] == move_line["name"]:
-                if move_line["ref"]:
-                    ref_label = move_line["ref"]
-                else:
-                    ref_label = ""
+                ref_label = move_line["ref"] or ""
             elif not move_line["ref"]:
                 ref_label = move_line["name"]
             elif not move_line["name"]:
@@ -155,8 +155,8 @@ class OpenItemsReport(models.AbstractModel):
                     "date_maturity": move_line["date_maturity"]
                     and move_line["date_maturity"].strftime("%d/%m/%Y"),
                     "original": original,
-                    "partner_id": prt_id,
-                    "partner_name": prt_name,
+                    "partner_id": partner.id or 0,
+                    "partner_name": partner.name or "",
                     "ref_label": ref_label,
                     "journal_id": move_line["journal_id"][0],
                     "move_name": move_line["move_id"][1],
@@ -172,12 +172,12 @@ class OpenItemsReport(models.AbstractModel):
 
             # Open Items Move Lines Data
             if acc_id not in open_items_move_lines_data.keys():
-                open_items_move_lines_data[acc_id] = {prt_id: [move_line]}
+                open_items_move_lines_data[acc_id] = {group_id: [move_line]}
             else:
-                if prt_id not in open_items_move_lines_data[acc_id].keys():
-                    open_items_move_lines_data[acc_id][prt_id] = [move_line]
+                if group_id not in open_items_move_lines_data[acc_id].keys():
+                    open_items_move_lines_data[acc_id][group_id] = [move_line]
                 else:
-                    open_items_move_lines_data[acc_id][prt_id].append(move_line)
+                    open_items_move_lines_data[acc_id][group_id].append(move_line)
         journals_data = self._get_journals_data(list(journals_ids))
         accounts_data = self._get_accounts_data(open_items_move_lines_data.keys())
         return (
@@ -236,7 +236,9 @@ class OpenItemsReport(models.AbstractModel):
                     move_lines = []
                     for move_line in open_items_move_lines_data[acc_id][prt_id]:
                         move_lines += [move_line]
-                    move_lines = sorted(move_lines, key=lambda k: (k["date"]))
+                    move_lines = sorted(
+                        move_lines, key=lambda k: (k["date"], k["partner_id"])
+                    )
                     new_open_items[acc_id][prt_id] = move_lines
         return new_open_items
 
@@ -251,7 +253,7 @@ class OpenItemsReport(models.AbstractModel):
         date_from = data["date_from"]
         only_posted_moves = data["only_posted_moves"]
         show_partner_details = data["show_partner_details"]
-
+        grouped_by = data["grouped_by"]
         (
             move_lines_data,
             partners_data,
@@ -265,6 +267,7 @@ class OpenItemsReport(models.AbstractModel):
             only_posted_moves,
             company_id,
             date_from,
+            grouped_by,
         )
 
         total_amount = self._calculate_amounts(open_items_move_lines_data)
@@ -290,6 +293,7 @@ class OpenItemsReport(models.AbstractModel):
             "accounts_data": accounts_data,
             "total_amount": total_amount,
             "Open_Items": open_items_move_lines_data,
+            "grouped_by": grouped_by,
         }
 
     def _get_ml_fields(self):

odoo/addons/account_financial_report/report/open_items_xlsx.py

@@ -101,11 +101,126 @@ class OpenItemsXslx(models.AbstractModel):
     def _get_col_pos_final_balance_label(self):
         return 5
 
-    def _generate_report_content(self, workbook, report, data, report_data):
-        res_data = self.env[
-            "report.account_financial_report.open_items"
-        ]._get_report_values(report, data)
-        # For each account
+    def _calculate_amounts_by_partner(self, account_id, open_items_move_lines_data):
+        total_amount = {}
+        for line in open_items_move_lines_data:
+            partner_id_key = line["partner_id"]
+            if account_id not in total_amount:
+                total_amount[account_id] = {}
+            if partner_id_key not in total_amount[account_id]:
+                total_amount[account_id][partner_id_key] = {"residual": 0.0}
+            total_amount[account_id][partner_id_key]["residual"] += line[
+                "amount_residual"
+            ]
+        return total_amount
+
+    def _generate_report_content_by_salesperson(
+        self, workbook, report, data, report_data, res_data
+    ):
+        Open_items = res_data["Open_Items"]
+        accounts_data = res_data["accounts_data"]
+        partners_data = res_data["partners_data"]
+        journals_data = res_data["journals_data"]
+        total_amount = res_data["total_amount"]
+
+        for partner_id in partners_data.keys():
+            # Create a new sheet for each partner
+            partner_totals = {}
+            partner_name = partners_data[partner_id]["name"]
+            new_sheet = workbook.add_worksheet(partner_name[:31])
+            report_data["sheet"] = new_sheet
+            report_data["row_pos"] = 0
+
+            for account_id in Open_items.keys():
+                if partner_id in Open_items[account_id]:
+                    self.write_array_title(
+                        accounts_data[account_id]["code"]
+                        + " - "
+                        + accounts_data[account_id]["name"],
+                        report_data,
+                    )
+
+                    # For each partner
+                    if Open_items[account_id]:
+                        type_object = "partner"
+                        # Write partner title
+                        self.write_array_title(
+                            partners_data[partner_id]["name"], report_data
+                        )
+
+                        # Calculate totals by partner_id
+                        partner_totals = self._calculate_amounts_by_partner(
+                            account_id, Open_items[account_id][partner_id]
+                        )
+                        # Display array header for move lines
+                        self.write_array_header(report_data)
+                        # Display account move lines
+                        has_lines = False
+                        for partner_id_key, total_amount_dict in partner_totals.get(
+                            account_id, {}
+                        ).items():
+                            for line in Open_items[account_id][partner_id]:
+                                if line["partner_id"] == partner_id_key:
+                                    line.update(
+                                        {
+                                            "account": accounts_data[account_id][
+                                                "code"
+                                            ],
+                                            "journal": journals_data[
+                                                line["journal_id"]
+                                            ]["code"],
+                                        }
+                                    )
+                                    self.write_line_from_dict(line, report_data)
+                                    has_lines = True
+                            if has_lines:
+                                partner = self.env["res.partner"].browse(partner_id_key)
+                                # Display ending balance line for partner
+                                partner_data = {
+                                    "id": partner_id_key,
+                                    "name": partner.name
+                                    if partner
+                                    else _("Missing Partner"),
+                                    "currency_id": accounts_data[account_id][
+                                        "currency_id"
+                                    ],
+                                    "currency_name": accounts_data[account_id][
+                                        "currency_name"
+                                    ],
+                                    "residual": total_amount_dict,
+                                }
+                                self.write_ending_balance_from_dict(
+                                    partner_data,
+                                    "partner_subtotal",
+                                    partner_totals,
+                                    report_data,
+                                    account_id=account_id,
+                                    partner_id=partner_id_key,
+                                )
+                                has_lines = False
+                        # Display ending balance line for salesperson
+                        partners_data[partner_id].update(
+                            {
+                                "currency_id": accounts_data[account_id]["currency_id"],
+                                "currency_name": accounts_data[account_id][
+                                    "currency_name"
+                                ],
+                            }
+                        )
+                        self.write_ending_balance_from_dict(
+                            partners_data[partner_id],
+                            type_object,
+                            total_amount,
+                            report_data,
+                            account_id=account_id,
+                            partner_id=partner_id,
+                        )
+                        # Line break
+                        report_data["row_pos"] += 1
+
+    def _generate_report_content_by_partner(
+        self, workbook, report, data, report_data, res_data
+    ):
         Open_items = res_data["Open_Items"]
         accounts_data = res_data["accounts_data"]
         partners_data = res_data["partners_data"]
@@ -120,7 +235,6 @@ class OpenItemsXslx(models.AbstractModel):
                 + accounts_data[account_id]["name"],
                 report_data,
             )
-
             # For each partner
             if Open_items[account_id]:
                 if show_partner_details:
@@ -180,18 +294,33 @@ class OpenItemsXslx(models.AbstractModel):
                         )
                         self.write_line_from_dict(line, report_data)
 
-                # Display ending balance line for account
-                type_object = "account"
-                self.write_ending_balance_from_dict(
-                    accounts_data[account_id],
-                    type_object,
-                    total_amount,
-                    report_data,
-                    account_id=account_id,
-                )
+                    # Display ending balance line for account
+                    type_object = "account"
+                    self.write_ending_balance_from_dict(
+                        accounts_data[account_id],
+                        type_object,
+                        total_amount,
+                        report_data,
+                        account_id=account_id,
+                    )
+
+                    # 2 lines break
+                    report_data["row_pos"] += 2
 
-                # 2 lines break
-                report_data["row_pos"] += 2
+    def _generate_report_content(self, workbook, report, data, report_data):
+        res_data = self.env[
+            "report.account_financial_report.open_items"
+        ]._get_report_values(report, data)
+        show_partner_details = res_data["show_partner_details"]
+        grouped_by = res_data["grouped_by"]
+        if grouped_by == "salesperson" and show_partner_details:
+            return self._generate_report_content_by_salesperson(
+                workbook, report, data, report_data, res_data
+            )
+        else:
+            return self._generate_report_content_by_partner(
+                workbook, report, data, report_data, res_data
+            )
 
     def write_ending_balance_from_dict(
         self,
@@ -211,6 +340,10 @@ class OpenItemsXslx(models.AbstractModel):
             name = my_object["code"] + " - " + my_object["name"]
             my_object["residual"] = total_amount[account_id]["residual"]
             label = _("Ending balance")
+        elif type_object == "partner_subtotal":
+            name = my_object["name"]
+            my_object["residual"] = total_amount[account_id][partner_id]["residual"]
+            label = _("Ending balance")
         return super().write_ending_balance_from_dict(
             my_object, name, label, report_data
         )

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

@@ -9,6 +9,7 @@
             </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" />
@@ -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">
@@ -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">

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

@@ -372,7 +372,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:4c8dd71b140619ff57e872835ca14c50beb3ddda9bde30205ce9456304884adb
+!! source digest: sha256:ecc9aa27354484eb81b4932dca2dd1cda89b3be41d684259fb8826b9098b61cf
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/account-financial-reporting/tree/18.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-18-0/account-financial-reporting-18-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=18.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/tests/test_open_items.py

@@ -1,7 +1,9 @@
 # Author: Julien Coux
 # Copyright 2016 Camptocamp SA
+# Copyright 2024 Tecnativa - Carolina Fernandez
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
+from odoo.fields import Date
 from odoo.tests import tagged
 
 from odoo.addons.account.tests.common import AccountTestInvoicingCommon
@@ -22,6 +24,14 @@ class TestOpenItems(AccountTestInvoicingCommon):
                 tracking_disable=True,
             )
         )
+        cls.account001 = cls.env["account.account"].create(
+            {
+                "code": "001",
+                "name": "Account 001",
+                "account_type": "income_other",
+                "reconcile": True,
+            }
+        )
 
     def test_partner_filter(self):
         partner_1 = self.env.ref("base.res_partner_1")
@@ -39,3 +49,23 @@ class TestOpenItems(AccountTestInvoicingCommon):
 
         wizard = self.env["open.items.report.wizard"].with_context(**context)
         self.assertEqual(wizard._default_partners(), expected_list)
+
+    def test_open_items_grouped_by(self):
+        open_item_wizard = self.env["open.items.report.wizard"]
+        all_accounts = self.env["account.account"].search(
+            [
+                ("reconcile", "=", True),
+            ],
+            order="code",
+        )
+        wizard = open_item_wizard.create(
+            {
+                "date_at": Date.today(),
+                "account_code_from": self.account001.id,
+                "account_code_to": all_accounts[-1].id,
+                "grouped_by": "salesperson",
+            }
+        )
+        wizard.on_change_account_range()
+        res = wizard._prepare_report_open_items()
+        self.assertEqual(res["grouped_by"], wizard.grouped_by)

odoo/addons/account_financial_report/wizard/open_items_wizard.py

@@ -59,6 +59,10 @@ class OpenItemsReportWizard(models.TransientModel):
         comodel_name="account.account",
         help="Ending account in a range",
     )
+    grouped_by = fields.Selection(
+        selection=[("partners", "Partners"), ("salesperson", "Partner Salesperson")],
+        default="partners",
+    )
 
     @api.onchange("account_code_from", "account_code_to")
     def on_change_account_range(self):
@@ -134,6 +138,19 @@ class OpenItemsReportWizard(models.TransientModel):
         else:
             self.account_ids = None
 
+    def _calculate_amounts_by_partner(self, account_id, open_items_move_lines_data):
+        total_amount = {}
+        for line in open_items_move_lines_data:
+            partner_id_key = line["partner_id"]
+            if account_id not in total_amount:
+                total_amount[account_id] = {}
+            if partner_id_key not in total_amount[account_id]:
+                total_amount[account_id][partner_id_key] = {"residual": 0.0}
+            total_amount[account_id][partner_id_key]["residual"] += line[
+                "amount_residual"
+            ]
+        return total_amount
+
     def _print_report(self, report_type):
         self.ensure_one()
         data = self._prepare_report_open_items()
@@ -165,6 +182,7 @@ class OpenItemsReportWizard(models.TransientModel):
             "account_ids": self.account_ids.ids,
             "partner_ids": self.partner_ids.ids or [],
             "account_financial_report_lang": self.env.lang,
+            "grouped_by": self.grouped_by,
         }
 
     def _export(self, report_type):

odoo/addons/account_financial_report/wizard/open_items_wizard_view.xml

@@ -21,6 +21,7 @@
                     <group name="other_filters">
                         <field name="target_move" widget="radio" />
                         <field name="show_partner_details" />
+                        <field name="grouped_by" />
                         <field name="hide_account_at_0" />
                         <field name="foreign_currency" />
                     </group>

{odoo_addon_account_financial_report-18.0.1.2.6.3.dist-info → odoo_addon_account_financial_report-18.0.1.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-account_financial_report
-Version: 18.0.1.2.6.3
+Version: 18.0.1.3.0
 Requires-Python: >=3.10
 Requires-Dist: odoo-addon-date_range==18.0.*
 Requires-Dist: odoo-addon-report_xlsx==18.0.*
@@ -29,7 +29,7 @@ Account Financial Reports
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:4c8dd71b140619ff57e872835ca14c50beb3ddda9bde30205ce9456304884adb
+   !! source digest: sha256:ecc9aa27354484eb81b4932dca2dd1cda89b3be41d684259fb8826b9098b61cf
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

{odoo_addon_account_financial_report-18.0.1.2.6.3.dist-info → odoo_addon_account_financial_report-18.0.1.3.0.dist-info}/RECORD

@@ -1,13 +1,13 @@
-odoo/addons/account_financial_report/README.rst,sha256=fqDONzWyDSkqSPhk_oP1Sa0PLdsaDhaETQuMQY_hmzQ,7308
+odoo/addons/account_financial_report/README.rst,sha256=ko7XFz9__JjvEcHJ4AsoUXSMAig_8ERboFxz9mr_gHo,7308
 odoo/addons/account_financial_report/__init__.py,sha256=YoL8hk5QxSifbFJL7gPzpOSk-3zB1OSHJBXyZK25G6Q,187
-odoo/addons/account_financial_report/__manifest__.py,sha256=yIKWy2Mz7Jvgh3gQ-GB1mmvrk30F2AGefhl6NQU4xnM,2061
+odoo/addons/account_financial_report/__manifest__.py,sha256=z1XSxKDVuXoExw9QnT7Wl3KSTSYzK-N3uIKfWk5Q0XQ,2061
 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=Kj9fu5spPXthOCeQYlRHBdY8Ls6Qm3bWipqBNbuGpSw,79880
+odoo/addons/account_financial_report/i18n/account_financial_report.pot,sha256=ME3vFy_j2WEs36Yn3XwpvsqS8fvlM_xGo6rh0AaTU_U,80536
 odoo/addons/account_financial_report/i18n/ar.po,sha256=KHy7GijuN4mStLkoM59XqzVAmFpMFghCcuBAbgt01NU,94131
 odoo/addons/account_financial_report/i18n/ca.po,sha256=Q9C48xuPBmsjc9Lvk13GbpLY7BVHVvcKMsZMjs_9ojQ,86610
 odoo/addons/account_financial_report/i18n/de.po,sha256=Et3gVHrNOP-y3_xCWHAxZBBtIipAOzxX0yAxkIyMjEM,92498
-odoo/addons/account_financial_report/i18n/es.po,sha256=1KyJjoVBtaMEuTT-GrVOKDy-ZHhKwgPojjWOizce7ZU,89401
+odoo/addons/account_financial_report/i18n/es.po,sha256=Ebi_bM6soUSZEensks9IKlkgdyhJ0wIVlF525S71K_c,90044
 odoo/addons/account_financial_report/i18n/es_AR.po,sha256=aACghbtcAXyo5JL3xjbV8KoY148btyHHuqaOPlcOmak,89458
 odoo/addons/account_financial_report/i18n/es_MX.po,sha256=FvBPNwLX4in3oqGVErLitn1RYWZ1-X9SvkboZuSFqDM,80169
 odoo/addons/account_financial_report/i18n/fr.po,sha256=VBGDMwFRxG1Yav_9cl-rDrbCLQgm4eWS8rq-jvidvac,94148
@@ -45,8 +45,8 @@ odoo/addons/account_financial_report/report/general_ledger.py,sha256=yHP6utvegBy
 odoo/addons/account_financial_report/report/general_ledger_xlsx.py,sha256=PlLj8FMiFRIbniLzMzvaN-p2HUAr7KnJZktRnOpYO24,17553
 odoo/addons/account_financial_report/report/journal_ledger.py,sha256=HvE8TlzMHAXGcNvqN2C8sEYx9CBKLk3a1vsu9X_3xX4,15465
 odoo/addons/account_financial_report/report/journal_ledger_xlsx.py,sha256=gqulSBNfZY5chQFbBxXLUa1I11AlY_NbaIz3lHDeF70,10060
-odoo/addons/account_financial_report/report/open_items.py,sha256=bAplEfAFLLq9-H_mM5VTttfST3DusSPT8d4mkINGpnk,12218
-odoo/addons/account_financial_report/report/open_items_xlsx.py,sha256=XtgGVN995J89c3mnaMw5uvliOJBY47H9hn4GGsPiLcs,8366
+odoo/addons/account_financial_report/report/open_items.py,sha256=wyuZ2EcYFFMXyNqBChs3r6YCqmSI_W-bzieuTnCadc8,12556
+odoo/addons/account_financial_report/report/open_items_xlsx.py,sha256=U2mzYDK_GxECJw2B45YhtJfJEQ_M35_snodnaLABKqQ,14931
 odoo/addons/account_financial_report/report/trial_balance.py,sha256=sUnfa-ss9jqMFd0fbqepNMnLwV84ywq87r4y2bEf-m4,42397
 odoo/addons/account_financial_report/report/trial_balance_xlsx.py,sha256=HqSKYcDwqeTcTYHRju7RvR410VjYnOy5vE78bHEWkQs,13246
 odoo/addons/account_financial_report/report/vat_report.py,sha256=Si2hVaxJLwLXfMqzAF0N5dMdbc2eaQtCVM0UmwQMHc0,10249
@@ -55,13 +55,13 @@ odoo/addons/account_financial_report/report/templates/aged_partner_balance.xml,s
 odoo/addons/account_financial_report/report/templates/general_ledger.xml,sha256=t_fB_YVNuD0kZe6fR9Ny1qp_Su9ucpq_IjlEw6N6RNs,39474
 odoo/addons/account_financial_report/report/templates/journal_ledger.xml,sha256=Sc2es_Xi8WWimBFp9JY_QYyAP0mMYHQhPp6Lmn7XHkY,21231
 odoo/addons/account_financial_report/report/templates/layouts.xml,sha256=EDBF0KpmyUzYODauhSIU1QL3zFYjlg3Ynq41K30WqgY,1575
-odoo/addons/account_financial_report/report/templates/open_items.xml,sha256=ku84beB5mDed_np9YhZuNygaUsdl1E-_AnlUQpq4Yy4,14834
+odoo/addons/account_financial_report/report/templates/open_items.xml,sha256=8zjI2NYzyzv3HsMaaV0uvM8dqQhZWwwKHIkei09OV6Q,21940
 odoo/addons/account_financial_report/report/templates/trial_balance.xml,sha256=fOtCCMMvAq7vQpEV0_51O6-YRQHjV9sWbB3NbkYJtYw,53287
 odoo/addons/account_financial_report/report/templates/vat_report.xml,sha256=2WeL6Njr8LFBtERKmfyi3IH-J1frSO4Gpew-ruzuWNk,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=YQCXbOuTGHCWGYwGnXMie_0tnWG5zYJGdoeey3o1xaw,382
 odoo/addons/account_financial_report/static/description/icon.png,sha256=WW-eOIjW5-jo7tgBieNv6K2DUKMoHFSVctnp0htstHI,15230
-odoo/addons/account_financial_report/static/description/index.html,sha256=xyuUBrf6XyGPeOAk6QlWJBG7mO7HerNTCBqY-KpUU-4,20640
+odoo/addons/account_financial_report/static/description/index.html,sha256=W04V75ftvNXLkKh30W8AyVcagAPZAyEqr64zzzrEfgI,20640
 odoo/addons/account_financial_report/static/src/css/report.css,sha256=UYlrKHXNvw3lcwlaTVNCxSQyMDi0JrizZjn4fS5cirw,2354
 odoo/addons/account_financial_report/static/src/css/report_html.css,sha256=WO4wfg0-z87dAqLlqz1LuA_rBizNjlGnCUCeMzSSSYs,149
 odoo/addons/account_financial_report/static/src/js/report.esm.js,sha256=bJcyov25ktGuF-eT_SUGkRLudz-6UNnKR0gmv3e-ZYc,2495
@@ -72,7 +72,7 @@ odoo/addons/account_financial_report/tests/test_age_report_configuration.py,sha2
 odoo/addons/account_financial_report/tests/test_aged_partner_balance.py,sha256=mWF9veN7r15-DhnixhDuh2y6X_itliLgZz3jDMlABrk,4584
 odoo/addons/account_financial_report/tests/test_general_ledger.py,sha256=eCRgwAIqG65sT37Q7udon85OH5PtHyrqBXGAFkZSAqQ,29114
 odoo/addons/account_financial_report/tests/test_journal_ledger.py,sha256=CTMBliHQwxcJjr7bgh8TmMA3OrNxB5DhfmO6OpqjV3o,11063
-odoo/addons/account_financial_report/tests/test_open_items.py,sha256=u_HWqxoEJiBRtacBiaHpF8ycciZVXmX_Q4qhqJUi7gg,1446
+odoo/addons/account_financial_report/tests/test_open_items.py,sha256=ffvvYkg_-s4Eu0KqQE7CKJDsmzCFb_W7WqMYYspKNLY,2480
 odoo/addons/account_financial_report/tests/test_trial_balance.py,sha256=x3yEtA6Djg1VMF0O6KdfH4ZT7sq6DcJQ1wm-9ThsHDY,27668
 odoo/addons/account_financial_report/tests/test_vat_report.py,sha256=9jkMJ9A2lquVkC6x9xkmiZ8YrH4FcySUwKNZw5u5rdM,14617
 odoo/addons/account_financial_report/view/account_age_report_configuration_views.xml,sha256=etQ_Do0Fz251A73gnWiM7lyCMKGiozIT1aU10vTs27Q,1764
@@ -92,13 +92,13 @@ odoo/addons/account_financial_report/wizard/general_ledger_wizard.py,sha256=izC4
 odoo/addons/account_financial_report/wizard/general_ledger_wizard_view.xml,sha256=h33UeqoY0VU0UiA58R1_WVEnHinLEwkE-3TwWO90vo8,7501
 odoo/addons/account_financial_report/wizard/journal_ledger_wizard.py,sha256=coCuXwBUtVP3j8OyiZSxXpiVn3H8T1WkFU8oSI_0qqU,5653
 odoo/addons/account_financial_report/wizard/journal_ledger_wizard_view.xml,sha256=_dratLc_fq4n0S6oBTQqmQE-gc-LKlmwdlH5ywoOelM,2901
-odoo/addons/account_financial_report/wizard/open_items_wizard.py,sha256=29OvzfgJvIVoskZ1Nzky72yhJmS8p4r3LJtmLLNhynI,6613
-odoo/addons/account_financial_report/wizard/open_items_wizard_view.xml,sha256=qvMifGs3k5YY8dWF3nhcSYNIdsyXf2Sg2X75CBU5vrc,4633
+odoo/addons/account_financial_report/wizard/open_items_wizard.py,sha256=8ncaypuTTscJ8HuI0AonRBjcDbiS87Sopp9XXdPuXQ0,7402
+odoo/addons/account_financial_report/wizard/open_items_wizard_view.xml,sha256=DgoEkTgBK7Cx349he87g-PB8pCWgrofa7-Sien_30GI,4685
 odoo/addons/account_financial_report/wizard/trial_balance_wizard.py,sha256=H5DOUU4W-JLJXAgJBzC8qD9U0gxao3TM0b-gKaO_jVs,11302
 odoo/addons/account_financial_report/wizard/trial_balance_wizard_view.xml,sha256=aHKMVPiQUfrpfUT0sojCfLUG38Am0DuEZSOHTPTof3k,7221
 odoo/addons/account_financial_report/wizard/vat_report_wizard.py,sha256=SQOpKuTWKjU9F5zfc7NIG0HxhZRHt5Eullia45RA_wM,3430
 odoo/addons/account_financial_report/wizard/vat_report_wizard_view.xml,sha256=3cJ0it2_5w20iw5x8QtTp11HoBk5kqQup6XjgJMbv7U,2274
-odoo_addon_account_financial_report-18.0.1.2.6.3.dist-info/METADATA,sha256=trgw_PmHtdb56_TbQie49PP1n99txfRQLXibK6puOAE,7996
-odoo_addon_account_financial_report-18.0.1.2.6.3.dist-info/WHEEL,sha256=ZhOvUsYhy81Dx67gN3TV0RchQWBIIzutDZaJODDg2Vo,81
-odoo_addon_account_financial_report-18.0.1.2.6.3.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
-odoo_addon_account_financial_report-18.0.1.2.6.3.dist-info/RECORD,,
+odoo_addon_account_financial_report-18.0.1.3.0.dist-info/METADATA,sha256=PV2-I305O5o9rLqQQihfgPRId-Ufy8tBK4mLhg76DCo,7994
+odoo_addon_account_financial_report-18.0.1.3.0.dist-info/WHEEL,sha256=ZhOvUsYhy81Dx67gN3TV0RchQWBIIzutDZaJODDg2Vo,81
+odoo_addon_account_financial_report-18.0.1.3.0.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
+odoo_addon_account_financial_report-18.0.1.3.0.dist-info/RECORD,,