[MERGE] Merged Dhruti's branch for the fix of avoiding crash when reservation is...

[odoo/odoo.git] / addons / mrp / mrp.py

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index cfe045f..b8962d5 100644 (file)
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -471,7 +471,7 @@ class mrp_production(osv.osv):
             #if bom_point.routing_id and bom_point.routing_id.location_id:
             #   self.write(cr, uid, [production.id], {'location_src_id': bom_point.routing_id.location_id.id})
 
-            factor = production.product_qty * production.product_uom.factor_inv / bom_point.product_uom.factor
+            factor = production.product_qty * production.product_uom.factor_inv * bom_point.product_uom.factor
             res = self.pool.get('mrp.bom')._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, properties)
             results = res[0]
             results2 = res[1]
@@ -1221,6 +1221,7 @@ class StockMove(osv.osv):
                         'product_qty': line['product_qty'],
                         'product_uos': line['product_uos'],
                         'product_uos_qty': line['product_uos_qty'],
+                        'move_dest_id': move.id,
                         'state': state,
                         'name': line['name'],
                         'move_history_ids': [(6,0,[move.id])],