merge
lp bug: https://launchpad.net/bugs/812322 fixed bzr revid: fp@tinyerp.com-20110924093719-s9r6u0iir5ehfm3s
This commit is contained in:
parent
382a1cd590
commit
1d8c15f5ee
|
@ -37,13 +37,6 @@
|
|||
<field name="action">action_done()</field>
|
||||
<field name="flow_stop">True</field>
|
||||
</record>
|
||||
<record id="act_cancel_inv" model="workflow.activity">
|
||||
<field name="wkf_id" ref="wkf_picking"/>
|
||||
<field name="name">cancel</field>
|
||||
<field name="flow_stop">True</field>
|
||||
<field name="kind">function</field>
|
||||
<field name="action">action_cancel()</field>
|
||||
</record>
|
||||
|
||||
<record id="act_cancel" model="workflow.activity">
|
||||
<field name="wkf_id" ref="wkf_picking"/>
|
||||
|
@ -121,11 +114,6 @@
|
|||
<field name="act_to" ref="act_cancel"/>
|
||||
<field name="condition">test_cancel()</field>
|
||||
</record>
|
||||
<record id="trans_draft_cancel" model="workflow.transition">
|
||||
<field name="act_from" ref="act_draft"/>
|
||||
<field name="act_to" ref="act_cancel_inv"/>
|
||||
<field name="signal">button_cancel</field>
|
||||
</record>
|
||||
|
||||
<record id="trans_assigned_cancel_auto" model="workflow.transition">
|
||||
<field name="act_from" ref="act_assigned"/>
|
||||
|
|
Loading…
Reference in New Issue