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 @@ - @@ -30,7 +29,6 @@ - @@ -46,7 +44,6 @@ - @@ -59,28 +56,5 @@ - - Closed tasks by user - report.task.user.pipeline.open - form - tree,graph - [('task_state','=','done')] - - - - - Opened tasks by user - report.task.user.pipeline.open - form - tree,graph - [('task_state','=','open')] - -