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

OCA · Jun 21, 2023 · b64ca36 · b64ca36
1 parent cdf5cee
commit b64ca36
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/sale_global_discount/__manifest__.py b/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": "16.0.1.0.1",
     "category": "Sales Management",
     "author": "Tecnativa," "Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/sale-workflow",

diff --git a/sale_global_discount/models/sale_order.py b/sale_global_discount/models/sale_order.py
@@ -97,9 +97,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 line.product_id.apply_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,