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/email_template | |
| parent | 593f5f571bbc49673975afc405e9345ef3457b92 (diff) | |
| parent | e36dc8c5e3ca3da1474747bae5ec87fea19b23b8 (diff) | |
[MERGE] merged with trunk-development-branch
bzr revid: hmo@tinyerp.com-20111214122924-izzibrz1yz67rt7g
Diffstat (limited to 'addons/email_template')
| -rw-r--r-- | addons/email_template/__openerp__.py | 4 | ||||
| -rw-r--r-- | addons/email_template/security/ir.model.access.csv | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py index 2ab7f194d18..9aca39f56e8 100644 --- a/addons/email_template/__openerp__.py +++ b/addons/email_template/__openerp__.py @@ -21,9 +21,9 @@ ############################################################################## { - "name" : "Automated E-Mails", + "name" : "E-Mail Templates", "version" : "1.1", - "author" : "Openlabs", + "author" : "OpenERP,OpenLabs", "website" : "http://openerp.com", "category" : "Marketing", 'complexity': "expert", diff --git a/addons/email_template/security/ir.model.access.csv b/addons/email_template/security/ir.model.access.csv index f5f61240a96..d2d6adf3bf3 100644 --- a/addons/email_template/security/ir.model.access.csv +++ b/addons/email_template/security/ir.model.access.csv @@ -1,4 +1,5 @@ -"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"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_manager","email.template","model_email_template",,1,1,1,1 +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+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_manager,email.template,model_email_template,,1,1,1,1
+access_email_template_preview_system,email.template.preview system,model_email_template_preview,base.group_system,1,1,1,1
|