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

Merged multiple heads

This commit is contained in:
resteve 2016-02-11 14:17:44 +01:00
parent 56ff65e326 dc58608ea2
commit b70f9ac5ba
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
move.py
View File

@ -6,9 +6,9 @@ from trytond.model import fields
from trytond.pool import Pool, PoolMeta from trytond.pool import Pool, PoolMeta
from trytond.pyson import Equal, Eval, Not from trytond.pyson import Equal, Eval, Not
from trytond.transaction import Transaction from trytond.transaction import Transaction
from trytond.config import config from trytond.config import config as config_
DIGITS = int(config.get('digits', 'unit_price_digits', 4)) from trytond.modules.product import price_digits
DISCOUNT_DIGITS = int(config.get('digits', 'discount_digits', 4)) DISCOUNT_DIGITS = config_.getint('product', 'discount_decimal', default=4)
__all__ = ['Move'] __all__ = ['Move']
__metaclass__ = PoolMeta __metaclass__ = PoolMeta
@ -25,7 +25,7 @@ class Move:
currency_digits = fields.Function(fields.Integer('Currency Digits'), currency_digits = fields.Function(fields.Integer('Currency Digits'),
'on_change_with_currency_digits') 'on_change_with_currency_digits')
gross_unit_price = fields.Function(fields.Numeric('Gross Price', gross_unit_price = fields.Function(fields.Numeric('Gross Price',
digits=(16, DIGITS), states=STATES, depends=['state']), digits=price_digits, states=STATES, depends=['state']),
'get_origin_fields') 'get_origin_fields')
discount = fields.Function(fields.Numeric('Discount', discount = fields.Function(fields.Numeric('Discount',
digits=(16, DISCOUNT_DIGITS), states=STATES, depends=['state']), digits=(16, DISCOUNT_DIGITS), states=STATES, depends=['state']),