diff options
| author | Naresh (OpenERP) <nch@tinyerp.com> | 2011-04-29 14:30:02 +0530 |
|---|---|---|
| committer | Naresh (OpenERP) <nch@tinyerp.com> | 2011-04-29 14:30:02 +0530 |
| commit | 72c838b8ff73135f5e1e9441d1fd1cb5bbdaae45 (patch) | |
| tree | 59c9cfc0605ac8487937f0ad55acb3b66ca400fc /addons/project_long_term/project_long_term.py | |
| parent | 29e05874b6b78d021e2642be9f93eaf5d24ce840 (diff) | |
| parent | d553615695cee83345692d53a033e1e7c5f2a512 (diff) | |
[MERGE FOR TRUNK]
bzr revid: nch@tinyerp.com-20110429090002-jv43vi0hcmbt6ib7
Diffstat (limited to 'addons/project_long_term/project_long_term.py')
| -rw-r--r-- | addons/project_long_term/project_long_term.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index c2bc55db212..4620fc81a7a 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -731,6 +731,7 @@ class project_task(osv.osv): task = self.browse(cr, uid, task_id, context=context) duration = str(task.planned_hours )+ 'H' str_resource = False + parent = task.parent_ids if task.phase_id.resource_ids: str_resource = ('%s | '*len(task.phase_id.resource_ids))[:-2] str_resource = str_resource % tuple(map(lambda x: 'Resource_%s'%x.resource_id.id, task.phase_id.resource_ids)) @@ -742,7 +743,10 @@ class project_task(osv.osv): effort = \'%s\' resource = %s '''%(task.id, task.name, duration, str_resource) - #start = datetime.strftime((datetime.strptime(start, "%Y-%m-%d")), "%Y-%m-%d") + if parent: + s +=''' + start = up.Task_%s.end +'''%(parent[0].id) else: s = ''' def Task_%s(): @@ -750,6 +754,10 @@ class project_task(osv.osv): effort = \'%s\' resource = %s '''%(task.id, task.name, duration, str_resource) + if parent: + s +=''' + start = up.Task_%s.end +'''%(parent[0].id) s += '\n' return s project_task() |
