pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

project: fix grantt report to use always DateTime object

Browse Source 
bzr revid: ced-47ae6a68996a4b025b39079942f1704c7d4d0755
This commit is contained in:
ced
2007-07-31 14:08:45 +00:00
parent d9b2eee071
commit 1d8975eb30
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project/report/_date_compute.py
+9 -7
View File
@@ -27,8 +27,7 @@
#
##############################################################################
import mx.DateTime
from mx.DateTime import *
from mx import DateTime
import time
import pooler
@@ -60,8 +59,11 @@ def _compute_tasks(cr, uid, task_list, date_begin):
else:
break
if task.date_start and date_start<task.date_start:
date_start = task.date_start
if task.date_start:
task_date_start = DateTime.strptime(task.date_start, '%Y-%m-%d %H:%M:%S')
if DateTime.cmp(date_start, task_date_start) < 0:
date_start = task_date_start
# Compute the closing date of the task
tasks[task.id] = []
@@ -80,7 +82,7 @@ def _compute_tasks(cr, uid, task_list, date_begin):
def _compute_project(cr, uid, project, date_begin):
tasks, last_date = _compute_tasks(cr, uid, project.tasks, date_begin)
for proj in project.child_id:
d0 = mx.DateTime.strptime(proj.date_start,'%Y-%m-%d')
d0 = DateTime.strptime(proj.date_start,'%Y-%m-%d')
if d0 > last_date:
last_date = d0
t2, l2 = _compute_project(cr, uid, proj, last_date)
@@ -91,9 +93,9 @@ def _compute_project(cr, uid, project, date_begin):
def _project_compute(cr, uid, project_id):
project = pooler.get_pool(cr.dbname).get('project.project').browse(cr, uid, project_id)
if project.date_start:
date_begin = mx.DateTime.strptime(project.date_start, '%Y-%m-%d')
date_begin = DateTime.strptime(project.date_start, '%Y-%m-%d')
else:
date_begin = now()
date_begin = DateTime.now()
tasks, last_date = _compute_project(cr, uid, project, date_begin)
return tasks, last_date