[17.0][MIG] sale_global_discount: Migration to 17.0

Author: miguel-S73

sale_global_discount/README.rst

@@ -93,6 +93,10 @@ Contributors
 
 -  Omar Castiñeira <omar@comunitea.com>
 
+-  `Studio73 <https://www.studio73.es>`__
+
+   -  Miguel Gandia
+
 Maintainers
 -----------
 

sale_global_discount/__manifest__.py

@@ -3,7 +3,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     "name": "Sale Global Discount",
-    "version": "16.0.1.0.0",
+    "version": "17.0.1.0.0",
     "category": "Sales Management",
     "author": "Tecnativa," "Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/sale-workflow",

sale_global_discount/hooks.py

@@ -1,39 +1,41 @@
 from odoo.tools.sql import column_exists
 
 
-def _pre_init_global_discount_fields(cr):
-    if not column_exists(cr, "sale_order", "amount_global_discount"):
-        cr.execute(
+def _pre_init_global_discount_fields(env):
+    if not column_exists(env.cr, "sale_order", "amount_global_discount"):
+        env.cr.execute(
             """
                 ALTER TABLE "sale_order"
                 ADD COLUMN "amount_global_discount" double precision DEFAULT 0
             """
         )
-        cr.execute(
+        env.cr.execute(
             """
         ALTER TABLE "sale_order" ALTER COLUMN "amount_global_discount" DROP DEFAULT
         """
         )
-    if not column_exists(cr, "sale_order", "amount_untaxed_before_global_discounts"):
-        cr.execute(
+    if not column_exists(
+        env.cr, "sale_order", "amount_untaxed_before_global_discounts"
+    ):
+        env.cr.execute(
             """
                 ALTER TABLE "sale_order"
                 ADD COLUMN "amount_untaxed_before_global_discounts" double precision
             """
         )
-        cr.execute(
+        env.cr.execute(
             """
         update sale_order set amount_untaxed_before_global_discounts = amount_untaxed
         """
         )
-    if not column_exists(cr, "sale_order", "amount_total_before_global_discounts"):
-        cr.execute(
+    if not column_exists(env.cr, "sale_order", "amount_total_before_global_discounts"):
+        env.cr.execute(
             """
                 ALTER TABLE "sale_order"
                 ADD COLUMN "amount_total_before_global_discounts" double precision
             """
         )
-        cr.execute(
+        env.cr.execute(
             """
         update sale_order set amount_total_before_global_discounts = amount_total
         """

sale_global_discount/models/sale_order.py

@@ -3,6 +3,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from odoo import _, api, exceptions, fields, models
+from odoo.tools.misc import formatLang
 
 
 class SaleOrder(models.Model):
@@ -14,6 +15,9 @@ class SaleOrder(models.Model):
         domain="[('discount_scope', '=', 'sale'), "
         "('account_id', '!=', False), '|', "
         "('company_id', '=', company_id), ('company_id', '=', False)]",
+        compute="_compute_global_discount_ids",
+        store=True,
+        readonly=False,
     )
     # HACK: Looks like UI doesn't behave well with Many2many fields and
     # negative groups when the same field is shown. In this case, we want to
@@ -68,7 +72,7 @@ def _check_global_discounts_sanity(self):
             return True
         taxes_keys = {}
         for line in self.order_line.filtered(
-            lambda l: not l.display_type and l.product_id
+            lambda _line: not _line.display_type and _line.product_id
         ):
             if not line.tax_id:
                 raise exceptions.UserError(
@@ -135,20 +139,92 @@ def _compute_amounts(self):
         return res
 
     def _compute_tax_totals(self):
-        return super(
-            SaleOrder, self.with_context(from_tax_calculation=True)
-        )._compute_tax_totals()
+        res = super()._compute_tax_totals()
+        for order in self:
+            amount_discount_by_group = {}
+            cumulative_discount_rate = 1.0
+            # Calculate the total discount amount and discount by tax group
+            for line in order.order_line:
+                if (
+                    line.display_type
+                    or not line.product_id
+                    or line.product_id.bypass_global_discount
+                ):
+                    continue
 
-    @api.onchange("partner_id")
-    def onchange_partner_id_set_gbl_disc(self):
-        self.global_discount_ids = (
-            self.partner_id.customer_global_discount_ids.filtered(
-                lambda d: d.company_id == self.company_id
+                cumulative_discount_rate = 1.0
+                for gbl_disc in order.global_discount_ids:
+                    discount_rate = gbl_disc.discount / 100
+                    cumulative_discount_rate *= 1 - discount_rate
+                discounted_price_subtotal = (
+                    line.price_subtotal * cumulative_discount_rate
+                )
+                # Calculate tax amounts for each tax group based on the discounted subtotal
+                for tax in line.tax_id:
+                    tax_group_id = tax.tax_group_id.id
+                    if tax_group_id not in amount_discount_by_group:
+                        amount_discount_by_group[tax_group_id] = 0.0
+                    # Compute taxes on the discounted subtotal
+                    discounted_tax_vals = tax.compute_all(
+                        discounted_price_subtotal,
+                        order.currency_id,
+                        1.0,
+                        product=line.product_id,
+                        partner=order.partner_shipping_id,
+                    )
+                    total_discounted_tax = sum(
+                        t.get("amount", 0.0)
+                        for t in discounted_tax_vals.get("taxes", [])
+                    )
+                    amount_discount_by_group[tax_group_id] += total_discounted_tax
+            # Update tax totals
+            amount_untaxed = (
+                order.amount_untaxed_before_global_discounts * cumulative_discount_rate
+            )
+            amount_total = amount_untaxed + sum(amount_discount_by_group.values())
+            order.tax_totals["amount_untaxed"] = amount_untaxed
+            order.tax_totals["amount_total"] = amount_total
+            order.tax_totals["formatted_amount_untaxed"] = formatLang(
+                self.env, amount_untaxed, currency_obj=order.currency_id
             )
-            or self.partner_id.commercial_partner_id.customer_global_discount_ids.filtered(
-                lambda d: d.company_id == self.company_id
+            order.tax_totals["formatted_amount_total"] = formatLang(
+                self.env, amount_total, currency_obj=order.currency_id
             )
-        )
+            # Update groups by subtotal
+            for group in order.tax_totals["groups_by_subtotal"].values():
+                for tax_group in group:
+                    tax_group_id = tax_group["tax_group_id"]
+                    discount_for_group = amount_discount_by_group.get(tax_group_id, 0.0)
+                    tax_group["tax_group_amount"] = discount_for_group
+                    tax_group["formatted_tax_group_amount"] = formatLang(
+                        self.env,
+                        tax_group["tax_group_amount"],
+                        currency_obj=order.currency_id,
+                    )
+            # Update subtotals
+            for subtotal in order.tax_totals["subtotals"]:
+                subtotal["amount"] = amount_untaxed
+                subtotal["formatted_amount"] = formatLang(
+                    self.env, amount_untaxed, currency_obj=order.currency_id
+                )
+        return res
+
+    @api.depends("partner_id", "company_id")
+    def _compute_global_discount_ids(self):
+        for order in self:
+            commercial = order.partner_id.commercial_partner_id
+            commercial_global_disc = commercial.customer_global_discount_ids
+            partner_global_disc = order.partner_id.customer_global_discount_ids
+            discounts = self.env["global.discount"]
+            _discounts = self.env["global.discount"]
+            if partner_global_disc:
+                _discounts = partner_global_disc
+            else:
+                _discounts = commercial_global_disc
+            for discount in _discounts:
+                if discount.company_id == order.company_id:
+                    discounts |= discount
+            order.global_discount_ids = discounts
 
     def _prepare_invoice(self):
         invoice_vals = super()._prepare_invoice()

sale_global_discount/readme/CONTRIBUTORS.md

@@ -2,3 +2,7 @@
   - David Vidal
   - Pedro M. Baeza
 - Omar Castiñeira \<<omar@comunitea.com>\>
+
+- [Studio73](https://www.studio73.es)
+  - Miguel Gandia
+  

sale_global_discount/static/description/index.html

@@ -441,6 +441,10 @@ <h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
 </ul>
 </li>
 <li>Omar Castiñeira &lt;<a class="reference external" href="mailto:omar&#64;comunitea.com">omar&#64;comunitea.com</a>&gt;</li>
+<li><a class="reference external" href="https://www.studio73.es">Studio73</a><ul>
+<li>Miguel Gandia</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">

sale_global_discount/tests/test_sale_global_discount.py

@@ -52,7 +52,9 @@ def setUpClass(cls, chart_template_ref=None):
                 "account_id": cls.account.id,
             }
         )
-        cls.pricelist = cls.env.ref("product.list0")
+        cls.pricelist = cls.env["product.pricelist"].create(
+            {"name": "Public Pricelist", "sequence": 1}
+        )
         cls.partner_1 = cls.env["res.partner"].create(
             {"name": "Mr. Odoo", "property_product_pricelist": cls.pricelist.id}
         )
@@ -157,7 +159,6 @@ def test_02_global_sale_discounts_from_partner(self):
         """Change the partner and his global discounts go to the invoice"""
         # (30% then 50%)
         self.sale.partner_id = self.partner_2
-        self.sale.onchange_partner_id_set_gbl_disc()
         self.assertAlmostEqual(self.sale.amount_global_discount, 162.49)
         self.assertAlmostEqual(self.sale.amount_untaxed, 87.5)
         self.assertAlmostEqual(self.sale.amount_untaxed_before_global_discounts, 249.99)
@@ -171,7 +172,6 @@ def test_02_global_sale_discounts_from_partner(self):
     def test_03_global_sale_discounts_to_invoice(self):
         """All the discounts go to the invoice"""
         self.sale.partner_id = self.partner_2
-        self.sale.onchange_partner_id_set_gbl_disc()
         self.sale.order_line.mapped("product_id").write({"invoice_policy": "order"})
         self.sale.action_confirm()
         move = self.sale._create_invoices()

sale_global_discount/views/report_sale_order.xml

@@ -22,7 +22,7 @@
                         <strong>Global Discounts</strong>
                         <br />
                         <t
-                            t-esc="'→'.join(['{:.2f}%'.format(x.discount) for x in doc.global_discount_ids])"
+                            t-out="'→'.join(['{:.2f}%'.format(x.discount) for x in doc.global_discount_ids])"
                         />
                     </td>
                     <td class="text-end">