diff options
| -rw-r--r-- | addons/mrp/mrp_workflow.xml | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/addons/mrp/mrp_workflow.xml b/addons/mrp/mrp_workflow.xml index 8be8f97b5d9..377fa790b70 100644 --- a/addons/mrp/mrp_workflow.xml +++ b/addons/mrp/mrp_workflow.xml @@ -163,8 +163,7 @@ <record id="act_produce" model="workflow.activity"> <field name="wkf_id" ref="wkf"/> <field name="name">produce</field> - <field name="kind">subflow</field> - <field name="subflow_id" search="[('osv','=','mrp.production')]"/> + <field name="kind">function</field> <field name="action">action_produce_assign_product()</field> </record> <record id="act_produce_check" model="workflow.activity"> @@ -180,8 +179,7 @@ <record id="act_buy" model="workflow.activity"> <field name="wkf_id" ref="wkf"/> <field name="name">buy</field> - <field name="kind">subflow</field> - <field name="subflow_id" search="[('osv','=','purchase.order')]"/> + <field name="kind">function</field> <field name="action">action_po_assign()</field> </record> <record id="act_make_done" model="workflow.activity"> @@ -308,26 +306,16 @@ <field name="trigger_model" eval="False"/> <field name="trigger_expr_id" eval="False"/> </record> - <record id="trans_produce_cancel" model="workflow.transition"> - <field name="act_from" ref="act_produce"/> - <field name="act_to" ref="act_cancel"/> - <field name="signal">subflow.cancel</field> - </record> <record id="trans_produce_service_cancel" model="workflow.transition"> <field name="act_from" ref="act_produce_service"/> <field name="act_to" ref="act_cancel"/> <field name="signal">subflow.cancel</field> </record> - <record id="trans_buy_cancel" model="workflow.transition"> - <field name="act_from" ref="act_buy"/> - <field name="act_to" ref="act_cancel"/> - <field name="signal">subflow.cancel</field> - </record> <record id="trans_produce_make_done" model="workflow.transition"> <field name="act_from" ref="act_produce"/> <field name="act_to" ref="act_make_done"/> - <field name="signal">subflow.done</field> + <field name="signal" eval="False"/> </record> <record id="trans_produce_service_make_done" model="workflow.transition"> @@ -337,12 +325,14 @@ <record id="trans_buy_make_done" model="workflow.transition"> <field name="act_from" ref="act_buy"/> <field name="act_to" ref="act_make_done"/> - <field name="signal">subflow.delivery_done</field> + <field name="signal" eval="False"/> </record> <record id="trans_make_done_done" model="workflow.transition"> <field name="act_from" ref="act_make_done"/> <field name="act_to" ref="act_done"/> - <field name="condition">action_check_finnished()</field> + <field name="condition">action_check_finnished() or (not move_id)</field> + <field name="trigger_model">stock.move</field> + <field name="trigger_expr_id">[move_id.id]</field> </record> <record id="trans_make_done_confirm" model="workflow.transition"> <field name="act_from" ref="act_make_done"/> |