odoo-addon-account-financial-report 17.0.1.7.0__py3-none-any.whl → 17.0.1.8.0__py3-none-any.whl

odoo/addons/account_financial_report/report/trial_balance.py

@@ -861,6 +861,7 @@ class TrialBalanceReport(models.AbstractModel):
         return groups_data
 
     def _get_report_values(self, docids, data):
+        res = super()._get_report_values(docids, data)
         show_partner_details = data["show_partner_details"]
         wizard_id = data["wizard_id"]
         company = self.env["res.company"].browse(data["company_id"])
@@ -955,29 +956,32 @@ class TrialBalanceReport(models.AbstractModel):
                     total_amount[account_id]["currency_name"] = accounts_data[
                         account_id
                     ]["currency_name"]
-        return {
-            "doc_ids": [wizard_id],
-            "doc_model": "trial.balance.report.wizard",
-            "docs": self.env["trial.balance.report.wizard"].browse(wizard_id),
-            "foreign_currency": data["foreign_currency"],
-            "company_name": company.display_name,
-            "company_currency": company.currency_id,
-            "currency_name": company.currency_id.name,
-            "date_from": data["date_from"],
-            "date_to": data["date_to"],
-            "only_posted_moves": data["only_posted_moves"],
-            "hide_account_at_0": data["hide_account_at_0"],
-            "show_partner_details": data["show_partner_details"],
-            "limit_hierarchy_level": data["limit_hierarchy_level"],
-            "show_hierarchy": show_hierarchy,
-            "hide_parent_hierarchy_level": data["hide_parent_hierarchy_level"],
-            "trial_balance": trial_balance,
-            "trial_balance_grouped": trial_balance_grouped,
-            "total_amount": total_amount,
-            "total_amount_grouped": total_amount_grouped,
-            "accounts_data": accounts_data,
-            "partners_data": partners_data,
-            "show_hierarchy_level": show_hierarchy_level,
-            "currency_model": self.env["res.currency"],
-            "grouped_by": grouped_by,
-        }
+        res.update(
+            {
+                "doc_ids": [wizard_id],
+                "doc_model": "trial.balance.report.wizard",
+                "docs": self.env["trial.balance.report.wizard"].browse(wizard_id),
+                "foreign_currency": data["foreign_currency"],
+                "company_name": company.display_name,
+                "company_currency": company.currency_id,
+                "currency_name": company.currency_id.name,
+                "date_from": data["date_from"],
+                "date_to": data["date_to"],
+                "only_posted_moves": data["only_posted_moves"],
+                "hide_account_at_0": data["hide_account_at_0"],
+                "show_partner_details": data["show_partner_details"],
+                "limit_hierarchy_level": data["limit_hierarchy_level"],
+                "show_hierarchy": show_hierarchy,
+                "hide_parent_hierarchy_level": data["hide_parent_hierarchy_level"],
+                "trial_balance": trial_balance,
+                "trial_balance_grouped": trial_balance_grouped,
+                "total_amount": total_amount,
+                "total_amount_grouped": total_amount_grouped,
+                "accounts_data": accounts_data,
+                "partners_data": partners_data,
+                "show_hierarchy_level": show_hierarchy_level,
+                "currency_model": self.env["res.currency"],
+                "grouped_by": grouped_by,
+            }
+        )
+        return res

odoo/addons/account_financial_report/report/vat_report.py

@@ -8,6 +8,7 @@ from odoo import api, models
 
 
 class VATReport(models.AbstractModel):
+    _inherit = "report.account_financial_report.abstract_report"
     _name = "report.account_financial_report.vat_report"
     _description = "Vat Report Report"
 
@@ -197,6 +198,7 @@ class VATReport(models.AbstractModel):
         return vat_report_list
 
     def _get_report_values(self, docids, data):
+        res = super()._get_report_values(docids, data)
         wizard_id = data["wizard_id"]
         company = self.env["res.company"].browse(data["company_id"])
         company_id = data["company_id"]
@@ -216,18 +218,21 @@ class VATReport(models.AbstractModel):
             vat_report = self._get_vat_report_tag_data(
                 vat_report_data, tax_data, tax_detail
             )
-        return {
-            "doc_ids": [wizard_id],
-            "doc_model": "vat.report.wizard",
-            "docs": self.env["vat.report.wizard"].browse(wizard_id),
-            "company_name": company.display_name,
-            "currency_name": company.currency_id.name,
-            "date_to": data["date_to"],
-            "date_from": data["date_from"],
-            "based_on": data["based_on"],
-            "tax_detail": data["tax_detail"],
-            "vat_report": vat_report,
-        }
+        res.update(
+            {
+                "doc_ids": [wizard_id],
+                "doc_model": "vat.report.wizard",
+                "docs": self.env["vat.report.wizard"].browse(wizard_id),
+                "company_name": company.display_name,
+                "currency_name": company.currency_id.name,
+                "date_to": data["date_to"],
+                "date_from": data["date_from"],
+                "based_on": data["based_on"],
+                "tax_detail": data["tax_detail"],
+                "vat_report": vat_report,
+            }
+        )
+        return res
 
     def _get_ml_fields_vat_report(self):
         return [

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:cfbb2086a9be8678690d4a0be5da4df57c9659b82433d1ce724a46ae7aa70cb3
+!! source digest: sha256:1f99d9f09b6b898088824b7b115048de26536d0ab194954bfec9847b648e1c9a
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/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/addons/account_financial_report/tests/test_aged_partner_balance.py

@@ -56,7 +56,7 @@ class TestAgedPartnerBalance(TransactionCase):
         """Check that report is produced correctly."""
         wizard = self.wizard_with_line_details
         wizard.onchange_type_accounts_only()
-        data = wizard._prepare_report_aged_partner_balance()
+        data = wizard._prepare_report_data()
 
         # Simulate web client behavior:
         # default value is a datetime.date but web client sends back strings
@@ -71,7 +71,7 @@ class TestAgedPartnerBalance(TransactionCase):
         self.assertTrue(result)
         second_wizard = self.wizard_without_line_details
         second_wizard.onchange_type_accounts_only()
-        data = second_wizard._prepare_report_aged_partner_balance()
+        data = second_wizard._prepare_report_data()
 
         # Simulate web client behavior:
         # default value is a datetime.date but web client sends back strings
@@ -91,7 +91,7 @@ class TestAgedPartnerBalance(TransactionCase):
         wizard.age_partner_config_id = self.account_age_report_config.id
 
         wizard.onchange_type_accounts_only()
-        data = wizard._prepare_report_aged_partner_balance()
+        data = wizard._prepare_report_data()
 
         # Simulate web client behavior:
         # default value is a datetime.date but web client sends back strings
@@ -109,7 +109,7 @@ class TestAgedPartnerBalance(TransactionCase):
         second_wizard.age_partner_config_id = self.account_age_report_config.id
 
         second_wizard.onchange_type_accounts_only()
-        data = second_wizard._prepare_report_aged_partner_balance()
+        data = second_wizard._prepare_report_data()
 
         # Simulate web client behavior:
         # default value is a datetime.date but web client sends back strings

odoo/addons/account_financial_report/tests/test_general_ledger.py

@@ -118,7 +118,7 @@ class TestGeneralLedgerReport(AccountTestInvoicingCommon):
                 "centralize": centralize,
             }
         )
-        data = general_ledger._prepare_report_general_ledger()
+        data = general_ledger._prepare_report_data()
         res_data = self.env[
             "report.account_financial_report.general_ledger"
         ]._get_report_values(general_ledger, data)

odoo/addons/account_financial_report/tests/test_journal_ledger.py

@@ -177,7 +177,7 @@ class TestJournalReport(AccountTestInvoicingCommon):
                 "move_target": "all",
             }
         )
-        data = wiz._prepare_report_journal_ledger()
+        data = wiz._prepare_report_data()
         res_data = self.JournalLedgerReport._get_report_values(wiz, data)
         self.check_report_journal_debit_credit(res_data, 100, 100)
 
@@ -186,7 +186,7 @@ class TestJournalReport(AccountTestInvoicingCommon):
         res_data = self.JournalLedgerReport._get_report_values(wiz, data)
         self.check_report_journal_debit_credit(res_data, 200, 200)
         wiz.move_target = "posted"
-        data = wiz._prepare_report_journal_ledger()
+        data = wiz._prepare_report_data()
         res_data = self.JournalLedgerReport._get_report_values(wiz, data)
         self.check_report_journal_debit_credit(res_data, 0, 0)
 
@@ -203,7 +203,7 @@ class TestJournalReport(AccountTestInvoicingCommon):
         self.check_report_journal_debit_credit(res_data, 200, 200)
 
         wiz.date_from = self.previous_fy_date_start
-        data = wiz._prepare_report_journal_ledger()
+        data = wiz._prepare_report_data()
         res_data = self.JournalLedgerReport._get_report_values(wiz, data)
         self.check_report_journal_debit_credit(res_data, 300, 300)
 
@@ -238,7 +238,7 @@ class TestJournalReport(AccountTestInvoicingCommon):
                 "move_target": "all",
             }
         )
-        data = wiz._prepare_report_journal_ledger()
+        data = wiz._prepare_report_data()
         res_data = self.JournalLedgerReport._get_report_values(wiz, data)
         self.check_report_journal_debit_credit(res_data, 250, 250)
         self.check_report_journal_debit_credit_taxes(res_data, 0, 300, 0, 50)
@@ -276,7 +276,7 @@ class TestJournalReport(AccountTestInvoicingCommon):
                 "move_target": "all",
             }
         )
-        data = wiz._prepare_report_journal_ledger()
+        data = wiz._prepare_report_data()
         res_data = self.JournalLedgerReport._get_report_values(wiz, data)
 
         self.check_report_journal_debit_credit(res_data, 250, 250)

odoo/addons/account_financial_report/tests/test_open_items.py

@@ -67,5 +67,5 @@ class TestOpenItems(AccountTestInvoicingCommon):
             }
         )
         wizard.on_change_account_range()
-        res = wizard._prepare_report_open_items()
+        res = wizard._prepare_report_data()
         self.assertEqual(res["grouped_by"], wizard.grouped_by)

odoo/addons/account_financial_report/tests/test_trial_balance.py

@@ -192,7 +192,7 @@ class TestTrialBalanceReport(AccountTestInvoicingCommon):
                 "show_partner_details": with_partners,
             }
         )
-        data = trial_balance._prepare_report_trial_balance()
+        data = trial_balance._prepare_report_data()
         res_data = self.env[
             "report.account_financial_report.trial_balance"
         ]._get_report_values(trial_balance, data)
@@ -547,7 +547,7 @@ class TestTrialBalanceReport(AccountTestInvoicingCommon):
                 "fy_start_date": self.fy_date_start,
             }
         )
-        data = trial_balance._prepare_report_trial_balance()
+        data = trial_balance._prepare_report_data()
         res_data = self.env[
             "report.account_financial_report.trial_balance"
         ]._get_report_values(trial_balance, data)
@@ -600,7 +600,7 @@ class TestTrialBalanceReport(AccountTestInvoicingCommon):
                 "fy_start_date": self.fy_date_start,
             }
         )
-        data = trial_balance._prepare_report_trial_balance()
+        data = trial_balance._prepare_report_data()
         res_data = self.env[
             "report.account_financial_report.trial_balance"
         ]._get_report_values(trial_balance, data)
@@ -654,7 +654,7 @@ class TestTrialBalanceReport(AccountTestInvoicingCommon):
                 "fy_start_date": self.fy_date_start,
             }
         )
-        data = trial_balance._prepare_report_trial_balance()
+        data = trial_balance._prepare_report_data()
         res_data = self.env[
             "report.account_financial_report.trial_balance"
         ]._get_report_values(trial_balance, data)

odoo/addons/account_financial_report/tests/test_vat_report.py

@@ -218,7 +218,7 @@ class TestVATReport(AccountTestInvoicingCommon):
                 "tax_detail": True,
             }
         )
-        data = vat_report._prepare_vat_report()
+        data = vat_report._prepare_report_data()
         res_data = self.env[
             "report.account_financial_report.vat_report"
         ]._get_report_values(vat_report, data)

odoo/addons/account_financial_report/wizard/abstract_wizard.py

@@ -34,18 +34,41 @@ class AbstractWizard(models.AbstractModel):
         required=False,
         string="Company",
     )
+    label_text_limit = fields.Integer(default=40)
 
     def button_export_html(self):
         self.ensure_one()
+        self._set_default_wizard_values()
         report_type = "qweb-html"
         return self._export(report_type)
 
     def button_export_pdf(self):
         self.ensure_one()
+        self._set_default_wizard_values()
         report_type = "qweb-pdf"
         return self._export(report_type)
 
     def button_export_xlsx(self):
         self.ensure_one()
+        self._set_default_wizard_values()
         report_type = "xlsx"
         return self._export(report_type)
+
+    def _limit_text(self, value, limit_field="label_text_limit"):
+        limit = self[limit_field]
+        if value and limit and len(value) > limit:
+            value = value[:limit] + "..."
+        return value
+
+    def _prepare_report_data(self):
+        self.ensure_one()
+        return {"wizard_name": self._name, "wizard_id": self.id}
+
+    def _set_default_wizard_values(self):
+        self.env["ir.default"].set(
+            self._name,
+            "label_text_limit",
+            self.label_text_limit,
+            user_id=False,
+            company_id=True,
+        )

odoo/addons/account_financial_report/wizard/aged_partner_balance_wizard.py

@@ -117,7 +117,7 @@ class AgedPartnerBalanceWizard(models.TransientModel):
 
     def _print_report(self, report_type):
         self.ensure_one()
-        data = self._prepare_report_aged_partner_balance()
+        data = self._prepare_report_data()
         if report_type == "xlsx":
             report_name = "a_f_r.report_aged_partner_balance_xlsx"
         else:
@@ -132,6 +132,7 @@ class AgedPartnerBalanceWizard(models.TransientModel):
         )
 
     def _prepare_report_aged_partner_balance(self):
+        # TODO: Kept for compatibility - To be merged into _prepare_report_data in 19
         self.ensure_one()
         return {
             "wizard_id": self.id,
@@ -146,6 +147,11 @@ class AgedPartnerBalanceWizard(models.TransientModel):
             "age_partner_config_id": self.age_partner_config_id.id,
         }
 
+    def _prepare_report_data(self):
+        res = super()._prepare_report_data()
+        res.update(self._prepare_report_aged_partner_balance())
+        return res
+
     def _export(self, report_type):
         """Default export is PDF."""
         return self._print_report(report_type)

odoo/addons/account_financial_report/wizard/general_ledger_wizard.py

@@ -276,7 +276,7 @@ class GeneralLedgerReportWizard(models.TransientModel):
 
     def _print_report(self, report_type):
         self.ensure_one()
-        data = self._prepare_report_general_ledger()
+        data = self._prepare_report_data()
         if report_type == "xlsx":
             report_name = "a_f_r.report_general_ledger_xlsx"
         else:
@@ -291,6 +291,7 @@ class GeneralLedgerReportWizard(models.TransientModel):
         )
 
     def _prepare_report_general_ledger(self):
+        # TODO: Kept for compatibility - To be merged into _prepare_report_data in 19
         self.ensure_one()
         return {
             "wizard_id": self.id,
@@ -313,6 +314,11 @@ class GeneralLedgerReportWizard(models.TransientModel):
             "domain": self._get_account_move_lines_domain(),
         }
 
+    def _prepare_report_data(self):
+        res = super()._prepare_report_data()
+        res.update(self._prepare_report_general_ledger())
+        return res
+
     def _export(self, report_type):
         """Default export is PDF."""
         return self._print_report(report_type)

odoo/addons/account_financial_report/wizard/general_ledger_wizard_view.xml

@@ -91,6 +91,11 @@
                                 context="{'skip_search_count': 1}"
                             />
                         </page>
+                        <page name="format" string="Format">
+                            <group>
+                                <field name="label_text_limit" />
+                            </group>
+                        </page>
                     </notebook>
                 </div>
                 <div invisible="only_one_unaffected_earnings_account">

odoo/addons/account_financial_report/wizard/journal_ledger_wizard.py

@@ -75,7 +75,7 @@ class JournalLedgerReportWizard(models.TransientModel):
 
     def _print_report(self, report_type):
         self.ensure_one()
-        data = self._prepare_report_journal_ledger()
+        data = self._prepare_report_data()
         if report_type == "xlsx":
             report_name = "a_f_r.report_journal_ledger_xlsx"
         else:
@@ -90,6 +90,7 @@ class JournalLedgerReportWizard(models.TransientModel):
         )
 
     def _prepare_report_journal_ledger(self):
+        # TODO: Kept for compatibility - To be merged into _prepare_report_data in 19
         self.ensure_one()
         journals = self.journal_ids
         if not journals:
@@ -112,6 +113,11 @@ class JournalLedgerReportWizard(models.TransientModel):
             "with_auto_sequence": self.with_auto_sequence,
         }
 
+    def _prepare_report_data(self):
+        res = super()._prepare_report_data()
+        res.update(self._prepare_report_journal_ledger())
+        return res
+
     def _export(self, report_type):
         """Default export is PDF."""
         self.ensure_one()

odoo/addons/account_financial_report/wizard/journal_ledger_wizard_view.xml

@@ -32,6 +32,7 @@
                         <field name="foreign_currency" />
                         <field name="with_account_name" />
                         <field name="with_auto_sequence" />
+                        <field name="label_text_limit" />
                     </group>
                     <group />
                 </group>

odoo/addons/account_financial_report/wizard/open_items_wizard.py

@@ -153,7 +153,7 @@ class OpenItemsReportWizard(models.TransientModel):
 
     def _print_report(self, report_type):
         self.ensure_one()
-        data = self._prepare_report_open_items()
+        data = self._prepare_report_data()
         if report_type == "xlsx":
             report_name = "a_f_r.report_open_items_xlsx"
         else:
@@ -168,6 +168,7 @@ class OpenItemsReportWizard(models.TransientModel):
         )
 
     def _prepare_report_open_items(self):
+        # TODO: Kept for compatibility - To be merged into _prepare_report_data in 19
         self.ensure_one()
         return {
             "wizard_id": self.id,
@@ -185,5 +186,10 @@ class OpenItemsReportWizard(models.TransientModel):
             "grouped_by": self.grouped_by,
         }
 
+    def _prepare_report_data(self):
+        res = super()._prepare_report_data()
+        res.update(self._prepare_report_open_items())
+        return res
+
     def _export(self, report_type):
         return self._print_report(report_type)

odoo/addons/account_financial_report/wizard/open_items_wizard_view.xml

@@ -24,6 +24,7 @@
                         <field name="grouped_by" />
                         <field name="hide_account_at_0" />
                         <field name="foreign_currency" />
+                        <field name="label_text_limit" />
                     </group>
                 </group>
                 <group name="partner_filter" col="1">

odoo/addons/account_financial_report/wizard/trial_balance_wizard.py

@@ -239,7 +239,7 @@ class TrialBalanceReportWizard(models.TransientModel):
 
     def _print_report(self, report_type):
         self.ensure_one()
-        data = self._prepare_report_trial_balance()
+        data = self._prepare_report_data()
         if report_type == "xlsx":
             report_name = "a_f_r.report_trial_balance_xlsx"
         else:
@@ -254,6 +254,7 @@ class TrialBalanceReportWizard(models.TransientModel):
         )
 
     def _prepare_report_trial_balance(self):
+        # TODO: Kept for compatibility - To be merged into _prepare_report_data in 19
         self.ensure_one()
         return {
             "wizard_id": self.id,
@@ -277,6 +278,11 @@ class TrialBalanceReportWizard(models.TransientModel):
             "grouped_by": self.grouped_by,
         }
 
+    def _prepare_report_data(self):
+        res = super()._prepare_report_data()
+        res.update(self._prepare_report_trial_balance())
+        return res
+
     def _export(self, report_type):
         """Default export is PDF."""
         return self._print_report(report_type)

odoo/addons/account_financial_report/wizard/vat_report_wizard.py

@@ -68,7 +68,7 @@ class VATReportWizard(models.TransientModel):
 
     def _print_report(self, report_type):
         self.ensure_one()
-        data = self._prepare_vat_report()
+        data = self._prepare_report_data()
         if report_type == "xlsx":
             report_name = "a_f_r.report_vat_report_xlsx"
         else:
@@ -83,6 +83,7 @@ class VATReportWizard(models.TransientModel):
         )
 
     def _prepare_vat_report(self):
+        # TODO: Kept for compatibility - To be merged into _prepare_report_data in 19
         self.ensure_one()
         return {
             "wizard_id": self.id,
@@ -95,6 +96,11 @@ class VATReportWizard(models.TransientModel):
             "account_financial_report_lang": self.env.lang,
         }
 
+    def _prepare_report_data(self):
+        res = super()._prepare_report_data()
+        res.update(self._prepare_vat_report())
+        return res
+
     def _export(self, report_type):
         """Default export is PDF."""
         return self._print_report(report_type)

{odoo_addon_account_financial_report-17.0.1.7.0.dist-info → odoo_addon_account_financial_report-17.0.1.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-account_financial_report
-Version: 17.0.1.7.0
+Version: 17.0.1.8.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
@@ -29,7 +29,7 @@ Account Financial Reports
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:cfbb2086a9be8678690d4a0be5da4df57c9659b82433d1ce724a46ae7aa70cb3
+   !! source digest: sha256:1f99d9f09b6b898088824b7b115048de26536d0ab194954bfec9847b648e1c9a
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png