odoo-addon-account-financial-report 17.0.1.3.1__py3-none-any.whl → 17.0.1.4.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:31f2a0927e06cdc26579335d58ded16502b7174f37b8044dce8ee3055b24e7d1
+   !! source digest: sha256:4dd0964e1e5bccd75c7c56d0b89bd21f35a0f176bd7b9b69aaebb7db4f3bd729
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |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": "17.0.1.3.1",
+    "version": "17.0.1.4.0",
     "category": "Reporting",
     "summary": "OCA Financial Reports",
     "author": "Camptocamp,"

odoo/addons/account_financial_report/i18n/account_financial_report.pot

@@ -1171,6 +1171,7 @@ msgstr ""
 #: code:addons/account_financial_report/report/open_items.py:0
 #: code:addons/account_financial_report/report/trial_balance.py:0
 #: code:addons/account_financial_report/report/trial_balance.py:0
+#: code:addons/account_financial_report/report/trial_balance.py:0
 #, python-format
 msgid "Missing Partner"
 msgstr ""

odoo/addons/account_financial_report/report/abstract_report_xlsx.py

@@ -496,7 +496,7 @@ class AbstractReportXslx(models.AbstractModel):
                         report_data["formats"]["format_header_amount"],
                     )
                 elif cell_type == "amount_currency":
-                    if my_object["currency_id"] and value:
+                    if my_object["currency_id"]:
                         format_amt = self._get_currency_amt_format_dict(
                             my_object, report_data
                         )
@@ -597,9 +597,8 @@ class AbstractReportXslx(models.AbstractModel):
                     {"bold": True, "border": True, "bg_color": "#FFFFCC"}
                 )
                 report_data["field_name"] = format_amt
-                format_amount = "#,##0." + (
-                    "0" * line_object["currency_id"].decimal_places
-                )
+                currency = self.env["res.currency"].browse(line_object["currency_id"])
+                format_amount = "#,##0." + ("0" * currency.decimal_places)
                 format_amt.set_num_format(format_amount)
         return format_amt
 

odoo/addons/account_financial_report/report/open_items.py

@@ -206,11 +206,18 @@ class OpenItemsReport(models.AbstractModel):
 
     @api.model
     def _order_open_items_by_date(
-        self, open_items_move_lines_data, show_partner_details, partners_data
+        self,
+        open_items_move_lines_data,
+        show_partner_details,
+        partners_data,
+        accounts_data,
     ):
+        # We need to order by account code, partner_name and date
+        accounts_data_sorted = sorted(accounts_data.items(), key=lambda x: x[1]["code"])
+        account_ids_sorted = [account[0] for account in accounts_data_sorted]
         new_open_items = {}
         if not show_partner_details:
-            for acc_id in open_items_move_lines_data.keys():
+            for acc_id in account_ids_sorted:
                 new_open_items[acc_id] = {}
                 move_lines = []
                 for prt_id in open_items_move_lines_data[acc_id]:
@@ -219,7 +226,7 @@ class OpenItemsReport(models.AbstractModel):
                 move_lines = sorted(move_lines, key=lambda k: (k["date"]))
                 new_open_items[acc_id] = move_lines
         else:
-            for acc_id in open_items_move_lines_data.keys():
+            for acc_id in account_ids_sorted:
                 new_open_items[acc_id] = {}
                 for prt_id in sorted(
                     open_items_move_lines_data[acc_id],
@@ -262,7 +269,10 @@ class OpenItemsReport(models.AbstractModel):
 
         total_amount = self._calculate_amounts(open_items_move_lines_data)
         open_items_move_lines_data = self._order_open_items_by_date(
-            open_items_move_lines_data, show_partner_details, partners_data
+            open_items_move_lines_data,
+            show_partner_details,
+            partners_data,
+            accounts_data,
         )
         return {
             "doc_ids": [wizard_id],

odoo/addons/account_financial_report/report/trial_balance.py

@@ -270,6 +270,9 @@ class TrialBalanceReport(models.AbstractModel):
                 total_amount[acc_id][prt_id]["ending_currency_balance"] += round(
                     tb["amount_currency"], 2
                 )
+        total_amount[acc_id][prt_id]["partner_name"] = (
+            tb["partner_id"][1] if tb["partner_id"] else _("Missing Partner")
+        )
         return total_amount
 
     @api.model
@@ -293,6 +296,7 @@ class TrialBalanceReport(models.AbstractModel):
             total_amount[acc_id][prt_id]["debit"] = tb["debit"]
             total_amount[acc_id][prt_id]["balance"] = tb["balance"]
             total_amount[acc_id][prt_id]["initial_balance"] = 0.0
+            total_amount[acc_id][prt_id]["partner_name"] = partners_data[prt_id]["name"]
             partners_ids.add(prt_id)
         for tb in tb_initial_prt:
             acc_id = tb["account_id"][0]
@@ -305,6 +309,18 @@ class TrialBalanceReport(models.AbstractModel):
             total_amount = self._compute_acc_prt_amount(
                 total_amount, tb, acc_id, prt_id, foreign_currency
             )
+        # sort on partner_name
+        for acc_id, total_data in total_amount.items():
+            tmp_list = sorted(
+                total_data.items(),
+                key=lambda x: isinstance(x[0], int)
+                and isinstance(x[1], dict)
+                and x[1]["partner_name"]
+                or x[0],
+            )
+            total_amount[acc_id] = {}
+            for key, value in tmp_list:
+                total_amount[acc_id][key] = value
         return total_amount, partners_data
 
     def _remove_accounts_at_cero(self, total_amount, show_partner_details, company):

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:31f2a0927e06cdc26579335d58ded16502b7174f37b8044dce8ee3055b24e7d1
+!! source digest: sha256:4dd0964e1e5bccd75c7c56d0b89bd21f35a0f176bd7b9b69aaebb7db4f3bd729
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/17.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-17-0/account-financial-reporting-17-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=17.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_addon_account_financial_report-17.0.1.3.1.dist-info → odoo_addon_account_financial_report-17.0.1.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-account_financial_report
-Version: 17.0.1.3.1
+Version: 17.0.1.4.0
 Requires-Python: >=3.10
 Requires-Dist: odoo-addon-date_range>=17.0dev,<17.1dev
 Requires-Dist: odoo-addon-report_xlsx>=17.0dev,<17.1dev
@@ -24,7 +24,7 @@ Account Financial Reports
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:31f2a0927e06cdc26579335d58ded16502b7174f37b8044dce8ee3055b24e7d1
+   !! source digest: sha256:4dd0964e1e5bccd75c7c56d0b89bd21f35a0f176bd7b9b69aaebb7db4f3bd729
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

{odoo_addon_account_financial_report-17.0.1.3.1.dist-info → odoo_addon_account_financial_report-17.0.1.4.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
-odoo/addons/account_financial_report/README.rst,sha256=X-xD_ymGL7yamryDd2xjj9nL-zXAN2uys8JZlqJt6_4,6949
+odoo/addons/account_financial_report/README.rst,sha256=NNIl5ewRdrUGNSt-D8RvCL-_4-cbFS7JOtOK0YizHak,6949
 odoo/addons/account_financial_report/__init__.py,sha256=YoL8hk5QxSifbFJL7gPzpOSk-3zB1OSHJBXyZK25G6Q,187
-odoo/addons/account_financial_report/__manifest__.py,sha256=H6NknGlBXT1HmgC5HrPIfTkq-LlEMn_8ObrgxUoHui8,2061
+odoo/addons/account_financial_report/__manifest__.py,sha256=FcQQYjzvPOOSX_Zef37bBxVrabTWwDf4Vxau3ZpZxy0,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=3u0yX4w7rqGFyV0MgNO0c3GW8PwiSoezcKTTS4OUT_g,81933
+odoo/addons/account_financial_report/i18n/account_financial_report.pot,sha256=rEuc-R3lkOS3hEbLoR8Ja2BgKYQIPgCxkGsh9kbniPM,81999
 odoo/addons/account_financial_report/i18n/ar.po,sha256=kB3FxLaMBJfgiZh58x3M7jtbc_H8QoOQDBsymZ7ZuQ8,90247
 odoo/addons/account_financial_report/i18n/ca.po,sha256=0XI9oBHiwBwj0JThhCnZ0QVX6jBQkU_EZE54X0LXj2E,87050
 odoo/addons/account_financial_report/i18n/de.po,sha256=ioa7EX0xQijfCSWfyIWWb6Rm2APLqc17ASRsamnPz60,92934
@@ -38,16 +38,16 @@ odoo/addons/account_financial_report/readme/HISTORY.md,sha256=5PzKD9lPwX_nKEaZRw
 odoo/addons/account_financial_report/readme/ROADMAP.md,sha256=kZqiEvRk8A3A47ZIh-OiAtqgaPpxO6ul0P60oCEg8Qg,360
 odoo/addons/account_financial_report/report/__init__.py,sha256=A-DcPm9nBQnH58gXR3H4kQoHF0pKAjLUnPnXl1RQqng,618
 odoo/addons/account_financial_report/report/abstract_report.py,sha256=54-xtL4smXKwYIV9LkPS2OMbvVRTkZ-L7hXtgtOFixw,5959
-odoo/addons/account_financial_report/report/abstract_report_xlsx.py,sha256=-T02-Xlc1Mx2wvjOXHRwXIbnHLJXUTL61cFBPKIxzc0,29891
+odoo/addons/account_financial_report/report/abstract_report_xlsx.py,sha256=QILq6AACBxyC8Mnyz9Jj9OAEn2NySRzQMndxCwfxG2M,29912
 odoo/addons/account_financial_report/report/aged_partner_balance.py,sha256=gyCJ4lEROzfDjsgFi7fGan2XTxLmDhKOj5ta9qXVXtk,19979
 odoo/addons/account_financial_report/report/aged_partner_balance_xlsx.py,sha256=DzOfIfKJ7a6lExmjACLN0JI0t1nEtsCY-N0HHbv_5Nw,14276
 odoo/addons/account_financial_report/report/general_ledger.py,sha256=GM_RoxP_7p4lXDVJxqx6s6g8N_8bSY49MXs7gkXAcus,34835
 odoo/addons/account_financial_report/report/general_ledger_xlsx.py,sha256=qn89GrGmpsEQoC6eBFbXImYfxQq-_OpgzXL5hF1LgqM,17268
 odoo/addons/account_financial_report/report/journal_ledger.py,sha256=5_w9CmKy_eZNgJsSL1TFTTe5b3DBBEY1qmseI1RuGPI,15424
 odoo/addons/account_financial_report/report/journal_ledger_xlsx.py,sha256=kY6c-56HHauIyHAc7q5iNerz0gJQrp4ahI4OB1XeCT8,10060
-odoo/addons/account_financial_report/report/open_items.py,sha256=WFM3dCgM2iPpsfV80mbY4wtW0aZHvM9vmQviz97-ItQ,11915
+odoo/addons/account_financial_report/report/open_items.py,sha256=kRM1kI17LI_LUj3zDFf4zxMtrqDXZAO9fbBAczr04PA,12218
 odoo/addons/account_financial_report/report/open_items_xlsx.py,sha256=ERlxxsY2ERTimVEpskyp_XdsNuRW0XcFih7pJ2VF914,8366
-odoo/addons/account_financial_report/report/trial_balance.py,sha256=Qjz3bMT-76fFhhfrpo74lWv7tWOfleAkBIEV2eQta_k,31411
+odoo/addons/account_financial_report/report/trial_balance.py,sha256=Gg8x4JLw-CWRJx4eljA5iNcdbsj0f4zbKieQkHBWYLM,32102
 odoo/addons/account_financial_report/report/trial_balance_xlsx.py,sha256=-DcUdiCPAD9uXB1VsfN3EsPJHxgltz246zAUqV_zCxA,12028
 odoo/addons/account_financial_report/report/vat_report.py,sha256=eLWr9mk1bOQUPH4FEGDssfhqEfAeZUJV5ryCf8YYea0,10117
 odoo/addons/account_financial_report/report/vat_report_xlsx.py,sha256=ksdmiHDQZBBtk8fqkxSAS6-nFIyhT-wue4OTSV6xW9c,2307
@@ -61,7 +61,7 @@ odoo/addons/account_financial_report/report/templates/vat_report.xml,sha256=2WeL
 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=41y4gmRZqRqNVIk3L93Jz_aBOCxL4l3uvhGfOXEnZ0M,19748
+odoo/addons/account_financial_report/static/description/index.html,sha256=YKvaBl-qmf7Ve33XNph0k600k8nfXGK70DJgoQWhHWo,19748
 odoo/addons/account_financial_report/static/src/css/report.css,sha256=Cu4VmyY5tVXIddaojFDsg0Ute2qPCvKbLiimak_X9ik,2361
 odoo/addons/account_financial_report/static/src/css/report_html.css,sha256=I1kX1RsThtjGNLOaNJEWCvMnB9iAFW6nGkcyFYZzJoA,135
 odoo/addons/account_financial_report/static/src/js/report.esm.js,sha256=He488vLRaLv6IIuVaNSnNl8kJMIwJmMIv7GkmXyPJZs,2475
@@ -98,7 +98,7 @@ odoo/addons/account_financial_report/wizard/trial_balance_wizard.py,sha256=zTC-j
 odoo/addons/account_financial_report/wizard/trial_balance_wizard_view.xml,sha256=HmwfFnzmQvw0wOILH2J1kY3aM8IGZKMBa7CHmMOigiQ,6577
 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-17.0.1.3.1.dist-info/METADATA,sha256=KfFbg_hfbRCYBdZo0TGGiq8h5Ph3DBqpAxm2ZxLHPUE,7626
-odoo_addon_account_financial_report-17.0.1.3.1.dist-info/WHEEL,sha256=9fEMia4zL7ZuZbnCOrcYogUhmn4XFIVaJ8G4YGI31xc,81
-odoo_addon_account_financial_report-17.0.1.3.1.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
-odoo_addon_account_financial_report-17.0.1.3.1.dist-info/RECORD,,
+odoo_addon_account_financial_report-17.0.1.4.0.dist-info/METADATA,sha256=80qUbV8X-tTtbewJIXZmf034sa9o4VfQyMsdechqv14,7626
+odoo_addon_account_financial_report-17.0.1.4.0.dist-info/WHEEL,sha256=9fEMia4zL7ZuZbnCOrcYogUhmn4XFIVaJ8G4YGI31xc,81
+odoo_addon_account_financial_report-17.0.1.4.0.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
+odoo_addon_account_financial_report-17.0.1.4.0.dist-info/RECORD,,