Merge pull request #666 from OCA/15.0

Syncing from upstream OCA/operating-unit (15.0)

README.md

@@ -23,7 +23,7 @@ addon | version | maintainers | summary
 --- | --- | --- | ---
 [account_asset_operating_unit](account_asset_operating_unit/) | 15.0.1.0.0 | [![ps-tubtim](https://github.com/ps-tubtim.png?size=30px)](https://github.com/ps-tubtim) | This module adds operating unit information to assets.
 [account_asset_transfer_operating_unit](account_asset_transfer_operating_unit/) | 15.0.1.0.0 | [![Saran440](https://github.com/Saran440.png?size=30px)](https://github.com/Saran440) | Add operating unit to asset transfer
-[account_financial_report_operating_unit](account_financial_report_operating_unit/) | 15.0.1.0.0 |  | Introduces Operating Unit (OU) in financial reports
+[account_financial_report_operating_unit](account_financial_report_operating_unit/) | 15.0.1.1.0 |  | Introduces Operating Unit (OU) in financial reports
 [account_operating_unit](account_operating_unit/) | 15.0.1.3.0 |  | Introduces Operating Unit (OU) in invoices and Accounting Entries with clearing account
 [account_operating_unit_access_all](account_operating_unit_access_all/) | 15.0.1.0.0 | [![kittiu](https://github.com/kittiu.png?size=30px)](https://github.com/kittiu) | Access all OUs' Accounting
 [analytic_operating_unit](analytic_operating_unit/) | 15.0.1.0.1 |  | Analytic Operating Unit

account_financial_report_operating_unit/README.rst

@@ -7,7 +7,7 @@ Accounting Financial Report Operating Unit
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:bc3297ecdd05c28b637bc25620ee3e09e64d0b748c8180c2f08775f4341f141e
+   !! source digest: sha256:9859bfe6eaee701a126438b77acd4118fede02657ad97961270afcee8eeacd8b
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

account_financial_report_operating_unit/__manifest__.py

@@ -3,7 +3,7 @@
 {
     "name": "Accounting Financial Report Operating Unit",
     "summary": "Introduces Operating Unit (OU) in financial reports",
-    "version": "15.0.1.0.0",
+    "version": "15.0.1.1.0",
     "author": "Ecosoft, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/operating-unit",
     "category": "Accounting & Finance",

account_financial_report_operating_unit/i18n/account_financial_report_operating_unit.pot

@@ -14,46 +14,32 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: account_financial_report_operating_unit
-#: model:ir.model,name:account_financial_report_operating_unit.model_report_account_financial_report_aged_partner_balance
-msgid "Aged Partner Balance Report"
+#: model:ir.model,name:account_financial_report_operating_unit.model_account_financial_report_abstract_wizard
+msgid "Abstract Wizard"
 msgstr ""
 
 #. module: account_financial_report_operating_unit
-#: model:ir.model,name:account_financial_report_operating_unit.model_aged_partner_balance_report_wizard
-msgid "Aged Partner Balance Wizard"
+#: model:ir.model,name:account_financial_report_operating_unit.model_report_account_financial_report_aged_partner_balance
+msgid "Aged Partner Balance Report"
 msgstr ""
 
 #. module: account_financial_report_operating_unit
 #: model:ir.model,name:account_financial_report_operating_unit.model_report_account_financial_report_general_ledger
 msgid "General Ledger Report"
 msgstr ""
 
-#. module: account_financial_report_operating_unit
-#: model:ir.model,name:account_financial_report_operating_unit.model_general_ledger_report_wizard
-msgid "General Ledger Report Wizard"
-msgstr ""
-
 #. module: account_financial_report_operating_unit
 #: model:ir.model,name:account_financial_report_operating_unit.model_report_account_financial_report_journal_ledger
 msgid "Journal Ledger Report"
 msgstr ""
 
-#. module: account_financial_report_operating_unit
-#: model:ir.model,name:account_financial_report_operating_unit.model_journal_ledger_report_wizard
-msgid "Journal Ledger Report Wizard"
-msgstr ""
-
 #. module: account_financial_report_operating_unit
 #: model:ir.model,name:account_financial_report_operating_unit.model_report_account_financial_report_open_items
 msgid "Open Items Report"
 msgstr ""
 
 #. module: account_financial_report_operating_unit
-#: model:ir.model,name:account_financial_report_operating_unit.model_open_items_report_wizard
-msgid "Open Items Report Wizard"
-msgstr ""
-
-#. module: account_financial_report_operating_unit
+#: model:ir.model.fields,field_description:account_financial_report_operating_unit.field_account_financial_report_abstract_wizard__operating_unit_ids
 #: model:ir.model.fields,field_description:account_financial_report_operating_unit.field_aged_partner_balance_report_wizard__operating_unit_ids
 #: model:ir.model.fields,field_description:account_financial_report_operating_unit.field_general_ledger_report_wizard__operating_unit_ids
 #: model:ir.model.fields,field_description:account_financial_report_operating_unit.field_journal_ledger_report_wizard__operating_unit_ids
@@ -78,16 +64,6 @@ msgstr ""
 msgid "Trial Balance Report"
 msgstr ""
 
-#. module: account_financial_report_operating_unit
-#: model:ir.model,name:account_financial_report_operating_unit.model_trial_balance_report_wizard
-msgid "Trial Balance Report Wizard"
-msgstr ""
-
-#. module: account_financial_report_operating_unit
-#: model:ir.model,name:account_financial_report_operating_unit.model_vat_report_wizard
-msgid "VAT Report Wizard"
-msgstr ""
-
 #. module: account_financial_report_operating_unit
 #: model:ir.model,name:account_financial_report_operating_unit.model_report_account_financial_report_vat_report
 msgid "Vat Report Report"

account_financial_report_operating_unit/i18n/es.po

@@ -16,47 +16,33 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.6.2\n"
 
+#. module: account_financial_report_operating_unit
+#: model:ir.model,name:account_financial_report_operating_unit.model_account_financial_report_abstract_wizard
+msgid "Abstract Wizard"
+msgstr ""
+
 #. module: account_financial_report_operating_unit
 #: model:ir.model,name:account_financial_report_operating_unit.model_report_account_financial_report_aged_partner_balance
 msgid "Aged Partner Balance Report"
 msgstr "Informe de Calidad de deuda"
 
-#. module: account_financial_report_operating_unit
-#: model:ir.model,name:account_financial_report_operating_unit.model_aged_partner_balance_report_wizard
-msgid "Aged Partner Balance Wizard"
-msgstr ""
-
 #. module: account_financial_report_operating_unit
 #: model:ir.model,name:account_financial_report_operating_unit.model_report_account_financial_report_general_ledger
 msgid "General Ledger Report"
 msgstr "Informe del libro mayor"
 
-#. module: account_financial_report_operating_unit
-#: model:ir.model,name:account_financial_report_operating_unit.model_general_ledger_report_wizard
-msgid "General Ledger Report Wizard"
-msgstr ""
-
 #. module: account_financial_report_operating_unit
 #: model:ir.model,name:account_financial_report_operating_unit.model_report_account_financial_report_journal_ledger
 msgid "Journal Ledger Report"
 msgstr "Informe del libro diario"
 
-#. module: account_financial_report_operating_unit
-#: model:ir.model,name:account_financial_report_operating_unit.model_journal_ledger_report_wizard
-msgid "Journal Ledger Report Wizard"
-msgstr ""
-
 #. module: account_financial_report_operating_unit
 #: model:ir.model,name:account_financial_report_operating_unit.model_report_account_financial_report_open_items
 msgid "Open Items Report"
 msgstr "Informe de efectos abiertos"
 
 #. module: account_financial_report_operating_unit
-#: model:ir.model,name:account_financial_report_operating_unit.model_open_items_report_wizard
-msgid "Open Items Report Wizard"
-msgstr ""
-
-#. module: account_financial_report_operating_unit
+#: model:ir.model.fields,field_description:account_financial_report_operating_unit.field_account_financial_report_abstract_wizard__operating_unit_ids
 #: model:ir.model.fields,field_description:account_financial_report_operating_unit.field_aged_partner_balance_report_wizard__operating_unit_ids
 #: model:ir.model.fields,field_description:account_financial_report_operating_unit.field_general_ledger_report_wizard__operating_unit_ids
 #: model:ir.model.fields,field_description:account_financial_report_operating_unit.field_journal_ledger_report_wizard__operating_unit_ids
@@ -81,16 +67,6 @@ msgstr "Unidades operativas"
 msgid "Trial Balance Report"
 msgstr "Balance de sumas y saldos"
 
-#. module: account_financial_report_operating_unit
-#: model:ir.model,name:account_financial_report_operating_unit.model_trial_balance_report_wizard
-msgid "Trial Balance Report Wizard"
-msgstr ""
-
-#. module: account_financial_report_operating_unit
-#: model:ir.model,name:account_financial_report_operating_unit.model_vat_report_wizard
-msgid "VAT Report Wizard"
-msgstr ""
-
 #. module: account_financial_report_operating_unit
 #: model:ir.model,name:account_financial_report_operating_unit.model_report_account_financial_report_vat_report
 msgid "Vat Report Report"

account_financial_report_operating_unit/static/description/index.html

@@ -367,7 +367,7 @@ <h1 class="title">Accounting Financial Report Operating Unit</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:bc3297ecdd05c28b637bc25620ee3e09e64d0b748c8180c2f08775f4341f141e
+!! source digest: sha256:9859bfe6eaee701a126438b77acd4118fede02657ad97961270afcee8eeacd8b
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/operating-unit/tree/15.0/account_financial_report_operating_unit"><img alt="OCA/operating-unit" src="https://img.shields.io/badge/github-OCA%2Foperating--unit-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/operating-unit-15-0/operating-unit-15-0-account_financial_report_operating_unit"><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/operating-unit&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 add filter by operating units for all reports.</p>

account_financial_report_operating_unit/wizards/__init__.py

@@ -1,9 +1,3 @@
-# Copyright 2021 Ecosoft Co., Ltd. (http://ecosoft.co.th)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from . import aged_partner_balance_wizard
-from . import general_ledger_wizard
-from . import journal_ledger_wizard
-from . import open_items_wizard
-from . import trial_balance_wizard
-from . import vat_report_wizard
+from . import abstract_wizard

account_financial_report_operating_unit/wizards/vat_report_wizard.py → account_financial_report_operating_unit/wizards/abstract_wizard.py

@@ -1,17 +1,17 @@
-# Copyright 2021 Ecosoft Co., Ltd. (http://ecosoft.co.th)
+# Copyright 2025 Ecosoft Co., Ltd. (http://ecosoft.co.th)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import fields, models
 
 
-class VATReportWizard(models.TransientModel):
-    _inherit = "vat.report.wizard"
+class AbstractWizard(models.AbstractModel):
+    _inherit = "account_financial_report_abstract_wizard"
 
     operating_unit_ids = fields.Many2many(
         comodel_name="operating.unit",
     )
 
-    def _prepare_vat_report(self):
-        res = super()._prepare_vat_report()
+    def _prepare_report_data(self):
+        res = super()._prepare_report_data()
         res.update({"operating_unit_ids": self.operating_unit_ids.ids or []})
         return res

account_financial_report_operating_unit/wizards/journal_ledger_wizard_view.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <record id="journal_ledger_wizard" model="ir.ui.view">
         <field name="name">Journal Ledger</field>
         <field name="model">journal.ledger.report.wizard</field>
         <field name="inherit_id" ref="account_financial_report.journal_ledger_wizard" />
         <field name="arch" type="xml">
-            <footer position="before">
+            <xpath expr="//page[1]" position="inside">
                 <separator string="Operating units" />
                 <group name="ou_filter" col="4">
                     <field
@@ -16,8 +15,7 @@
                         colspan="4"
                     />
                 </group>
-            </footer>
+            </xpath>
         </field>
     </record>
-
 </odoo>