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

Merge branch 'master' into 'master'

Browse Source 
[FIX] account_discount: calculation if tax option included used

See merge request flectra-hq/flectra!11
This commit is contained in:
Parthiv Patel 2018-01-24 13:01:08 +00:00
commit 778eef5b33
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/account_discount/models/account_invoice.py
View File

@ -43,7 +43,8 @@ class AccountInvoice(models.Model):
self._check_constrains() self._check_constrains()
for line in self.invoice_line_ids: for line in self.invoice_line_ids:
line.write({'discount': 0.0}) 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': if self.discount_method == 'per':
for line in self.invoice_line_ids: for line in self.invoice_line_ids:
line.write({'discount': line.discount + self.discount_per}) line.write({'discount': line.discount + self.discount_per})
@ -51,7 +52,7 @@ class AccountInvoice(models.Model):
for line in self.invoice_line_ids: for line in self.invoice_line_ids:
discount_value_ratio = \ discount_value_ratio = \
(self.discount_amount * line.price_subtotal) / \ (self.discount_amount * line.price_subtotal) / \
amount_untaxed gross_amount
discount_per_ratio = \ discount_per_ratio = \
(discount_value_ratio * 100) / line.price_subtotal (discount_value_ratio * 100) / line.price_subtotal
line.write({'discount': line.discount + discount_per_ratio}) line.write({'discount': line.discount + discount_per_ratio})