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/fetchmail | |
| parent | 593f5f571bbc49673975afc405e9345ef3457b92 (diff) | |
| parent | e36dc8c5e3ca3da1474747bae5ec87fea19b23b8 (diff) | |
[MERGE] merged with trunk-development-branch
bzr revid: hmo@tinyerp.com-20111214122924-izzibrz1yz67rt7g
Diffstat (limited to 'addons/fetchmail')
| -rw-r--r-- | addons/fetchmail/__openerp__.py | 4 | ||||
| -rw-r--r-- | addons/fetchmail/fetchmail_installer_view.xml | 14 | ||||
| -rw-r--r-- | addons/fetchmail/fetchmail_view.xml | 2 | ||||
| -rw-r--r-- | addons/fetchmail/security/ir.model.access.csv | 6 |
4 files changed, 6 insertions, 20 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/fetchmail_installer_view.xml b/addons/fetchmail/fetchmail_installer_view.xml index b5bd7df80ca..918b7ecd430 100644 --- a/addons/fetchmail/fetchmail_installer_view.xml +++ b/addons/fetchmail/fetchmail_installer_view.xml @@ -1,19 +1,5 @@ <openerp> <data> - <record model="ir.actions.act_window" id="view_email_server_form_installer"> - <field name="name">Setup Incoming Mail Servers</field> - <field name="type">ir.actions.act_window</field> - <field name="res_model">fetchmail.server</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form</field> - <field name="view_id" eval="False"/> - <field name="help">You can connect OpenERP to your incoming mail server so that documents (leads, tasks, issues, etc) are synchronized automatically with your incoming emails.</field> - </record> - <record id="view_email_server_form_installer_todo" model="ir.actions.todo"> - <field name="action_id" ref="view_email_server_form_installer"/> - <field name="category_id" ref="base.category_sales_management_config"/> - <field name="sequence">4</field> - </record> </data> </openerp> diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml index 56b7165ac56..0b9720a7503 100644 --- a/addons/fetchmail/fetchmail_view.xml +++ b/addons/fetchmail/fetchmail_view.xml @@ -32,7 +32,7 @@ </group> <notebook colspan="4"> <page string="Server & Login"> - <group col="4" colspan="2" attrs="{'invisible' : [('type', '=', 'local')]}"> + <group col="2" colspan="2" attrs="{'invisible' : [('type', '=', 'local')]}"> <separator string="Server Information" colspan="2"/> <field name="server" colspan="4" attrs="{'required' : [('type', '!=', 'local')]}" /> <field name="port" required="1" attrs="{'required' : [('type', '!=', 'local')]}" /> 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
|