[MERGE] lp:~openerp-dev/openobject-addons/trunk-clean-search-tools-event-tch

bzr revid: jam@tinyerp.com-20120719093838-11rju8406ilmf16o

diff --cc addons/event/event_view.xml
index 1b1b5da,4e22843..359d231
--- 1/addons/event/event_view.xml
--- 2/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@@ -324,6 -324,9 +324,9 @@@
              <field name="type">search</field>
              <field name="arch" type="xml">
                  <search string="Events">
+                     <field name="name" string="Events"/>
 -                    <field name="type" widget="selection"/>
 -                    <field name="user_id" widget="selection"/>
++                    <field name="type"/>
++                    <field name="user_id"/>
                      <filter icon="terp-mail-message-new"
                          string="Inbox" help="Unread messages"
                          name="needaction_pending"
@@@ -338,7 -339,7 +339,8 @@@
                                string="My Events"
                                  help="My Events"
                                domain="[('user_id','=',uid)]"/>
-                         <filter icon="terp-go-today" string="Upcoming"
++                    <separator/>
+                     <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" />
@@@ -525,8 -519,11 +520,11 @@@
              <field name="type">search</field>
              <field name="arch" type="xml">
                  <search string="Event Registration">
-                     <group>
-                         <filter icon="terp-mail-message-new"
+                     <field name="name" string="Participant"
+                             filter_domain="['|','|','|',('name','ilike',self),('partner_id','ilike',self),('email','ilike',self),('origin','ilike',self)]"/>
 -                    <field name="event_id" widget="selection"/>
++                    <field name="event_id"/>
+                     <field name="user_id"/>
+                     <filter icon="terp-mail-message-new"
                              string="Inbox" help="Unread messages"
                              name="needaction_pending"
                              domain="[('needaction_pending','=',True)]"/>