merge lp:~openerp-dev/openobject-addons/trunk-clean-search-fix-tpa

bzr revid: jam@tinyerp.com-20120724122410-0xuynuz04s6oze2m

addons/account_payment/account_payment_view.xml

@@ -214,7 +214,7 @@
             <field name="arch" type="xml">
                 <search string="Search Payment Orders">
                     <field name="reference" string="Payment Order"/>
-                    <field name="mode" widget='selection'/>
+                    <field name="mode"/>
                     <field name="state"/>
                     <field name="date_done"/>
                     <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>

addons/account_voucher/report/account_voucher_sales_receipt_view.xml

@@ -55,7 +55,7 @@
                 <filter string="Pro-forma" icon="terp-gtk-media-pause" domain="[('state','=','proforma')]" help = "Pro-forma Vouchers"/>
                 <filter string="Posted" name="current" icon="terp-check" domain="[('state','not in', ('draft','cancel'))]" help = "Validated Vouchers"/>
                 <group expand="0" string="Extended Filters...">
-                    <field name="journal_id" widget="selection"/>
+                    <field name="journal_id"/>
                     <field name="account_id"/>
                     <field name="pay_now"/>
                     <field name="company_id" groups="base.group_multi_company"/>

addons/event/event_view.xml

@@ -331,29 +331,19 @@
                     <field name="name" string="Events"/>
                     <field name="type"/>
                     <field name="user_id"/>
-                    <filter icon="terp-mail-message-new"
-                        string="Inbox" help="Unread messages"
-                        name="needaction_pending"
-                        domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                     <separator/>
                     <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/>
-                    <filter icon="terp-personal"
-                              string="My Events"
-                                help="My Events"
-                              domain="[('user_id','=',uid)]"/>
+                    <filter icon="terp-personal" 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'))]"
-                                help="Upcoming events from today" />
+                    <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" />
                     <group expand="0" string="Group By...">
                         <filter string="Responsible"  icon="terp-personal" context="{'group_by': 'user_id'}"/>
                         <filter string="Event Type" icon="terp-crm"  context="{'group_by':'type'}"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                        <filter string="Starting Date" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'date_begin'}"/>
+                        <filter string="Starting Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_begin'}"/>
                     </group>
                 </search>
             </field>
@@ -524,22 +514,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <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="name" string="Participant" filter_domain="['|','|','|',('name','ilike',self),('partner_id','ilike',self),('email','ilike',self),('origin','ilike',self)]"/>
                     <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)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                     <separator/>
                     <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/>
-                    <filter icon="terp-personal"
-                              string="My Registrations"
-                                help="My Registrations"
-                              domain="[('user_id','=',uid)]"/>
+                    <filter icon="terp-personal" string="My Registrations" help="My Registrations" domain="[('user_id','=',uid)]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Responsible"  icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>

addons/event/report/report_event_registration_view.xml

@@ -52,24 +52,11 @@
             <field name="type">search</field>
             <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"/>
-                        <filter icon="terp-personal"
-                            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/>
+                    <field name="event_id" string="Event"/>
+                    <field name="user_id"/>
+                    <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)]"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="event_type" widget="selection"/>
                         <field name="event_date"/>
@@ -80,27 +67,18 @@
                         <filter string="Register" icon="terp-personal" context="{'group_by':'user_id_registration'}" help="Registration contact" groups="base.extended"/>
                         <filter string="Speaker" name="speaker" icon="terp-personal+" context="{'group_by': 'speaker_id'}" groups="base.extended"/>
                         <filter string="Event Responsible" name="user_id" icon="terp-personal" context="{'group_by': 'user_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Event" name="event" icon="terp-crm" context="{'group_by':'event_id', 'max_reg_event_visible':0}"/>
                         <filter string="Event Type" icon="terp-crm"  context="{'group_by':'event_type'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Event State" icon="terp-stock_effects-object-colorize" context="{'group_by':'event_state'}"/>
                         <filter string="Registration State" icon="terp-stock_effects-object-colorize" context="{'group_by':'registration_state'}"/>
-                        <separator orientation="vertical" groups="base.group_multi_company"/>
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'event_date'}" help="Event Beginning Date"/>
-                        <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}" help="Event Beginning Date"/>
-                        <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'year'}" help="Event Beginning Date"/>
+                        <filter string="Day" icon="terp-go-month" domain="[]" context="{'group_by':'event_date'}" help="Event Beginning Date"/>
+                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Event Beginning Date"/>
+                        <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}"/>
+                        <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>

addons/hr_recruitment/report/hr_recruitment_report_view.xml

@@ -66,7 +66,6 @@
                     <field name="date" string="Creation Date"/>
                     <field name="date_closed"/>
                 </group>
-                <newline/>
                 <group expand="1" string="Group By ...">
                    <filter string="Responsible" name='User' icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                    <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>

addons/idea/idea_view.xml

@@ -114,8 +114,7 @@
                 <field name="category_ids"/>
                 <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="New Ideas"/>
                 <filter icon="terp-camera_test" string="In Progress" domain="[('state','=', 'open')]" help="Open Ideas"/>
-                <filter icon="terp-check" string="Accepted"
-                        domain="[('state','=','close')]" help="Accepted Ideas" />
+                <filter icon="terp-check" string="Accepted" domain="[('state','=','close')]" help="Accepted Ideas" />
                 <group expand="0" string="Group By...">
                     <filter icon="terp-personal" string="Creator" help="By Creators" context="{'group_by':'create_uid'}"/>
                     <filter icon="terp-stock_symbol-selection" string="Category" help="By Idea Category" context="{'group_by':'category_ids'}"/>

addons/lunch/report/report_lunch_order_view.xml

@@ -25,19 +25,14 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Lunch Order Analysis">
-                <group>
-                    <field name="date"/>
-                </group>
-                <newline/>
+                <field name="date"/>
                 <group expand="0" string="Group By...">
                     <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <filter string="Box" icon="terp-dolar" context="{'group_by':'box_name'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
-                <newline/>
             </search>
         </field>
     </record>

addons/sale/report/sale_report_view.xml

@@ -55,27 +55,17 @@
                 <field name="partner_id"/>
                 <field name="product_id"/>
                 <field name="user_id"/>
-                <filter icon="terp-document-new"
-                        string="Quotations"
-                        domain="[('state','=','draft')]"/>
-                <filter icon="terp-check"
-                        string="Sales"
-                        domain="[('state','not in',('draft','done','cancel'))]"/>
+                <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
+                <filter icon="terp-check" string="Sales" domain="[('state','not in',('draft','done','cancel'))]"/>
                 <separator/>
-                <filter icon="terp-accessories-archiver"
-                        string="Picked"
-                        domain="[('shipped','=',True)]"/>
+                <filter icon="terp-accessories-archiver" string="Picked" domain="[('shipped','=',True)]"/>
                 <separator/>
-                <filter icon="terp-personal"
-                        string="My Sales"
-                        help="My Sales"
-                        domain="[('user_id','=',uid)]"/>
+                <filter icon="terp-personal" string="My Sales" help="My Sales" domain="[('user_id','=',uid)]"/>
                 <group expand="0" string="Extended Filters...">
                     <field name="shop_id"/>
                     <field name="categ_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </group>
-                <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="Salesperson" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
                     <filter string="Partner" icon="terp-partner"  name="Customer" context="{'group_by':'partner_id'}"/>
@@ -86,9 +76,9 @@
                     <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <filter string="Shop" icon="terp-go-home" context="{'group_by':'shop_id'}"/>
                     <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
-                   <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Ordered date of the sales order"/>
-                   <filter string="Month" name="order_month" icon="terp-go-month" context="{'group_by':'month'}" help="Ordered month of the sales order"/>
-                   <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Ordered Year of the sales order"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Ordered date of the sales order"/>
+                    <filter string="Month" name="order_month" icon="terp-go-month" context="{'group_by':'month'}" help="Ordered month of the sales order"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Ordered Year of the sales order"/>
                 </group>
             </search>
         </field>

addons/sale/sale_view.xml

@@ -341,10 +341,7 @@
                     <field name="name" string="Sales Order" filter_domain="['|',('name','ilike',self),('client_order_ref','ilike',self)]"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
-                    <filter icon="terp-mail-message-new"
-                        string="Inbox" help="Unread messages"
-                        name="needaction_pending"
-                        domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                     <separator/>
                     <filter icon="terp-document-new" string="Quotations" name="draft" domain="[('state','in',('draft','sent'))]" help="Sales Order that haven't yet been confirmed"/>
                     <filter icon="terp-check" string="Sales" name="sales" domain="[('state','in',('manual','progress'))]"/>

addons/share/res_users_view.xml

@@ -7,7 +7,7 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="base.view_users_search"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='name']" position="after">
+                <xpath expr="//field[@name='company_ids']" position="after">
                     <filter name="no_share" string="Regular users only (no share user)" icon="terp-partner"
                         domain="[('share','=',False)]"/>
                 </xpath>
@@ -32,8 +32,7 @@
                 <search string="Groups">
                     <field name="name" string="Group"/>
                     <field name="share"/>
-                    <filter name="no_share" string="Regular groups only (no share groups)" icon="terp-partner"
-                        domain="[('share','=',False)]"/>
+                    <filter name="no_share" string="Regular groups only (no share groups)" icon="terp-partner" domain="[('share','=',False)]"/>
                 </search>
             </field>
         </record>

addons/stock/report/report_stock_move_view.xml

@@ -58,15 +58,8 @@
             <search string="Moves Analysis">
                 <field name="product_id" default_focus="1"/>
                 <field name="partner_id" context="{'contact_display':'partner'}"/>
-                <filter string="Done"
-                        name="done"
-                        icon="terp-dialog-close"
-                        domain="[('state','=','done')]"
-                        help = "Completed Stock-Moves"/>
-                <filter string="Todo"
-                        icon="terp-gtk-go-back-rtl"
-                        domain="[('state','in',('assigned','waiting','confirmed'))]"
-                        help = "Future Stock-Moves"/>
+                <filter string="Done" name="done" icon="terp-dialog-close" domain="[('state','=','done')]" help = "Completed Stock-Moves"/>
+                <filter string="Todo" icon="terp-gtk-go-back-rtl" domain="[('state','in',('assigned','waiting','confirmed'))]" help = "Future Stock-Moves"/>
                 <separator/>
                 <filter icon="terp-go-home" name="in" string="Incoming" domain="[('type','=','in')]"/>
                 <filter icon="terp-go-home" name="internal" string="Internal" domain="[('type','=','internal')]"/>
@@ -154,15 +147,10 @@
                 <field name="product_id" default_focus="1"/>
                 <field name="location_id" filter_domain="[('location_id', 'child_of', self)]"/>
                 <field name="company_id" groups="base.group_multi_company"/>
-                <filter string="Real"
-                        name="real"
-                        icon="terp-check"
-                        domain="[('state','=','done')]"
-                        help="Analysis of current inventory (only moves that have already been processed)"/>
-                <filter string="Future"
-                        icon="terp-stock"
-                        domain="[('state','in',('assigned','done','waiting','confirmed'))]"
-                        help = "Analysis including future moves (similar to virtual stock)"/>
+                <filter string="Real" name="real" icon="terp-check" domain="[('state','=','done')]"
+                    help="Analysis of current inventory (only moves that have already been processed)"/>
+                <filter string="Future" icon="terp-stock" domain="[('state','in',('assigned','done','waiting','confirmed'))]"
+                    help = "Analysis including future moves (similar to virtual stock)"/>
                 <separator/>
                 <filter icon="terp-go-home" name="location_type_internal" string="Internal" domain="[('location_type','=','internal')]"/>
                 <group expand="0" string="Extended Filters...">
@@ -174,12 +162,11 @@
                     <field name="date"/>
                     <filter icon="terp-go-home" name="location_type_scrap" string="Scrap" domain="[('location_type','=','scrap')]"/>
                 </group>
-                <newline/>
                 <group expand="1" string="Group By..." >
                     <filter string="Partner" name="group_partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                     <filter name="group_product_categ_id" string="Product Category" icon="terp-stock_symbol-selection" context="{'group_by':'product_categ_id'}"/>
                     <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                     <filter name="group_lot" string="Lot" icon="terp-accessories-archiver" context="{'group_by':'prodlot_id'}"/>
+                    <filter name="group_lot" string="Lot" icon="terp-accessories-archiver" context="{'group_by':'prodlot_id'}"/>
                     <filter name="group_company" string="Company" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
                     <filter name="group_location" string="Location" icon="terp-go-home" context="{'group_by':'location_id'}"/>
                     <filter string="Date" icon="terp-go-month" context="{'group_by':'date'}"/>

addons/stock/report/report_stock_view.xml

@@ -36,13 +36,10 @@
                 <search string="Dates of Inventories">
                     <field name="date"/>
                     <field name="product_id"/>
-                    <filter icon="terp-accessories-archiver" name="stockable" string="Stockable"
-                        domain="[('product_id.type','=', 'product')]"/>
-                    <filter icon="terp-accessories-archiver" string="Consumable"
-                        domain="[('product_id.type','=', 'consu')]"/>
+                    <filter icon="terp-accessories-archiver" name="stockable" string="Stockable" domain="[('product_id.type','=', 'product')]"/>
+                    <filter icon="terp-accessories-archiver" string="Consumable" domain="[('product_id.type','=', 'consu')]"/>
                     <separator/>
-                    <filter icon="terp-accessories-archiver-minus" string="Non Inv"
-                        domain="[('date','=', False)]"/>
+                    <filter icon="terp-accessories-archiver-minus" string="Non Inv" domain="[('date','=', False)]"/>
                 </search>
             </field>
         </record>

addons/stock/stock_view.xml

@@ -555,12 +555,9 @@
                 <search string="Stock Locations">
                     <field name="name" string="Stock Locations"/>
                     <field name="location_id" string="Parent Location"/>
-                    <filter icon="terp-go-home" name="in_location"
-                        string="Internal" domain="[('usage', '=', 'internal')]" help="Internal Locations"/>
-                    <filter icon="terp-personal" name="customer"
-                        string="Customer" domain="[('usage', '=', 'customer')]" help="Customer Locations"/>
-                    <filter icon="terp-personal" name="supplier"
-                        string="Supplier" domain="[('usage', '=', 'supplier')]" help="Supplier Locations"/>
+                    <filter icon="terp-go-home" name="in_location" string="Internal" domain="[('usage', '=', 'internal')]" help="Internal Locations"/>
+                    <filter icon="terp-personal" name="customer" string="Customer" domain="[('usage', '=', 'customer')]" help="Customer Locations"/>
+                    <filter icon="terp-personal" name="supplier" string="Supplier" domain="[('usage', '=', 'supplier')]" help="Supplier Locations"/>
                 </search>
             </field>
         </record>