bzr revid: fp@tinyerp.com-20081027130636-ano4ijfhclsjfpc0
This commit is contained in:
Fabien Pinckaers
2008-10-27 14:06:36 +01:00
parent 22a16e1b13
commit 66985dc511
2 changed files with 5 additions and 4 deletions
+2 -2
View File
@@ -248,10 +248,10 @@
<newline/>
<group col="11" colspan="4">
<field name="state" select="1"/>
<button name="do_draft" states="open" string="Set Draft" type="object"/>
<button name="do_draft" states="open" string="Draft" type="object"/>
<button name="do_open" states="pending,draft" string="Open" type="object"/>
<button name="do_reopen" states="done,cancelled" string="Re-open" type="object"/>
<button name="do_pending" states="open" string="Set Pending" type="object"/>
<button name="do_pending" states="open" string="Pending" type="object"/>
<button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open" string="Delegate" type="action"/>
<button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action"/>
<button name="do_cancel" states="draft,open,pending" string="Cancel" type="object"/>
+3 -2
View File
@@ -52,7 +52,7 @@ ask_fields = {
'include_info': {'string':'Copy Description', 'type':'boolean', '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."},
'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},
}
class wizard_delegate(wizard.interface):
@@ -69,7 +69,8 @@ class wizard_delegate(wizard.interface):
'parent_id': data['id'],
'state': 'open',
'description': data['form']['include_info'] and task.description or '',
'child_ids': []
'child_ids': [],
'work_ids': []
})
task_obj.write(cr, uid, data['id'], {
'remaining_hours': data['form']['planned_hours_me'],