diff --git a/addons/inter_company_rules/models/purchase_order.py b/addons/inter_company_rules/models/purchase_order.py
index b59592a2a1d..24151ec4117 100644
--- a/addons/inter_company_rules/models/purchase_order.py
+++ b/addons/inter_company_rules/models/purchase_order.py
@@ -30,6 +30,7 @@ class purchase_order(models.Model):
             :param company : the company of the created PO
             :rtype company : res.company record
         """
+        self = self.with_context(force_company=company.id)
         SaleOrder = self.env['sale.order']
         company_partner = self.company_id.partner_id
 
@@ -75,9 +76,13 @@ class purchase_order(models.Model):
             :rtype direct_delivery_address : res.partner record
         """
         partner_addr = partner.sudo().address_get(['default', 'invoice', 'delivery', 'contact'])
+        warehouse = company.warehouse_id and company.warehouse_id.company_id.id == company.id and company.warehouse_id or False
+        if not warehouse:
+            raise Warning(_('Configure correct warehouse for company(%s) from Menu: Settings/companies/companies' % (company.name)))
         return {
             'name': self.env['ir.sequence'].sudo().next_by_code('sale.order') or '/',
             'company_id': company.id,
+            'warehouse_id': warehouse.id,
             'client_order_ref': name,
             'partner_id': partner.id,
             'pricelist_id': partner.property_product_pricelist.id,
diff --git a/addons/inter_company_rules/models/sale_order.py b/addons/inter_company_rules/models/sale_order.py
index a8070e270ad..473dea16b0c 100644
--- a/addons/inter_company_rules/models/sale_order.py
+++ b/addons/inter_company_rules/models/sale_order.py
@@ -31,6 +31,7 @@ class sale_order(models.Model):
             :param company : the company of the created PO
             :rtype company : res.company record
         """
+        self = self.with_context(force_company=company.id)
         PurchaseOrder = self.env['purchase.order']
         company_partner = self.company_id and self.company_id.partner_id or False
         if not company or not company_partner.id: