From 80861660c6fd598c29b3cf6bb044490f2b1feec9 Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Tue, 10 Nov 2009 18:19:20 +0530
Subject: merge multi_company, multi_company_account,
 multi_company_hr_timesheet_sheet, multi_company_product,
 multi_company_project, multi_company_purchase modules.

bzr revid: vra@tinyerp.com-20091110124920-qho0im1rrx3mf4sf
---
 addons/project/security/project_security.xml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'addons/project/security/project_security.xml')

diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index dd859f0f882..f9b8af20541 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -19,5 +19,29 @@
 		<field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>
 	</record>
 
+	<record model="ir.rule.group" id="project_comp_rule_group">
+		<field name="name">Project multi-company</field>
+		<field name="model_id" search="[('model','=','project.project')]" model="ir.model"/>
+		<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"/>
+	</record>
+
+	<record model="ir.rule.group" id="task_comp_rule_group">
+		<field name="name" >Task multi-company</field>
+		<field name="model_id" search="[('model','=','project.task')]" model="ir.model"/>
+		<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="rule_group" ref="task_comp_rule_group"/>
+	</record>
+
 </data>
 </openerp>
-- 
cgit v1.2.3


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

bzr revid: fabian@fabian-openerp-20091125163958-m6bokw0m6wbvp3s4
---
 addons/project/security/project_security.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'addons/project/security/project_security.xml')

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>
 
-- 
cgit v1.2.3


From 54e1058afd0a70fd48e94319d581836cc7efcade Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 25 Nov 2009 18:50:23 +0100
Subject: [imp] multi-company groups

bzr revid: fp@tinyerp.com-20091125175023-hmi1msewn9ehb3f2
---
 addons/project/security/project_security.xml | 48 ++++++++++++++--------------
 1 file changed, 24 insertions(+), 24 deletions(-)

(limited to 'addons/project/security/project_security.xml')

diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index cb5bad3db9c..a350354ffca 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -12,32 +12,32 @@
         <field name="name">Project / User</field>
     </record>
 
-	<record model="ir.ui.menu" id="menu_definitions">
-		<field name="groups_id" eval="[(6,0,[ref('group_project_manager'), ref('group_project_finance')])]"/>
-	</record>
-	<record model="ir.ui.menu" id="menu_open_view_project">
-		<field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>
-	</record>
+    <record model="ir.ui.menu" id="menu_definitions">
+        <field name="groups_id" eval="[(6,0,[ref('group_project_manager'), ref('group_project_finance')])]"/>
+    </record>
+    <record model="ir.ui.menu" id="menu_open_view_project">
+        <field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>
+    </record>
 
-	<record model="ir.rule.group" id="project_comp_rule_group">
-		<field name="name">Project multi-company</field>
-		<field name="model_id" search="[('model','=','project.project')]" model="ir.model"/>
-		<field name="global" eval="True"/>
-	</record>
-	<record model="ir.rule" id="project_comp_rule">
-		<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="project_comp_rule_group">
+        <field name="name">Project multi-company</field>
+        <field name="model_id" ref="model_project_project"/>
+        <field name="global" eval="True"/>
+    </record>
+    <record model="ir.rule" id="project_comp_rule">
+        <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">
-		<field name="name" >Task multi-company</field>
-		<field name="model_id" search="[('model','=','project.task')]" model="ir.model"/>
-		<field name="global" eval="True"/>
-	</record>
-	<record model="ir.rule" id="task_comp_rule">
-        	<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>
+    <record model="ir.rule.group" id="task_comp_rule_group">
+        <field name="name" >Task multi-company</field>
+        <field name="model_id" ref="model_project_task"/>
+        <field name="global" eval="True"/>
+    </record>
+    <record model="ir.rule" id="task_comp_rule">
+            <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>
 
 </data>
 </openerp>
-- 
cgit v1.2.3