[MIG] sale_fixed_discount: Migration to 18.0

Author: MohamedOsman7

sale_fixed_discount/README.rst

@@ -7,7 +7,7 @@ Sale Fixed Discount
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:6b49ea689315a0a5b3c5db1dbd0a6ea8c2400faad3943a6da1a547d929d4360d
+   !! source digest: sha256:9fbc48c4968018c610d6befda6c7804ced8212bb8b51c5a1f3bb97d9cde0baad
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -17,13 +17,13 @@ Sale Fixed Discount
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsale--workflow-lightgray.png?logo=github
-    :target: https://github.com/OCA/sale-workflow/tree/17.0/sale_fixed_discount
+    :target: https://github.com/OCA/sale-workflow/tree/18.0/sale_fixed_discount
     :alt: OCA/sale-workflow
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/sale-workflow-17-0/sale-workflow-17-0-sale_fixed_discount
+    :target: https://translation.odoo-community.org/projects/sale-workflow-18-0/sale-workflow-18-0-sale_fixed_discount
     :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/sale-workflow&target_branch=17.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/sale-workflow&target_branch=18.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -43,7 +43,7 @@ Installation
 
 This module depends on module 'account_invoice_fixed_discount',
 available in
-https://github.com/OCA/account-invoicing/tree/17.0/account_invoice_fixed_discount
+https://github.com/OCA/account-invoicing/tree/18.0/account_invoice_fixed_discount
 
 Configuration
 =============
@@ -69,7 +69,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/sale-workflow/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 <https://github.com/OCA/sale-workflow/issues/new?body=module:%20sale_fixed_discount%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/sale-workflow/issues/new?body=module:%20sale_fixed_discount%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -84,16 +84,16 @@ Authors
 Contributors
 ------------
 
--  Lois Rilo <lois.rilo@forgeflow.com>
-   (`www.forgeflow.com <http://www.forgeflow.com>`__)
--  Jordi Ballester <jordi.ballester@forgeflow.com>
-   (`www.forgeflow.com <http://www.forgeflow.com>`__)
--  Pieter Paulussen <pieterpaulussen@code-source.be>
-   (`www.code-source.be <http://www.code-source.be>`__)
+- Lois Rilo <lois.rilo@forgeflow.com>
+  (`www.forgeflow.com <http://www.forgeflow.com>`__)
+- Jordi Ballester <jordi.ballester@forgeflow.com>
+  (`www.forgeflow.com <http://www.forgeflow.com>`__)
+- Pieter Paulussen <pieterpaulussen@code-source.be>
+  (`www.code-source.be <http://www.code-source.be>`__)
 
--  OERP Canada <https://www.oerp.ca/>:
+- OERP Canada <https://www.oerp.ca/>:
 
-   -  Foram Darji <fd@oerp.ca>
+  - Foram Darji <fd@oerp.ca>
 
 Maintainers
 -----------
@@ -108,6 +108,6 @@ 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.
 
-This module is part of the `OCA/sale-workflow <https://github.com/OCA/sale-workflow/tree/17.0/sale_fixed_discount>`_ project on GitHub.
+This module is part of the `OCA/sale-workflow <https://github.com/OCA/sale-workflow/tree/18.0/sale_fixed_discount>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

sale_fixed_discount/__manifest__.py

@@ -3,7 +3,7 @@
 {
     "name": "Sale Fixed Discount",
     "summary": "Allows to apply fixed amount discounts in sales orders.",
-    "version": "17.0.2.1.0",
+    "version": "18.0.1.0.0",
     "category": "Sales",
     "website": "https://github.com/OCA/sale-workflow",
     "author": "ForgeFlow, Odoo Community Association (OCA)",

sale_fixed_discount/i18n/sale_fixed_discount.pot

@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 17.0\n"
+"Project-Id-Version: Odoo Server 18.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -51,7 +51,6 @@ msgstr ""
 #. module: sale_fixed_discount
 #. odoo-python
 #: code:addons/sale_fixed_discount/models/sale_order_line.py:0
-#, python-format
 msgid ""
 "The fixed discount %(fixed)s does not match the calculateddiscount "
 "%(discount)s %%.Please correct one of the discounts."

sale_fixed_discount/models/sale_order_line.py

@@ -1,7 +1,7 @@
 # Copyright 2017-20 ForgeFlow S.L.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import ValidationError
 from odoo.tools.float_utils import float_compare, float_round
 
@@ -35,18 +35,16 @@ def _check_discounts(self):
                     != 0
                 ):
                     raise ValidationError(
-                        _(
+                        self.env._(
                             "The fixed discount %(fixed)s does not match the calculated"
                             "discount %(discount)s %%."
-                            "Please correct one of the discounts."
+                            "Please correct one of the discounts.",
+                            fixed=line.discount_fixed,
+                            discount=line.discount,
                         )
-                        % {
-                            "fixed": line.discount_fixed,
-                            "discount": line.discount,
-                        }
                     )
 
-    def _convert_to_tax_base_line_dict(self, **kwargs):
+    def _prepare_base_line_for_taxes_computation(self, **kwargs):
         """Prior to calculating the tax toals for a line, update the discount value
         used in the tax calculation to the full float value. Otherwise, we get rounding
         errors in the resulting calculated totals.
@@ -63,20 +61,21 @@ def _convert_to_tax_base_line_dict(self, **kwargs):
 
         # Accurately pass along the fixed discount amount to the tax computation method.
         if self.discount_fixed:
-            return self.env["account.tax"]._convert_to_tax_base_line_dict(
+            return self.env["account.tax"]._prepare_base_line_for_taxes_computation(
                 self,
-                partner=self.order_id.partner_id,
-                currency=self.order_id.currency_id,
-                product=self.product_id,
-                taxes=self.tax_id,
-                price_unit=self.price_unit,
-                quantity=self.product_uom_qty,
-                discount=self._get_discount_from_fixed_discount(),
-                price_subtotal=self.price_subtotal,
-                **kwargs,
+                **{
+                    "tax_ids": self.tax_id,
+                    "quantity": self.product_uom_qty,
+                    "partner_id": self.order_id.partner_id,
+                    "currency_id": self.order_id.currency_id
+                    or self.order_id.company_id.currency_id,
+                    "rate": self.order_id.currency_rate,
+                    "discount": self._get_discount_from_fixed_discount(),
+                    **kwargs,
+                },
             )
 
-        return super()._convert_to_tax_base_line_dict()
+        return super()._prepare_base_line_for_taxes_computation(**kwargs)
 
     @api.depends("discount_fixed", "price_unit")
     def _compute_discount(self):

sale_fixed_discount/readme/INSTALL.md

@@ -1,3 +1,3 @@
 This module depends on module 'account_invoice_fixed_discount',
 available in
-<https://github.com/OCA/account-invoicing/tree/17.0/account_invoice_fixed_discount>
+<https://github.com/OCA/account-invoicing/tree/18.0/account_invoice_fixed_discount>

sale_fixed_discount/security/res_groups.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo noupdate="1">
-    <record id="product.group_discount_per_so_line" model="res.groups">
+    <record id="sale.group_discount_per_so_line" model="res.groups">
         <field
             name="implied_ids"
             eval="[(4, ref('account_invoice_fixed_discount.group_fixed_discount'))]"

sale_fixed_discount/static/description/index.html

@@ -367,9 +367,9 @@ <h1 class="title">Sale Fixed Discount</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:6b49ea689315a0a5b3c5db1dbd0a6ea8c2400faad3943a6da1a547d929d4360d
+!! source digest: sha256:9fbc48c4968018c610d6befda6c7804ced8212bb8b51c5a1f3bb97d9cde0baad
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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/sale-workflow/tree/17.0/sale_fixed_discount"><img alt="OCA/sale-workflow" src="https://img.shields.io/badge/github-OCA%2Fsale--workflow-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/sale-workflow-17-0/sale-workflow-17-0-sale_fixed_discount"><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/sale-workflow&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><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/sale-workflow/tree/18.0/sale_fixed_discount"><img alt="OCA/sale-workflow" src="https://img.shields.io/badge/github-OCA%2Fsale--workflow-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/sale-workflow-18-0/sale-workflow-18-0-sale_fixed_discount"><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/sale-workflow&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module extends the functionality of Sales to allow you to apply
 fixed amount discount at sales order line level.</p>
 <p>The module also extends the sales order report to show fixed discount.</p>
@@ -392,7 +392,7 @@ <h1 class="title">Sale Fixed Discount</h1>
 <h1><a class="toc-backref" href="#toc-entry-1">Installation</a></h1>
 <p>This module depends on module ‘account_invoice_fixed_discount’,
 available in
-<a class="reference external" href="https://github.com/OCA/account-invoicing/tree/17.0/account_invoice_fixed_discount">https://github.com/OCA/account-invoicing/tree/17.0/account_invoice_fixed_discount</a></p>
+<a class="reference external" href="https://github.com/OCA/account-invoicing/tree/18.0/account_invoice_fixed_discount">https://github.com/OCA/account-invoicing/tree/18.0/account_invoice_fixed_discount</a></p>
 </div>
 <div class="section" id="configuration">
 <h1><a class="toc-backref" href="#toc-entry-2">Configuration</a></h1>
@@ -417,7 +417,7 @@ <h1><a class="toc-backref" href="#toc-entry-4">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/sale-workflow/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/sale-workflow/issues/new?body=module:%20sale_fixed_discount%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/sale-workflow/issues/new?body=module:%20sale_fixed_discount%0Aversion:%2018.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">
@@ -452,7 +452,7 @@ <h2><a class="toc-backref" href="#toc-entry-8">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>This module is part of the <a class="reference external" href="https://github.com/OCA/sale-workflow/tree/17.0/sale_fixed_discount">OCA/sale-workflow</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/sale-workflow/tree/18.0/sale_fixed_discount">OCA/sale-workflow</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>
 </div>

sale_fixed_discount/tests/test_sale_fixed_discount.py

@@ -2,14 +2,16 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo.exceptions import ValidationError
-from odoo.tests import Form, TransactionCase
+from odoo.tests import Form
 
+from odoo.addons.base.tests.common import BaseCommon
 
-class TestSaleFixedDiscount(TransactionCase):
+
+class TestSaleFixedDiscount(BaseCommon):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
-        cls.env.user.groups_id |= cls.env.ref("product.group_discount_per_so_line")
+        cls.env.user.groups_id |= cls.env.ref("sale.group_discount_per_so_line")
         cls.partner = cls.env["res.partner"].create({"name": "Test"})
         cls.tax = cls.env["account.tax"].create(
             {
@@ -106,8 +108,8 @@ def test_03_fixed_discount_invoice(self):
         self.assertEqual(self.sale.invoice_ids.invoice_line_ids.discount_fixed, 20.0)
         self.assertEqual(self.sale.invoice_ids.invoice_line_ids.discount, 10.0)
 
-        self.assertEqual(self.sale.invoice_ids.tax_totals["amount_untaxed"], 180.0)
-        self.assertEqual(self.sale.invoice_ids.tax_totals["amount_total"], 207.0)
+        self.assertEqual(self.sale.invoice_ids.tax_totals["base_amount"], 180.0)
+        self.assertEqual(self.sale.invoice_ids.tax_totals["total_amount"], 207.0)
 
     def test_04_fixed_discount_without_price(self):
         with Form(self.sale) as sale_order:
@@ -131,5 +133,5 @@ def test_05_fixed_discount_invoice(self):
         self.assertEqual(self.sale.invoice_ids.invoice_line_ids.discount_fixed, 20.0)
         self.assertEqual(self.sale.invoice_ids.invoice_line_ids.discount, 10.0)
 
-        self.assertEqual(self.sale.invoice_ids.tax_totals["amount_untaxed"], 180.0)
-        self.assertEqual(self.sale.invoice_ids.tax_totals["amount_total"], 207.0)
+        self.assertEqual(self.sale.invoice_ids.tax_totals["base_amount"], 180.0)
+        self.assertEqual(self.sale.invoice_ids.tax_totals["total_amount"], 207.0)

sale_fixed_discount/views/account_invoice_views.xml

@@ -7,7 +7,7 @@
         <field name="inherit_id" ref="account_invoice_fixed_discount.view_move_form" />
         <field name="arch" type="xml">
             <field name="discount_fixed" position="attributes">
-                <attribute name="groups">product.group_discount_per_so_line</attribute>
+                <attribute name="groups">sale.group_discount_per_so_line</attribute>
             </field>
         </field>
     </record>

sale_fixed_discount/views/sale_order_views.xml

@@ -11,19 +11,13 @@
                 expr="//field[@name='order_line']/form//label[@for='discount']"
                 position="before"
             >
-                <field
-                    name="discount_fixed"
-                    groups="product.group_discount_per_so_line"
-                />
+                <field name="discount_fixed" groups="sale.group_discount_per_so_line" />
             </xpath>
             <xpath
-                expr="//field[@name='order_line']/tree/field[@name='discount']"
+                expr="//field[@name='order_line']/list/field[@name='discount']"
                 position="before"
             >
-                <field
-                    name="discount_fixed"
-                    groups="product.group_discount_per_so_line"
-                />
+                <field name="discount_fixed" groups="sale.group_discount_per_so_line" />
             </xpath>
         </field>
     </record>