From d140a93e24bfff4e43c6ef5415962c37da49a547 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 16 Apr 2010 16:12:47 +0530
Subject: [PATCH] [IMP]:improved task report.

bzr revid: apa@tinyerp.com-20100416104247-q39jzzucc7hxj53r
---
 addons/project/report/project_report_view.xml | 98 ++++++++++++-------
 1 file changed, 64 insertions(+), 34 deletions(-)

diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index b0ea3a55c7e..3d828326151 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -22,7 +22,7 @@
                     <field name="year" invisible="1"/>
                     <field name="month" invisible="1"/>
                     <field name="nbr" sum='#Number of tasks'/>
-                    <field name="no_of_days"/>
+                    <field name="no_of_days" sum="#Days"/>
                     <field name="hours_planned" sum='Planned Hours'/>
                     <field name="hours_effective" sum='Effective Hours'/>
                     <field name="hours_delay" sum='Avg. Plan.-Eff.'/>
@@ -51,46 +51,76 @@
             <field name="arch" type="xml">
                 <search string="Tasks">
                 	<group>
-                    <filter icon="terp-project" string=" Year" 
-                    domain="[('date_start','&lt;', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;=',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                    help="Tasks performed within a year"/>
-                    <filter icon="terp-project" string="This Month" name="month"
-                    		domain="[('date_start','&lt;', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;=',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" help="Tasks performed within a month"/>
-	                	 <filter icon="gtk-media-rewind"
-                            string="    7 Days    " separator="1"
-                            domain="[('date_start','&lt;', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                            help="Tasks during last 7 days"
-                            />
-                         <separator orientation="vertical"/>
-	                	<filter string="Current" icon="terp-project" domain="['|', ('state','=','draft'),('state', '=' ,'open')]" help = "Draft and in progress tasks"/>
-                    	<filter string="Pending" icon="terp-project" domain="[('state','=','pending')]"/>
-
-                    <filter string="Deadline" icon="terp-project" domain="[('date_deadline','=',time.strftime('%%Y/%%m/%%d'))]"/>
-  					<separator orientation="vertical"/>
-                    <field name="project_id">
-                        <filter icon="terp-project" string="My Task" help="My Tasks" domain="[('project_id','=',context.get('project_id', False)]"/>
-                        <filter icon="terp-project" string="Non assigned Tasks" help ="Non assigned Tasks"  domain="[('project_id','=',False"/>
-                      </field>
-                    <field name="user_id" widget="selection">
-                        <filter icon="terp-project" string="My Task" help = "My tasks" domain="[('user_id','=',uid)]" />
-                        <filter icon="terp-project" string="Non Assigned Task" help="Non Assigned Tasks"  domain="[('user_id','=',False)]"/>
-                    </field>
+	                    <filter icon="terp-project" string="This Year"
+	                    	    domain="[('date_start','&lt;', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+	                    	    help="Tasks performed in this year"/>
+	                    <filter icon="terp-project" string="This Month"
+	                    		name="month"
+	                    		domain="[('date_start','&lt;', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;=',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+	                    		help="Tasks performed in this month"/>
+		                <filter icon="gtk-media-rewind"
+	                            string="    7 Days    "
+	                            separator="1"
+	                            domain="[('date_start','&lt;', time.strftime('%%Y-%%m-%%d')), ('date_start','&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-project"
+	                    		domain="[('state','=','draft')]"
+	                    		help = "Draft tasks"/>
+		                <filter string="Current"
+		                		icon="terp-project"
+		                		domain="[('state', '=' ,'open')]"
+		                		help = "In progress tasks"/>
+	                   	<filter string="Pending"
+	                   			icon="terp-project"
+	                   			domain="[('state','=','pending')]"
+	                   			help = "Pending tasks"/>
+	                    <!--filter string="Deadline"
+	                    		icon="terp-project"
+	                    		domain="[('date_deadline','=',time.strftime('%%Y/%%m/%%d'))]"/-->
+	  					<separator orientation="vertical"/>
+	                    <field name="project_id">
+	                        <filter icon="terp-project"
+	                        		string="My Task"
+	                        		help="My Tasks"
+	                        		domain="[('project_id','=',context.get('project_id', False)]"/>
+	                        <filter icon="terp-project"
+	                        		string="Non assigned Tasks"
+	                        		help ="Non assigned Tasks"
+	                        		domain="[('project_id','=',False"/>
+	                    </field>
+	                    <field name="user_id" widget="selection">
+	                        <filter icon="terp-project"
+	                        		string="My Task"
+	                        		help = "My tasks"
+	                        		domain="[('user_id','=',uid)]" />
+	                        <filter icon="terp-project"
+	                        		string="Non Assigned Task"
+	                        		help="Non Assigned Tasks"
+	                        		domain="[('user_id','=',False)]"/>
+	                    </field>
                     </group>
                     <newline/>
 	                <group expand="1" string="Extended options..." colspan="10" col="12">
-                    	<filter string="Done" icon="terp-project" name="done" domain="[('state','=','done')]"/>
-                    	<filter string="Cancelled" icon="terp-project" domain="[('state','=','cancelled')]"/>
-	                    <field name="priority"/>
+                    	<!--filter string="Done"
+                    			icon="terp-project"
+                    			name="done"
+                    			domain="[('state','=','done')]"/>
+                    	<filter string="Cancelled"
+                    			icon="terp-project"
+                    			domain="[('state','=','cancelled')]"/-->
 	                    <field name="type"/>
-                    <newline/>
+	                    <field name="priority"/>
+	                    <field name="date_deadline"/>
+	                    <newline/>
 	                    <field name="date_start"/>
 	                    <field name="date_end"/>
-                      <field name="date_deadline"/>
-	                </group>
+                    </group>
                     <newline/>
                     <group  string="Group By..." colspan="10" col="11">
-                        <filter string="User" name="user_id" icon="terp-project" context="{'group_by':'user_id'}" />
-                        <filter string="Project" icon="terp-project" context="{'group_by':'project_id'}" default = "1" />
+                        <filter string="User" icon="terp-project" context="{'group_by':'user_id'}" />
+                        <filter string="Project" icon="terp-project" context="{'group_by':'project_id'}"/>
                         <filter string="Partner" icon="terp-project" context="{'group_by':'partner_id'}" />
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-project" context="{'group_by':'state'}"/>
@@ -110,7 +140,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="search_view_id" ref="view_task_project_user_search"/>
-            <field name="context">{'search_default_month': 1 }</field>
+            <field name="context">{'search_default_month':1,'search_default_user_id':uid}</field>
 
         </record>
         <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report"/>