From 1cc4bcff72c15e0da31aaf85a5641e047820b6ab Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 15 Jun 2012 11:08:19 +0530
Subject: [PATCH 1/2] [IMP] base_calendar : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120615053819-drgrp3lgck1vk1n1
---
 addons/base_calendar/base_calendar_view.xml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 5c83337044c..a20e61e5245 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -94,6 +94,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Invitations">
+                   <field name="email"
+                   filter_domain="[('email','ilike',self)]"
+                   string="Email"/>
+                   <field name="event_date"/>
+                   <separator orientation="vertical"/>
                    <filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review"
                        domain="[('state','=', 'needs-action')]"
                        help="Invitations To Review" />
@@ -107,11 +112,9 @@
                        domain="[('state','=', 'delegated')]"
                        help="Delegated Invitations" />
                    <separator orientation="vertical"/>
-                   <field name="email"/>
                    <field name="user_id" string="Responsible"/>
                    <separator orientation="vertical"/>
                    <field name="cutype" string="Invitation type"/>
-                   <field name="event_date"/>
                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Responsible" icon="terp-personal" domain="[]"
@@ -435,6 +438,10 @@
             <field name="arch" type="xml">
                 <search string="Search Events">
                        <group>
+                           <field name="name"
+                           filter_domain="['|' ('name','ilike',self), ('location','ilike',self)]"
+                           string="Event"/>
+                           <separator orientation="vertical"/>
                            <filter icon="terp-go-today" string="My Events"
                                domain="[('user_id','=',uid)]"
                                help="My Events" />
@@ -443,9 +450,6 @@
                                domain="[('state','=','confirmed')]"
                                help="Confirmed Events" />
                            <separator orientation="vertical"/>
-                           <field name="name" string="Summary"/>
-                           <field name="location" string="Location"/>
-                           <separator orientation="vertical"/>
                            <field name="user_id"/>
                            <separator orientation="vertical"/>
                            <field name="show_as"/>
@@ -465,7 +469,6 @@
                             <separator orientation="vertical" />
                             <filter string="Date" icon="terp-go-month"
                                 domain="[]" context="{'group_by':'date'}" />
-
                         </group>
                 </search>
             </field>

From 3019c4efd45ac240fbf08712c079dcca697549f3 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 18 Jun 2012 11:55:40 +0530
Subject: [PATCH 2/2] [IMP] base : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120618062540-wlalcz7mr9rirkp5
---
 addons/base_calendar/base_calendar_view.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index a20e61e5245..a856d6e718c 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -94,9 +94,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Invitations">
-                   <field name="email"
-                   filter_domain="[('email','ilike',self)]"
-                   string="Email"/>
+                   <field name="email" filter_domain="[('email','ilike',self)]" string="Email"/>
                    <field name="event_date"/>
                    <separator orientation="vertical"/>
                    <filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review"
@@ -438,9 +436,7 @@
             <field name="arch" type="xml">
                 <search string="Search Events">
                        <group>
-                           <field name="name"
-                           filter_domain="['|' ('name','ilike',self), ('location','ilike',self)]"
-                           string="Event"/>
+                           <field name="name" filter_domain="['|' ('name','ilike',self), ('location','ilike',self)]" string="Event"/>
                            <separator orientation="vertical"/>
                            <filter icon="terp-go-today" string="My Events"
                                domain="[('user_id','=',uid)]"