diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 854349f110b..7ca680ad762 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -212,6 +212,8 @@ class mrp_bom(osv.osv):
         @param properties: List of related properties.
         @return: False or BoM id.
         """
+        if not context:
+            context = {}
         if properties is None:
             properties = []
         if product_id:
@@ -229,6 +231,8 @@ class mrp_bom(osv.osv):
         else:
             # neither product nor template, makes no sense to search
             return False
+        if context.get('company_id'):
+            domain = domain + [('company_id', '=', context['company_id'])]
         domain = domain + [ '|', ('date_start', '=', False), ('date_start', '<=', time.strftime(DEFAULT_SERVER_DATE_FORMAT)),
                             '|', ('date_stop', '=', False), ('date_stop', '>=', time.strftime(DEFAULT_SERVER_DATE_FORMAT))]
         # order to prioritize bom with product_id over the one without
diff --git a/addons/mrp/procurement.py b/addons/mrp/procurement.py
index dd14cd89c93..bbcfbedb828 100644
--- a/addons/mrp/procurement.py
+++ b/addons/mrp/procurement.py
@@ -86,7 +86,7 @@ class procurement_order(osv.osv):
         else:
             properties = [x.id for x in procurement.property_ids]
             bom_id = bom_obj._bom_find(cr, uid, product_id=procurement.product_id.id,
-                                       properties=properties, context=context)
+                                       properties=properties, context=dict(context, company_id=procurement.company_id.id))
             bom = bom_obj.browse(cr, uid, bom_id, context=context)
             routing_id = bom.routing_id.id
         return {