From 46c6906aae054de35cb1afa303ecafd65c34e82b Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 24 Sep 2010 12:17:28 +0530
Subject: [PATCH] [MOD] hr_holidays : small changes

bzr revid: vir@tinyerp.com-20100924064728-piaatulgfk8mfor7
---
 .../report/hr_holidays_report_view.xml        | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index d0304c91915..89cdb6014bb 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -9,13 +9,13 @@
         <field name="arch" type="xml">
             <tree colors="blue:state in ('draft');black:state in ('confirm','refuse','validate');gray:state in('cancel')" string="Leaves Statistics">
                 <field name="date" invisible="1"/>
-                <field name="delay_approve"/>                
                 <field name="employee_id" invisible="1"/>
                 <field name="category_id" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="date_from" invisible="1"/>
                 <field name="date_to" invisible="1"/>
                 <field name="number_of_days_temp" sum="#Days"/>
+                <field name="delay_approve"/>
                 <field name="holiday_status_id" invisible="1"/>
                 <field name="department_id" invisible="1"/>
                 <field name="year" invisible="1"/>
@@ -51,7 +51,7 @@
                     <filter icon="terp-go-month" string=" Month " name="month" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]" help="Leaves taken in current month"/>
 	                <filter icon="terp-go-month" string="    Month-1    " separator="1"
                        domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]" help="Leaves taken in last month"/>
-	                <separator orientation="vertical"/>  
+	                <separator orientation="vertical"/>
 	                <filter string="Future Leaves" icon="terp-gtk-media-pause" domain="[('state', 'in' ,('draft','confirm'))]"
 	                	help = "Draft and Confirmed leaves"/>
 	               	<filter string="Validated" icon="terp-camera_test" domain="[('state','=','validate')]"
@@ -61,8 +61,18 @@
                     <field name="department_id"/>
 					<field name="employee_id"/>
 	            </group>
+	            <newline/>
+                <group expand="0" string="Extended Filters..." colspan="10" col="12">
+                    <field name="holiday_status_id"/>
+                    <field name="category_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="user_id"/>
+                    <newline/>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
+                </group>
                 <newline/>
-                <group expand="0" string="Group By..." colspan="10" col="12">
+                <group expand="1" string="Group By..." colspan="10" col="12">
                     <filter icon="terp-personal" string="Employee" name="Employee" context="{'group_by':'employee_id'}"
                             help="Leaves by empolyee"/>
                     <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
@@ -75,19 +85,9 @@
                     <separator orientation="vertical"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Leave on Date"/>
-                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by Leave on Month"/>
-                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by Leave on Year"/>
-                </group>
-                <newline/>
-                <group expand="0" string="Extended Filters..." colspan="10" col="12">
-                    <field name="holiday_status_id"/>
-                    <field name="category_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="user_id"/>
-                    <newline/>
-                    <field name="date_from"/>
-                    <field name="date_to"/>
+                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by create date"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of create date"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of create date"/>
                 </group>
             </search>
         </field>