[16][REF] split account_ecotax into account_ecotax and account_ecotax…

…_tax

The goal is to be able to choose between the implementation with and without using the odoo tax mechanism.
The advantages of the implementation based on Odoo tax mechanims are :
- Possibility to choose if product price include or exclude the ecotax amounts
- Isolate the ecotax amounts into a specifc accounting account
The disadvantage is that it adds a small layer of complexity and you have to manage the tax configuration and see all those ecotax taxes on your invoices
And a major difference which can be good or not depending on your use cases, the ecotax amounts are not in the turnover when using Odoo tax mechanism

account_ecotax/README.rst

@@ -41,6 +41,14 @@ ECOTAXE classification can either a fixed or weight based ecotaxe.
 A product can have one or serveral ecotaxe classifications. For exemple wooden window blinds equipped with electric motor can
 have ecotaxe for wood and ecotaxe for electric motor.
 
+This module has some limits : 
+- The ecotax amount is always included in the price of the product.
+- The ecotax amount is not isolated in an specific accounting account but is included in the product income account.
+
+If one of these limits is an issue, you could install the submodule account_ecotax_tax.
+This second module lets you manage the ecotax as a tax, so you can configure if you want it to be included or excluded of product price and also configuring an accounting account to isolate it.
+The main consequence of this approach is that the ecotax won't be considered in the turnover, since it is considered as a tax.
+
 This module version add the possibility to manage several ecotaxe classification by product.
 A migration script is necessary to update from previous versions.
 
@@ -68,42 +76,19 @@ product.template   ecotaxe_line_product_ids
 Usage
 =====
 
-1. Create a tax group named **"Ecotaxes"**. The sequence must be lower than other tax groups.
-   - Set the **Preceding Subtotal** field to **"Without Ecotax"**.
-
-2. Create two taxes named **"Fixed Ecotax"** and **"Weight-Based Ecotax"**.
-   - Check the **Ecotax** checkbox.
-   - Set the correct Python code:
-
-     - For the fixed ecotax:
-
-       .. code-block:: python
-
-          result = quantity and product.fixed_ecotax * quantity or 0.0
-
-     - For the weight-based ecotax:
-
-       .. code-block:: python
-
-          result = quantity and product.weight_based_ecotax * quantity or 0.0
-
-   - Check the **Included in Base Amount** option.
-   - The sequence for Ecotax must be lower than the VAT tax.
-
-3. For VAT taxes, check the **Base Affected by Previous Taxes?** option.
-
-4. Add an ecotax classification via the menu **Accounting > Configuration > Taxes > Ecotax Classification**.
+1. Add an ecotax classification via the menu **Accounting > Configuration > Taxes > Ecotax Classification**.
 
    - The ecotax classification can be either a fixed ecotax or a weight-based ecotax.
    - Ecotax classification information can be used for legal declarations.
    - For the fixed ecotax, the ecotax amount is used as a default value, which can be overridden on the product.
    - For the weight-based ecotax, define one ecotax by a coefficient applied to the weight (depending on the product's materials).
-   - Set the appropriate tax in the **Sale Ecotax** field.
 
-5. Assign one or more ecotax classifications to a product.
+2. Assign one or more ecotax classifications to a product.
 
    - The ecotax amount can also be manually overridden on the product.
 
+3. Create an invoice with this product
+
 Bug Tracker
 ===========
 
@@ -126,6 +111,7 @@ Contributors
 ~~~~~~~~~~~~
 
 * Mourad EL HADJ MIMOUNE <[email protected]>
+* Florian da Costa <[email protected]>
 
 Maintainers
 ~~~~~~~~~~~
@@ -143,10 +129,13 @@ promote its widespread use.
 .. |maintainer-mourad-ehm| image:: https://github.com/mourad-ehm.png?size=40px
     :target: https://github.com/mourad-ehm
     :alt: mourad-ehm
+.. |maintainer-florian-dacosta| image:: https://github.com/florian-dacosta.png?size=40px
+    :target: https://github.com/florian-dacosta
+    :alt: florian-dacosta
 
-Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
-|maintainer-mourad-ehm| 
+|maintainer-mourad-ehm| |maintainer-florian-dacosta| 
 
 This module is part of the `OCA/account-fiscal-rule <https://github.com/OCA/account-fiscal-rule/tree/16.0/account_ecotax>`_ project on GitHub.
 

account_ecotax/__manifest__.py

@@ -10,10 +10,9 @@
     "website": "https://github.com/OCA/account-fiscal-rule",
     "category": "Localization/Account Taxes",
     "license": "AGPL-3",
-    "maintainers": ["mourad-ehm"],
+    "maintainers": ["mourad-ehm", "florian-dacosta"],
     "depends": [
         "account",
-        "account_tax_python",
     ],
     "data": [
         "data/decimal_precision.xml",
@@ -26,7 +25,6 @@
         "views/account_move_view.xml",
         "views/product_template_view.xml",
         "views/product_view.xml",
-        "views/account_tax_view.xml",
     ],
     "installable": True,
 }

account_ecotax/models/account_ecotax_classification.py

@@ -82,22 +82,6 @@ class AccountEcotaxClassification(models.Model):
     )
     intrastat_code = fields.Char()
     scale_code = fields.Char()
-    sale_ecotax_ids = fields.Many2many(
-        "account.tax",
-        "ecotax_classif_taxes_rel",
-        "ecotax_classif_id",
-        "tax_id",
-        string="Sale EcoTax",
-        domain=[("is_ecotax", "=", True), ("type_tax_use", "=", "sale")],
-    )
-    purchase_ecotax_ids = fields.Many2many(
-        "account.tax",
-        "ecotax_classif_purchase_taxes_rel",
-        "ecotax_classif_id",
-        "tax_id",
-        string="Purchase EcoTax",
-        domain=[("is_ecotax", "=", True), ("type_tax_use", "=", "purchase")],
-    )
 
     @api.depends("ecotax_type")
     def _compute_ecotax_vals(self):

account_ecotax/models/account_move_line.py

@@ -24,43 +24,22 @@ class AcountMoveLine(models.Model):
         compute="_compute_ecotax",
     )
 
+    def _get_ecotax_amounts(self):
+        self.ensure_one()
+        amount_unit = sum(self.ecotax_line_ids.mapped("amount_unit"))
+        subtotal_ecotax = sum(self.ecotax_line_ids.mapped("amount_total"))
+        return amount_unit, subtotal_ecotax
+
     @api.depends(
         "currency_id",
-        "tax_ids",
-        "quantity",
-        "product_id",
+        "ecotax_line_ids.amount_unit",
+        "ecotax_line_ids.amount_total",
     )
     def _compute_ecotax(self):
         for line in self:
-            ecotax_ids = line.tax_ids.filtered(lambda tax: tax.is_ecotax)
-
-            if line.display_type == "tax" or not ecotax_ids:
-                continue
-            if line.display_type == "product" and line.move_id.is_invoice(True):
-                amount_currency = line.price_unit * (1 - line.discount / 100)
-                handle_price_include = True
-                quantity = line.quantity
-            else:
-                amount_currency = line.amount_currency
-                handle_price_include = False
-                quantity = 1
-            compute_all_currency = ecotax_ids.compute_all(
-                amount_currency,
-                currency=line.currency_id,
-                quantity=quantity,
-                product=line.product_id,
-                partner=line.move_id.partner_id or line.partner_id,
-                is_refund=line.is_refund,
-                handle_price_include=handle_price_include,
-                include_caba_tags=line.move_id.always_tax_exigible,
-            )
-            subtotal_ecotax = 0.0
-            for tax in compute_all_currency["taxes"]:
-                subtotal_ecotax += tax["amount"]
-
-            unit = subtotal_ecotax / quantity if quantity else subtotal_ecotax
-            line.ecotax_amount_unit = unit
-            line.subtotal_ecotax = subtotal_ecotax
+            amount_unit, amount_total = line._get_ecotax_amounts()
+            line.ecotax_amount_unit = amount_unit
+            line.subtotal_ecotax = amount_total
 
     @api.onchange("product_id")
     def _onchange_product_ecotax_line(self):
@@ -89,31 +68,3 @@ def edit_ecotax_lines(self):
             "res_id": self.id,
         }
         return view
-
-    def _get_computed_taxes(self):
-        tax_ids = super()._get_computed_taxes()
-        ecotax_ids = self.env["account.tax"]
-        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")
-            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")
-            ecotax_ids = purchase_ecotaxs.filtered(
-                lambda tax: tax.company_id == self.move_id.company_id
-            )
-
-        if ecotax_ids and self.move_id.fiscal_position_id:
-            ecotax_ids = self.move_id.fiscal_position_id.map_tax(ecotax_ids)
-        if ecotax_ids:
-            tax_ids |= ecotax_ids
-
-        return tax_ids

account_ecotax/readme/CONTRIBUTORS.rst

@@ -1 +1,2 @@
 * Mourad EL HADJ MIMOUNE <[email protected]>
+* Florian da Costa <[email protected]>

account_ecotax/readme/DESCRIPTION.rst

@@ -11,6 +11,14 @@ ECOTAXE classification can either a fixed or weight based ecotaxe.
 A product can have one or serveral ecotaxe classifications. For exemple wooden window blinds equipped with electric motor can
 have ecotaxe for wood and ecotaxe for electric motor.
 
+This module has some limits : 
+- The ecotax amount is always included in the price of the product.
+- The ecotax amount is not isolated in an specific accounting account but is included in the product income account.
+
+If one of these limits is an issue, you could install the submodule account_ecotax_tax.
+This second module lets you manage the ecotax as a tax, so you can configure if you want it to be included or excluded of product price and also configuring an accounting account to isolate it.
+The main consequence of this approach is that the ecotax won't be considered in the turnover, since it is considered as a tax.
+
 This module version add the possibility to manage several ecotaxe classification by product.
 A migration script is necessary to update from previous versions.
 

account_ecotax/readme/USAGE.rst

@@ -1,35 +1,12 @@
-1. Create a tax group named **"Ecotaxes"**. The sequence must be lower than other tax groups.
-   - Set the **Preceding Subtotal** field to **"Without Ecotax"**.
-
-2. Create two taxes named **"Fixed Ecotax"** and **"Weight-Based Ecotax"**.
-   - Check the **Ecotax** checkbox.
-   - Set the correct Python code:
-
-     - For the fixed ecotax:
-
-       .. code-block:: python
-
-          result = quantity and product.fixed_ecotax * quantity or 0.0
-
-     - For the weight-based ecotax:
-
-       .. code-block:: python
-
-          result = quantity and product.weight_based_ecotax * quantity or 0.0
-
-   - Check the **Included in Base Amount** option.
-   - The sequence for Ecotax must be lower than the VAT tax.
-
-3. For VAT taxes, check the **Base Affected by Previous Taxes?** option.
-
-4. Add an ecotax classification via the menu **Accounting > Configuration > Taxes > Ecotax Classification**.
+1. Add an ecotax classification via the menu **Accounting > Configuration > Taxes > Ecotax Classification**.
 
    - The ecotax classification can be either a fixed ecotax or a weight-based ecotax.
    - Ecotax classification information can be used for legal declarations.
    - For the fixed ecotax, the ecotax amount is used as a default value, which can be overridden on the product.
    - For the weight-based ecotax, define one ecotax by a coefficient applied to the weight (depending on the product's materials).
-   - Set the appropriate tax in the **Sale Ecotax** field.
 
-5. Assign one or more ecotax classifications to a product.
+2. Assign one or more ecotax classifications to a product.
 
    - The ecotax amount can also be manually overridden on the product.
+
+3. Create an invoice with this product

account_ecotax/static/description/index.html

@@ -379,6 +379,12 @@ <h1 class="title">Ecotax Management</h1>
 ECOTAXE classification can either a fixed or weight based ecotaxe.</p>
 <p>A product can have one or serveral ecotaxe classifications. For exemple wooden window blinds equipped with electric motor can
 have ecotaxe for wood and ecotaxe for electric motor.</p>
+<p>This module has some limits :
+- The ecotax amount is always included in the price of the product.
+- The ecotax amount is not isolated in an specific accounting account but is included in the product income account.</p>
+<p>If one of these limits is an issue, you could install the submodule account_ecotax_tax.
+This second module lets you manage the ecotax as a tax, so you can configure if you want it to be included or excluded of product price and also configuring an accounting account to isolate it.
+The main consequence of this approach is that the ecotax won’t be considered in the turnover, since it is considered as a tax.</p>
 <p>This module version add the possibility to manage several ecotaxe classification by product.
 A migration script is necessary to update from previous versions.</p>
 <p>There is the main change to manage in migration script:</p>
@@ -408,48 +414,19 @@ <h1 class="title">Ecotax Management</h1>
 </div>
 <div class="section" id="usage">
 <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>
-</li>
-<li><p class="first">Create two taxes named <strong>“Fixed Ecotax”</strong> and <strong>“Weight-Based Ecotax”</strong>.
-- Check the <strong>Ecotax</strong> checkbox.
-- Set the correct Python code:</p>
-<blockquote>
-<ul>
-<li><p class="first">For the fixed ecotax:</p>
-<pre class="code python literal-block">
-<span class="n">result</span> <span class="o">=</span> <span class="n">quantity</span> <span class="ow">and</span> <span class="n">product</span><span class="o">.</span><span class="n">fixed_ecotax</span> <span class="o">*</span> <span class="n">quantity</span> <span class="ow">or</span> <span class="mf">0.0</span>
-</pre>
-</li>
-<li><p class="first">For the weight-based ecotax:</p>
-<pre class="code python literal-block">
-<span class="n">result</span> <span class="o">=</span> <span class="n">quantity</span> <span class="ow">and</span> <span class="n">product</span><span class="o">.</span><span class="n">weight_based_ecotax</span> <span class="o">*</span> <span class="n">quantity</span> <span class="ow">or</span> <span class="mf">0.0</span>
-</pre>
-</li>
-</ul>
-</blockquote>
-<ul class="simple">
-<li>Check the <strong>Included in Base Amount</strong> option.</li>
-<li>The sequence for Ecotax must be lower than the VAT tax.</li>
-</ul>
-</li>
-<li><p class="first">For VAT taxes, check the <strong>Base Affected by Previous Taxes?</strong> option.</p>
-</li>
-<li><p class="first">Add an ecotax classification via the menu <strong>Accounting &gt; Configuration &gt; Taxes &gt; Ecotax Classification</strong>.</p>
-<ul class="simple">
+<ol class="arabic simple">
+<li>Add an ecotax classification via the menu <strong>Accounting &gt; Configuration &gt; Taxes &gt; Ecotax Classification</strong>.<ul>
 <li>The ecotax classification can be either a fixed ecotax or a weight-based ecotax.</li>
 <li>Ecotax classification information can be used for legal declarations.</li>
 <li>For the fixed ecotax, the ecotax amount is used as a default value, which can be overridden on the product.</li>
 <li>For the weight-based ecotax, define one ecotax by a coefficient applied to the weight (depending on the product’s materials).</li>
-<li>Set the appropriate tax in the <strong>Sale Ecotax</strong> field.</li>
 </ul>
 </li>
-<li><p class="first">Assign one or more ecotax classifications to a product.</p>
-<ul class="simple">
+<li>Assign one or more ecotax classifications to a product.<ul>
 <li>The ecotax amount can also be manually overridden on the product.</li>
 </ul>
 </li>
+<li>Create an invoice with this product</li>
 </ol>
 </div>
 <div class="section" id="bug-tracker">
@@ -472,6 +449,7 @@ <h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
 <h2><a class="toc-backref" href="#toc-entry-5">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">
@@ -483,8 +461,8 @@ <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
 <p>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.</p>
-<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
-<p><a class="reference external image-reference" href="https://github.com/mourad-ehm"><img alt="mourad-ehm" src="https://github.com/mourad-ehm.png?size=40px" /></a></p>
+<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainers</a>:</p>
+<p><a class="reference external image-reference" href="https://github.com/mourad-ehm"><img alt="mourad-ehm" src="https://github.com/mourad-ehm.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/florian-dacosta"><img alt="florian-dacosta" src="https://github.com/florian-dacosta.png?size=40px" /></a></p>
 <p>This module is part of the <a class="reference external" href="https://github.com/OCA/account-fiscal-rule/tree/16.0/account_ecotax">OCA/account-fiscal-rule</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>