From 1551b1e59aa33f02cd6d4170d5f8e5eb74a9b7ca Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Mon, 18 Jun 2012 15:03:57 +0530
Subject: [PATCH] [IMP]sale_* : improve search code in xml

bzr revid: rpr@tinyerp.com-20120618093357-akc9497ojot04qsg
---
 addons/sale/report/sale_report_view.xml | 73 ++++++++++++-------------
 1 file changed, 35 insertions(+), 38 deletions(-)

diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 9cb332d69e2..6f37a9f729d 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -50,56 +50,53 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Sales Analysis">
-                <group>
+                    <field name="date"/>
+                    <field name="date_confirm"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-document-new"
                         string="Quotations"
                         domain="[('state','=','draft')]"/>
                     <filter icon="terp-check"
                         string="Sales"
                         domain="[('state','not in',('draft','done','cancel'))]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-accessories-archiver"
                         string="Picked"
                         domain="[('shipped','=',True)]"/>
+                    <filter icon="terp-personal"
+                        string="My Sales"
+                        help="My Sales"
+                        domain="[('user_id','=',uid)]"/>
                     <separator orientation="vertical"/>
                     <field name="partner_id"/>
                     <field name="product_id"/>
-                    <field name="user_id">
-                        <filter icon="terp-personal"
-                            string="My Sales"
-                            help="My Sales"
-                            domain="[('user_id','=',uid)]"/>
-                    </field>
-                </group>
-                <newline/>
-                <group expand="0" string="Extended Filters...">
-                    <field name="shop_id" widget="selection"/>
-                    <field name="categ_id" widget="selection"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <newline/>
-                    <field name="date"/>
-                    <field name="date_confirm"/>
-                </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'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
-                    <filter string="Reference Unit of Measure" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
-                    <filter string="Category of Product" icon="terp-stock_symbol-selection" name="Category" context="{'group_by':'categ_id'}"/>
-                    <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
-                    <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}" groups="analytic.group_analytic_accounting"/>
-                    <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
-                    <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
-                    <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'}"/>
-                    <separator orientation="vertical"/>
-                   <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>
+                    <field name="user_id"/>
+                   <newline/>
+                   <group expand="0" string="Extended Filters...">
+                       <field name="shop_id" widget="selection"/>
+                       <field name="categ_id" widget="selection"/>
+                       <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                   <newline/>
+                   </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'}"/>
+                       <separator orientation="vertical"/>
+                       <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
+                       <filter string="Reference Unit of Measure" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
+                       <filter string="Category of Product" icon="terp-stock_symbol-selection" name="Category" context="{'group_by':'categ_id'}"/>
+                       <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
+                       <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}" groups="analytic.group_analytic_accounting"/>
+                       <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
+                       <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                       <separator orientation="vertical"/>
+                       <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'}"/>
+                       <separator orientation="vertical"/>
+                       <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>
     </record>