From ce9efa907f7e9cf2bb087a0177a1fac163d73c24 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 18 Dec 2007 20:11:57 +0000
Subject: [PATCH] Change in report: user task's pipeline

bzr revid: fp@tinyerp.com-3ea750a891abdea873ee18e25e8a10a61e5ac1d1
---
 addons/report_task/report_task.py       | 12 +++++-------
 addons/report_task/report_task_view.xml | 26 -------------------------
 2 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/addons/report_task/report_task.py b/addons/report_task/report_task.py
index 3f7e96c6224..12643afcfb4 100644
--- a/addons/report_task/report_task.py
+++ b/addons/report_task/report_task.py
@@ -39,25 +39,23 @@ class  report_task_user_pipeline_open (osv.osv):
 		'task_hrs': fields.float('Task Hours', readonly=True),
 		'task_progress': fields.float('Task Progress', readonly=True),
 		'company_id' : fields.many2one('res.company', 'Company'),
-		'task_state': fields.selection([('draft', 'Draft'),('open', 'Open'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True),
 	}
 
 	def init(self, cr):
 		cr.execute('''
 			create or replace view report_task_user_pipeline_open as (
 				select
-					min(t.id) as id,
+					u.id as id,
 					u.id as user_id,
 					u.company_id as company_id,
 					count(t.*) as task_nbr,
 					sum(t.planned_hours) as task_hrs,
-					sum(t.planned_hours * (100 - t.progress) / 100) as task_progress,
-					t.state as task_state
+					sum(t.planned_hours * (100 - t.progress) / 100) as task_progress
 				from
-					project_task t
-				left join res_users u on (u.id = t.user_id)
+					res_users u
+				left join project_task t on (u.id = t.user_id)
 				group by
-					u.id, u.company_id, t.state
+					u.id, u.company_id
 			)
 		''')
 report_task_user_pipeline_open()
diff --git a/addons/report_task/report_task_view.xml b/addons/report_task/report_task_view.xml
index b9b9e9349de..29122a38857 100644
--- a/addons/report_task/report_task_view.xml
+++ b/addons/report_task/report_task_view.xml
@@ -17,7 +17,6 @@
 				<field name="task_nbr" select="2"/>
 				<field name="task_hrs" select="2"/>
 				<field name="task_progress" select="2"/>
-				<field name="task_state" select="1"/>
 			</form>
 		</field>
 	</record>
@@ -30,7 +29,6 @@
 			<graph string="Tasks by User" type="bar">
 				<field name="user_id"/>
 				<field name="task_progress" operator="+"/>
-				<field name="task_state" group="True"/>
 			</graph>
 		</field>
 	</record>
@@ -46,7 +44,6 @@
 				<field name="task_nbr"/>
 				<field name="task_hrs"/>
 				<field name="task_progress"/>
-				<field name="task_state"/>
 			</tree>
 		</field>
 	</record>
@@ -59,28 +56,5 @@
 	</record>
 	<menuitem name="Project Management/Reporting/All Months/Tasks by User" action="action_project_task" id="menu_project_task_user_tree"/>
 
-	<record model="ir.actions.act_window" id="action_project_task_done">
-		<field name="name">Closed tasks by user</field>
-		<field name="res_model">report.task.user.pipeline.open</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,graph</field>
-		<field name="domain">[('task_state','=','done')]</field>
-	</record>
-	<menuitem 
-		name="Project Management/Reporting/All Months/Tasks by User/Closed Tasks by User"
-		action="action_project_task_done"
-		id="menu_project_task_user_tree2"/>
-
-	<record model="ir.actions.act_window" id="action_project_task_open">
-		<field name="name">Opened tasks by user</field>
-		<field name="res_model">report.task.user.pipeline.open</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,graph</field>
-		<field name="domain">[('task_state','=','open')]</field>
-	</record>
-	<menuitem 
-		name="Project Management/Reporting/All Months/Tasks by User/Opened Tasks by User"
-		action="action_project_task_open" 
-		id="menu_project_task_user_tree3"/>
 </data>
 </terp>