tryton-do/tryton
2
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

- Added Symbol field on uom object.

Browse Source 
- Added tooltips on factor and rate fields.
- Improved on_change function (use 1.0 instead of 0.0 when fields factor and rate must be filled).
- Fix the factor and rate check function (rounding, interger division and completeness).
- Fix default values of context on create and write functions.
- Fix arg name on compyte_qty.
- Fix helper functions _compute_qty and compute_price.
This commit is contained in:
Bertrand Chenal
2008-03-13 01:22:57 +01:00
parent ff1b46b946
commit 1c3eb8968b
1 changed files with 42 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
uom.py
+42 -35
View File
@@ -4,7 +4,6 @@ STATES = {
'readonly': "active == False",
}
class UomCategory(OSV):
'Product uom category'
_name = 'product.uom.category'
@@ -12,7 +11,6 @@ class UomCategory(OSV):
_order = 'name'
name = fields.Char('Name', size=64, required=True)
UomCategory()
@@ -22,6 +20,7 @@ class Uom(OSV):
_description = __doc__
_order = 'name'
name = fields.Char('Name', size=64, required=True, states=STATES,)
symbol = fields.Char('Symbol', size=10, required=True, states=STATES,)
category = fields.Many2One('product.uom.category', 'UOM Category',
required=True, ondelete='cascade',
states=STATES,)
@@ -29,9 +28,12 @@ class Uom(OSV):
on_change = ['rate'],states=STATES,
help='The coefficient for the formula:\n' \
'1 (base unit) = coef (this unit)')
factor = fields.Float('Factor', digits=(12, 6), states=STATES,)
rounding = fields.Float('Rounding Precision', digits=(16, 3),
required=True,states=STATES,)
factor = fields.Float('Factor', digits=(12, 6), states=STATES,
on_change = ['factor'], required=True,
help='The coefficient for the formula:\n' \
'coef (base unit) = 1 (this unit)')
rounding = fields.Float('Rounding Precision', digits=(12, 6),
required=True, states=STATES,)
active = fields.Boolean('Active')
def default_rate(self, cursor, user, context=None):
@@ -48,19 +50,22 @@ class Uom(OSV):
def on_change_factor(self, cursor, user, ids, value, context=None):
if value.get('factor', 0.0) == 0.0:
return {'value': {'rate': 0}}
return {'rate': round(1/value['factor'], 6)}
return {'factor': 1.0, 'rate': 1.0}
return {'rate': round(1.0/value['factor'], 6)}
def on_change_rate(self, cursor, user, ids, value, context=None):
if value.get('rate', 0.0) == 0.0:
return {'value': {'factor': 0}}
return {'factor': round(1/value['rate'], 6)}
return {'factor': 1.0, 'rate': 1.0}
return {'factor': round(1.0/value['rate'], 6)}
@staticmethod
def round(number, precision=1.0):
return round(number/precision)*precision
@staticmethod
def check_factor_and_rate(values):
factor = None
rate = None
if ('factor' not in values) and ('rate' not in values):
return values
elif 'factor' in values and 'rate' in values:
@@ -68,25 +73,27 @@ class Uom(OSV):
return values
elif values['factor'] != 0.0 and \
values['rate'] != 0.0:
if values['rate'] == round(1/values['factor'], 6) or \
values['factor'] == round(1/values['rate'], 6):
if values['rate'] == round(1.0/values['factor'], 6) or \
values['factor'] == round(1.0/values['rate'], 6):
return values
else:
factor = round(1/values['rate'], 6)
factor = round(1.0/values['rate'], 6)
elif values['rate'] != 0.0 and \
values['factor'] != round(1/values['rate'], 6):
factor = round(1/values['rate'], 6)
values['factor'] != round(1.0/values['rate'], 6):
factor = round(1.0/values['rate'], 6)
elif values['factor'] != 0.0 and \
values['rate'] != round(1/values['factor'], 6):
rate = round(1/values['factor'], 6)
values['rate'] != round(1.0/values['factor'], 6):
rate = round(1.0/values['factor'], 6)
else:
return values
elif 'rate' in values:
if values['rate'] != 0.0:
factor = round(1/values['rate'], 6)
factor = round(1.0/values['rate'], 6)
else:
factor = 0.0
elif 'factor' in values:
if values['factor'] != 0.0:
rate = round(1/values['factor'], 6)
rate = round(1.0/values['factor'], 6)
else:
rate = 0.0
@@ -96,15 +103,15 @@ class Uom(OSV):
if factor != None: values['factor'] = factor
return values
def create(self, cursor, user, values, context):
def create(self, cursor, user, values, context=None):
values = self.check_factor_and_rate(values)
return super(Uom, self).create(cursor, user, values, context)
def write(self, cursor, user, ids, values, context):
def write(self, cursor, user, ids, values, context=None):
values = self.check_factor_and_rate(values)
return super(Uom, self).write(cursor, user, ids, values, context)
def _compute_qty(self, cursor, user, from_uom_id, qty, to_uom=False):
def _compute_qty(self, cursor, user, from_uom, qty, to_uom=False):
"""
Convert quantity for given uom's. from_uom and to_uom should
be browse records.
@@ -113,15 +120,15 @@ class Uom(OSV):
return qty
if from_uom.category.id <> to_uom.category.id:
return qty
if from_uom.factor_data:
amount = qty * from_uom.factor_data
if from_uom.factor >= 1.0: # Choose the more precise field.
amount = qty * from_uom.factor
else:
amount = qty / from_uom.factor
amount = qty / from_uom.rate
if to_uom:
if to_uom.factor_data:
amount = rounding(amount / to_uom.factor_data, to_uom.rounding)
if to_uom.factor >= 1.0:
amount = self.round(amount / to_uom.factor, to_uom.rounding)
else:
amount = rounding(amount * to_uom.factor, to_uom.rounding)
amount = self.round(amount * to_uom.rate, to_uom.rounding)
return amount
def _compute_price(self, cursor, user, from_uom, price, to_uom=False):
@@ -133,16 +140,16 @@ class Uom(OSV):
return price
if from_uom.category.id <> to_uom.category.id:
return price
if from_uom.factor_data:
new_price = float(price) / from_uom.factor_data
if from_uom.factor >= 1.0:
new_price = float(price) / from_uom.factor
else:
new_price = float(price) * from_uom.factor
new_price = float(price) * from_uom.rate
if to_uom.factor_data:
new_price = new_price * to_uom.factor_data
if to_uom.factor >= 1.0:
new_price = new_price * to_uom.factor
else:
new_price = new_price / to_uom.factor
new_price = new_price / to_uom.rate
return new_price
return new_price # XXX no rounding ?
Uom()