diff options
| author | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-12-14 17:39:21 +0100 |
|---|---|---|
| committer | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-12-14 17:39:21 +0100 |
| commit | 0c0c0816762185bf7153f052d186cf00910617e1 (patch) | |
| tree | d27e380f3f9fc9fc604c553bd6fce43377750ada /addons/procurement/procurement_workflow.xml | |
| parent | 3c7cd8f24d4282a284bb967ef9d2c7ddd5b8839e (diff) | |
[FIX] purchase, procurement: workflow of procurement order fixed
bzr revid: qdp-launchpad@openerp.com-20121214163921-hevj7um2n7jf8e1p
Diffstat (limited to 'addons/procurement/procurement_workflow.xml')
| -rw-r--r-- | addons/procurement/procurement_workflow.xml | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml index 1ac0453b0c5..12c20393310 100644 --- a/addons/procurement/procurement_workflow.xml +++ b/addons/procurement/procurement_workflow.xml @@ -34,6 +34,7 @@ <field name="action">write({'state':'exception'})</field> <field name="join_mode">AND</field> </record> + <!-- to check... what's the use? mrp_jit, i guess --> <record id="act_confirm_temp" model="workflow.activity"> <field name="wkf_id" ref="wkf_procurement"/> <field name="name">confirm_temp</field> @@ -47,16 +48,6 @@ <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> @@ -116,6 +107,7 @@ <field name="signal">button_check</field> <field name="condition">not test_cancel()</field> </record> + <!-- to check... what's the use? mrp_jit, i guess --> <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"/> @@ -150,18 +142,6 @@ <field name="act_to" ref="act_cancel"/> <field name="signal">button_cancel</field> </record> - <record id="trans_confirm_mto_purchase" model="workflow.transition"> - <field name="act_from" ref="act_confirm_mto"/> - <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"/> @@ -182,7 +162,7 @@ <record id="trans_confirm_mto_make_done" model="workflow.transition"> <field name="act_from" ref="act_confirm_mto"/> <field name="act_to" ref="act_make_done"/> - <field name="condition">not check_produce()</field> + <field name="condition">not check_produce() and not check_buy()</field> </record> <record id="trans_make_to_stock_make_done" model="workflow.transition"> |