diff options
| author | Nimesh (Open ERP) <nco@tinyerp.com> | 2012-12-10 12:38:25 +0530 |
|---|---|---|
| committer | Nimesh (Open ERP) <nco@tinyerp.com> | 2012-12-10 12:38:25 +0530 |
| commit | 504f10c220cffa9d19caa4846b261ae7c8dbc1ce (patch) | |
| tree | 7d391f9f23543c827ba97e41a1297a5ebc3969d2 /addons/fetchmail/fetchmail_view.xml | |
| parent | 3defbc23a130b411997dea30f52d0c78e9cfff07 (diff) | |
| parent | 7f1d5daf2f7a137a470a4a72779408edf7995910 (diff) | |
[MERGE] with trunk
bzr revid: nco@tinyerp.com-20121210070825-5rgigvkb1nb3hu30
Diffstat (limited to 'addons/fetchmail/fetchmail_view.xml')
| -rw-r--r-- | addons/fetchmail/fetchmail_view.xml | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml index 66c7e5a7f5c..8bbdeb26f6d 100644 --- a/addons/fetchmail/fetchmail_view.xml +++ b/addons/fetchmail/fetchmail_view.xml @@ -93,6 +93,20 @@ <field name="view_id" ref="view_email_server_tree"/> <field name="search_view_id" ref="view_email_server_search"/> </record> + + <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> + <menuitem parent="base.menu_email" @@ -117,7 +131,7 @@ <act_window context="{'search_default_server_id': active_id, 'default_fetchmail_server_id': active_id}" id="act_server_history" name="Messages" domain="[('email_from', '!=', False), ('fetchmail_server_id', '=', active_id)]" - res_model="mail.message" src_model="fetchmail.server"/> + res_model="mail.mail" src_model="fetchmail.server"/> </data> </openerp> |