diff --git a/addons/project/project.py b/addons/project/project.py index f4250b922f1..db6515a0975 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -289,6 +289,7 @@ class task(osv.osv): 'delay_hours': fields.function(_hours_get, method=True, string='Delay Hours', multi='hours', store=True, help="Computed as: Total Time - Estimated Time. It gives the difference of the time estimated by the project manager and the real time to close the task."), 'user_id': fields.many2one('res.users', 'Assigned to'), + 'delegated_user_id': fields.related('child_ids','user_id',type='many2one', relation='res.users', string='Delegated To'), 'partner_id': fields.many2one('res.partner', 'Partner'), 'work_ids': fields.one2many('project.task.work', 'task_id', 'Work done'), } diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 61dbe6d9f4d..91917947558 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -359,6 +359,28 @@ + + my.pending.task.tree + project.task + tree + + + + + + + + + + + + + + + + + + project.task.calendar project.task @@ -423,6 +445,7 @@ form tree,form,calendar,graph [('user_id', '=', uid),('state','=','pending')] + diff --git a/addons/project/wizard/task_delegate.py b/addons/project/wizard/task_delegate.py index d2919dcb54e..82f9d7e580e 100644 --- a/addons/project/wizard/task_delegate.py +++ b/addons/project/wizard/task_delegate.py @@ -31,7 +31,7 @@ ask_form = """ - + @@ -42,7 +42,7 @@ ask_fields = { 'name': {'string': 'Delegated Title', 'type': 'char', 'required': 'True', 'size':64, 'help':"New title of the task delegated to the user."}, 'prefix': {'string': 'Your Task Title', 'type': 'char', 'required': 'True', 'size':64, 'help':"New title of your own task to validate the work done."}, 'user_id': {'string':'Assign To', 'type':'many2one', 'relation': 'res.users', 'required':'True', 'help':"User you want to delegate this task to."}, - 'include_info': {'string':'Copy Description', 'type':'boolean', 'help':"Reinclude the description of the task in the task of the user."}, + 'new_task_description': {'string':'New Task Description', 'type':'text', 'help':"Reinclude the description of the task in the task of the user."}, 'planned_hours': {'string':'Planned Hours', 'type':'float', 'widget':'float_time', 'help':"Estimated time to close this task by the delegated user."}, 'planned_hours_me': {'string':'Hours to Validate', 'type':'float', 'widget':'float_time', 'help':"Estimated time for you to validate the work done by the user to whom you delegate this task."}, 'state': {'string':'Validation State', 'type':'selection', 'selection': [('pending','Pending'),('done','Done')], 'help':"New state of your own task. Pending will be reopened automatically when the delegated task is closed.", 'required':True}, @@ -60,7 +60,7 @@ class wizard_delegate(wizard.interface): 'remaining_hours': data['form']['planned_hours'], 'parent_id': data['id'], 'state': 'open', - 'description': data['form']['include_info'] and task.description or '', + 'description': data['form']['new_task_description'] or '', 'child_ids': [], 'work_ids': [] }) @@ -87,7 +87,7 @@ class wizard_delegate(wizard.interface): 'planned_hours': task.remaining_hours, 'planned_hours_me': 1.0, 'prefix': _('CHECK: ')+ newname, - 'include_info': 1, + 'new_task_description': task.description, 'state': 'pending' }