Merged multiple heads

This commit is contained in:
resteve 2016-02-11 14:17:44 +01:00
commit b70f9ac5ba
1 changed files with 4 additions and 4 deletions

View File

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