diff options
| author | Meera Trambadia (OpenERP) <mtr@tinyerp.com> | 2011-09-16 11:11:38 +0530 |
|---|---|---|
| committer | Meera Trambadia (OpenERP) <mtr@tinyerp.com> | 2011-09-16 11:11:38 +0530 |
| commit | d979aad3de95ae24aa1db52cf17c4eecf3d3ce6b (patch) | |
| tree | 592698c8e0dab53fcd157dd456a800bd4a80b5bf /addons/email_template/security | |
| parent | eea80125f7d1c739260929fb1f38866ef21439e1 (diff) | |
| parent | d101d3fbaaffe2d0219ac6cfeef50338a2501664 (diff) | |
[MERGE] branch merged with lp:openobject-addons
bzr revid: mtr@tinyerp.com-20110916054138-93b3caomaij5dyp4
Diffstat (limited to 'addons/email_template/security')
| -rw-r--r-- | addons/email_template/security/email_template_security.xml | 6 | ||||
| -rw-r--r-- | addons/email_template/security/ir.model.access.csv | 10 |
2 files changed, 2 insertions, 14 deletions
diff --git a/addons/email_template/security/email_template_security.xml b/addons/email_template/security/email_template_security.xml deleted file mode 100644 index e3f3401217c..00000000000 --- a/addons/email_template/security/email_template_security.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<openerp> - <data noupdate="0"> - - </data> -</openerp> diff --git a/addons/email_template/security/ir.model.access.csv b/addons/email_template/security/ir.model.access.csv index 17859d6bb9d..f5f61240a96 100644 --- a/addons/email_template/security/ir.model.access.csv +++ b/addons/email_template/security/ir.model.access.csv @@ -1,10 +1,4 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_email_template_account","email_template.account","model_email_template_account","marketing.group_marketing_user",1,0,0,0 -"access_email_template","email.template","model_email_template","marketing.group_marketing_user",1,0,0,0 -"access_email_template_mailbox","email_template.mailbox","model_email_template_mailbox","marketing.group_marketing_user",1,1,1,1 -"access_email_template_account_system","email_template.account system","model_email_template_account","base.group_system",1,1,1,1 +"access_email_template","email.template","model_email_template",,1,0,0,0 "access_email_template_system","email.template system","model_email_template","base.group_system",1,1,1,1 -"access_email_template_mailbox_system","email_template.mailbox system","model_email_template_mailbox","base.group_system",1,0,0,0 -"access_email_template_account_manager","email_template.account","model_email_template_account","marketing.group_marketing_manager",1,1,1,1 -"access_email_template_manager","email.template","model_email_template","marketing.group_marketing_manager",1,1,1,1 -"access_email_template_mailbox_manager","email_template.mailbox","model_email_template_mailbox","marketing.group_marketing_manager",1,1,1,1 +"access_email_template_manager","email.template","model_email_template",,1,1,1,1 |