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

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.1.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.1
+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.1.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/ar.po,sha256=CYaygYm4FGQyNrPYqVzP_1UA28zE8xf09jqImZ_EdH4,89811
+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.1.dist-info/METADATA,sha256=sH3sNMfX1sZ48VL0dyX-B4ZUSfvFpqRSDlgJCzcwIbU,7996
-odoo_addon_account_financial_report-18.0.1.2.6.1.dist-info/WHEEL,sha256=ZhOvUsYhy81Dx67gN3TV0RchQWBIIzutDZaJODDg2Vo,81
-odoo_addon_account_financial_report-18.0.1.2.6.1.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
-odoo_addon_account_financial_report-18.0.1.2.6.1.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,,