diff options
| author | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-08-30 16:54:26 +0530 |
|---|---|---|
| committer | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-08-30 16:54:26 +0530 |
| commit | 91c022497bb07f1c951fe6c2c1883c5b8bde0325 (patch) | |
| tree | 89e7b4ecd507441990b1de79741e5e7c01b76cd4 /addons/fetchmail/fetchmail_view.xml | |
| parent | 253325f48822e2a61a3a38d2f3e22346f494ae35 (diff) | |
| parent | d8c65aa88eb9f779941feae45955fa09aaf8ce11 (diff) | |
[MERGE]merge with lp:~openerp-dev/openobject-addons/trunk-mail-cleaning-fp and done changes as needed
bzr revid: sgo@tinyerp.com-20120830112426-15b9jere67yyoa3q
Diffstat (limited to 'addons/fetchmail/fetchmail_view.xml')
| -rw-r--r-- | addons/fetchmail/fetchmail_view.xml | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml index cf651b5fd3d..3cdc886ba2b 100644 --- a/addons/fetchmail/fetchmail_view.xml +++ b/addons/fetchmail/fetchmail_view.xml @@ -104,27 +104,16 @@ /> <record model="ir.ui.view" id="email_message_tree_view"> - <field name="name">mail.message.list.fetchmail</field> - <field name="model">mail.message</field> - <field name="inherit_id" ref="mail.view_email_message_tree"/> + <field name="name">mail.mail.form.fetchmail</field> + <field name="model">mail.mail</field> + <field name="inherit_id" ref="mail.view_mail_form"/> <field name="arch" type="xml"> - <field name="user_id" position="after"> + <field name="references" position="after"> <field name="fetchmail_server_id"/> </field> </field> </record> - <record model="ir.ui.view" id="email_message_search_view"> - <field name="name">mail.message.inherit.search</field> - <field name="model">mail.message</field> - <field name="inherit_id" ref="mail.view_email_message_search"/> - <field name="arch" type="xml"> - <xpath expr="/search/group/filter[@string='Thread']" position="before"> - <filter string="Mail Server" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'fetchmail_server_id'}"/> - </xpath> - </field> - </record> - <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)]" |