From 6e178d51ec4b40a685e5c619342cbcd7b467a1c9 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 18:16:29 +0530
Subject: [PATCH] [IMP] point_of_sale: improved search views.

bzr revid: tpa@tinyerp.com-20120720124629-4eau5t3r09x7b5y2
---
 .../point_of_sale/account_statement_view.xml  | 34 ++++----------
 addons/point_of_sale/point_of_sale_view.xml   | 39 +++++-----------
 .../report/pos_order_report_view.xml          | 44 ++++++-------------
 3 files changed, 34 insertions(+), 83 deletions(-)

diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml
index 3b3542bb777..b690e8d9ba7 100644
--- a/addons/point_of_sale/account_statement_view.xml
+++ b/addons/point_of_sale/account_statement_view.xml
@@ -27,21 +27,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Cash Statements">
-                    <group>
-                        <field name="name" string="Cash Statement"/>
-                        <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
-                        <separator orientation="vertical"/>
-                        <field name="journal_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Cash Statement"/>
+                    <field name="date"/>
+                    <field name="journal_id"/>
+                    <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
                     <group expand="0" string="Group By...">
                         <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
-                        <separator orientation="vertical"/>
                         <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
-                        <separator orientation="vertical"/>
                         <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </search>
@@ -54,22 +46,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Cash Statements">
-                    <group>
-                        <field name="name" string="Cash Statement"/>
-                        <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
-                        <filter string="Closed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
-                        <separator orientation="vertical"/>
-                        <field name="journal_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Cash Statement"/>
+                    <field name="date"/>
+                    <field name="journal_id"/>
+                    <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
+                    <filter string="Closed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                     <group expand="0" string="Group By...">
                         <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
-                        <separator orientation="vertical"/>
                         <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
-                        <separator orientation="vertical"/>
                         <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </search>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 6b1b9132344..57dce86afcb 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -139,24 +139,19 @@
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
                     <field name="name" string="Sales Order"/>
-                    <separator orientation="vertical"/>
                     <field name="date_order"/>
-                    <separator orientation="vertical"/>
+                    <field name="user_id"/>
                     <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
                     <filter icon="gtk-apply" string="Done" domain="[('state','in',('paid','invoiced','done'))]"/>
                     <filter icon="terp-check" string="Invoiced" domain="[('state','=','invoiced')]"/>
                     <filter icon="gtk-convert" string="Posted" domain="[('state','=','done')]"/>
-                    <separator orientation="vertical"/>
-                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <separator string="" orientation="vertical"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <separator string="" orientation="vertical"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
                     </group>
-               </search>
+                </search>
             </field>
         </record>
 
@@ -835,12 +830,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Point of Sale Config">
-                    <filter string="Active" domain="[('state', '=', 'active')]" />
-                    <filter string="Inactive" domain="[('state', '=', 'inactive')]" />
-                    <separator orientation="vertical"/>
                     <field name="name" />
                     <field name="shop_id" />
-
+                    <filter string="Active" domain="[('state', '=', 'active')]" />
+                    <filter string="Inactive" domain="[('state', '=', 'inactive')]" />
                 </search>
             </field>
         </record>
@@ -985,15 +978,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Point of Sale Session">
-                    <filter string="Open" domain="[('state', '=', 'opened')]" />
-                    <separator orientation="vertical"/>
-                    <filter string="Today" domain="[('start_at', '>=', time.strftime('%%Y-%%m-%%d 00:00:00'))]" />
-                    <separator orientation="vertical"/>
                     <field name="config_id" />
                     <field name="name" />
                     <field name="user_id" />
-
-                    <newline />
+                    <filter string="Open" domain="[('state', '=', 'opened')]" />
+                    <separator/>
+                    <filter string="Today" domain="[('start_at', '>=', time.strftime('%%Y-%%m-%%d 00:00:00'))]" />
                     <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
                         <filter string="Point of Sales" domain="[]" context="{'group_by': 'user_id'}" />
@@ -1032,27 +1022,22 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
-                    <filter icon="gtk-apply" string="Done" domain="[('state','in',('paid','invoiced','done'))]"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-check" string="Invoiced" domain="[('state','=','invoiced')]"/>
-                    <filter icon="gtk-convert" string="Posted" domain="[('state','=','done')]"/>
-                    <separator orientation="vertical"/>
                     <field name="name"/>
                     <field name="user_id"/>
                     <field name="date_order"/>
                     <field name="session_id"/>
-                    <newline/>
+                    <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
+                    <filter icon="gtk-apply" string="Done" domain="[('state','in',('paid','invoiced','done'))]"/>
+                    <filter icon="terp-check" string="Invoiced" domain="[('state','=','invoiced')]"/>
+                    <filter icon="gtk-convert" string="Posted" domain="[('state','=','done')]"/>
                     <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Session" icon="terp-personal" domain="[]" context="{'group_by':'session_id'}"/>
-                        <separator string="" orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <separator string="" orientation="vertical"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
                     </group>
-               </search>
+                </search>
             </field>
         </record>
 
diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml
index 00e0eb91f2f..11057b3b133 100644
--- a/addons/point_of_sale/report/pos_order_report_view.xml
+++ b/addons/point_of_sale/report/pos_order_report_view.xml
@@ -34,41 +34,23 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Point of Sale Analysis">
-                    <group>
-                        <filter icon="terp-go-year" string="Year" name="year"
-                            domain="[('year','=',time.strftime('%%Y'))]"
-                            help="POS ordered created during current year"/>
-                        <filter icon="terp-go-today"
-                             string="Today"
-                             name="today"
-                             domain="[('date','=', time.strftime('%%Y-%%m-%%d'))]"
-                             help="POS ordered created by today"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-dolar"
-                            string="Invoiced"
-                            domain="[('state','=',('invoiced'))]"/>
-                        <filter icon="terp-dolar"
-                            string="Not Invoiced"
-                            domain="[('state','=',('paid'))]"/>
-			            <separator orientation="vertical"/>
-			            <field name="partner_id"/>
-			            <field name="date"/>
-			            <field name="user_id" widget="selection" /> 
-                        <filter icon="terp-personal"
-                            string="My Sales"
-                            help="My Sales"
-                            domain="[('user_id','=',uid)]"/>
-                        <separator orientation="vertical"/>
-                        <field name="partner_id"/>
-                        <field name="user_id" widget="selection"/>
-                    </group>
-                    <newline/>
+                    <field name="partner_id"/>
+                    <field name="date"/>
+                    <field name="user_id"/>
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
+                    <filter icon="terp-dolar" string="Invoiced" domain="[('state','=',('invoiced'))]"/>
+                    <filter icon="terp-dolar" string="Not Invoiced" domain="[('state','=',('paid'))]"/>
+                    <separator/>
+                    <filter icon="terp-go-year" string="Year" name="year" domain="[('year','=',time.strftime('%%Y'))]" help="POS ordered created during current year"/>
+                    <filter icon="terp-go-today" string="Today" name="today" domain="[('date','=', time.strftime('%%Y-%%m-%%d'))]"
+                         help="POS ordered created by today"/>
+                    <separator/>
+                    <filter icon="terp-personal" string="My Sales" help="My Sales" domain="[('user_id','=',uid)]"/>
                     <group expand="1" string="Group By...">
                         <filter string="Salesperson" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
                         <filter string="Customer" icon="terp-personal" context="{'group_by':'partner_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day of order date"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Month of order date"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Year of order date"/>