From 8df17faa84cd69bdb65b7824e936ec64fc37f921 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Mon, 28 Feb 2011 14:39:19 +0530
Subject: [PATCH] [IMP] emails :- add email_from field in search view and
 remove email filter.

bzr revid: ysa@tinyerp.com-20110228090919-r68zey4af7u8btze
---
 addons/emails/email_view.xml        | 1 +
 addons/fetchmail/fetchmail_view.xml | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/emails/email_view.xml b/addons/emails/email_view.xml
index a88764dd883..2201b50dfd3 100644
--- a/addons/emails/email_view.xml
+++ b/addons/emails/email_view.xml
@@ -101,6 +101,7 @@
                     <separator orientation="vertical"/>
                     <filter icon="terp-call-start" string="Waiting" domain="[('state','=','waiting')]"/>
                     <filter icon="terp-gtk-stop" string="Exception" domain="[('state','=','exception')]"/>
+                    <field name="email_from"/>
                     <field name="name"/>
                     <field name="date"/>
                     <field name="user_id" string="User"/>
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index f03d8f91a72..fec467083a7 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -126,10 +126,6 @@
 	      <field name="type">search</field>
 	      <field name="inherit_id" ref="emails.view_email_message_search"/>
 	      <field name="arch" type="xml">
-			<xpath expr="/search/field[@name='name']" position="before">
-			     <filter string="Emails" name="emails" domain="[('server_id','!=',False)]" icon="terp-mail-message-new"/>
-			     <separator orientation="vertical"/>
-			</xpath>
 			<xpath expr="/search/group/filter[@string='Thread']" position="before">
                 <filter string="Mail Server" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'server_id'}"/>
             </xpath>