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

bzr revid: tpa@tinyerp.com-20120720112627-43b2e5tnmtvtfaln
---
 .../hr_timesheet_invoice_view.xml             |  8 ++-
 .../hr_timesheet_invoice_report_view.xml      | 52 ++++++-------------
 .../report/report_analytic_view.xml           | 11 ++--
 3 files changed, 23 insertions(+), 48 deletions(-)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 81dc1e3c9cf..631fa566bce 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -89,10 +89,10 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="account.view_account_analytic_line_filter"/>
             <field name="arch" type="xml">
-                <field name="date" position="before">
+                <field name="others" position="after">
+                    <separator/>
                     <filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}" domain="[('invoice_id','=',False), ('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/>
                     <filter name="invoiced" string="Invoiced" domain="[('invoice_id','!=',False), ('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/> 
-                    <separator orientation="vertical"/>
                 </field>
             </field>
         </record>
@@ -144,9 +144,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Type of invoicing">
-                    <group>
-                        <field name="name" string="Type of invoicing"/>
-                    </group>
+                    <field name="name" string="Type of invoicing"/>
                 </search>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 59b4ceb67a3..1fad5f92b2e 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -46,29 +46,19 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
-                    <group>
-                      <filter icon="terp-personal"
-                              string="Non Assigned timesheets to users"
-                              help="Non Assigned timesheets to users"
-                              domain="[('user_id','=',False)]"/>
-                      <separator orientation="vertical"/>
-                      <field name="user_id" widget="selection"/>
-                      <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                      <field name="product_id"/>
-                    </group>
-                    <newline/>
+                    <field name="user_id"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                    <field name="product_id"/>
+                    <filter icon="terp-personal" string="Non Assigned timesheets to users" help="Non Assigned timesheets to users" domain="[('user_id','=',False)]"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <field name="invoice_id" widget="selection"/>
+                        <field name="invoice_id"/>
                     </group>
                     <group expand="1" string="Group By...">
                         <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                         <filter string="Invoice" icon="terp-dolar" context="{'group_by':'invoice_id'}"/>
-                        <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':'name'}"/>
@@ -149,12 +139,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
-                    <group>
-                        <field name="name" string="Timesheet by users"/>
-                        <separator orientation="vertical"/>
-                        <field name="user_id"/>
-                        <field name="month"/>
-                    </group>
+                    <field name="name" string="Timesheet by users"/>
+                    <field name="user_id"/>
+                    <field name="month"/>
                 </search>
             </field>
         </record>
@@ -201,7 +188,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet by invoice">
-                    <separator orientation="vertical"/>
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="manager_id"/>
                     <field name="user_id"/>
@@ -282,13 +268,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Daily timesheet by account">
-                    <group>
-                        <field name="name" string="Timesheet by account"/>
-                        <separator orientation="vertical"/>
-                        <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                        <field name="user_id"/>
-                        <field name="month"/>
-                    </group>
+                    <field name="name" string="Timesheet by account"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                    <field name="user_id"/>
+                    <field name="month"/>
                 </search>
             </field>
         </record>
@@ -351,13 +334,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet by account">
-                    <group>
-                        <field name="name" string="Timesheet by account"/>
-                        <separator orientation="vertical"/>
-                        <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                        <field name="user_id"/>
-                        <field name="month"/>
-                    </group>
+                    <field name="name" string="Timesheet by account"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                    <field name="user_id"/>
+                    <field name="month"/>
                 </search>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index c7d0c6b7c25..05319b075e8 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -113,13 +113,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Analytic Lines to Invoice">
-                   <group>
-                        <field name="name" string="Analytic Lines"/>
-                        <separator orientation="vertical"/>
-                        <field name="product_id"/>
-                        <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                        <field name="month"/>
-                   </group>
+                    <field name="name" string="Analytic Lines"/>
+                    <field name="product_id"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                    <field name="month"/>
                </search>
             </field>
         </record>