Merge lp:~openerp-dev/openobject-addons/6.1-opw-582068-msh into lp:openobject-addons/6.1

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of view project.task.history.cumulative.graph, here filter project_id raise an error. "Backported from trunk" from branch https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1022509-mdi.

Demo :- Go to Project -> Reporting -> Tasks -> Cumulative Flows -> Now click on My Project filter(i.e. Projects), this will raise an error.

Thanks.

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Already Fixed on Trunk (means that it was already fixed and merged in Trunk). If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

7069. By DJ Patel (OpenERP) on 2012-11-16

[FIX]Fixed the issue of view project.task.history.cumulative.graph, here filter project_id raise an error, Backported from trunk.

=== modified file 'project/project.py'
--- project/project.py	2012-08-29 10:56:45 +0000
+++ project/project.py	2012-11-16 10:32:23 +0000
@@ -1217,23 +1217,26 @@
     _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 (
             SELECT
-                history.date::varchar||'-'||history.history_id::varchar as id,
-                history.date as end_date,
+                history.date::varchar||'-'||history.history_id::varchar AS id,
+                history.date AS end_date,
                 *
             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()

=== modified file 'project/report/project_cumulative.xml'
--- project/report/project_cumulative.xml	2011-12-13 04:33:44 +0000
+++ project/report/project_cumulative.xml	2012-11-16 10:32:23 +0000
@@ -25,6 +25,7 @@
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Project Tasks" type="bar">
+                    <!-- <field name="project_id"/> -->
                     <field name="date"/>
                     <field name="planned_hours" operator="+"/>
                     <field name="type_id" group="True"/>