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

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

diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 55c5539..60ec094 100644 (file)
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -63,15 +63,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Audittrail Rule">
-                    <group>
-                        <field name="name" string="Audittrail Rule"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft  Rule"/>
-                        <filter icon="terp-camera_test" string="Subscribed" domain="[('state','=','subscribed')]" help="Subscribed Rule"/>
-                        <separator orientation="vertical"/>
-                        <field name="object_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Audittrail Rule"/>
+                    <field name="object_id" string="Model"/>
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft  Rule"/>
+                    <filter icon="terp-camera_test" string="Subscribed" domain="[('state','=','subscribed')]" help="Subscribed Rule"/>
                     <group expand="0" string="Group By...">
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
@@ -171,16 +166,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Audittrail Log">
-                    <group>
-                        <field name="name" string="Audittrail Log"/>
-                        <separator orientation="vertical"/>
-                        <field name="object_id"/>
-                        <field name="user_id"  widget="selection"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Audittrail Log"/>
+                    <field name="object_id" string="Model"/>
+                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'object_id'}"/>
                         <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'timestamp'}"/>
                     </group>

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 4e22843..359d231 100644 (file)
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -325,8 +325,8 @@
             <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"
@@ -339,6 +339,7 @@
                               string="My Events"
                                 help="My Events"
                               domain="[('user_id','=',uid)]"/>
+                    <separator/>
                     <filter icon="terp-go-today" string="Upcoming"
                                 name="upcoming"
                                 domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
@@ -521,7 +522,7 @@
                 <search string="Event Registration">
                     <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"