From 1d8975eb30ed6fc5207e146b26f41c17b375abf6 Mon Sep 17 00:00:00 2001
From: ced <>
Date: Tue, 31 Jul 2007 14:08:45 +0000
Subject: [PATCH] project: fix grantt report to use always DateTime object

bzr revid: ced-47ae6a68996a4b025b39079942f1704c7d4d0755
---
 addons/project/report/_date_compute.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/addons/project/report/_date_compute.py b/addons/project/report/_date_compute.py
index 6b7e267c448..f2eccb47606 100644
--- a/addons/project/report/_date_compute.py
+++ b/addons/project/report/_date_compute.py
@@ -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