From ac2bd8624ccc2ed6a89e119ba5591588fc1f705b Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 15 Jun 2012 18:42:31 +0530
Subject: [PATCH] [IMP]event_* : improve search code in xml

bzr revid: cha@tinyerp.com-20120615131231-p2jxm11m2nr1beb3
---
 addons/event/event_view.xml                   | 32 +++++++--------
 .../report/report_event_registration_view.xml | 41 +++++++++----------
 2 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 01b41833a65..1714cf32cf8 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -265,21 +265,21 @@
             <field name="arch" type="xml">
                 <search string="Events">
                     <group>
+                        <field name="name" string="Events" filter_domain="[('name','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-today" string="Upcoming"
-                                name="upcoming"
-                                domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                                help="Upcoming events from today" />
-                        <field name="name"/>
-                        <field name="type" widget="selection"/>
-                        <field name="user_id" widget="selection">
                         <filter icon="terp-personal"
                               string="My Events"
                                 help="My Events"
                               domain="[('user_id','=',uid)]"/>
-                        </field>
+                        <filter icon="terp-go-today" string="Upcoming"
+                                name="upcoming"
+                                domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
+                                help="Upcoming events from today" />
+                        <separator orientation="vertical"/>
+                        <field name="type" widget="selection"/>
+                        <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -337,6 +337,7 @@
             <field name="arch" type="xml">
                 <tree string="Registration" >
                     <field name="create_date"/>
+                    <field name="partner_id"/>
                     <field name="name"/>
                     <field name="email"/>
                     <field name="event_id" />
@@ -448,19 +449,18 @@
             <field name="arch" type="xml">
                 <search string="Event Registration">
                     <group>
+                        <field name="name" string="Participant"
+                            filter_domain="['|','|','|', ('name','ilike',self), ('partner_id','ilike',self), ('email','ilike',self), ('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Registrations in unconfirmed state"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
-                        <separator orientation="vertical"/>
-                        <field name="event_id" widget="selection"/>
-                        <field name="name" string="Participant"
-                            filter_domain="['|','|', ('name','ilike',self), ('partner_id','ilike',self), ('email','ilike',self)]"/>
-                        <field name="user_id">
                         <filter icon="terp-personal"
                               string="My Registrations"
                                 help="My Registrations"
                               domain="[('user_id','=',uid)]"/>
-                        </field>
-                        <field name="origin"/>
+                        <separator orientation="vertical"/>
+                        <field name="event_id" widget="selection"/>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index 89ba191dab6..7ae6c0fae2e 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -53,27 +53,21 @@
             <field name="arch" type="xml">
                 <search string="Event on Registration">
                     <group>
-                    <filter icon="terp-document-new"
-                        string="New"
-                        domain="[('event_state','=','draft')]"
-                        help="Events which are in New state"/>
-                    <filter icon="terp-check"
-                        string="Confirm"
-                        domain="[('event_state','=','confirm')]"
-                        help="Events which are in confirm state"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-camera_test"
-                          string="Confirmed Registrations"
-                          help="Registrations in confirmed or done state"
-                          context="{'no_of_draft_invisible':1}"/>
-                    <separator orientation="vertical"/>
-                    <field name="event_id" string="Event"/>
-                    <field name="user_id" widget="selection">
+                        <filter icon="terp-document-new"
+                            string="New"
+                            domain="[('event_state','=','draft')]"
+                            help="Events which are in New state"/>
+                        <filter icon="terp-check"
+                            string="Confirm"
+                            domain="[('event_state','=','confirm')]"
+                            help="Events which are in confirm state"/>
                         <filter icon="terp-personal"
-                        string="My Events"
-                        help="My Events"
-                        domain="[('user_id','=',uid)]"/>
-                    </field>
+                            string="My Events"
+                            help="My Events"
+                            domain="[('user_id','=',uid)]"/>
+                        <separator orientation="vertical"/>
+                        <field name="event_id" string="Event"/>
+                        <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
@@ -81,7 +75,6 @@
                         <field name="event_date"/>
                     </group>
                     <newline/>
-
                     <group expand="1" string="Group By...">
                         <filter string="Participant / Contact" icon="terp-personal" context="{'group_by':'name_registration'}" help="Registration contact"/>
                         <filter string="Register" icon="terp-personal" context="{'group_by':'user_id_registration'}" help="Registration contact" groups="base.extended"/>
@@ -103,6 +96,12 @@
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'year'}" help="Event Beginning Date"/>
                     </group>
+                    <group expand="0" string="Display">
+                        <filter icon="terp-camera_test"
+                              string="Show Confirmed Registrations"
+                              help="Registrations in confirmed or done state"
+                              context="{'no_of_draft_invisible':1}"/>
+                    </group>
                 </search>
             </field>
         </record>