From e46086dc2dbd935cefd764ac88b0f46101f87810 Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Wed, 20 Nov 2024 15:52:10 +0100 Subject: [PATCH 1/3] [ADD] account_ecotax_accounting --- .github/workflows/test.yml | 11 +- account_ecotax_accounting/README.rst | 85 ++++ account_ecotax_accounting/__init__.py | 1 + account_ecotax_accounting/__manifest__.py | 19 + account_ecotax_accounting/models/__init__.py | 4 + .../models/account_ecotax_classification.py | 16 + .../models/account_move.py | 110 +++++ .../models/res_company.py | 10 + .../models/res_config_settings.py | 24 + .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 2 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 426 ++++++++++++++++++ account_ecotax_accounting/tests/__init__.py | 1 + .../tests/test_ecotax_accounting.py | 187 ++++++++ .../views/account_ecotax_classification.xml | 14 + .../views/res_config_settings.xml | 31 ++ .../odoo/addons/account_ecotax_accounting | 1 + setup/account_ecotax_accounting/setup.py | 6 + 19 files changed, 947 insertions(+), 2 deletions(-) create mode 100644 account_ecotax_accounting/README.rst create mode 100644 account_ecotax_accounting/__init__.py create mode 100644 account_ecotax_accounting/__manifest__.py create mode 100644 account_ecotax_accounting/models/__init__.py create mode 100644 account_ecotax_accounting/models/account_ecotax_classification.py create mode 100644 account_ecotax_accounting/models/account_move.py create mode 100644 account_ecotax_accounting/models/res_company.py create mode 100644 account_ecotax_accounting/models/res_config_settings.py create mode 100644 account_ecotax_accounting/readme/CONTRIBUTORS.rst create mode 100644 account_ecotax_accounting/readme/DESCRIPTION.rst create mode 100644 account_ecotax_accounting/static/description/icon.png create mode 100644 account_ecotax_accounting/static/description/index.html create mode 100644 account_ecotax_accounting/tests/__init__.py create mode 100644 account_ecotax_accounting/tests/test_ecotax_accounting.py create mode 100644 account_ecotax_accounting/views/account_ecotax_classification.xml create mode 100644 account_ecotax_accounting/views/res_config_settings.xml create mode 120000 setup/account_ecotax_accounting/odoo/addons/account_ecotax_accounting create mode 100644 setup/account_ecotax_accounting/setup.py diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a7005a3fe..9b09dd450 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,10 +36,17 @@ jobs: matrix: include: - container: ghcr.io/oca/oca-ci/py3.10-odoo16.0:latest - exclude: "account_product_fiscal_classification" + exclude: "account_product_fiscal_classification,account_ecotax_accounting" name: test with Odoo - container: ghcr.io/oca/oca-ci/py3.10-ocb16.0:latest - exclude: "account_product_fiscal_classification" + exclude: "account_product_fiscal_classification,account_ecotax_accounting" + name: test with OCB + makepot: "true" + - container: ghcr.io/oca/oca-ci/py3.10-odoo16.0:latest + include: "account_ecotax_accounting" + name: test with Odoo + - container: ghcr.io/oca/oca-ci/py3.10-ocb16.0:latest + include: "account_ecotax_accounting" name: test with OCB makepot: "true" services: diff --git a/account_ecotax_accounting/README.rst b/account_ecotax_accounting/README.rst new file mode 100644 index 000000000..e0635e701 --- /dev/null +++ b/account_ecotax_accounting/README.rst @@ -0,0 +1,85 @@ +================== +Ecotaxe Accounting +================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:f50b40a0b44847a416947a1d3ad8506bec06fd47c73e5cda267332e25c602664 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--fiscal--rule-lightgray.png?logo=github + :target: https://github.com/OCA/account-fiscal-rule/tree/16.0/account_ecotax_accounting + :alt: OCA/account-fiscal-rule +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/account-fiscal-rule-16-0/account-fiscal-rule-16-0-account_ecotax_accounting + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/account-fiscal-rule&target_branch=16.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module will create a Accounting entry to transfer ecotax amount from the product income account to a ecotaxe income account. +For each invoice with ecotax, an other accounting entry is created/linked to it and will re-sunchronize in case of cancelation. + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Akretion + +Contributors +~~~~~~~~~~~~ + +* Florian da Costa + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +.. |maintainer-florian-dacosta| image:: https://github.com/florian-dacosta.png?size=40px + :target: https://github.com/florian-dacosta + :alt: florian-dacosta + +Current `maintainer `__: + +|maintainer-florian-dacosta| + +This module is part of the `OCA/account-fiscal-rule `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_ecotax_accounting/__init__.py b/account_ecotax_accounting/__init__.py new file mode 100644 index 000000000..0650744f6 --- /dev/null +++ b/account_ecotax_accounting/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/account_ecotax_accounting/__manifest__.py b/account_ecotax_accounting/__manifest__.py new file mode 100644 index 000000000..c1f305da1 --- /dev/null +++ b/account_ecotax_accounting/__manifest__.py @@ -0,0 +1,19 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + "name": "Ecotaxe Accounting", + "summary": "Automatically isolate ecotaxe amount in a dedicated account", + "version": "16.0.1.0.0", + "category": "Fiscale Rules", + "author": "Akretion,Odoo Community Association (OCA)", + "excludes": ["account_ecotax_tax"], + "maintainers": ["florian-dacosta"], + "website": "https://github.com/OCA/account-fiscal-rule", + "license": "AGPL-3", + "depends": ["account_ecotax"], + "data": [ + "views/account_ecotax_classification.xml", + "views/res_config_settings.xml", + ], + "installable": True, +} diff --git a/account_ecotax_accounting/models/__init__.py b/account_ecotax_accounting/models/__init__.py new file mode 100644 index 000000000..f1dafd5d8 --- /dev/null +++ b/account_ecotax_accounting/models/__init__.py @@ -0,0 +1,4 @@ +from . import account_ecotax_classification +from . import res_company +from . import res_config_settings +from . import account_move diff --git a/account_ecotax_accounting/models/account_ecotax_classification.py b/account_ecotax_accounting/models/account_ecotax_classification.py new file mode 100644 index 000000000..ae1a03dff --- /dev/null +++ b/account_ecotax_accounting/models/account_ecotax_classification.py @@ -0,0 +1,16 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class AccountEcotaxClassification(models.Model): + _inherit = "account.ecotax.classification" + + ecotax_account_id = fields.Many2one( + "account.account", + string="Ecotaxe Account", + help="In case a customer invoice is validated with ecotax of this " + "classification, the ecotax amount will be transfered from the product " + "account to this account. If this field is not set, the account " + "configured on company level will be used", + ) diff --git a/account_ecotax_accounting/models/account_move.py b/account_ecotax_accounting/models/account_move.py new file mode 100644 index 000000000..16908466a --- /dev/null +++ b/account_ecotax_accounting/models/account_move.py @@ -0,0 +1,110 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from collections import defaultdict + +from odoo import _, exceptions, fields, models + + +class AccountMove(models.Model): + _inherit = "account.move" + + ecotax_move_id = fields.Many2one("account.move", readonly=True, copy=False) + + def _create_prepare_ecotax_move_vals(self): + self.ensure_one() + ecotax_journal_id = self.company_id.ecotax_journal_id.id + if not ecotax_journal_id: + raise exceptions.UserError( + _( + "Please configure the relative ecotax journal on the company settings" + ) + ) + return { + "journal_id": ecotax_journal_id, + "move_type": "entry", + "ref": _("Ecotaxe entry for %s") % self.name, + "date": self.date, + "currency_id": self.currency_id.id, + "company_id": self.company_id.id, + } + + def _manage_ecotax_isolation(self): + self.ensure_one() + ecotax_lines = self.invoice_line_ids.ecotax_line_ids + account_ecotax_mapping = defaultdict(float) + product_account_mapping = defaultdict(float) + for ecotax_line in ecotax_lines: + account = ( + ecotax_line.classification_id.ecotax_account_id + or self.company_id.ecotax_account_id + ) + if not account: + continue + account_ecotax_mapping[account] += ecotax_line.amount_total + product_account_mapping[ + ecotax_line.account_move_line_id.account_id + ] += ecotax_line.amount_total + if not account_ecotax_mapping: + return self.env["account.move"] + ecotax_move = self.ecotax_move_id + if ecotax_move: + if ecotax_move.state != "cancel": + raise exceptions.ValidationError( + _("The linked ecotax entry should be canceled.") + ) + ecotax_move.button_draft() + ecotax_move.line_ids.unlink() + else: + vals = self._create_prepare_ecotax_move_vals() + ecotax_move = self.create(vals) + self.write({"ecotax_move_id": ecotax_move.id}) + line_vals_list = [] + for account, amount_curr in account_ecotax_mapping.items(): + line_vals = { + "name": "ecotax for %s" % self.name, + "account_id": account.id, + "currency_id": self.currency_id.id, + "amount_currency": self.move_type == "out_invoice" + and -amount_curr + or amount_curr, + "move_id": ecotax_move.id, + # We never want tax lines here even if the account has a default + # tax set + "tax_ids": False, + } + line_vals_list.append(line_vals) + for account, amount_curr in product_account_mapping.items(): + line_vals = { + "account_id": account.id, + "currency_id": self.currency_id.id, + "amount_currency": self.move_type == "out_invoice" + and amount_curr + or -amount_curr, + "move_id": ecotax_move.id, + # We never want tax lines here even if the account has a default + # tax set + "tax_ids": False, + } + line_vals_list.append(line_vals) + ecotax_move.write({"line_ids": [(0, 0, vals) for vals in line_vals_list]}) + ecotax_move.action_post() + return ecotax_move + + def _post(self, soft=True): + res = super()._post(soft=soft) + for move in self: + if move.move_type in ("out_invoice", "out_refund"): + move._manage_ecotax_isolation() + return res + + def button_draft(self): + res = super().button_draft() + if self.ecotax_move_id: + self.ecotax_move_id.button_cancel() + return res + + def button_cancel(self): + res = super().button_cancel() + if self.ecotax_move_id: + self.ecotax_move_id.button_cancel() + return res diff --git a/account_ecotax_accounting/models/res_company.py b/account_ecotax_accounting/models/res_company.py new file mode 100644 index 000000000..d50c2b066 --- /dev/null +++ b/account_ecotax_accounting/models/res_company.py @@ -0,0 +1,10 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class ResCompany(models.Model): + _inherit = "res.company" + + ecotax_account_id = fields.Many2one("account.account") + ecotax_journal_id = fields.Many2one("account.journal") diff --git a/account_ecotax_accounting/models/res_config_settings.py b/account_ecotax_accounting/models/res_config_settings.py new file mode 100644 index 000000000..02bb4bc9c --- /dev/null +++ b/account_ecotax_accounting/models/res_config_settings.py @@ -0,0 +1,24 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import fields, models + + +class ResConfigSettings(models.TransientModel): + _inherit = "res.config.settings" + + ecotax_account_id = fields.Many2one( + "account.account", + string="Ecotaxe Account", + related="company_id.ecotax_account_id", + readonly=False, + help="When a customer invoices with ecotax is validated, if the ecotax " + "classifications do not have any account configured, the ecotax amount " + "will be isolated in this account.", + ) + ecotax_journal_id = fields.Many2one( + "account.journal", + string="Ecotaxe Journal", + related="company_id.ecotax_journal_id", + readonly=False, + help="Journal used to create the ecotax isolation accounting entries", + ) diff --git a/account_ecotax_accounting/readme/CONTRIBUTORS.rst b/account_ecotax_accounting/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..0bddb053a --- /dev/null +++ b/account_ecotax_accounting/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Florian da Costa diff --git a/account_ecotax_accounting/readme/DESCRIPTION.rst b/account_ecotax_accounting/readme/DESCRIPTION.rst new file mode 100644 index 000000000..b8eace9ad --- /dev/null +++ b/account_ecotax_accounting/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +This module will create a Accounting entry to transfer ecotax amount from the product income account to a ecotaxe income account. +For each invoice with ecotax, an other accounting entry is created/linked to it and will re-sunchronize in case of cancelation. diff --git a/account_ecotax_accounting/static/description/icon.png b/account_ecotax_accounting/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/account_ecotax_accounting/static/description/index.html b/account_ecotax_accounting/static/description/index.html new file mode 100644 index 000000000..88415c889 --- /dev/null +++ b/account_ecotax_accounting/static/description/index.html @@ -0,0 +1,426 @@ + + + + + +Ecotaxe Accounting + + + +
+

Ecotaxe Accounting

+ + +

Beta License: AGPL-3 OCA/account-fiscal-rule Translate me on Weblate Try me on Runboat

+

This module will create a Accounting entry to transfer ecotax amount from the product income account to a ecotaxe income account. +For each invoice with ecotax, an other accounting entry is created/linked to it and will re-sunchronize in case of cancelation.

+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Akretion
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+ +Odoo Community Association + +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

Current maintainer:

+

florian-dacosta

+

This module is part of the OCA/account-fiscal-rule project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/account_ecotax_accounting/tests/__init__.py b/account_ecotax_accounting/tests/__init__.py new file mode 100644 index 000000000..ed3da94bb --- /dev/null +++ b/account_ecotax_accounting/tests/__init__.py @@ -0,0 +1 @@ +from . import test_ecotax_accounting diff --git a/account_ecotax_accounting/tests/test_ecotax_accounting.py b/account_ecotax_accounting/tests/test_ecotax_accounting.py new file mode 100644 index 000000000..5bcd27024 --- /dev/null +++ b/account_ecotax_accounting/tests/test_ecotax_accounting.py @@ -0,0 +1,187 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + + +from odoo.tests import tagged + +from odoo.addons.account.tests.common import TestAccountReconciliationCommon + + +@tagged("post_install", "-at_install") +class TestEcotaxAccounting(TestAccountReconciliationCommon): + @classmethod + def setUpClass(cls, chart_template_ref=None): + super().setUpClass(chart_template_ref=chart_template_ref) + cls.ecotax_journal = cls.env["account.journal"].create( + { + "name": "Ecotax", + "code": "ECO", + "type": "general", + } + ) + cls.ecotax_account1 = cls.env["account.account"].create( + { + "name": "Ecotax revenue", + "code": "708015", + "account_type": "income", + } + ) + cls.ecotax_account2 = cls.env["account.account"].create( + { + "name": "Ecotax revenue 2", + "code": "708016", + "account_type": "income", + } + ) + cls.product_account_revenue = cls.env["account.account"].create( + { + "name": "Product revenue", + "code": "701016", + "account_type": "income", + } + ) + cls.ecotax_classification1 = cls.env["account.ecotax.classification"].create( + { + "name": "Fixed Ecotax 1", + "ecotax_type": "fixed", + "default_fixed_ecotax": 0.4, + "product_status": "M", + "supplier_status": "MAN", + "ecotax_account_id": cls.ecotax_account1.id, + } + ) + cls.env.company.write( + { + "ecotax_account_id": cls.ecotax_account2.id, + "ecotax_journal_id": cls.ecotax_journal.id, + } + ) + cls.ecotax_classification2 = cls.env["account.ecotax.classification"].create( + { + "name": "Fixed Ecotax 2", + "ecotax_type": "fixed", + "default_fixed_ecotax": 0.2, + "product_status": "M", + "supplier_status": "MAN", + } + ) + cls.invoice_partner = cls.env["res.partner"].create({"name": "Test"}) + + def test_invoice_ecotax_isolation(self): + eco_class1_id = self.ecotax_classification1.id + eco_class2_id = self.ecotax_classification2.id + invoice = self.env["account.move"].create( + { + "move_type": "out_invoice", + "partner_id": self.invoice_partner.id, + "invoice_line_ids": [ + ( + 0, + 0, + { + "account_id": self.company_data[ + "default_account_revenue" + ].id, + "price_unit": 10.0, + "quantity": 2.0, + "name": "invoice line 1", + "tax_ids": [(6, 0, [])], + "ecotax_line_ids": [ + ( + 0, + 0, + { + "classification_id": eco_class1_id, + }, + ), + ( + 0, + 0, + { + "classification_id": eco_class2_id, + }, + ), + ], + }, + ), + ( + 0, + 0, + { + "account_id": self.product_account_revenue.id, + "price_unit": 20.0, + "quantity": 1.0, + "name": "invoice line 2", + "tax_ids": [(6, 0, [])], + "ecotax_line_ids": [ + ( + 0, + 0, + { + "classification_id": eco_class1_id, + }, + ), + ], + }, + ), + ( + 0, + 0, + { + "account_id": self.product_account_revenue.id, + "price_unit": 30.0, + "quantity": 2.0, + "name": "invoice line 2", + "tax_ids": [(6, 0, [])], + "ecotax_line_ids": [ + ( + 0, + 0, + { + "classification_id": eco_class2_id, + }, + ), + ], + }, + ), + ], + } + ) + invoice.action_post() + self.assertEqual(invoice.amount_total, 100.0) + + ecotax_move = invoice.ecotax_move_id + self.assertTrue(ecotax_move) + self.assertEqual(ecotax_move.journal_id, self.ecotax_journal) + self.assertEqual(ecotax_move.state, "posted") + self.assertEqual(len(ecotax_move.line_ids), 4) + default_product_line = ecotax_move.line_ids.filtered( + lambda l: l.account_id == self.company_data["default_account_revenue"] + ) + other_product_line = ecotax_move.line_ids.filtered( + lambda l: l.account_id == self.product_account_revenue + ) + ecotax1_line = ecotax_move.line_ids.filtered( + lambda l: l.account_id == self.ecotax_account1 + ) + ecotax2_line = ecotax_move.line_ids.filtered( + lambda l: l.account_id == self.ecotax_account2 + ) + + self.assertAlmostEqual(default_product_line.debit, 1.2) + self.assertAlmostEqual(other_product_line.debit, 0.8) + self.assertAlmostEqual(ecotax1_line.credit, 1.2) + self.assertAlmostEqual(ecotax2_line.credit, 0.8) + + # test update on invoice + invoice.button_draft() + self.assertEqual(ecotax_move.state, "cancel") + line1 = invoice.invoice_line_ids.filtered( + lambda l: l.account_id == self.company_data["default_account_revenue"] + ) + line1.write({"quantity": 1.0}) + invoice.action_post() + self.assertEqual(ecotax_move.state, "posted") + ecotax1_line = ecotax_move.line_ids.filtered( + lambda l: l.account_id == self.ecotax_account1 + ) + self.assertAlmostEqual(ecotax1_line.credit, 0.8) diff --git a/account_ecotax_accounting/views/account_ecotax_classification.xml b/account_ecotax_accounting/views/account_ecotax_classification.xml new file mode 100644 index 000000000..c57bf86da --- /dev/null +++ b/account_ecotax_accounting/views/account_ecotax_classification.xml @@ -0,0 +1,14 @@ + + + + + account.ecotax.classification + + + + + + + + + diff --git a/account_ecotax_accounting/views/res_config_settings.xml b/account_ecotax_accounting/views/res_config_settings.xml new file mode 100644 index 000000000..65ef6612c --- /dev/null +++ b/account_ecotax_accounting/views/res_config_settings.xml @@ -0,0 +1,31 @@ + + + + res.config.settings + + + +

Ecotax

+
+
+
+
+
+
+
+
+
+ + + + diff --git a/setup/account_ecotax_accounting/odoo/addons/account_ecotax_accounting b/setup/account_ecotax_accounting/odoo/addons/account_ecotax_accounting new file mode 120000 index 000000000..60060cc17 --- /dev/null +++ b/setup/account_ecotax_accounting/odoo/addons/account_ecotax_accounting @@ -0,0 +1 @@ +../../../../account_ecotax_accounting \ No newline at end of file diff --git a/setup/account_ecotax_accounting/setup.py b/setup/account_ecotax_accounting/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/account_ecotax_accounting/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From 4f34a2d6d9631c3dff4bfce68e5c5c5dcfaba9ed Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Fri, 8 Aug 2025 12:07:09 +0200 Subject: [PATCH 2/3] Fix CI adding rebel modules --- .copier-answers.yml | 4 +++- .github/workflows/test.yml | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 1766445a6..9ed264742 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -16,7 +16,9 @@ odoo_test_flavor: Both odoo_version: 16.0 org_name: Odoo Community Association (OCA) org_slug: OCA -rebel_module_groups: [] +rebel_module_groups: +- account_product_fiscal_classification +- account_ecotax_accounting repo_description: Odoo Accounting Taxe and Fiscal Features repo_name: account-fiscal-rule repo_slug: account-fiscal-rule diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9b09dd450..d233ac9ee 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,10 +36,10 @@ jobs: matrix: include: - container: ghcr.io/oca/oca-ci/py3.10-odoo16.0:latest - exclude: "account_product_fiscal_classification,account_ecotax_accounting" + include: "account_product_fiscal_classification" name: test with Odoo - container: ghcr.io/oca/oca-ci/py3.10-ocb16.0:latest - exclude: "account_product_fiscal_classification,account_ecotax_accounting" + include: "account_product_fiscal_classification" name: test with OCB makepot: "true" - container: ghcr.io/oca/oca-ci/py3.10-odoo16.0:latest @@ -49,6 +49,13 @@ jobs: include: "account_ecotax_accounting" name: test with OCB makepot: "true" + - container: ghcr.io/oca/oca-ci/py3.10-odoo16.0:latest + exclude: "account_product_fiscal_classification,account_ecotax_accounting" + name: test with Odoo + - container: ghcr.io/oca/oca-ci/py3.10-ocb16.0:latest + exclude: "account_product_fiscal_classification,account_ecotax_accounting" + name: test with OCB + makepot: "true" services: postgres: image: postgres:12.0 @@ -58,6 +65,9 @@ jobs: POSTGRES_DB: odoo ports: - 5432:5432 + env: + INCLUDE: "${{ matrix.include }}" + EXCLUDE: "${{ matrix.exclude }}" steps: - uses: actions/checkout@v4 with: From 13ee5ea03cfe1f4f8dd31236a51866a8d2739b79 Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Fri, 8 Aug 2025 14:18:07 +0200 Subject: [PATCH 3/3] [FIX] Force tax on test products This aims to avoid having a different tax depending on which localization is installed for instance --- account_ecotax_sale/tests/test_sale_ecotax.py | 3 +++ account_ecotax_sale_tax/tests/test_sale_ecotax.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/account_ecotax_sale/tests/test_sale_ecotax.py b/account_ecotax_sale/tests/test_sale_ecotax.py index 7fd8a648f..d7866eed3 100644 --- a/account_ecotax_sale/tests/test_sale_ecotax.py +++ b/account_ecotax_sale/tests/test_sale_ecotax.py @@ -2,6 +2,7 @@ # @author Mourad EL HADJ MIMOUNE # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from odoo import Command from odoo.tests.common import Form from odoo.addons.account_ecotax.tests.test_ecotax import TestInvoiceEcotaxCommon @@ -16,6 +17,7 @@ def setUpClass(cls): "name": "product_a", "uom_id": cls.env.ref("uom.product_uom_unit").id, "weight": 100, + "taxes_id": [Command.set(cls.invoice_tax.ids)], "list_price": 200, } ) @@ -24,6 +26,7 @@ def setUpClass(cls): "name": "product_b", "uom_id": cls.env.ref("uom.product_uom_unit").id, "list_price": 200, + "taxes_id": [Command.set(cls.invoice_tax.ids)], "weight": 400, } ) diff --git a/account_ecotax_sale_tax/tests/test_sale_ecotax.py b/account_ecotax_sale_tax/tests/test_sale_ecotax.py index 2998ee987..c71cc8efb 100644 --- a/account_ecotax_sale_tax/tests/test_sale_ecotax.py +++ b/account_ecotax_sale_tax/tests/test_sale_ecotax.py @@ -29,7 +29,7 @@ def test_01_classification_weight_based_ecotax(self): so_form.save() self.assertEqual(self.sale.order_line.ecotax_amount_unit, 16) self.assertEqual(self.sale.order_line.subtotal_ecotax, 48) - self.assertEqual(self.sale.amount_total, 648) + self.assertEqual(self.sale.amount_total, 712.8) self.assertEqual(self.sale.amount_ecotax, 48) def test_02_classification_ecotax(self): @@ -56,5 +56,5 @@ def test_02_classification_ecotax(self): self.assertAlmostEqual(sale_line1.subtotal_ecotax, 15.0) self.assertEqual(sale_line2.ecotax_amount_unit, 16) self.assertEqual(sale_line2.subtotal_ecotax, 32) - self.assertEqual(self.sale.amount_total, 1047.0) + self.assertEqual(self.sale.amount_total, 1151.7) self.assertEqual(self.sale.amount_ecotax, 47.0)