diff options
| author | Raphael Collet <rco@openerp.com> | 2011-12-12 10:52:37 +0100 |
|---|---|---|
| committer | Raphael Collet <rco@openerp.com> | 2011-12-12 10:52:37 +0100 |
| commit | dcfb5b0f460df97281119aa482e4fd74337f40bc (patch) | |
| tree | baf5e127721f350360a43a7c7c65f8891eb6d50f /addons/fetchmail | |
| parent | 6ced5c16c1b269f3820588156c0ba197c55e498e (diff) | |
| parent | d9bbf2f3909e5c8e14306d43afb635f2cf1f4af8 (diff) | |
merge from trunk
bzr revid: rco@openerp.com-20111212095237-x8wdo5m6v1z3yivy
Diffstat (limited to 'addons/fetchmail')
| -rw-r--r-- | addons/fetchmail/fetchmail_installer_view.xml | 14 | ||||
| -rw-r--r-- | addons/fetchmail/fetchmail_view.xml | 2 |
2 files changed, 1 insertions, 15 deletions
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')]}" /> |