summaryrefslogtreecommitdiff
path: root/addons/project
diff options
context:
space:
mode:
Diffstat (limited to 'addons/project')
-rw-r--r--addons/project/report/_date_compute.py2
-rw-r--r--addons/project/report/gantt.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/addons/project/report/_date_compute.py b/addons/project/report/_date_compute.py
index beca7e5a621..85458ee0175 100644
--- a/addons/project/report/_date_compute.py
+++ b/addons/project/report/_date_compute.py
@@ -59,7 +59,7 @@ def _compute_tasks(cr, uid, task_list, date_begin):
# Compute the closing date of the task
tasks[task.id] = []
- res = pooler.get_pool(cr.dbname).get('hr.timesheet.group').interval_get(cr, uid, task.project_id.timesheet_id.id, date_start, task.planned_hours)
+ res = pooler.get_pool(cr.dbname).get('hr.timesheet.group').interval_get(cr, uid, task.project_id.timesheet_id.id, date_start, task.remaining_hours)
for (d1,d2) in res:
tasks[task.id].append((d1, d2, task.name, task.user_id.login))
date_close = tasks[task.id][-1][1]
diff --git a/addons/project/report/gantt.py b/addons/project/report/gantt.py
index 1caa71b423f..ab4d947caa0 100644
--- a/addons/project/report/gantt.py
+++ b/addons/project/report/gantt.py
@@ -51,6 +51,7 @@ class GanttCanvas(object):
self._min = x[0]
if x[1]>self._max or not self._max:
self._max = x[1]
+ print name, self._conv[1](x[1])
self._datas[user].append( (name, x))
self._names.setdefault(name, x[0])