diff --git a/addons/mrp/models/stock_warehouse.py b/addons/mrp/models/stock_warehouse.py
index ad525bd1e73..ab0bfeff5c2 100644
--- a/addons/mrp/models/stock_warehouse.py
+++ b/addons/mrp/models/stock_warehouse.py
@@ -110,6 +110,7 @@ class StockWarehouse(models.Model):
                 'create_values': {
                     'action': 'manufacture',
                     'procure_method': 'make_to_order',
+                    'company_id': self.company_id.id,
                     'picking_type_id': self.manu_type_id.id,
                     'route_id': self._find_global_route('mrp.route_warehouse0_manufacture', _('Manufacture')).id
                 },
diff --git a/addons/purchase_stock/models/stock.py b/addons/purchase_stock/models/stock.py
index 444374b6325..0f6a1ff0ac3 100644
--- a/addons/purchase_stock/models/stock.py
+++ b/addons/purchase_stock/models/stock.py
@@ -125,6 +125,7 @@ class StockWarehouse(models.Model):
                     'action': 'buy',
                     'picking_type_id': self.in_type_id.id,
                     'group_propagation_option': 'none',
+                    'company_id': self.company_id.id,
                     'route_id': self._find_global_route('purchase_stock.route_warehouse0_buy', _('Buy')).id
                 },
                 'update_values': {