diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-05-22 13:42:36 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-05-22 13:42:36 +0200 |
| commit | cd278d83abd291209d7c3f18ee8eb9ab43a4158a (patch) | |
| tree | 8d866ce7e1d365667e0a4fe9e85b10f15d36ea3d /addons/fetchmail/fetchmail_view.xml | |
| parent | c1cb8bf7653d98153c43e0ee35eb3558438e0b78 (diff) | |
| parent | d4d6e882668cfdc7c4634a0e30a047d0c83c75a7 (diff) | |
[MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130522103305-yi5ql1chdx9qxxlx
bzr revid: tde@openerp.com-20130522114236-qi2s3i2dl2lemdvh
Diffstat (limited to 'addons/fetchmail/fetchmail_view.xml')
| -rw-r--r-- | addons/fetchmail/fetchmail_view.xml | 20 |
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 |