diff options
| author | Arnaud Pineux <api@openerp.com> | 2012-12-07 12:53:04 +0100 |
|---|---|---|
| committer | Arnaud Pineux <api@openerp.com> | 2012-12-07 12:53:04 +0100 |
| commit | ef0b59cb8506bb55724326a8dfd94cc0355c7c81 (patch) | |
| tree | bab585f74b673a5cd582d6864bf54c08bec988d1 /addons/procurement/procurement_workflow.xml | |
| parent | 538834d9c34e3bd54e984e8bf03953260399a22e (diff) | |
[FIX] WORKFLOW: avoid overwriting transitions for clean uninstallation
bzr revid: api@openerp.com-20121207115304-3uhsbnhv8i3g4qdx
Diffstat (limited to 'addons/procurement/procurement_workflow.xml')
| -rw-r--r-- | addons/procurement/procurement_workflow.xml | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml index 53b6608fa6f..4215f9b0ac5 100644 --- a/addons/procurement/procurement_workflow.xml +++ b/addons/procurement/procurement_workflow.xml @@ -31,6 +31,12 @@ <field name="name">confirm_wait</field> <field name="kind">function</field> <field name="action">write({'state':'exception'})</field> + <field name="join_mode">AND</field> + </record> + <record id="act_confirm_temp" model="workflow.activity"> + <field name="wkf_id" ref="wkf_procurement"/> + <field name="name">confirm_temp</field> + <field name="slip_mode">OR</field> </record> <record id="act_confirm_mts" model="workflow.activity"> <field name="wkf_id" ref="wkf_procurement"/> @@ -40,6 +46,16 @@ <field name="wkf_id" ref="wkf_procurement"/> <field name="name">confirm_mto</field> </record> + <record id="act_buy" model="workflow.activity"> + <field name="wkf_id" ref="wkf_procurement"/> + <field name="name">buy</field> + <field name="split_mode">OR</field> + </record> + <record id="act_buy_end" model="workflow.activity"> + <field name="wkf_id" ref="wkf_procurement"/> + <field name="name">buy_end</field> + <field name="join_mode">AND</field> + </record> <record id="act_make_to_stock" model="workflow.activity"> <field name="wkf_id" ref="wkf_procurement"/> <field name="name">make_to_stock</field> @@ -106,10 +122,14 @@ </record> <record id="trans_confirm_confirm_wait" model="workflow.transition"> <field name="act_from" ref="act_confirm"/> - <field name="act_to" ref="act_confirm_wait"/> + <field name="act_to" ref="act_confirm_temp"/> <field name="signal">button_check</field> <field name="condition">not test_cancel()</field> </record> + <record id="trans_confirm_temp_confirm_wait" model="workflow.transition"> + <field name="act_from" ref="act_confirm_temp"/> + <field name="act_to" ref="act_confirm_wait"/> + </record> <record id="trans_confirm_wait_confirm_mto" model="workflow.transition"> <field name="act_from" ref="act_confirm_wait"/> <field name="act_to" ref="act_confirm_mto"/> @@ -142,9 +162,17 @@ </record> <record id="trans_confirm_mto_purchase" model="workflow.transition"> <field name="act_from" ref="act_confirm_mto"/> - <field name="act_to" ref="act_make_done"/> + <field name="act_to" ref="act_buy"/> <field name="condition">check_buy()</field> </record> + <record id="trans_buy_buy_end" model="workflow.transition"> + <field name="act_from" ref="act_buy"/> + <field name="act_to" ref="act_buy_end"/> + </record> + <record id="trans_buy_done" model="workflow.transition"> + <field name="act_from" ref="act_buy_end"/> + <field name="act_to" ref="act_make_done"/> + </record> <record id="trans_confirm_mto_confirm" model="workflow.transition"> <field name="act_from" ref="act_confirm_mto"/> <field name="act_to" ref="act_confirm"/> |