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

bzr revid: tpa@tinyerp.com-20120720103721-4i424494z5wkmvhj
---
 addons/hr_expense/hr_expense_view.xml         | 34 ++++------
 .../report/hr_expense_report_view.xml         | 65 +++++++------------
 2 files changed, 38 insertions(+), 61 deletions(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index de19ed74b09..02e09268111 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -136,27 +136,19 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Expense">
-                    <group>
-                      <field name="name" string="Expenses"/>
-                      <separator orientation="vertical"/>
-                      <field name="date"/>
-                      <separator orientation="vertical"/>
-                      <filter icon="terp-document-new" domain="[('state','=','draft')]" string="New" help="New Expense"/>
-                      <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" help="Confirmed Expense"/>
-                      <filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay" help="Expenses to Invoice"/>
-                      <separator orientation="vertical"/>
-                      <field name="employee_id"/>
-                      <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}"/>
-                      <field name="user_id"  string="User"/>
-                </group>
-                <newline />
-                <group expand="0" string="Group By...">
-                    <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
-                </group>
+                    <field name="name" string="Expenses"/>
+                    <field name="date"/>
+                    <field name="employee_id"/>
+                    <field name="department_id" string="Department" context="{'invisible_department': False}"/>
+                    <field name="user_id"  string="User"/>
+                    <filter icon="terp-document-new" domain="[('state','=','draft')]" string="New" help="New Expense"/>
+                    <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" help="Confirmed Expense"/>
+                    <filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay" help="Expenses to Invoice"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
+                        <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 7877edf4b3a..01d7a9b7bef 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -51,46 +51,31 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Expenses Analysis">
-              <group>
-                    <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]"
-                      help = "Confirm Expenses"/>
-                    <filter string="Approved" icon="terp-check" domain="[('state','=','accepted')]"
-                      help = "Approved Expenses"/>
-                    <filter string="Invoiced" icon="terp-dolar" domain="[('state','in', ('invoiced', 'paid'))]"
-                      help = "Invoiced Expenses"/>
-                    <separator orientation="vertical"/>
-                    <field name="employee_id"/>
-                    <field name="department_id"/>
-            </group>
-            <newline/>
-            <group expand="0" string="Extended Filters...">
-                <field name="product_id"/>
-                <separator orientation="vertical"/>
-                <field name="user_id"/>
-                <separator orientation="vertical"/>
-                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                <newline/>
-                <field name="date" string="Creation Date"/>
-                <field name="date_confirm"/>
-                <field name="date_valid"/>
-            </group>
-            <newline/>
-            <group expand="1" string="Group By...">
-                <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
-                <filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
-                <separator orientation="vertical"/>
-                <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
-                <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}" 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'}"/>
-                <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                <separator orientation="vertical"/>
-                <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
-                <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
-                <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Creation Date"/>
-            </group>
+                <field name="employee_id"/>
+                <field name="department_id"/>
+                <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]" help = "Confirm Expenses"/>
+                <filter string="Approved" icon="terp-check" domain="[('state','=','accepted')]" help = "Approved Expenses"/>
+                <filter string="Invoiced" icon="terp-dolar" domain="[('state','in', ('invoiced', 'paid'))]" help = "Invoiced Expenses"/>
+                <group expand="0" string="Extended Filters...">
+                    <field name="product_id"/>
+                    <field name="user_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="date" string="Creation Date"/>
+                    <field name="date_confirm"/>
+                    <field name="date_valid"/>
+                </group>
+                <group expand="1" string="Group By...">
+                    <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
+                    <filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
+                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                    <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}" groups="analytic.group_analytic_accounting"/>
+                    <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Creation Date"/>
+                </group>
             </search>
         </field>
     </record>