[MERGE] Merged with addons/trunk.

bzr revid: tde@openerp.com-20120719143402-c1960p3gt863u07s

diff --cc addons/mail/mail_message_view.xml
index cdcd30a,34ba6db..151b255
--- 1/addons/mail/mail_message_view.xml
--- 2/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@@ -76,29 -73,7 +76,30 @@@
                  <search string="Messages Search">
                      <field name="user_id"/>
                      <field name="body"/>
 -                    <field name="model" string="Message" filter_domain="['|', ('subject', 'ilike', self), ('body_text', 'ilike', self)]" />
++                    <field name="subject"/>
 +                    <field name="type"/>
 +                    <filter icon="terp-personal+" string="My Feeds"
 +                            name="my_feeds" help="My Feeds"
 +                            domain="[('user_id','=',uid)]"/>
 +                    <filter icon="terp-personal+" string="Comments"
 +                            name="comments" help="Comments"
 +                            domain="[('type', '=', 'comment')]"/>
 +                    <filter icon="terp-personal+" string="Notifications"
 +                            name="notifications" help="Notifications"
 +                            domain="[('type', '=', 'notification')]"/>
 +                    <filter icon="terp-personal+" string="Emails"
 +                            name="emails" help="Emails"
 +                            domain="[('type', '=', 'email')]"/>
 +                    <filter icon="terp-go-today" string="Today"
 +                            name="today" help="Today"
 +                            domain="[   ('date', '&lt;=', datetime.date.today().strftime('%%Y-%%m-%%d 23:59:59')),
 +                                        ('date', '&gt;=', datetime.date.today().strftime('%%Y-%%m-%%d 00:00:00'))
 +                                    ]"/>
 +                    <filter icon="terp-go-week" string="This week"
 +                            name="7_days" help="This week"
 +                            domain="[   ('date', '&lt;=', datetime.date.today().strftime('%%Y-%%m-%%d 23:59:59')),
 +                                        ('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00'))
 +                                    ]"/>
                  </search>
              </field>
          </record>

diff --cc addons/mail/static/src/xml/mail.xml
index 3693525,ce15f83..5d76096
--- 1/addons/mail/static/src/xml/mail.xml
--- 2/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@@ -1,11 -1,7 +1,11 @@@
  <?xml version="1.0" encoding="UTF-8"?>
  <template>
  
 -    <div t-name="mail.Wall" class="oe_view_manager oe_mail_wall oe_view_manager_current">
 +    <!-- 
 +        wall main template
 +        Template used to display the communication history in the wall.
 +        -->
-     <div t-name="mail.wall" class="oe_view_manager oe_mail_wall oe_view_manager_global">
++    <div t-name="mail.wall" class="oe_view_manager oe_mail_wall oe_view_manager_current">
          <table class="oe_view_manager_header">
            <colgroup>
              <col width="33%"/>