summaryrefslogtreecommitdiff
path: root/addons/fetchmail
diff options
context:
space:
mode:
authorbth-openerp <bth@tinyerp.com>2013-05-23 10:55:42 +0530
committerbth-openerp <bth@tinyerp.com>2013-05-23 10:55:42 +0530
commit4d4385d8ca5fd2e5ab3a3cf51ccd3bb04cf3c064 (patch)
tree74c9ca6eef41aed6a11445ccb92c2b7c6f04d053 /addons/fetchmail
parent6850809fab15d6d4093a5f51282d2965e1c023f7 (diff)
parente16f5b6e11e924c9871db6001ae052c4b34a7d0a (diff)
[MERGE]Merge lp:openobject-addons.
bzr revid: bth@tinyerp.com-20130523052542-y1gs9h3na12pxlrr
Diffstat (limited to 'addons/fetchmail')
-rw-r--r--addons/fetchmail/fetchmail_view.xml20
1 files changed, 11 insertions, 9 deletions
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 4e653adce28..5ee17c61b6f 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -97,15 +97,17 @@
<record id="inherit_view_general_configuration" model="ir.ui.view">
<field name="name">General Settings</field>
<field name="model">base.config.settings</field>
- <field name="inherit_id" ref="base_setup.view_general_configuration"/>
- <field name="arch" type="xml">
- <div name="email" position="inside">
- <button type="action"
- name="%(action_email_server_tree)d"
- string="Configure the incoming email gateway" class="oe_link"/>
- </div>
- </field>
- </record>
+ <field name="inherit_id" ref="base_setup.view_general_configuration"/>
+ <field name="arch" type="xml">
+ <div name="email.outgoing_server" position="after">
+ <div name="email.incoming_server">
+ <button type="action"
+ name="%(action_email_server_tree)d"
+ string="Configure the incoming email gateway" class="oe_link"/>
+ </div>
+ </div>
+ </field>
+ </record>
<menuitem