odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Improve UOM/UOS integrity 

bzr revid: ced-0c2996edab76de07f3c44e8a7c866d5955901a0f
This commit is contained in:
ced 2007-09-12 13:20:21 +00:00
parent 4a8767bb7f
commit 558408012d
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
addons/product/product.py
View File

@ -201,13 +201,17 @@ class product_template(osv.osv):
'uom_id': fields.many2one('product.uom', 'Default UOM', required=True),
'uom_po_id': fields.many2one('product.uom', 'Purchase UOM', required=True),
'state': fields.selection([('draft', 'In Development'),('sellable','In Production'),('end','End of Lifecycle'),('obsolete','Obsolete')], 'State'),
'uos_id' : fields.many2one('product.uom', 'Unit of Sale'),
'uos_coeff': fields.float('UOM -> UOS Coeff', digits=(16,4)),
'uos_id' : fields.many2one('product.uom', 'Unit of Sale',
help='Keep empty to use the default UOM'),
'uos_coeff': fields.float('UOM -> UOS Coeff', digits=(16,4),
help='Coefficient to convert UOM to UOS\n'
' uom = uos * coeff'),
'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure type', required=True),
'tracking': fields.boolean('Track lots'),
'seller_delay': fields.function(_calc_seller_delay, method=True, type='integer', string='Supplier lead time', help="This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays."),
'seller_ids': fields.one2many('product.supplierinfo', 'product_id', 'Partners'),
}
def _get_uom_id(self, cr, uid, *args):
cr.execute('select id from product_uom order by id limit 1')
res = cr.fetchone()
@ -231,6 +235,18 @@ class product_template(osv.osv):
'uos_coeff' : lambda *a: 1.0,
'mes_type' : lambda *a: 'fixed',
}
def _check_uos(self, cursor, user, ids):
for product in self.browse(cursor, user, ids):
if product.uos_id \
and product.uos_id.category_id.id \
== product.uom_id.category_id.id:
return False
return True
_constraints = [(_check_uos,
'Error: UOS must be in a different category than the UOM', ['uos_id'])]
def name_get(self, cr, user, ids, context={}):
if 'partner_id' in context:
pass

9
addons/sale/sale.py
View File

@ -664,7 +664,8 @@ class sale_order_line(osv.osv):
if not product:
return {'value': {'price_unit': 0.0, 'notes':'', 'th_weight' : 0,
'product_uos_qty': qty}, 'domain': {'product_uom': []}}
'product_uos_qty': qty}, 'domain': {'product_uom': [],
'product_uos': []}}
if not pricelist:
raise osv.except_osv('No Pricelist !',
@ -721,12 +722,16 @@ class sale_order_line(osv.osv):
if product.uos_id:
result['product_uos'] = product.uos_id.id
result['product_uos_qty'] = qty * product.uos_coeff
uos_category_id = product.uos_id.category_id.id
else:
result['product_uos'] = False
result['product_uos_qty'] = qty
uos_category_id = False
result['th_weight'] = qty * product.weight
domain = {'product_uom':
[('category_id', '=', product.uom_id.category_id.id)]}
[('category_id', '=', product.uom_id.category_id.id)],
'product_uos':
[('category_id', '=', uos_category_id)]}
elif uom: # whether uos is set or not
default_uom = product.uom_id and product.uom_id.id
q = product_uom_obj._compute_qty(cr, uid, uom, qty, default_uom)