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

[fix] 

bzr revid: hmo@tinyerp.com-20090206050812-y97bk9asy5ww7a88
This commit is contained in:
Harry (Open ERP) 2009-02-06 10:38:12 +05:30
parent c7149c13df
commit 7e24105aa8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/mrp/mrp.py
View File

@ -854,7 +854,8 @@ class mrp_procurement(osv.osv):
#
def _quantity_compute_get(self, cr, uid, proc, context={}):
if proc.product_id.type=='product':
return proc.move_id.product_uos_qty
if proc.move_id.product_uos:
return proc.move_id.product_uos_qty
return False
def _uom_compute_get(self, cr, uid, proc, context={}):

3
addons/sale/sale.py
View File

@ -583,7 +583,8 @@ class sale_order(osv.osv):
'product_id': line.product_id.id,
'product_qty': line.product_uom_qty,
'product_uom': line.product_uom.id,
'product_uos_qty': line.product_uos_qty,
'product_uos_qty': (line.product_uos and line.product_uos_qty)\
or line.product_uom_qty,
'product_uos': (line.product_uos and line.product_uos.id)\
or line.product_uom.id,
'location_id': order.shop_id.warehouse_id.lot_stock_id.id,