diff options
| author | Olivier Dony <odo@openerp.com> | 2012-12-11 18:01:19 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2012-12-11 18:01:19 +0100 |
| commit | 5b56a77add9a4f92b5cf2f84d419caff9b0dc4e6 (patch) | |
| tree | e1f7f576fa8944d2d72e64876e7c42327e5d8879 /addons/fetchmail | |
| parent | f5fd0fc0815190b3e80854a8ad0afa7a5d1271c4 (diff) | |
| parent | 33ae7185620cec8e621f7cec592db82c6b9e12fe (diff) | |
[MERGE] Sync with trunk
bzr revid: odo@openerp.com-20121211170119-5spf2iqzl89kphnk
Diffstat (limited to 'addons/fetchmail')
| -rw-r--r-- | addons/fetchmail/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/fetchmail/fetchmail_view.xml | 16 |
2 files changed, 16 insertions, 2 deletions
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py index 8d46bcb225c..84a26d5ec40 100644 --- a/addons/fetchmail/__openerp__.py +++ b/addons/fetchmail/__openerp__.py @@ -63,7 +63,7 @@ For more specific needs, you may also assign custom-defined actions ], 'demo': [], 'installable': True, - 'auto_install': False, + 'auto_install': True, 'images': ['images/1_email_servers.jpeg'], } 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> |