From 671a01060420910160137fb7ff896a601e49cc14 Mon Sep 17 00:00:00 2001
From: "Jagdish Panchal (Open ERP)" <jap@tinyerp.com>
Date: Fri, 11 Nov 2011 16:16:06 +0530
Subject: [PATCH] [imp] improvement Analysis HR

bzr revid: jap@tinyerp.com-20111111104606-td601olh0ypgz2cz
---
 addons/hr_evaluation/report/hr_evaluation_report_view.xml    | 4 +++-
 addons/hr_expense/report/hr_expense_report_view.xml          | 5 +++--
 addons/hr_recruitment/report/hr_recruitment_report_view.xml  | 5 +++--
 .../hr_timesheet_sheet/report/hr_timesheet_report_view.xml   | 3 ++-
 addons/hr_timesheet_sheet/report/timesheet_report_view.xml   | 4 +++-
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 80a6bb51b6c..5246c853bee 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -48,7 +48,9 @@
             <search string="Evaluations Analysis">
             	<group>
             		<filter icon="terp-go-year" string=" Year "
+                        name="year"
                     	domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]" help="Evaluation done in current year"/>
+                    <separator orientation="vertical"/>						
                     <filter icon="terp-go-month" string=" Month " name="month" 
                             domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Evaluation done in current month"/>
@@ -95,7 +97,7 @@
         <field name="res_model">hr.evaluation.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_month':1,'search_default_employee':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_employee':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_evaluation_report_search"/>
     </record>
 
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 680003b88be..1a8228a479f 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -53,9 +53,10 @@
         <field name="arch" type="xml">
             <search string="Expenses Analysis">
               <group>
-                <filter icon="terp-go-year" string="  Year  "
+                <filter icon="terp-go-year" string="  Year  " name="year"
                       domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                       help="Expenses during current year"/>
+                    <separator orientation="vertical"/>					  
                   <filter icon="terp-go-month" string="   Month   "
                       name="month"
                       domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
@@ -113,7 +114,7 @@
         <field name="res_model">hr.expense.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_month':1,'search_default_employee':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_employee':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_hr_expense_report_search"/>
     </record>
 
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 5353a8497ed..07f160b8ee2 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -50,9 +50,10 @@
         <field name="arch" type="xml">
             <search string="Recruitment Analysis">
                 <group>
-                    <filter icon="terp-go-year" string="Year"
+                    <filter icon="terp-go-year" string="Year" name="year"
                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                         help="Recruitment performed in current year"/>
+                    <separator orientation="vertical"/>	
                     <filter icon="terp-go-month" string="Month"
                         name="month"
                         domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
@@ -126,7 +127,7 @@
         <field name="res_model">hr.recruitment.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_hr_recruitment_report_search"/>
     </record>
     <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10" groups="base.group_hr_manager,base.group_hr_user"/>
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
index 96151786676..2bd93e76ffd 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -45,6 +45,7 @@
                             name="year"
                             domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                             help="Timesheet in current year"/>
+                        <separator orientation="vertical"/>							
                         <filter icon="terp-go-month" string=" Month "
                             name="month"
                             domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
@@ -90,7 +91,7 @@
             <field name="res_model">hr.timesheet.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{'search_default_month':1,'search_default_group_user_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_group_user_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="help">This report performs analysis on timesheets created by your human resources in the system. It allows you to have a full overview of  entries done by your employees. You can group them by specific selection criteria thanks to the search tool.</field>
         </record>
         <menuitem
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index d452f3fc01b..f927e9bfe95 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -50,8 +50,10 @@
                 <search string="Timesheet">
                     <group>
                         <filter icon="terp-go-year" string=" Year "
+                                name="year"
                                 domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
                                 help="Timesheet in current year"/>
+                        <separator orientation="vertical"/>								
                         <filter icon="terp-go-month" string=" Month "
                                 name="month"
                                 domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
@@ -117,7 +119,7 @@
             <field name="res_model">timesheet.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{'search_default_month':1,'search_default_User_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_User_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="search_view_id" ref="view_timesheet_report_search"/>
         </record>
         <menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all"