From 67797b4a46b92daebae590f6dde4f8bd47ce70e4 Mon Sep 17 00:00:00 2001
From: fabian <fabian@fabian-openerp>
Date: Wed, 25 Nov 2009 17:39:58 +0100
Subject: [PATCH] [IMP] Added multi company rules

bzr revid: fabian@fabian-openerp-20091125163958-m6bokw0m6wbvp3s4
---
 addons/product/security/product_security.xml | 13 +++++++++++
 addons/project/security/project_security.xml |  8 ++-----
 addons/sale/sale_view.xml                    |  1 +
 addons/sale/security/sale_security.xml       | 24 +++++++++++++++-----
 4 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 7347c61d1bc..1d255aff2c8 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -7,6 +7,19 @@
     </record>
     <record id="group_product_manager" model="res.groups">
         <field name="name">Product / Manager</field>
+
+    </record>
+</data>
+<data noupdate="0">
+
+     <record model="ir.rule.group" id="product_comp_rule_group">
+        <field name="name" >Product multi-company</field>
+        <field name="model_id" search="[('model','=','product.product')]" model="ir.model"/>
+        <field name="global" eval="True"/>
+    </record>
+    <record id="product_comp_rule" model="ir.rule">
+        <field name="rule_group" ref="product_comp_rule_group"/>
+        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="group_product_variant" model="res.groups">
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index f9b8af20541..cb5bad3db9c 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -25,10 +25,8 @@
 		<field name="global" eval="True"/>
 	</record>
 	<record model="ir.rule" id="project_comp_rule">
-		<field name="field_id" search="[('model','=','project.project'),('name','=','company_id')]" model="ir.model.fields"/>
-		<field name="operator">child_of</field>
-		<field name="operand">user.company_id.id</field>
 		<field name="rule_group" ref="project_comp_rule_group"/>
+        	<field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
 	</record>
 
 	<record model="ir.rule.group" id="task_comp_rule_group">
@@ -37,9 +35,7 @@
 		<field name="global" eval="True"/>
 	</record>
 	<record model="ir.rule" id="task_comp_rule">
-		<field name="field_id" search="[('model','=','project.task'),('name','=','company_id')]" model="ir.model.fields"/>
-		<field name="operator">child_of</field>
-		<field name="operand">user.company_id.id</field>
+        	<field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
 		<field name="rule_group" ref="task_comp_rule_group"/>
 	</record>
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 7be63508be2..c8af35d8f52 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -206,6 +206,7 @@
                             <field groups="base.group_extended" name="invoice_quantity" attrs="{'readonly':[('order_policy','=','prepaid'),('order_policy','=','picking')]}"/>
                             <field name="payment_term" widget="selection"/>
                             <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
+                            <field name="company_id" groups="base.group_extended" widget="selection"/>
                             <separator colspan="4" string="Notes"/>
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 9778e607ecf..932dd9ff747 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -2,18 +2,30 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="group_sale_manager" model="res.groups">
-        <field name="name">Sale / Manager</field>
-    </record>
-    <record id="group_sale_user" model="res.groups">
-        <field name="name">Sale / Salesman</field>
-    </record>
+    	<record id="group_sale_manager" model="res.groups">
+        	<field name="name">Sale / Manager</field>
+    	</record>
+    	<record id="group_sale_user" model="res.groups">
+        	<field name="name">Sale / Salesman</field>
+     	</record>
 
 
 	<record model='ir.ui.menu' id='menu_shop_configuration'>
 		<field name="groups_id" eval="[(6,0,[ref('group_sale_manager')])]"/>
 	</record>
 
+	<record model="ir.rule.group" id="sale_order_comp_rule_group">
+		<field name="name">Sale Order multi-company</field>
+		<field name="model_id" search="[('model','=','sale.order')]" model="ir.model"/>
+		<field name="global" eval="True"/>
+	</record>
+	<record model="ir.rule" id="sale_order_comp_rule">
+		<field name="field_id" search="[('model','=','sale.order'),('name','=','company_id')]" model="ir.model.fields"/>
+		<field name="rule_group" ref="sale_order_comp_rule_group"/>
+        	<field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+	</record>
+
+	
 
 </data>
 </openerp>