diff options
| author | DBR (OpenERP) <dbr@tinyerp.com> | 2011-09-20 12:15:50 +0530 |
|---|---|---|
| committer | DBR (OpenERP) <dbr@tinyerp.com> | 2011-09-20 12:15:50 +0530 |
| commit | fa577c8a15ad327d77d4e9e24d5e0ea27ca3e613 (patch) | |
| tree | 96cfa22a87945b37b853b3e10b3a0f1944204666 /addons/mrp/security | |
| parent | 2380552cb493040b22e61f8e4209cc6df8edc912 (diff) | |
| parent | f2f072e2e3c9a273a050d6f2277beb64b1671e18 (diff) | |
[Merge]with: lp:openobject-addons
bzr revid: dbr@tinyerp.com-20110920064550-v90yjoblpzp5ebiq
Diffstat (limited to 'addons/mrp/security')
| -rw-r--r-- | addons/mrp/security/ir.model.access.csv | 2 | ||||
| -rw-r--r-- | addons/mrp/security/mrp_security.xml | 21 |
2 files changed, 19 insertions, 4 deletions
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv index c32157f13d1..4af31e9c902 100644 --- a/addons/mrp/security/ir.model.access.csv +++ b/addons/mrp/security/ir.model.access.csv @@ -85,7 +85,7 @@ "access_product_pricelist_type_mrp_manager","product.pricelist.type mrp_manager","product.model_product_pricelist_type","mrp.group_mrp_manager",1,1,1,1 "access_product_pricelist_mrp_manager","product.pricelist mrp_manager","product.model_product_pricelist","mrp.group_mrp_manager",1,1,1,1 "access_ir_property_group_product_mrp_manager","ir_property group_product_mrp_manager","base.model_ir_property","mrp.group_mrp_manager",1,1,1,1 -"access_product_group_res_partner_mrp_manager","res_partner group_mrp_manager","base.model_res_partner","mrp.group_mrp_manager",1,1,1,1 +"access_product_group_res_partner_mrp_manager","res_partner group_mrp_manager","base.model_res_partner","mrp.group_mrp_manager",1,1,1,0 "access_product_pricelist_version_mrp_manager","product.pricelist.version mrp_manager","product.model_product_pricelist_version","mrp.group_mrp_manager",1,1,1,1 "access_product_pricelist_item_mrp_manager","product.pricelist.item mrp_manager","product.model_product_pricelist_item","mrp.group_mrp_manager",1,1,1,1 "access_resource_calendar_manufacturinguser","resource.calendar manufacturing.user","resource.model_resource_calendar","mrp.group_mrp_user",1,0,0,0 diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml index 1cc4c5cea9b..fb83f8c4a62 100644 --- a/addons/mrp/security/mrp_security.xml +++ b/addons/mrp/security/mrp_security.xml @@ -2,12 +2,13 @@ <openerp> <data noupdate="0"> - <record id="group_mrp_manager" model="res.groups"> - <field name="name">Manufacturing / Manager</field> - </record> <record id="group_mrp_user" model="res.groups"> <field name="name">Manufacturing / User</field> </record> + <record id="group_mrp_manager" model="res.groups"> + <field name="name">Manufacturing / Manager</field> + <field name="implied_ids" eval="[(4, ref('group_mrp_user'))]"/> + </record> <!-- restrict access to menu --> <record model='ir.ui.menu' id="mrp_Sched_all"> @@ -36,5 +37,19 @@ <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field> </record> + <record model="ir.rule" id="mrp_routing_rule"> + <field name="name">mrp_routing multi-company</field> + <field name="model_id" search="[('model','=','mrp.routing')]" model="ir.model"/> + <field name="global" eval="True"/> + <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field> + </record> + + <record model="ir.rule" id="mrp_routing_workcenter_rule"> + <field name="name">mrp_routing_workcenter multi-company</field> + <field name="model_id" search="[('model','=','mrp.routing.workcenter')]" model="ir.model"/> + <field name="global" eval="True"/> + <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field> + </record> + </data> </openerp> |