diff --git a/addons/project/project.py b/addons/project/project.py index 314b4f56eb7..788f8af6efc 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -307,7 +307,7 @@ class task(osv.osv): 'project_id': fields.many2one('project.project', 'Project', ondelete='cascade', help="If you have [?] in the project name, it means there are no analytic account linked to this project."), 'parent_ids': fields.many2many('project.task', 'project_task_parent_rel', 'task_id', 'parent_id', 'Parent Tasks'), - 'child_ids': fields.many2many('project.task', 'project_task_child_rel', 'task_id', 'child_id', 'Delegated Tasks'), + 'child_ids': fields.many2many('project.task', 'project_task_parent_rel', 'parent_id', 'task_id', 'Delegated Tasks'), 'notes': fields.text('Notes'), 'occupation_rate': fields.float('Occupation Rate', help='The occupation rate fields indicates how much of his time a user is working on a task. A 100% occupation rate means the user works full time on the tasks. The ending date of a task is computed like this: Starting Date + Duration / Occupation Rate.'), 'planned_hours': fields.float('Planned Hours', required=True, help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'), @@ -567,4 +567,4 @@ class users(osv.osv): } users() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index eaf2c72efa3..6f55d13e4f4 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -103,12 +103,17 @@ - - - - - - + + + + + + + + + + + @@ -267,7 +272,7 @@ - + diff --git a/addons/project/wizard/task_delegate.py b/addons/project/wizard/task_delegate.py index 1c235b28d1d..1bb6c538593 100644 --- a/addons/project/wizard/task_delegate.py +++ b/addons/project/wizard/task_delegate.py @@ -67,7 +67,6 @@ class wizard_delegate(wizard.interface): 'remaining_hours': data['form']['planned_hours_me'], 'planned_hours': data['form']['planned_hours_me'] + (task.effective_hours or 0.0), 'name': newname, - 'child_ids': [(6, 0, [new_task_id])] }) if data['form']['state']=='pending': task_obj.do_pending(cr, uid, [data['id']]) @@ -106,7 +105,3 @@ class wizard_delegate(wizard.interface): } } wizard_delegate('project.task.delegate') - - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: -