[MERGE]:merged with trunk

bzr revid: apa@tinyerp.com-20120801070425-ydyx8nc2ngi3j0zi

4 files changed, 12 insertions, 19 deletions

diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index 274259e544e..f9edb8b9e2f 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -29,10 +29,10 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_company"/>
             <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Lorem ipsum dolor <b>sit amet</b>, consectetur <em>adipiscing elit</em>. Pellentesque et quam sapien, in sagittis tellus. 
-            Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi, varius a consequat id, consectetur sit amet nulla. 
+            <field name="body_html"><![CDATA[Lorem ipsum dolor <b>sit amet</b>, consectetur <em>adipiscing elit</em>. Pellentesque et quam sapien, in sagittis tellus.
+Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi, varius a consequat id, consectetur sit amet nulla.
 
-Fusce tempus elit volutpat mi auctor adipiscing. Nam congue luctus suscipit. Duis vestibulum dapibus enim vitae dignissim. Sed tellus libero, venenatis ut mollis ut, luctus quis dui. Sed rhoncus pulvinar orci in consectetur. 
+Fusce tempus elit volutpat mi auctor adipiscing. Nam congue luctus suscipit. Duis vestibulum dapibus enim vitae dignissim. Sed tellus libero, venenatis ut mollis ut, luctus quis dui. Sed rhoncus pulvinar orci in consectetur.
 
 Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in dolor in sapien tempus vehicula.]]></field>
             <field name="type">comment</field>
@@ -54,11 +54,11 @@ Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_company"/>
             <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Agreed !  
+            <field name="body_html"><![CDATA[Agreed !
 Would it be possible to learn more about the author ?  (second comment)]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"/>
+            <field name="user_id" ref="base.user_demo"/>
         </record>
 
         <record id="message_blogpost0_comment2_attachment0" model="ir.attachment">
@@ -76,10 +76,10 @@ Would it be possible to learn more about the author ?  (second comment)]]></fiel
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_company"/>
             <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Sure: Curabitur tempor bibendum diam, et euismod ante rutrum vel. 
+            <field name="body_html"><![CDATA[Sure: Curabitur tempor bibendum diam, et euismod ante rutrum vel.
 
-In quis purus neque. Integer sodales dolor eu elit fringilla blandit. Maecenas lacus nisi, facilisis sit amet viverra eu, tristique vel augue. 
-Donec viverra congue dui eu blandit. In lacinia molestie nulla, ut sagittis risus feugiat eu. 
+In quis purus neque. Integer sodales dolor eu elit fringilla blandit. Maecenas lacus nisi, facilisis sit amet viverra eu, tristique vel augue.
+Donec viverra congue dui eu blandit. In lacinia molestie nulla, ut sagittis risus feugiat eu.
 
 Check the file in attachment for more information !  (third comment)]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index c755209f952..bd01e50baa5 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -104,7 +104,6 @@
             <field name="arch" type="xml">
                 <search string="Search Groups">
                     <field name="name" string="Group"/>
-                    <separator orientation="vertical"/>
                     <field name="responsible_id"/>
                 </search>
             </field>
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 986bb4bef38..b967035bec3 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', '&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'))
                                     ]"/>
+                    <field name="user_id"/>
                 </search>
             </field>
         </record>
@@ -208,31 +206,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>
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index f07e1e467ee..68727832e53 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -9,7 +9,8 @@
           sequence="10"/>
 
         <!-- left-side menu: Feeds !-->
-        <menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main"/>
+        <menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main" groups="base.group_user" sequence="10"/>
+
         <record id="mail_wallfeeds" model="ir.ui.menu">
           <field name="name">News Feed</field>
           <field name="sequence" eval="10"/>