From 154e9072af2531721554f99b203b2f037e9ecc04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 31 May 2012 11:05:42 +0200
Subject: [PATCH] [REV] message_state: reverted changes and deleted
 message_state field from mail.thread. This will be added with another task.

bzr revid: tde@openerp.com-20120531090542-p3w1p1bqtx5jzjht
---
 addons/crm/crm_lead_view.xml                  | 1 -
 addons/hr_recruitment/hr_recruitment_view.xml | 1 -
 addons/mail/mail_message.py                   | 4 ----
 addons/mail/mail_message_view.xml             | 5 ++++-
 addons/mail/mail_thread.py                    | 3 ---
 addons/project/project_view.xml               | 1 -
 addons/project_issue/project_issue.py         | 2 --
 addons/project_issue/project_issue_view.xml   | 1 -
 8 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 98b5dfe4e61..7f921a35bfe 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -303,7 +303,6 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Leads">
-                <filter icon="terp-check" name="inbox" string="Inbox" domain="[('message_state','=','unread')]"/>
                 <filter icon="terp-check"
                     string="New"
                     name="new" help="New Leads"
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index ef4cb4694dd..6da9719839c 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -185,7 +185,6 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Jobs">
-               <filter icon="terp-check" name="inbox" string="Inbox" domain="[('message_state','=','unread')]"/>
                <filter icon="terp-document-new" string="New" name="filter_new" 
                    domain="[('state','=','draft')]"
                    help="All Initial Jobs"
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index b560c687164..f86ae29c80f 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -520,10 +520,6 @@ class mail_message(osv.osv):
         :param browse_record message: the message that was just sent
         :return: True
         """
-        if context is None:
-            context = {}
-        if context.get('active_ids', False) and context.get('active_model', False):
-            self.pool.get(context['active_model']).write(cr, uid, context['active_ids'], {'message_state':'read'}, context=context)
         if message.auto_delete:
             self.pool.get('ir.attachment').unlink(cr, uid,
                                                   [x.id for x in message.attachment_ids \
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 11a53c18780..5f78de51c1d 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -167,6 +167,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Email Search">
+                    <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')]"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-gtk-stop" name="exception" string="Failed" domain="[('state','=','exception')]"/>
                     <separator orientation="vertical"/>
@@ -213,7 +216,7 @@
             <field name="res_model">mail.message</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="context">{'search_default_type_email': 1}</field>
+            <field name="context">{'search_default_received': 1, 'search_default_type_email': 1}</field>
             <field name="search_view_id" ref="view_email_message_search"/>
         </record>
 
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 0d133c334a9..8cd8ef415c3 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -72,7 +72,6 @@ class mail_thread(osv.osv):
     _columns = {
         'message_ids_social': fields.function(_get_message_ids, method=True,
                         type='one2many', obj='mail.message', string='Temp messages', _fields_id = 'res_id'),
-        'message_state': fields.selection([('read', 'Read'),('unread', 'Unread')], 'Message State'),
     }
 
     #------------------------------------------------------
@@ -570,7 +569,6 @@ class mail_thread(osv.osv):
             data.update(custom_values)
         res_id = model_pool.create(cr, uid, data, context=context)
         self.message_append_dict(cr, uid, [res_id], msg_dict, context=context)
-        self.write(cr, uid, [res_id], {'message_state':'unread'}, context=context)
         return res_id
 
     def message_update(self, cr, uid, ids, msg_dict, vals={}, default_act=None, context=None):
@@ -589,7 +587,6 @@ class mail_thread(osv.osv):
                                 to determine the model of the thread to
                                 update (instead of the current model).
         """
-        self.write(cr, uid, ids, {'message_state':'unread'}, context=context)
         return self.message_append_dict(cr, uid, ids, msg_dict, context=context)
 
     def message_thread_followers(self, cr, uid, ids, context=None):
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index bc3d214a07f..3bfda696abd 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -579,7 +579,6 @@
             <field name="arch" type="xml">
                <search string="Tasks">
                     <group>
-                        <filter icon="terp-check" name="inbox" string="Inbox" domain="[('message_state','=','unread')]"/>
                         <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/>
                         <filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index d73884f26bb..2aa9195ce19 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -508,7 +508,6 @@ class project_issue(base_stage, osv.osv):
             vals.update(custom_values)
 
         res_id = self.create(cr, uid, vals, context)
-        self.write(cr, uid, [res_id], {'message_state':'unread'}, context=context)
         self.message_append_dict(cr, uid, [res_id], msg, context=context)
         self.convert_to_bug(cr, uid, [res_id], context=context)
         return res_id
@@ -547,7 +546,6 @@ class project_issue(base_stage, osv.osv):
 
         vals.update(vls)
         res = self.write(cr, uid, ids, vals)
-        self.write(cr, uid, ids, {'message_state':'unread'}, context=context)
         self.message_append_dict(cr, uid, ids, msg, context=context)
         return res
     
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index e69a02606d8..b94bdd846ff 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -171,7 +171,6 @@
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
                     <group>
-                        <filter icon="terp-check" name="inbox" string="Inbox" domain="[('message_state','=','unread')]"/>
                         <filter string="New" icon="terp-document-new" name="draft" domain="[('state','=','draft')]" help="New Issues"/>
                         <filter string="To Do" name="todo" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
                         <filter string="Pending" domain="[('state','=','pending')]"  help="Pending Issues" icon="terp-gtk-media-pause"/>