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

PEP8 fixes

This commit is contained in:
Jordi Esteve 2014-08-30 15:14:54 +02:00
parent 8311e518b7
commit f84eed597a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sale.py
View File

@ -1,5 +1,5 @@
#This file is part sale_margin module for Tryton. #This file is part sale_margin module for Tryton.
#The COPYRIGHT file at the top level of this repository contains #The COPYRIGHT file at the top level of this repository contains
#the full copyright notices and license terms. #the full copyright notices and license terms.
from decimal import Decimal from decimal import Decimal
from trytond.model import fields from trytond.model import fields
@ -14,9 +14,9 @@ class Sale:
__name__ = 'sale.sale' __name__ = 'sale.sale'
margin = fields.Function(fields.Numeric('Margin', margin = fields.Function(fields.Numeric('Margin',
digits=(16, Eval('currency_digits', 2),), digits=(16, Eval('currency_digits', 2),),
depends=['currency_digits'], depends=['currency_digits'],
help='It gives profitability by calculating the difference ' help='It gives profitability by calculating the difference '
'between the Unit Price and Cost Price.'), 'between the Unit Price and Cost Price.'),
'get_margin') 'get_margin')
margin_cache = fields.Numeric('Margin Cache', margin_cache = fields.Numeric('Margin Cache',
digits=(16, Eval('currency_digits', 2)), digits=(16, Eval('currency_digits', 2)),
@ -80,7 +80,7 @@ class SaleLine:
cost = Decimal(str(self.quantity or '0.0')) * \ cost = Decimal(str(self.quantity or '0.0')) * \
(self.cost_price or Decimal('0.0')) (self.cost_price or Decimal('0.0'))
if self.amount: if self.amount:
return Decimal(self.amount-cost) return Decimal(self.amount - cost)
return Decimal('0.0') return Decimal('0.0')
def get_margin(self, name): def get_margin(self, name):
@ -89,7 +89,9 @@ class SaleLine:
''' '''
Currency = Pool().get('currency.currency') Currency = Pool().get('currency.currency')
if self.type == 'line': if self.type == 'line':
cost = Decimal(str(self.quantity)) * (self.cost_price or Decimal('0.0')) cost = Decimal(str(self.quantity)) * (self.cost_price or
Decimal('0.0'))
return Currency.round(self.sale.currency, self.amount - cost) return Currency.round(self.sale.currency, self.amount - cost)
else: else:
return Decimal('0.0') return Decimal('0.0')