From cd5490aec2a5bfe1090fc73a75615b8a423c411f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 15 Nov 2012 11:36:24 +0100
Subject: [PATCH] [IMP] mail: merge the sent menu and the archives menu

bzr revid: chm@openerp.com-20121115103624-ilkh0ys3w6a0t8f2
---
 addons/mail/mail_thread_view.xml | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index cdeade04d84..4622a25bf98 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -84,29 +84,11 @@
               'search_default_message_read': True
             }</field>
             <field name="params" eval="&quot;{
-                'domain': [('notification_ids.partner_id.user_ids', 'in', [uid])],
-                'view_mailbox': True,
-                'read_action': 'unread', }&quot;"/>
-            <field name="help" type="html">
-                <p>
-                    No message found.
-                </p>
-            </field>
-        </record>
-
-        <record id="action_mail_sent_feeds" model="ir.actions.client">
-            <field name="name">Sent</field>
-            <field name="tag">mail.wall</field>
-            <field name="context">{
-              'default_model': 'res.users', 
-              'default_res_id': uid
-            }</field>
-            <field name="params" eval="&quot;{
-                'domain': [('author_id.user_ids', 'in', [uid])],
+                'domain': ['|', ('notification_ids.partner_id.user_ids', 'in', [uid]), ('author_id.user_ids', 'in', [uid])],
                 'view_mailbox': True, }&quot;"/>
             <field name="help" type="html">
                 <p>
-                    <b>No message sent yet.</b>
+                    No message found and no message sent yet.
                 </p><p>
                     Click on the top-right icon to compose a message. This
                     message will be sent by email if it's an internal contact.
@@ -150,11 +132,5 @@
           <field name="action" ref="action_mail_archives_feeds"/>
           <field name="parent_id" ref="mail.mail_feeds"/>
         </record>
-        <record id="mail_sentfeeds" model="ir.ui.menu">
-          <field name="name">Sent</field>
-          <field name="sequence" eval="18"/>
-          <field name="action" ref="action_mail_sent_feeds"/>
-          <field name="parent_id" ref="mail.mail_feeds"/>
-        </record>
     </data>
 </openerp>