From a1ead34ba5167a70e4f6501bd27c7585d4fc2839 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 19 Jun 2012 10:59:37 +0530
Subject: [PATCH] [IMP] point_of_sale : Improved the Search View.

bzr revid: mdi@tinyerp.com-20120619052937-ndi4f77pxnzpb3zi
---
 .../point_of_sale/account_statement_view.xml  | 10 +++--
 addons/point_of_sale/point_of_sale_view.xml   |  5 ++-
 .../report/pos_order_report_view.xml          | 10 ++---
 .../report/report_cash_register_view.xml      | 44 +++++++++----------
 4 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml
index e5ade747840..d7941758821 100644
--- a/addons/point_of_sale/account_statement_view.xml
+++ b/addons/point_of_sale/account_statement_view.xml
@@ -27,10 +27,11 @@
             <field name="arch" type="xml">
                 <search string="Search Cash Statements">
                     <group>
+                        <field name="name" filter_domain="[('name','ilike',self)]" string="Cash Statement"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="name"/>
                         <field name="journal_id"/>
                     </group>
                     <newline/>
@@ -52,11 +53,12 @@
             <field name="arch" type="xml">
                 <search string="Search Cash Statements">
                     <group>
+                        <field name="name" filter_domain="[('name','ilike',self)]" string="Cash Statement"/>
+                        <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="date"/>
-                        <field name="name"/>
                         <field name="journal_id"/>
                     </group>
                     <newline/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index b832da7ef5b..6f8c0177787 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -138,15 +138,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
+                    <field name="name" filter_domain="[('name','ilike',self)]" string="Sales Order"/>
+                    <field name="date_order"/>
+                    <separator orientation="vertical"/>
                     <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"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
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 b3a9990023c..255af0cdd30 100644
--- a/addons/point_of_sale/report/pos_order_report_view.xml
+++ b/addons/point_of_sale/report/pos_order_report_view.xml
@@ -35,21 +35,21 @@
             <field name="arch" type="xml">
                 <search string="Point of Sale Analysis">
                     <group>
+                        <field name="date"/>
+                        <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="user_id" widget="selection">
                         <filter icon="terp-personal"
                             string="My Sales"
                             help="My Sales"
                             domain="[('user_id','=',uid)]"/>
-                    </field>
-                    <field name="date"/>
+                        <separator orientation="vertical"/>
+                        <field name="partner_id"/>
+                        <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By...">
diff --git a/addons/point_of_sale/report/report_cash_register_view.xml b/addons/point_of_sale/report/report_cash_register_view.xml
index 3cbc315ce0f..fb25e4e4487 100644
--- a/addons/point_of_sale/report/report_cash_register_view.xml
+++ b/addons/point_of_sale/report/report_cash_register_view.xml
@@ -21,40 +21,40 @@
         </record>
 
         <record id="view_report_cash_register_search" model="ir.ui.view">
-          <field name="name">report.cash.register.search</field>
-          <field name="model">report.cash.register</field>
-          <field name="type">search</field>
-          <field name="arch" type="xml">
-              <search string="Point of Sale Cash Register Analysis">
-                <group>
-                    <filter icon="terp-document-new"
-                        string="Draft"
-                        domain="[('state','=',('draft'))]"/>
-                      <filter icon="terp-camera_test"
-                          string="Confirm"
-                          domain="[('state','=',('confirm'))]"/>
+            <field name="name">report.cash.register.search</field>
+            <field name="model">report.cash.register</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Point of Sale Cash Register Analysis">
+                    <group>
+                        <field name="date"/>
                         <separator orientation="vertical"/>
-                        <field name="user_id" widget="selection">
+                        <filter icon="terp-document-new"
+                            string="Draft"
+                            domain="[('state','=',('draft'))]"/>
+                        <filter icon="terp-camera_test"
+                            string="Confirm"
+                            domain="[('state','=',('confirm'))]"/>
                         <filter icon="terp-personal"
                             string="My Sales"
                             help="My Sales"
                             domain="[('user_id','=',uid)]"/>
-                        </field>
-                        <field name="date"/>
+                        <separator orientation="vertical"/>
+                        <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
-                  <group expand="1" string="Group By...">
-                      <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                      <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
+                    <group expand="1" string="Group By...">
+                        <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                        <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                      <separator orientation="vertical"/>
+                        <separator orientation="vertical"/>
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day from Creation date of cash register"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Month from Creation date of cash register"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Year from Creation date of cash register"/>
-                  </group>
-              </search>
-          </field>
+                    </group>
+                </search>
+            </field>
         </record>
 
         <record id="action_report_cash_register_all" model="ir.actions.act_window">