From 42dbaa3952e7d6c248fc98703526205366ca579b Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 26 May 2010 12:24:21 +0530
Subject: [PATCH] [IMP]:hr_evaluation:improved the SQL report.

bzr revid: apa@tinyerp.com-20100526065421-tuy6sw96apgkz22b
---
 .../report/hr_evaluation_report_view.xml      | 54 ++++++++++---------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 921d8b43a2b..6b2e6ead15f 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -42,35 +42,42 @@
         <field name="arch" type="xml">
             <search string="Evaluations">
             	<group>
-            		<filter icon="terp-hr" string="This Year"
-                    	    domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                    	    help="Tasks performed in this year"/>
-                    <filter icon="terp-hr" string="This Month"
-                    		name="month"
-                    		domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                    		help="Tasks performed in this month"/>
+            		<filter icon="gtk-media-rewind" string="Last 365 Days"
+                    	domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+                    	help="Tasks performed in last 365 days"/>
+                    <filter icon="gtk-media-rewind" string="Last 30 Days"
+                    	name="month"
+                    	domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+                    	help="Tasks performed in last 30 days"/>
 	                <filter icon="gtk-media-rewind"
-                            string="    7 Days    "
-                            separator="1"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                            help="Tasks during last 7 days"/>
+                        string="    7 Days    "
+                        separator="1"
+                        domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                        help="Tasks during last 7 days"/>
                     <separator orientation="vertical"/>
                     <filter string="Draft"
-                    		icon="terp-hr"
-                    		domain="[('state','=','draft')]"
-                    		help = "Draft Evaluations"/>
+                    	icon="terp-hr"
+                    	domain="[('state','=','draft')]"
+                    	help = "Draft Evaluations"/>
 	                <filter string="Plan In Progress"
-	                		icon="terp-hr"
-	                		domain="[('state', '=' ,'wait')]"
-	                		help = "In progress Evaluations"/>
+	                	icon="terp-hr"
+	                	domain="[('state', '=' ,'wait')]"
+	                	help = "In progress Evaluations"/>
                    	<filter string="Final Validation"
-                   			icon="terp-hr"
-                   			domain="[('state','=','progress')]"
-                   			help = "Final Validation Evaluations"/>
+                   		icon="terp-hr"
+                   		domain="[('state','=','progress')]"
+                   		help = "Final Validation Evaluations"/>
+                   	<filter icon="terp-hr"
+                        string="Done"
+                        domain="[('state','=','done')]"/>
   					<separator orientation="vertical"/>
 	                <field name="employee_id" widget="selection"/>
+	                <field name="plan_id" widget="selection"/>
                 </group>
                 <newline/>
+<<<<<<< TREE
+				<group expand="0" string="Extended options..." colspan="10" col="12">
+=======
                 <group expand="1" string="Group By...">
                     <filter string="Employee" name="employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
                     <filter string="Rating" icon="terp-hr" context="{'group_by':'rating'}"/>
@@ -91,13 +98,12 @@
                     		string="Cancelled"
                     		domain="[('state','=','cancel')]"/>
                     <separator orientation="vertical"/>
+>>>>>>> MERGE-SOURCE
                     <field name="rating"/>
-                    <field name="plan_id" widget="selection"/>
                     <separator orientation="vertical"/>
                     <field name="deadline"/>
-                    <newline/>
-                    <field name="create_date"/>
-                    <field name="closed"/>
+                    <separator orientation="vertical"/>
+                    <field name="state"/>
                 </group>
             </search>
         </field>