diff options
| author | Denis Ledoux <dle@openerp.com> | 2013-06-25 18:20:46 +0200 |
|---|---|---|
| committer | Denis Ledoux <dle@openerp.com> | 2013-06-25 18:20:46 +0200 |
| commit | 5ed41bcea4c5b0f4e4afdd45c8a114cf3ca144fc (patch) | |
| tree | f3d256944be2979be18c07282e62dc5bcb8ec10a /addons/mail/mail_alias_view.xml | |
| parent | 3afc97f451d8550f18b7b54a08456f7d242888e8 (diff) | |
| parent | c180afab26171617c1c7c22db5d9836b159e5e7d (diff) | |
[MERGE]upstream
bzr revid: dle@openerp.com-20130625162046-snd83ltaha9o5fl8
Diffstat (limited to 'addons/mail/mail_alias_view.xml')
| -rw-r--r-- | addons/mail/mail_alias_view.xml | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/addons/mail/mail_alias_view.xml b/addons/mail/mail_alias_view.xml index e0d8e173ebc..248bf7e8f3a 100644 --- a/addons/mail/mail_alias_view.xml +++ b/addons/mail/mail_alias_view.xml @@ -9,13 +9,23 @@ <field name="arch" type="xml"> <form string="Alias" version="7.0"> <sheet> - <label for="alias_name" class="oe_edit_only"/> <h2><field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline"/></h2> + <div class="oe_right oe_button_box"> + <button name="open_document" string="Open Document" + type="object" class="oe_link" + attrs="{'invisible': ['|', ('alias_model_id', '=', False), ('alias_force_thread_id', '=', 0)]}"/> + <button name="open_parent_document" string="Open Parent Document" + type="object" class="oe_link" + attrs="{'invisible': ['|', ('alias_parent_model_id', '=', False), ('alias_parent_thread_id', '=', 0)]}"/> + </div> <group> <field name="alias_model_id"/> - <field name="alias_user_id"/> <field name="alias_force_thread_id"/> <field name="alias_defaults"/> + <field name="alias_contact"/> + <field name="alias_user_id"/> + <field name="alias_parent_model_id"/> + <field name="alias_parent_thread_id"/> </group> </sheet> </form> @@ -32,6 +42,7 @@ <field name="alias_model_id"/> <field name="alias_user_id"/> <field name="alias_defaults"/> + <field name="alias_contact"/> </tree> </field> </record> @@ -44,8 +55,13 @@ <search string="Search Alias"> <field name="alias_name"/> <field name="alias_model_id"/> + <field name="alias_force_thread_id"/> + <field name="alias_parent_model_id"/> + <field name="alias_parent_thread_id"/> + <separator/> + <filter string="Active" name="active" domain="[('alias_name', '!=', False)]"/> <group expand="0" string="Group By..."> - <filter string="User" name="User" icon="terp-personal" context="{'group_by':'alias_user_id'}"/> + <filter string="User" name="User" context="{'group_by':'alias_user_id'}"/> <filter string="Model" name="Model" context="{'group_by':'alias_model_id'}"/> </group> </search> @@ -55,6 +71,10 @@ <record id="action_view_mail_alias" model="ir.actions.act_window"> <field name="name">Aliases</field> <field name="res_model">mail.alias</field> + <field name="context">{ + 'search_default_active': True, + } + </field> </record> <menuitem id="mail_alias_menu" |