[16.0][IMP] sale_global_discount: Remake amount global discount

OCA · Jun 20, 2024 · 257971e · 257971e
1 parent 8e464a8
commit 257971e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/sale_global_discount/models/account_tax.py b/sale_global_discount/models/account_tax.py
@@ -50,7 +50,7 @@ def _convert_to_tax_base_line_dict(
             )
         discounts = base_line.order_id.global_discount_ids.mapped("discount")
         discounted_price_unit = price_unit
-        if base_line.product_id.apply_global_discount:
+        if not base_line.product_id.bypass_global_discount:
             discounted_price_unit = base_line.order_id.get_discounted_global(
                 price_unit, discounts.copy()
             )

diff --git a/sale_global_discount/models/sale_order.py b/sale_global_discount/models/sale_order.py
@@ -99,9 +99,11 @@ def _compute_amounts(self):
             discounts = order.global_discount_ids.mapped("discount")
             amount_discounted_untaxed = amount_discounted_tax = 0
             for line in order.order_line:
-                discounted_subtotal = self.get_discounted_global(
-                    line.price_subtotal, discounts.copy()
-                )
+                discounted_subtotal = line.price_subtotal
+                if not line.product_id.bypass_global_discount:
+                    discounted_subtotal = self.get_discounted_global(
+                        line.price_subtotal, discounts.copy()
+                    )
                 amount_discounted_untaxed += discounted_subtotal
                 discounted_tax = line.tax_id.compute_all(
                     discounted_subtotal,