odoo-addon-account-financial-report 15.0.3.0.0.1__py3-none-any.whl → 15.0.3.1.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:7a729cad2177a2d79dea23692b620f65ca49b3f28348bb0f191cd074fdb4bf41
+   !! source digest: sha256:fa3709792bdb87d5699afcd9bcdc39c7c927bc864adcb1a08a627e88c55a4164
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

odoo/addons/account_financial_report/__manifest__.py

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

odoo/addons/account_financial_report/i18n/account_financial_report.pot

@@ -1148,6 +1148,7 @@ msgstr ""
 #: code:addons/account_financial_report/report/open_items_xlsx.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

@@ -215,11 +215,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]:
@@ -228,7 +235,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],
@@ -279,7 +286,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

@@ -287,6 +287,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
@@ -310,6 +313,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]
@@ -322,6 +326,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:7a729cad2177a2d79dea23692b620f65ca49b3f28348bb0f191cd074fdb4bf41
+!! source digest: sha256:fa3709792bdb87d5699afcd9bcdc39c7c927bc864adcb1a08a627e88c55a4164
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/account-financial-reporting/tree/15.0/account_financial_report"><img alt="OCA/account-financial-reporting" src="https://img.shields.io/badge/github-OCA%2Faccount--financial--reporting-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/account-financial-reporting-15-0/account-financial-reporting-15-0-account_financial_report"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/account-financial-reporting&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module adds a set of financial reports. They are accessible under

{odoo_addon_account_financial_report-15.0.3.0.0.1.dist-info → odoo_addon_account_financial_report-15.0.3.1.0.dist-info}/METADATA

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

{odoo_addon_account_financial_report-15.0.3.0.0.1.dist-info → odoo_addon_account_financial_report-15.0.3.1.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
-odoo/addons/account_financial_report/README.rst,sha256=a-YYNhmZ_7H1t7XgluNtLlch7SVLImSe0eDPv5maRyE,6889
+odoo/addons/account_financial_report/README.rst,sha256=_Dj4IXtm4lkENf5k20dajRmRX_0h73yiJ-j29TDAPKI,6889
 odoo/addons/account_financial_report/__init__.py,sha256=YoL8hk5QxSifbFJL7gPzpOSk-3zB1OSHJBXyZK25G6Q,187
-odoo/addons/account_financial_report/__manifest__.py,sha256=G05L8B5x61L7mQ_4Ld95CKR0C_m4a2Paniq4TETkEbk,2307
+odoo/addons/account_financial_report/__manifest__.py,sha256=ygDuqchPoy9G0lL9QjST8aklcoa6GEUvVa1027TDMKo,2307
 odoo/addons/account_financial_report/menuitems.xml,sha256=k20N6cNRlDsnPhc378MVs7jwzJhbbJQ2k-P3WdsmF_M,1206
 odoo/addons/account_financial_report/reports.xml,sha256=c2KamS250rNzHUInjNwC0G2dhwiIqtYgbked51PtmVw,9254
-odoo/addons/account_financial_report/i18n/account_financial_report.pot,sha256=ypCilq5ysJuqD-s7BUd2sop_UtJTD86WVpSGdUobVYI,85393
+odoo/addons/account_financial_report/i18n/account_financial_report.pot,sha256=1xJDwfyAn4ULV3o6Tj0vpcIZJerwhmXfWF7tqKUskos,85459
 odoo/addons/account_financial_report/i18n/ar.po,sha256=bihZISzHhgELfeIHhrekJttgJsTq-D-3T0YAXMoxWzQ,93182
 odoo/addons/account_financial_report/i18n/ca.po,sha256=V1jky-Xj_Ju1xCS2JDSFO5rndKz43jWPY6tiyM6wYGI,90022
 odoo/addons/account_financial_report/i18n/da.po,sha256=qaMeKCi-_c7hUjsYHSm3vf-DbrhP5njy-n2waDNLGmI,89254
@@ -37,16 +37,16 @@ odoo/addons/account_financial_report/readme/HISTORY.rst,sha256=sgCgHPjX3fXH6T0yS
 odoo/addons/account_financial_report/readme/ROADMAP.rst,sha256=CK1z_cr3bdtTPHyCOXliTBkAB0rqPL_srPhIkBj-6Xw,362
 odoo/addons/account_financial_report/report/__init__.py,sha256=D-L2gAu6aAsGo9YtxVH14sulDEPHK0CEy7A2kTwewTE,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=ugty0nle8yhqdxCdi6aBjxEh8vN2u2KRz9hTsrpJgT0,29911
+odoo/addons/account_financial_report/report/abstract_report_xlsx.py,sha256=tx3R8NNXKU6AEobYs5urvaVHNqOxXCOZTY3Rf80Ec0c,29932
 odoo/addons/account_financial_report/report/aged_partner_balance.py,sha256=p-D_r-PA8dKl0tHYawEcP5QpvjwiBq7eSQm2kRBHY-A,20848
 odoo/addons/account_financial_report/report/aged_partner_balance_xlsx.py,sha256=9xB660H5Xv8aX65oy-1gDXBSjQERIpRrlJhbtXtyToQ,14492
 odoo/addons/account_financial_report/report/general_ledger.py,sha256=wRXeQsrMlaZtGbjcSDDCyN5EjGM3Wlp4CGfmWIhcQmE,35441
 odoo/addons/account_financial_report/report/general_ledger_xlsx.py,sha256=lYk-CJ8n9H_fVOBRe6pPnqkDLibs3WIpEIptZXEX-xk,16456
 odoo/addons/account_financial_report/report/journal_ledger.py,sha256=j83-QCAONs7AAh1C3C7_3_nByKk43B7o3Atx42OhdOc,15362
 odoo/addons/account_financial_report/report/journal_ledger_xlsx.py,sha256=Pp7iDkBjSk0BqZkSPAiKI2hBHNcjKYjZoBxuL_ENz5E,10126
-odoo/addons/account_financial_report/report/open_items.py,sha256=7iIrnkCLuH17Lx0I98Nvt0KfYpcyhVcNRSJMr9i_PS8,13788
+odoo/addons/account_financial_report/report/open_items.py,sha256=ylazC_E-iYHWdYmSz8iC2gljSvOksSdB-b0weSqF0EM,14091
 odoo/addons/account_financial_report/report/open_items_xlsx.py,sha256=a4HMQ97VkwTO_8tnxyzFIIlLkawaG1HBXnujgYUI_Ug,15119
-odoo/addons/account_financial_report/report/trial_balance.py,sha256=TNfnjUD0TLXmDvcj6cUHDK60EfOdtLj4PAh9zh346tg,40093
+odoo/addons/account_financial_report/report/trial_balance.py,sha256=jVrUCrop4qgfu2nugeNP8g5X7pbLBU88XYCzzRXKUaY,40784
 odoo/addons/account_financial_report/report/trial_balance_xlsx.py,sha256=iGn0bVz63eMNL6Xdnjk8r4JdZrX2ojnEm9E0BaOcDoY,13278
 odoo/addons/account_financial_report/report/vat_report.py,sha256=mRr8zk3sTVvz7CFHQAzDL4Eexqzt7X6JVOEPD2axumM,10163
 odoo/addons/account_financial_report/report/vat_report_xlsx.py,sha256=aa0dLzYdywjmO63ONRYUBTpSGmsPfEjX60CkUbULuo8,2317
@@ -60,7 +60,7 @@ odoo/addons/account_financial_report/report/templates/vat_report.xml,sha256=F5hQ
 odoo/addons/account_financial_report/security/ir.model.access.csv,sha256=S1VQLLwLeaOeAMYGqtoOqHUaZVrvDUVE4Z-0-SRjSGQ,1134
 odoo/addons/account_financial_report/security/security.xml,sha256=gpNJnzruXfeYskn26FqY9U04FiuTf8vgLCKEGY8PADM,422
 odoo/addons/account_financial_report/static/description/icon.png,sha256=WW-eOIjW5-jo7tgBieNv6K2DUKMoHFSVctnp0htstHI,15230
-odoo/addons/account_financial_report/static/description/index.html,sha256=vnhIUbULmQnNjLhbBYoCjpvvyTuKJQa6t5Z9kmXglsI,19748
+odoo/addons/account_financial_report/static/description/index.html,sha256=7JTFw2UaglotN2FhNEggVAgH9PPCdZq1bQHWZIkzv-8,19748
 odoo/addons/account_financial_report/static/src/css/report.css,sha256=y0CysZUK3afkYSHgBaMi_qmh8da3XXEZwJDjRBg6HqQ,2335
 odoo/addons/account_financial_report/static/src/css/report_html.css,sha256=I1kX1RsThtjGNLOaNJEWCvMnB9iAFW6nGkcyFYZzJoA,135
 odoo/addons/account_financial_report/static/src/js/action_manager_report.js,sha256=g8aZkSRMgNcFzQ4f_3mmeKl7oNnoap_cDUxuyGxMT4M,1608
@@ -98,7 +98,7 @@ odoo/addons/account_financial_report/wizard/trial_balance_wizard.py,sha256=rq4kn
 odoo/addons/account_financial_report/wizard/trial_balance_wizard_view.xml,sha256=kzsselPX_jYDWQEbDSXIS5K2vKuyzjTZMdinH0976c0,7413
 odoo/addons/account_financial_report/wizard/vat_report_wizard.py,sha256=pJATDNWLcEWvctby5e5yvv4Kz7YDfCTi7YZP7slA8a4,3424
 odoo/addons/account_financial_report/wizard/vat_report_wizard_view.xml,sha256=T3P81O4csDGP7Jmf7eAtmbIIldja3IoXbBmweMMt8vA,2330
-odoo_addon_account_financial_report-15.0.3.0.0.1.dist-info/METADATA,sha256=uD3uCSE-Na9AP0qJlap5TeXjg5oVX4yLpzXrF6AbCsk,7567
-odoo_addon_account_financial_report-15.0.3.0.0.1.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-odoo_addon_account_financial_report-15.0.3.0.0.1.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
-odoo_addon_account_financial_report-15.0.3.0.0.1.dist-info/RECORD,,
+odoo_addon_account_financial_report-15.0.3.1.0.dist-info/METADATA,sha256=XPVj6ttbn9PG5Wvx8WzKz41pPpFHz0DzTcuYFAndmZU,7565
+odoo_addon_account_financial_report-15.0.3.1.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+odoo_addon_account_financial_report-15.0.3.1.0.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
+odoo_addon_account_financial_report-15.0.3.1.0.dist-info/RECORD,,