odoo-addon-account-financial-report 16.0.1.10.1__py3-none-any.whl → 16.0.1.11.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:ec584b1197021e99e7545e0c2c9406822757867aa4527fe4efe8dfd5f0adc0ab
+   !! source digest: sha256:f09700927327f126c8625b22440d66ffdf4b57ba05e681e1bc7b07537aa8ff1b
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |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": "16.0.1.10.1",
+    "version": "16.0.1.11.0",
     "category": "Reporting",
     "summary": "OCA Financial Reports",
     "author": "Camptocamp,"

odoo/addons/account_financial_report/i18n/account_financial_report.pot

@@ -1186,6 +1186,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

@@ -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],
@@ -265,7 +272,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:ec584b1197021e99e7545e0c2c9406822757867aa4527fe4efe8dfd5f0adc0ab
+!! source digest: sha256:f09700927327f126c8625b22440d66ffdf4b57ba05e681e1bc7b07537aa8ff1b
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/16.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-16-0/account-financial-reporting-16-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=16.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-16.0.1.10.1.dist-info → odoo_addon_account_financial_report-16.0.1.11.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-account_financial_report
-Version: 16.0.1.10.1
+Version: 16.0.1.11.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:ec584b1197021e99e7545e0c2c9406822757867aa4527fe4efe8dfd5f0adc0ab
+   !! source digest: sha256:f09700927327f126c8625b22440d66ffdf4b57ba05e681e1bc7b07537aa8ff1b
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

{odoo_addon_account_financial_report-16.0.1.10.1.dist-info → odoo_addon_account_financial_report-16.0.1.11.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
-odoo/addons/account_financial_report/README.rst,sha256=Gsx6SCca5IbHt009gD2sdw7Vv_Q0yjONmVA032BD9F0,6972
+odoo/addons/account_financial_report/README.rst,sha256=YrPx_wNLKPaHficOB26yXNRvVDO0flItMU6p71yJOfA,6972
 odoo/addons/account_financial_report/__init__.py,sha256=YoL8hk5QxSifbFJL7gPzpOSk-3zB1OSHJBXyZK25G6Q,187
-odoo/addons/account_financial_report/__manifest__.py,sha256=DNfU9VS_yUWzar3V_qUmgc4_xypYL-n7k8DYW7Zd6dE,2062
+odoo/addons/account_financial_report/__manifest__.py,sha256=GJHjQ9O_Yf4zueWs2YwqyZBf0pWxxXQa7HGoqffQ-Vc,2062
 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=P1U1Mmx5c9VysiDBQ2HdYF9yDkHgc2iPwnGs1Jdbg-c,83705
+odoo/addons/account_financial_report/i18n/account_financial_report.pot,sha256=bLPftbmVVx8olSZ-QCVKZQx1Io4ZfQSwhzvaCo2bWy0,83771
 odoo/addons/account_financial_report/i18n/ar.po,sha256=NZeQk53pe7f2gZvxTaLH0WANLATy_lEtA7EDITH7N1Q,91684
 odoo/addons/account_financial_report/i18n/ca.po,sha256=rrafvhfR1Y7wN6ri5539ilx-44O-NL5Z3kRdwi4_euo,90545
 odoo/addons/account_financial_report/i18n/de.po,sha256=stXVO3YQWuFlJUxaTUaF22BQAgKAyLsKpNnl1-Rifgw,94371
@@ -38,16 +38,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=gRk0ytj2szK4zFwEQqAVo9b4Ofc-YG7yJXeZdn3GLgs,19616
 odoo/addons/account_financial_report/report/aged_partner_balance_xlsx.py,sha256=h_z-Jw_k46SBp5tWJh8iZU83-PGmKwGDZIyFRV--FNc,14334
 odoo/addons/account_financial_report/report/general_ledger.py,sha256=is5PS0xS63Us_hw0qXQpw_koxroMkcLD6nDjIkTyNSA,34934
 odoo/addons/account_financial_report/report/general_ledger_xlsx.py,sha256=_g7aNXL0yier8i4HwMCcWpZOtI3BuIBJxUJJWsyWp5g,17278
 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=Pp7iDkBjSk0BqZkSPAiKI2hBHNcjKYjZoBxuL_ENz5E,10126
-odoo/addons/account_financial_report/report/open_items.py,sha256=JND4C0oixuL7cc45kVj5tc4ysivHQJguEPcX_ebviWI,12258
+odoo/addons/account_financial_report/report/open_items.py,sha256=JjPpILfCbXf1Dx8JB_K8Muy2uGkfchh802Ghr2EoN0c,12561
 odoo/addons/account_financial_report/report/open_items_xlsx.py,sha256=iv32561UaRppS5XyclMnYwLHJ2icYUA1hNeUOkcl8ng,14960
-odoo/addons/account_financial_report/report/trial_balance.py,sha256=GcvZQ9tET2CHEdFbtuTuwAE9T-c89MP-fX7IXr_B3zA,31411
+odoo/addons/account_financial_report/report/trial_balance.py,sha256=nW9EGutFp3X9-uYniYZtta3xXl4PwWtgmLDQ7KE4vPQ,32102
 odoo/addons/account_financial_report/report/trial_balance_xlsx.py,sha256=phPDqy4pXbd94oFmwjPNe_XKoMCgcTXPE6HOkGJJDko,12060
 odoo/addons/account_financial_report/report/vat_report.py,sha256=pDwcCqbWTOveJD6GbOwJxU35kt8gMnzZ0rbRu2_h3KI,10317
 odoo/addons/account_financial_report/report/vat_report_xlsx.py,sha256=aa0dLzYdywjmO63ONRYUBTpSGmsPfEjX60CkUbULuo8,2317
@@ -61,7 +61,7 @@ odoo/addons/account_financial_report/report/templates/vat_report.xml,sha256=-xlv
 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=t5ARB43-znx-SJ0CW_F0lAh_E8CJDPlfmafGFiRmfjo,20035
+odoo/addons/account_financial_report/static/description/index.html,sha256=yGTSdbm4-LCrJ8yb9VrxkEG5E7Cnv6YaFSBMq3Qehr0,20035
 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=k4SVH
 odoo/addons/account_financial_report/wizard/trial_balance_wizard_view.xml,sha256=7oNGPs3s8DVw3movVGe2ryRUNl1MtN7O76UH8zaFFtI,7048
 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-16.0.1.10.1.dist-info/METADATA,sha256=vvG5RYlLjxYfvi30yBP1vwGH5R2XupwpVvEtt5Y6Cmc,7650
-odoo_addon_account_financial_report-16.0.1.10.1.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-odoo_addon_account_financial_report-16.0.1.10.1.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
-odoo_addon_account_financial_report-16.0.1.10.1.dist-info/RECORD,,
+odoo_addon_account_financial_report-16.0.1.11.0.dist-info/METADATA,sha256=tfnTO2AbMLieBY0JHBbhH_xUkmINxcN6Q_aZtylamco,7650
+odoo_addon_account_financial_report-16.0.1.11.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+odoo_addon_account_financial_report-16.0.1.11.0.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
+odoo_addon_account_financial_report-16.0.1.11.0.dist-info/RECORD,,