[FIX] ecotax classification restricted by country

computing the product ecotax passing partner country in context does not work well because sometimes we cant have the country passed. For example in account.move.line._compute_totals, sometimes we do not have the context and  the tax is wrongly computed because of an empty ecotax amount.
Refactore to set or not the ecotax tax on the sale/invoice line depending on the country. It is more limited because it means than a same product can only have classification for a same set of country, but it is more reliable.

Author: florian-dacosta

account_ecotax/models/product_product.py

@@ -101,7 +101,7 @@ def _get_ecotax_amounts_from_classification(self, classifications):
         return fixed_ecotax, weight_based_ecotax, amount_ecotax
 
     def _get_country_eligible_classification(self, country):
-        self.ensure_one()
+        self and self.ensure_one()
         return self.all_ecotax_line_product_ids.filtered(
             lambda line: not line.country_ids
             or (country and country in line.country_ids)

account_ecotax_sale_tax/models/sale_order_line.py

@@ -15,11 +15,6 @@ class SaleOrderLine(models.Model):
 
     def _get_ecotax_amounts(self):
         self.ensure_one()
-        country = (
-            self.order_id.partner_shipping_id.country_id
-            or self.order_id.partner_id.country_id
-        )
-        self = self.with_context(country=country)
         # do not call super as we completly change the way to compute it
         ecotax_ids = self.tax_id.filtered(lambda tax: tax.is_ecotax)
         if (self.display_type and self.display_type != "product") or not ecotax_ids:
@@ -44,8 +39,6 @@ def _get_ecotax_amounts(self):
         "tax_id",
         "product_uom_qty",
         "product_id",
-        "order_id.partner_id",
-        "order_id.partner_shipping_id",
     )
     def _compute_ecotax_tax(self):
         return self._compute_ecotax()
@@ -61,7 +54,12 @@ def _get_new_vals_list(self):
     def _compute_ecotax_line_ids(self):
         return super()._compute_ecotax_line_ids()
 
-    @api.depends("product_id", "company_id")
+    @api.depends(
+        "product_id",
+        "company_id",
+        "order_id.partner_id",
+        "order_id.partner_shipping_id",
+    )
     def _compute_tax_id(self):
         res = super()._compute_tax_id()
         for line in self:
@@ -70,10 +68,15 @@ def _compute_tax_id(self):
 
     def _get_computed_ecotaxes(self):
         self.ensure_one()
-        sale_ecotaxes = self.product_id.all_ecotax_line_product_ids.mapped(
-            "classification_id"
-        ).mapped("sale_ecotax_ids")
-        ecotax_ids = sale_ecotaxes.filtered(
+        country = (
+            self.order_id.partner_shipping_id.country_id
+            or self.order_id.partner_id.country_id
+        )
+        eligible_classifications = self.product_id._get_country_eligible_classification(
+            country
+        )
+        sale_ecotaxs = eligible_classifications.classification_id.sale_ecotax_ids
+        ecotax_ids = sale_ecotaxs.filtered(
             lambda tax: tax.company_id == self.order_id.company_id
         )
 
@@ -90,12 +93,3 @@ def _prepare_invoice_line(self, **optional_values):
         if "ecotax_line_ids" in res and not res["ecotax_line_ids"]:
             res.pop("ecotax_line_ids")
         return res
-
-    def _convert_to_tax_base_line_dict(self):
-        self.ensure_one()
-        country = (
-            self.order_id.partner_shipping_id.country_id
-            or self.order_id.partner_id.country_id
-        )
-        self = self.with_context(country=country)
-        return super()._convert_to_tax_base_line_dict()

account_ecotax_tax/README.rst

@@ -1,7 +1,3 @@
-.. image:: https://odoo-community.org/readme-banner-image
-   :target: https://odoo-community.org/get-involved?utm_source=readme
-   :alt: Odoo Community Association
-
 =================================
 Ecotax Management (with Odoo tax)
 =================================
@@ -17,7 +13,7 @@ Ecotax Management (with Odoo tax)
 .. |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/license-AGPL--3-blue.png
+.. |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
@@ -89,6 +85,8 @@ Known issues / Roadmap
 Since an update in Odoo https://github.com/odoo/odoo/commit/13e9833e0bc809a26843890363586f61a37d061c the case with ecotax as tax included and another tax included does not work anymore.
 The ecotax tax should only be used along with price excluded tax, or be configured as price excluded itself.
 
+There is a limitation with the country restriction on ecotax classification when using the account_ecotax_tax and account_ecotax_sale_tax modules.OIt is currently not possible to have multiple classificaiton restricted to different countries for a same product.
+
 Bug Tracker
 ===========
 

account_ecotax_tax/models/account_move_line.py

@@ -18,11 +18,6 @@ class AcountMoveLine(models.Model):
 
     def _get_ecotax_amounts(self):
         self.ensure_one()
-        country = (
-            self.move_id.partner_shipping_id.country_id
-            or self.move_id.partner_id.country_id
-        )
-        self = self.with_context(country=country)
         ecotax_ids = self.tax_ids.filtered(lambda tax: tax.is_ecotax)
 
         if self.display_type == "tax" or not ecotax_ids:
@@ -57,8 +52,6 @@ def _get_ecotax_amounts(self):
         "tax_ids",
         "quantity",
         "product_id",
-        "move_id.partner_id",
-        "move_id.partner_shipping_id",
     )
     def _compute_ecotax_tax(self):
         return self._compute_ecotax()
@@ -74,23 +67,40 @@ def _get_new_vals_list(self):
     def _compute_ecotax_line_ids(self):
         return super()._compute_ecotax_line_ids()
 
+    @api.depends(
+        "product_id",
+        "product_uom_id",
+        "move_id.partner_id",
+        "move_id.partner_shipping_id",
+    )
+    def _compute_tax_ids(self):
+        return super()._compute_tax_ids()
+
     def _get_computed_taxes(self):
         tax_ids = super()._get_computed_taxes()
         ecotax_ids = self.env["account.tax"]
+        country = (
+            self.move_id.partner_shipping_id.country_id
+            or self.move_id.partner_id.country_id
+        )
         if self.move_id.is_sale_document(include_receipts=True):
             # Out invoice.
-            sale_ecotaxs = self.product_id.all_ecotax_line_product_ids.mapped(
-                "classification_id"
-            ).mapped("sale_ecotax_ids")
+            eligible_classifications = (
+                self.product_id._get_country_eligible_classification(country)
+            )
+            sale_ecotaxs = eligible_classifications.classification_id.sale_ecotax_ids
             ecotax_ids = sale_ecotaxs.filtered(
                 lambda tax: tax.company_id == self.move_id.company_id
             )
 
         elif self.move_id.is_purchase_document(include_receipts=True):
             # In invoice.
-            purchase_ecotaxs = self.product_id.all_ecotax_line_product_ids.mapped(
-                "classification_id"
-            ).mapped("purchase_ecotax_ids")
+            eligible_classifications = (
+                self.product_id._get_country_eligible_classification(country)
+            )
+            purchase_ecotaxs = (
+                eligible_classifications.classification_id.purchase_ecotax_ids
+            )
             ecotax_ids = purchase_ecotaxs.filtered(
                 lambda tax: tax.company_id == self.move_id.company_id
             )
@@ -101,12 +111,3 @@ def _get_computed_taxes(self):
             tax_ids |= ecotax_ids
 
         return tax_ids
-
-    def _convert_to_tax_base_line_dict(self):
-        self.ensure_one()
-        country = (
-            self.move_id.partner_shipping_id.country_id
-            or self.move_id.partner_id.country_id
-        )
-        self = self.with_context(country=country)
-        return super()._convert_to_tax_base_line_dict()

account_ecotax_tax/models/account_tax.py

@@ -26,12 +26,10 @@ def onchange_is_ecotax(self):
 # price_unit
 # product: product.product object or None
 # partner: res.partner object or None
-
-# Previously we needed to have 1 tax for weight ecotax configured this way
+# for weight based ecotax
 # result = quantity and  product.weight_based_ecotax * quantity or 0.0
-# and 1 tax for fixed ecotax configured this way
+# for fix ecotax
 # result = quantity and product.fixed_ecotax  * quantity or 0.0
-# we now are able to have one generic tax. You have to use ecotax_amount_context
-# to have ecotax working depending on the delivery addresses
-result = quantity and product.ecotax_amount_context  * quantity or 0.0
+# to manage both weight and fix with only one ecotax tax
+result = quantity and product.ecotax_amount  * quantity or 0.0
             """

account_ecotax_tax/models/product_product.py

@@ -1,42 +1,22 @@
-# Copyright 2021 Camptocamp
-#   @author Silvio Gregorini <[email protected]>
-# Copyright 2023 Akretion (http://www.akretion.com)
-# #   @author Mourad EL HADJ MIMOUNE <[email protected]>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from odoo import api, fields, models
+from odoo import _, api, exceptions, models
+from odoo.fields import first
 
 
 class ProductProduct(models.Model):
     _inherit = "product.product"
 
-    ecotax_amount_context = fields.Float(
-        digits="Ecotax",
-        compute="_compute_product_ecotax_context",
-        help="Ecotax Amount computed form all ecotax line classification, but depending"
-        " of the context (delivery country)",
-    )
-
-    @api.depends(
-        "all_ecotax_line_product_ids",
-        "all_ecotax_line_product_ids.classification_id",
-        "all_ecotax_line_product_ids.classification_id.ecotax_type",
-        "all_ecotax_line_product_ids.classification_id.ecotax_coef",
-        "all_ecotax_line_product_ids.force_amount",
-        "weight",
-    )
-    @api.depends_context("country")
-    def _compute_product_ecotax_context(self):
+    @api.constrains("additional_ecotax_line_product_ids", "ecotax_line_product_ids")
+    def check_ecotax_line_country(self):
         for product in self:
-            country = self.env.context.get("country", False)
-            eligible_classifications = product._get_country_eligible_classification(
-                country
-            )
-            (
-                _fixed_ecotax,
-                _weight_based_ecotax,
-                amount_ecotax,
-            ) = product._get_ecotax_amounts_from_classification(
-                eligible_classifications
-            )
-            product.ecotax_amount_context = amount_ecotax
+            countries = first(product.all_ecotax_line_product_ids).country_ids
+            for ecotax_line in product.all_ecotax_line_product_ids:
+                if ecotax_line.country_ids != countries:
+                    raise exceptions.UserError(
+                        _(
+                            "All ecotax classification for a product should have the same "
+                            "countries allowed. This is a restriction of the "
+                            "account_ecotax_tax module."
+                        )
+                    )

account_ecotax_tax/readme/ROADMAP.rst

@@ -1,2 +1,4 @@
 Since an update in Odoo https://github.com/odoo/odoo/commit/13e9833e0bc809a26843890363586f61a37d061c the case with ecotax as tax included and another tax included does not work anymore.
 The ecotax tax should only be used along with price excluded tax, or be configured as price excluded itself.
+
+There is a limitation with the country restriction on ecotax classification when using the account_ecotax_tax and account_ecotax_sale_tax modules.OIt is currently not possible to have multiple classificaiton restricted to different countries for a same product.

account_ecotax_tax/static/description/index.html

@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>README.rst</title>
+<title>Ecotax Management (with Odoo tax)</title>
 <style type="text/css">
 
 /*
@@ -360,21 +360,16 @@
 </style>
 </head>
 <body>
-<div class="document">
+<div class="document" id="ecotax-management-with-odoo-tax">
+<h1 class="title">Ecotax Management (with Odoo tax)</h1>
 
-
-<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
-<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
-</a>
-<div class="section" id="ecotax-management-with-odoo-tax">
-<h1>Ecotax Management (with Odoo tax)</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:325b4d53ac93f3760030128a6c45ca9e12cef59c1998fc54a3044f230150da9a
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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-fiscal-rule/tree/16.0/account_ecotax_tax"><img alt="OCA/account-fiscal-rule" src="https://img.shields.io/badge/github-OCA%2Faccount--fiscal--rule-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/account-fiscal-rule-16-0/account-fiscal-rule-16-0-account_ecotax_tax"><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-fiscal-rule&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><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-fiscal-rule/tree/16.0/account_ecotax_tax"><img alt="OCA/account-fiscal-rule" src="https://img.shields.io/badge/github-OCA%2Faccount--fiscal--rule-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/account-fiscal-rule-16-0/account-fiscal-rule-16-0-account_ecotax_tax"><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-fiscal-rule&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 allows to compute the ecotax amounts from Odoo tax mechanism.
 The advantages compared to the base account_ecotax module is that it allows to :
 - Manage ecotax amount as included or excluded from the price of the product
@@ -395,7 +390,7 @@ <h1>Ecotax Management (with Odoo tax)</h1>
 </ul>
 </div>
 <div class="section" id="usage">
-<h2><a class="toc-backref" href="#toc-entry-1">Usage</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
 <ol class="arabic">
 <li><p class="first">Create a tax group named <strong>“Ecotaxes”</strong>. The sequence must be lower than other tax groups.
 - Set the <strong>Preceding Subtotal</strong> field to <strong>“Without Ecotax”</strong>.</p>
@@ -441,35 +436,36 @@ <h2><a class="toc-backref" href="#toc-entry-1">Usage</a></h2>
 </ol>
 </div>
 <div class="section" id="known-issues-roadmap">
-<h2><a class="toc-backref" href="#toc-entry-2">Known issues / Roadmap</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-2">Known issues / Roadmap</a></h1>
 <p>Since an update in Odoo <a class="reference external" href="https://github.com/odoo/odoo/commit/13e9833e0bc809a26843890363586f61a37d061c">https://github.com/odoo/odoo/commit/13e9833e0bc809a26843890363586f61a37d061c</a> the case with ecotax as tax included and another tax included does not work anymore.
 The ecotax tax should only be used along with price excluded tax, or be configured as price excluded itself.</p>
+<p>There is a limitation with the country restriction on ecotax classification when using the account_ecotax_tax and account_ecotax_sale_tax modules.OIt is currently not possible to have multiple classificaiton restricted to different countries for a same product.</p>
 </div>
 <div class="section" id="bug-tracker">
-<h2><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/account-fiscal-rule/issues">GitHub Issues</a>.
 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
 <a class="reference external" href="https://github.com/OCA/account-fiscal-rule/issues/new?body=module:%20account_ecotax_tax%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h2><a class="toc-backref" href="#toc-entry-4">Credits</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-4">Credits</a></h1>
 <div class="section" id="authors">
-<h3><a class="toc-backref" href="#toc-entry-5">Authors</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
 <ul class="simple">
 <li>Akretion</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h3><a class="toc-backref" href="#toc-entry-6">Contributors</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
 <ul class="simple">
 <li>Mourad EL HADJ MIMOUNE &lt;<a class="reference external" href="mailto:mourad.elhadj.mimoune&#64;akretion.com">mourad.elhadj.mimoune&#64;akretion.com</a>&gt;</li>
 <li>Florian da Costa &lt;<a class="reference external" href="mailto:florian.dacosta&#64;akretion.com">florian.dacosta&#64;akretion.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h3><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org">
 <img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
@@ -484,6 +480,5 @@ <h3><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h3>
 </div>
 </div>
 </div>
-</div>
 </body>
 </html>

account_ecotax_tax/tests/test_ecotax.py

@@ -35,7 +35,7 @@ def setUpClass(cls):
                 "sequence": 0,
                 "is_ecotax": True,
                 "python_compute": "result = (quantity and"
-                " product.ecotax_amount_context * quantity  or 0.0)",
+                " product.ecotax_amount * quantity  or 0.0)",
                 "tax_exigibility": "on_invoice",
                 "invoice_repartition_line_ids": [
                     (