Merge lp:~openerp-dev/openobject-addons/6.1-opw-586446-mma into lp:openobject-addons/6.1

[Mayur Maheshwari(OpenERP)]

Hello,

Open Project -> Reporting -> Task -> cumulative flow ,
click on project(my projects filter) gives error

This Branch Fixed this issue
code back-ported from 7.0

Thanks,
Mayur

Unmerged revisions

7156. By Mayur Maheshwari(OpenERP) on 2013-02-19

[FIX]project: fixed traceback when click on project_id in cumulative serch view

=== modified file 'project/project.py'
--- project/project.py	2012-08-29 10:56:45 +0000
+++ project/project.py	2013-02-19 09:42:32 +0000
@@ -1217,7 +1217,7 @@
     _auto = False
     _columns = {
         'end_date': fields.date('End Date'),
-        'project_id': fields.related('task_id', 'project_id', string='Project', type='many2one', relation='project.project')
+        'project_id': fields.many2one('project.project', 'Project'),
     }
     def init(self, cr):
         cr.execute(""" CREATE OR REPLACE VIEW project_task_history_cumulative AS (
@@ -1227,13 +1227,16 @@
                 *
             FROM (
                 SELECT
-                    id as history_id,
-                    date+generate_series(0, CAST((coalesce(end_date,DATE 'tomorrow')::date - date)AS integer)-1) as date,
-                    task_id, type_id, user_id, kanban_state, state,
-                    remaining_hours, planned_hours
+                    h.id AS history_id,
+                    h.date+generate_series(0, CAST((coalesce(h.end_date, DATE 'tomorrow')::date - h.date) AS integer)-1) AS date,
+                    h.task_id, h.type_id, h.user_id, h.kanban_state, h.state,
+                    greatest(h.remaining_hours, 1) AS remaining_hours, greatest(h.planned_hours, 1) AS planned_hours,
+                    t.project_id
                 FROM
-                    project_task_history
-            ) as history
+                    project_task_history AS h
+                    JOIN project_task AS t ON (h.task_id = t.id)
+
+            ) AS history
         )
         """)
 project_task_history_cumulative()