diff --git a/addons/mrp_byproduct/mrp_byproduct.py b/addons/mrp_byproduct/mrp_byproduct.py
index 982723cc85c..f982cb5aba1 100644
--- a/addons/mrp_byproduct/mrp_byproduct.py
+++ b/addons/mrp_byproduct/mrp_byproduct.py
@@ -87,7 +87,6 @@ class mrp_production(osv.osv):
                     'product_uom': sub_product.product_uom.id,
                     'location_id': source,
                     'location_dest_id': production.location_dest_id.id,
-                    'move_dest_id': production.move_prod_id.id,
                     'production_id': production.id
                 }
                 move_id = move_obj.create(cr, uid, data, context=context)
diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py
index ec03ae965d5..3984f86c2d5 100644
--- a/addons/stock/wizard/stock_change_product_qty.py
+++ b/addons/stock/wizard/stock_change_product_qty.py
@@ -113,7 +113,7 @@ class stock_change_product_qty(osv.osv_memory):
     def onchange_location_id(self, cr, uid, ids, location_id, product_id, context=None):
         if location_id:
             qty_wh = 0.0
-            qty = self.pool.get('product.product')._product_available(cr, uid, [product_id], context=dict(context or {}, location=location_id))
+            qty = self.pool.get('product.product')._product_available(cr, uid, [product_id], context=dict(context or {}, location=location_id, compute_child=False))
             if product_id in qty:
                 qty_wh = qty[product_id]['qty_available']
             return { 'value': { 'new_quantity': qty_wh } }