Yaltik
/
flectra
2
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'master' into 'master' 

[FIX] sales_discount: calculation if tax option included used

See merge request flectra-hq/flectra!9
This commit is contained in:
Parthiv Patel 2018-01-24 10:49:27 +00:00
parent 15cfca3e68 775913b9dd
commit 92587f7883
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/sales_discount/models/sale.py
View File

@ -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})