diff options
| author | Amit Bhavsar (Open ERP) <amb@tinyerp.com> | 2013-05-28 14:49:41 +0530 |
|---|---|---|
| committer | Amit Bhavsar (Open ERP) <amb@tinyerp.com> | 2013-05-28 14:49:41 +0530 |
| commit | 24848a8dccf0b8acc77b2e9fd007f613bbf1736b (patch) | |
| tree | 343ca29c494e3310c1d6fa4b4f2e97a396e21c8e /addons/fetchmail/fetchmail_view.xml | |
| parent | 1b08798b52df8f0a3a72d116577cd7451b45b30c (diff) | |
| parent | 814a121dabbbe45a1c9ee671222b3a2bf261059a (diff) | |
[MERGE] merge with latest trunk
bzr revid: bde@tinyerp.com-20130522095432-1sl1b6uu6ewod4md
bzr revid: amb@tinyerp.com-20130528091941-wak8fnembuvewwjf
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 |