summaryrefslogtreecommitdiff
path: root/addons/fetchmail
diff options
context:
space:
mode:
authorHarry (OpenERP) <hmo@tinyerp.com>2011-12-13 13:11:29 +0530
committerHarry (OpenERP) <hmo@tinyerp.com>2011-12-13 13:11:29 +0530
commit359f0b42e22e69e9965462c8e8d5b8c57239d2f8 (patch)
tree64412070716c5949d6c8703e5f2bd83235177ce1 /addons/fetchmail
parenteb4c08585db4868fbf03dc0a019a383e9e653e7e (diff)
parent78f56f29f2469f2e4a398d7d6cbdcafaa622341c (diff)
[MERGE] merged with trunk development branch.
bzr revid: hmo@tinyerp.com-20111213074129-0frej7vvaefubybe
Diffstat (limited to 'addons/fetchmail')
-rw-r--r--addons/fetchmail/__openerp__.py4
-rw-r--r--addons/fetchmail/security/ir.model.access.csv6
2 files changed, 5 insertions, 5 deletions
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index b50c33b2394..99e3e02a909 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -21,11 +21,11 @@
##############################################################################
{
- "name" : "Fetch Emails",
+ "name" : "Email Gateway",
"version" : "1.0",
"depends" : ["base", 'mail'],
"author" : "OpenERP SA",
- "category": 'Customer Relationship Management',
+ "category": 'Tools',
"description": """
Retrieve incoming email on POP / IMAP servers
=============================================
diff --git a/addons/fetchmail/security/ir.model.access.csv b/addons/fetchmail/security/ir.model.access.csv
index bc5572de82d..7deea6eb9f4 100644
--- a/addons/fetchmail/security/ir.model.access.csv
+++ b/addons/fetchmail/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_fetchmail_server","fetchmail.server","model_fetchmail_server",,1,0,0,0
-"access_fetchmail_server","fetchmail.server","model_fetchmail_server","base.group_system",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_fetchmail_server,fetchmail.server,model_fetchmail_server,,1,0,0,0
+access_fetchmail_server,fetchmail.server,model_fetchmail_server,base.group_system,1,1,1,1