diff options
| author | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-08-06 11:12:19 +0530 |
|---|---|---|
| committer | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-08-06 11:12:19 +0530 |
| commit | 2cc02f84d245871402dabfdba67dee62bdb30fa2 (patch) | |
| tree | b39f15bc7b70e89347768b3ebacf3f7e27a23984 /addons/mail/mail_message_view.xml | |
| parent | c494b78f7776f64bde8d4cdefa82f7cdda867548 (diff) | |
| parent | 1da7ac2448a5e29bb43994286d3fbb8d90576d54 (diff) | |
[MERGE]merge with lp:~openerp-dev/openobject-addons/trunk-message-sub-type-apa
bzr revid: sgo@tinyerp.com-20120806054219-yxe9cwx4yguz7t55
Diffstat (limited to 'addons/mail/mail_message_view.xml')
| -rw-r--r-- | addons/mail/mail_message_view.xml | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml index 374b97624b1..024929c5bac 100644 --- a/addons/mail/mail_message_view.xml +++ b/addons/mail/mail_message_view.xml @@ -64,9 +64,7 @@ <field name="arch" type="xml"> <search string="Messages Search"> <field name="model" string="Message"/> - <separator orientation="vertical"/> <field name="date"/> - <separator orientation="vertical"/> <field name="user_id"/> </search> </field> @@ -80,7 +78,6 @@ <field name="priority">25</field> <field name="arch" type="xml"> <search string="Messages Search"> - <field name="user_id"/> <field name="subject" string="Content" filter_domain="['|', ('subject', 'ilike', self), ('body', 'ilike', self)]" /> <field name="type"/> <filter icon="terp-personal+" string="My Feeds" @@ -105,6 +102,7 @@ domain="[ ('date', '<=', datetime.date.today().strftime('%%Y-%%m-%%d 23:59:59')), ('date', '>=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00')) ]"/> + <field name="user_id"/> </search> </field> </record> @@ -209,31 +207,26 @@ <field name="arch" type="xml"> <search string="Email Search"> <field name="email_from" filter_domain="['|' '|',('email_from','ilike',self), ('email_to','ilike',self), ('subject','ilike',self)]" string="Email"/> - <separator orientation="vertical"/> <field name="date"/> - <separator orientation="vertical"/> <filter icon="terp-camera_test" name="received" string="Received" domain="[('state','=','received')]"/> <filter icon="terp-call-start" name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/> <filter icon="terp-check" name="sent" string="Sent" domain="[('state','=','sent')]"/> <filter icon="terp-gtk-stop" name="exception" string="Failed" domain="[('state','=','exception')]"/> + <separator/> <filter icon="terp-camera_test" name="type_email" string="Email" domain="[('type','=','email')]"/> <filter icon="terp-camera_test" name="type_comment" string="Comment" domain="[('type','=','comment')]"/> <filter icon="terp-camera_test" name="type_notification" string="Notification" domain="[('type','=','notification')]"/> - <newline/> <group expand="0" string="Extended Filters..."> <field name="user_id" string="User"/> <field name="partner_id" string="Partner Name"/> <field name="model"/> <field name="res_id"/> </group> - <newline/> <group expand="0" string="Group By..."> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/> - <separator orientation="vertical"/> <filter string="Thread" icon="terp-mail-" domain="[]" context="{'group_by':'message_id'}"/> - <separator orientation="vertical"/> <filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/> </group> </search> |