NaNtic
/
trytond-sale_margin
mirror of https://github.com/NaN-tic/trytond-sale_margin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Get margin: amount from amount line

This commit is contained in:
resteve 2013-10-01 18:01:00 +02:00
parent 0d8eb26e61
commit 0b86ed0ec3
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sale.py
View File

@ -76,9 +76,7 @@ class SaleLine:
def on_change_with_margin(self):
cost = Decimal(str(self.quantity or '0.0')) * \
(self.cost_price or Decimal('0.0'))
amount = Decimal(str(self.quantity or '0.0')) * \
(self.unit_price or Decimal('0.0'))
res = Decimal(amount-cost)
res = Decimal(self.amount-cost)
return res
def get_margin(self, name):
@ -87,8 +85,7 @@ class SaleLine:
'''
Currency = Pool().get('currency.currency')
if self.type == 'line':
cost = Decimal(str(self.quantity)) * (self.cost_price or Decimal('0.0'))
amount = Decimal(str(self.quantity)) * (self.unit_price)
return Currency.round(self.sale.currency, amount - cost)
cost = Decimal(str(self.quantity)) * (self.cost_price or Decimal('0.0'))
return Currency.round(self.sale.currency, self.amount - cost)
else:
return Decimal('0.0')