diff options
| author | Harry (OpenERP) <hmo@tinyerp.com> | 2011-12-14 17:59:24 +0530 |
|---|---|---|
| committer | Harry (OpenERP) <hmo@tinyerp.com> | 2011-12-14 17:59:24 +0530 |
| commit | 092f97b32b35af6a40b9d2ae70c3159da2fb235f (patch) | |
| tree | 2974d3719af9338cd0b1814da900d7e9ca8d4779 /addons/marketing/security | |
| parent | 593f5f571bbc49673975afc405e9345ef3457b92 (diff) | |
| parent | e36dc8c5e3ca3da1474747bae5ec87fea19b23b8 (diff) | |
[MERGE] merged with trunk-development-branch
bzr revid: hmo@tinyerp.com-20111214122924-izzibrz1yz67rt7g
Diffstat (limited to 'addons/marketing/security')
| -rw-r--r-- | addons/marketing/security/ir.model.access.csv | 2 | ||||
| -rw-r--r-- | addons/marketing/security/marketing_security.xml | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/addons/marketing/security/ir.model.access.csv b/addons/marketing/security/ir.model.access.csv index 0343f29f43a..4a08a4aa60d 100644 --- a/addons/marketing/security/ir.model.access.csv +++ b/addons/marketing/security/ir.model.access.csv @@ -1 +1 @@ -"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/marketing/security/marketing_security.xml b/addons/marketing/security/marketing_security.xml index 344e562eb67..d04473da8bf 100644 --- a/addons/marketing/security/marketing_security.xml +++ b/addons/marketing/security/marketing_security.xml @@ -2,11 +2,13 @@ <openerp> <data> <record id="marketing.group_marketing_user" model="res.groups"> - <field name="name">Marketing / User</field> + <field name="name">User</field> + <field name="category_id" ref="base.module_category_marketing"/> </record> <record id="marketing.group_marketing_manager" model="res.groups"> - <field name="name">Marketing / Manager</field> + <field name="name">Manager</field> + <field name="category_id" ref="base.module_category_marketing"/> <field name="implied_ids" eval="[(4, ref('marketing.group_marketing_user'))]"/> </record> |