[MERGE] forward port of branch 7.0 up to ce38582

This commit is contained in:
Denis Ledoux 2016-02-15 11:36:02 +01:00
commit 5401345ce2
1 changed files with 2 additions and 1 deletions

View File

@ -69,6 +69,7 @@ class change_production_qty(osv.osv_memory):
prod_obj = self.pool.get('mrp.production')
bom_obj = self.pool.get('mrp.bom')
move_obj = self.pool.get('stock.move')
uom_obj = self.pool.get('product.uom')
for wiz_qty in self.browse(cr, uid, ids, context=context):
prod = prod_obj.browse(cr, uid, record_id, context=context)
prod_obj.write(cr, uid, [prod.id], {'product_qty': wiz_qty.product_qty})
@ -87,7 +88,7 @@ class change_production_qty(osv.osv_memory):
if not bom_id:
raise osv.except_osv(_('Error!'), _("Cannot find bill of material for this product."))
factor = prod.product_qty * prod.product_uom.factor / bom_point.product_uom.factor
factor = uom_obj._compute_qty(cr, uid, prod.product_uom.id, prod.product_qty, bom_point.product_uom.id)
product_details, workcenter_details = \
bom_obj._bom_explode(cr, uid, bom_point, prod.product_id, factor / bom_point.product_qty, [], context=context)
for r in product_details: