diff options
| author | kum (Open ERP) <kum@tinyerp.co.in> | 2009-11-26 14:12:52 +0530 |
|---|---|---|
| committer | kum (Open ERP) <kum@tinyerp.co.in> | 2009-11-26 14:12:52 +0530 |
| commit | c9f87c4dc9ebceddb609c5cfc2e6fd15abc481e8 (patch) | |
| tree | 053269a0cc8d08a3d44694c3c73d38abadd6749e /addons/project/security | |
| parent | 38caea46b0ba92d3a2db17c7c72ec4c290b3b334 (diff) | |
| parent | d8dc05715d93963f3c72b78a57d07ca9552ef45f (diff) | |
[IMP] English Improvement resolved conflicts
bzr revid: kum@tinyerp.co.in-20091125113147-pmsqovlrx4ia54hf
bzr revid: kum@tinyerp.co.in-20091126062538-149ru08q9obdlksy
bzr revid: kum@tinyerp.co.in-20091126084252-ml6pgh170e6f4r3f
Diffstat (limited to 'addons/project/security')
| -rw-r--r-- | addons/project/security/project_security.xml | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml index dd859f0f882..a350354ffca 100644 --- a/addons/project/security/project_security.xml +++ b/addons/project/security/project_security.xml @@ -12,12 +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" 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" 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> |