diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 976e83545bd..f44d354f121 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -49,6 +49,15 @@
['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
+
+
+ Stock Picking Type multi-company
+
+
+ ['|', ('warehouse_id', '=', False), '|',('warehouse_id.company_id','=',False),('warehouse_id.company_id','child_of',[user.company_id.id])]
+
+
+
Warehouse multi-company
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 774985ed3ac..5bfd33b917b 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2743,7 +2743,7 @@ class stock_warehouse(osv.osv):
_columns = {
'name': fields.char('Warehouse Name', size=128, required=True, select=True),
- 'company_id': fields.many2one('res.company', 'Company', required=True, select=True),
+ 'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True, select=True),
'partner_id': fields.many2one('res.partner', 'Address'),
'view_location_id': fields.many2one('stock.location', 'View Location', required=True, domain=[('usage', '=', 'view')]),
'lot_stock_id': fields.many2one('stock.location', 'Location Stock', required=True, domain=[('usage', '=', 'internal')]),
diff --git a/addons/stock_account/security/stock_account_security.xml b/addons/stock_account/security/stock_account_security.xml
index 97ecaecd278..7c30c4ab08d 100644
--- a/addons/stock_account/security/stock_account_security.xml
+++ b/addons/stock_account/security/stock_account_security.xml
@@ -8,6 +8,15 @@
Manage Inventory Valuation and Costing Methods
+
+
+
+ Stock History multi-company
+
+
+ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
+
+