HR_TIMESHEET_SHEET: fix workflow
bzr revid: ced-b83bc1fb87c00d058996c8968f82e3b303f3d259
This commit is contained in:
parent
3c9e4b6679
commit
ef4159c2c3
|
@ -248,10 +248,6 @@ class hr_timesheet_sheet(osv.osv):
|
|||
'date_to' : _default_date_to,
|
||||
'state': lambda *a: 'new',
|
||||
}
|
||||
def create(self, cr, uid, vals, *args, **kwargs):
|
||||
if 'state' in vals and vals['state'] == 'new':
|
||||
vals['state']='draft'
|
||||
return super(hr_timesheet_sheet, self).create(cr, uid, vals, *args, **kwargs)
|
||||
|
||||
def _sheet_date(self, cr, uid, ids):
|
||||
for sheet in self.browse(cr, uid, ids):
|
||||
|
|
|
@ -16,12 +16,18 @@
|
|||
<field name="on_create">True</field>
|
||||
</record>
|
||||
|
||||
<record model="workflow.activity" id="act_new">
|
||||
<field name="wkf_id" ref="wkf_timesheet" />
|
||||
<field name="name">new</field>
|
||||
<field name="kind">function</field>
|
||||
<field name="action">write({'state':'new'})</field>
|
||||
<field name="flow_start">True</field>
|
||||
</record>
|
||||
<record model="workflow.activity" id="act_draft">
|
||||
<field name="wkf_id" ref="wkf_timesheet" />
|
||||
<field name="name">draft</field>
|
||||
<field name="kind">function</field>
|
||||
<field name="action">write({'state':'draft'})</field>
|
||||
<field name="flow_start">True</field>
|
||||
</record>
|
||||
<record model="workflow.activity" id="act_confirm">
|
||||
<field name="wkf_id" ref="wkf_timesheet" />
|
||||
|
@ -34,8 +40,13 @@
|
|||
<field name="name">done</field>
|
||||
<field name="kind">function</field>
|
||||
<field name="action">write({'state':'done'})</field>
|
||||
<field name="flow_stop">True</field>
|
||||
</record>
|
||||
|
||||
<record model="workflow.transition" id="t0">
|
||||
<field name="act_from" ref="act_new"/>
|
||||
<field name="act_to" ref="act_draft"/>
|
||||
</record>
|
||||
<record model="workflow.transition" id="t1">
|
||||
<field name="act_from" ref="act_draft" />
|
||||
<field name="act_to" ref="act_confirm" />
|
||||
|
|
Loading…
Reference in New Issue