From ad58b17e6eb5ba7d3c92992695703ad0f5ba1353 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Wed, 21 May 2014 17:34:19 +0200
Subject: [PATCH] [IMP] Add security rules from bzr branch

---
 addons/stock/security/stock_security.xml                 | 9 +++++++++
 addons/stock/stock.py                                    | 2 +-
 addons/stock_account/security/stock_account_security.xml | 9 +++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

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 @@
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
+    
+    <record model="ir.rule" id="stock_picking_rule">
+        <field name="name">Stock Picking Type multi-company</field>
+        <field name="model_id" search="[('model','=','stock.picking.type')]" model="ir.model"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|', ('warehouse_id', '=', False), '|',('warehouse_id.company_id','=',False),('warehouse_id.company_id','child_of',[user.company_id.id])]</field>
+    </record>
+    
+    
 
     <record model="ir.rule" id="stock_warehouse_comp_rule">
         <field name="name">Warehouse multi-company</field>
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 @@
         <field name="name">Manage Inventory Valuation and Costing Methods</field>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
+    
+    
+    <record model="ir.rule" id="stock_history_rule">
+        <field name="name">Stock History multi-company</field>
+        <field name="model_id" search="[('model','=','stock.history')]" model="ir.model"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+    
 </data>
 </openerp>