From 975b6c4988cc83f294062eec0d8824f99fbd96a2 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Wed, 7 Jul 2010 14:36:49 +0200
Subject: [PATCH] [IMP] holidays,timesheet: report views

bzr revid: nel@tinyerp.com-20100707123649-3iqzh8uzzsmrq22b
---
 .../report/available_holidays_view.xml        | 47 ++++++++-----------
 .../report/hr_holidays_report_view.xml        | 11 ++---
 .../report/hr_timesheet_report_view.xml       |  9 ++--
 .../report/timesheet_report_view.xml          | 14 +++---
 4 files changed, 37 insertions(+), 44 deletions(-)

diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index 111d8d2f8a6..a172e7eb0ea 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -10,18 +10,17 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                <tree string="Available Holidays">
-                    <field name="employee_id"/>
-                    <field name="category_id"/>
-                    <field name="holiday_status_id"/>
+                    <field name="employee_id" invisible="1"/>
+                    <field name="category_id" invisible="1"/>
+                    <field name="holiday_status_id" invisible="1"/>
                     <field name="department_id" invisible="1"/>
+                    <field name="day" invisible="1"/>
+                    <field name="month" invisible="1"/>
+                    <field name="year" invisible="1"/>
+                    <field name="date" invisible="1"/>
                     <field name="max_leave" sum="Allocated Leaves"/>
                     <field name="taken_leaves" sum="Taken Leaves"/>
-                    <field name="user_id" invisible="1"/>
                     <field name="remaining_leave" sum="Remaining Leaves"/>
-                    <field name="year" invisible="1"/>
-                    <field name="day" invisible="1"/>
-                	<field name="month" invisible="1"/>
-                	<field name="date" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -48,11 +47,6 @@
 	        <field name="arch" type="xml">
 	            <search string="Leaves">
 	            	<group>
-	                    <filter icon="terp-personal" string="Employee" domain="[('category_id', '=', False)]"
-	                            help="Leaves by empolyee"/>
-	                    <filter icon="terp-stock_symbol-selection" string="Category"
-	                            domain="[('employee_id', '=', False)]" help="Leaves by category"/>
-                        <separator orientation="vertical"/>
 		            	<filter icon="terp-go-year" string="This Year"
 			                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 			                    help="Leaves in this year"/>
@@ -61,27 +55,26 @@
 			            <filter icon="terp-go-week" string="    7 Days    " separator="1"
 		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" help="Leaves during last 7 days"/>
 		                <separator orientation="vertical"/>
-						<field name="employee_id"/>
-		                <field name="user_id" widget="selection">
-		                    <filter icon="terp-personal" string="My Leaves" domain="[('user_id','=',uid)]"/>
-		                </field>
+                    <field name="employee_id"/>
 		            </group>
 		            <newline/>
-	                <group expand="0" string="Extended options..." colspan="10" col="12">
-                    <field name="holiday_status_id" widget="selection"/>
-                	<field name="department_id" widget="selection"/>
-	                </group>
-	                <newline/>
-	                <group expand="0" string="Group By..." colspan="10" col="12">
-	                    <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-	                    <separator orientation="vertical"/>
-	                    <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'holiday_status_id'}"/>
+	                <group expand="1" string="Group By..." colspan="10" col="12">
 	                    <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
+	                    <filter icon="terp-personal" string="Employee" 
+                          name="user" context="{'group_by':'employee_id'}"
+	                        help="Leaves by employee"/>
+                        <separator orientation="vertical"/>
+	                    <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'holiday_status_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':'year'}"/>
 	                </group>
+	                <newline/>
+	                <group expand="0" string="Extended options..." colspan="10" col="12">
+                    <field name="holiday_status_id" widget="selection"/>
+                	<field name="department_id" widget="selection"/>
+	                </group>
 	            </search>
 	        </field>
 	    </record>
@@ -91,7 +84,7 @@
             <field name="res_model">available.holidays.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':1,'group_by':[], "search_default_user_id": uid}</field>
+            <field name="context">{'search_default_month':1,'search_default_user':1,'group_by':[], "search_default_user_id": uid, 'group_by_no_leaf':1}</field>
             <field name="view_id" ref="view_hr_available_holidays_report_search"/>
         </record>
 
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index 0d515bcacff..be08ab63bae 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -9,8 +9,8 @@
         <field name="arch" type="xml">
             <tree string="Leaves Statistics">
                 <field name="date" invisible="1"/>
-                <field name="employee_id"/>
-                <field name="category_id"/>
+                <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"/>
@@ -52,14 +52,13 @@
 		            <filter icon="terp-go-week" string="    7 Days    " separator="1"
 	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" help="Leaves during last 7 days"/>
 	                <separator orientation="vertical"/>
-	                <filter string="Current Leaves" icon="terp-gtk-media-pause" domain="[('state', 'in' ,('draft','confirm'))]"
-	                	help = "In progress Leaves"/>
+	                <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')]"
 	               		help = "Pending Leaves"/>
                   <filter icon="terp-gtk-stop" string="Cancelled" domain="[('state','=','cancel')]"/>
 					<separator orientation="vertical"/>
                     <field name="department_id"/>
-					<separator orientation="vertical"/>
 					<field name="employee_id"/>
 	            </group>
                 <newline/>
@@ -77,7 +76,7 @@
                     <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'}"/>
-                    <filter string="Month" icon="terp-go-month" context="{'group_by':'date'}"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
                 <newline/>
diff --git a/addons/hr_timesheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet/report/hr_timesheet_report_view.xml
index 41fb3520bcc..648b8f30321 100644
--- a/addons/hr_timesheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet/report/hr_timesheet_report_view.xml
@@ -54,12 +54,11 @@
                             domain="[('date','=', time.strftime('%%Y-%%m-%%d'))]"
                             help="Timesheet dof the day"/>
                         <separator orientation="vertical"/>
-                        <field name="account_id"/>
-                        <field name="user_id" />
-                        <field name="date" />
+                            <field name="account_id"/>
+                            <field name="user_id" />
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By...">
+                    <group expand="1" string="Group By...">
                         <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical"/>
@@ -79,6 +78,8 @@
                         <field name="journal_id"/>
                         <separator orientation="vertical"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <newline/>
+                        <field name="date" />
                     </group>
                 </search>
             </field>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index a5d7d9b420f..0bc2b70d341 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -49,18 +49,18 @@
             <field name="arch" type="xml">
                 <search string="Timesheet">
                     <group col="10" colspan="12">
-                        <filter icon="terp-go-year" string="This 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 this year"/>
-                        <filter icon="terp-go-month" string="This 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'))]"
-                                help="Timesheet in this month"/>
                         <filter icon="terp-go-week"
                                 string="    7 Days    "
                                 separator="1"
                                 domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                                 help="Timesheet during last 7 days"/>
+                        <filter icon="terp-go-month" string="This 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'))]"
+                                help="Timesheet in this month"/>
+                        <filter icon="terp-go-year" string="This 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 this year"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-document-new"
                                 string="Draft"