summaryrefslogtreecommitdiff
path: root/addons/fetchmail
diff options
context:
space:
mode:
authorUjjvala Collins (OpenERP) <uco@tinyerp.com>2011-12-09 16:32:52 +0530
committerUjjvala Collins (OpenERP) <uco@tinyerp.com>2011-12-09 16:32:52 +0530
commiteb4c08585db4868fbf03dc0a019a383e9e653e7e (patch)
tree39d1364152fc75fed34c5c8fe8d47bccc1e6db09 /addons/fetchmail
parent82753bfc6a544125b3f5503e80335a1f2b2606c9 (diff)
parentd9fcbf5946ceb13411aa92f3afc13f66adcb2a24 (diff)
[MERGE]: Merged with trunk-addons.
bzr revid: uco@tinyerp.com-20111209110252-u2ai6i63icpwblhc
Diffstat (limited to 'addons/fetchmail')
-rw-r--r--addons/fetchmail/fetchmail_installer_view.xml14
-rw-r--r--addons/fetchmail/fetchmail_view.xml2
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 &amp; 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')]}" />