From 775913b9dda59afa5985faa7c64b247aa4952bb1 Mon Sep 17 00:00:00 2001 From: thomi Date: Tue, 23 Jan 2018 15:12:15 +0100 Subject: [PATCH] [FIX] sales_discount: calculation if tax option included used --- addons/sales_discount/models/sale.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/sales_discount/models/sale.py b/addons/sales_discount/models/sale.py index 7a61ad7b..120be974 100644 --- a/addons/sales_discount/models/sale.py +++ b/addons/sales_discount/models/sale.py @@ -42,7 +42,8 @@ class SaleOrder(models.Model): self._check_constrains() for line in self.order_line: line.write({'discount': 0.0}) - amount_untaxed = self.amount_untaxed + # amount_untaxed = self.amount_untaxed + gross_amount = self.gross_amount if self.discount_method == 'per': for line in self.order_line: line.write({'discount': line.discount + self.discount_per}) @@ -50,7 +51,7 @@ class SaleOrder(models.Model): for line in self.order_line: discount_value_ratio = \ (self.discount_amount * - line.price_subtotal) / amount_untaxed + line.price_subtotal) / gross_amount discount_per_ratio = \ (discount_value_ratio * 100) / line.price_subtotal line.write({'discount': line.discount + discount_per_ratio})