diff options
| author | Olivier Dony <odo@openerp.com> | 2013-11-20 15:43:18 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2013-11-20 15:43:18 +0100 |
| commit | 44664076dadd1676f6e6f528b7fc59f810aaf5c6 (patch) | |
| tree | c00b2f60f57ad4d2df474ec13a156e45abe36bec /addons/procurement/procurement_workflow.xml | |
| parent | f534c7e3f2dc8bff7ebff27ad8c94c0353ea9f58 (diff) | |
| parent | 5a0e603589d2c07045eb64452a52f117f93d1292 (diff) | |
[MERGE] Forward-port of latest 7.0 fixes up to rev 9618 rev-id: dle@openerp.com-20131120142131-s333lyva85cyn41o
bzr revid: odo@openerp.com-20131120144059-yyh7emvgdarff09b
bzr revid: odo@openerp.com-20131120144318-11nmn1zj00zmi10z
Diffstat (limited to 'addons/procurement/procurement_workflow.xml')
| -rw-r--r-- | addons/procurement/procurement_workflow.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml index 76b54370ef2..d4068a6eada 100644 --- a/addons/procurement/procurement_workflow.xml +++ b/addons/procurement/procurement_workflow.xml @@ -147,13 +147,15 @@ <record id="trans_confirm_mto_make_done" model="workflow.transition"> <!-- This transition is there to unblock products that would be in MTO with a supply method that would be - produce or buy without MRP or purchase module installed. These modules overwrite the check_produce() + produce or buy, and without MRP or Purchase modules installed. These modules overwrite the check_produce() and check_buy() methods -so that it invalidates their part of this 'bypass transition'-, and define their own workflow paths. + The stock_location module also introduces a check_move() alternative, for pulled flows that are + satisfied with an internal product move. This yields a threefold test for the bypass transition. --> <field name="act_from" ref="act_confirm_mto"/> <field name="act_to" ref="act_make_done"/> - <field name="condition">not check_produce() and not check_buy()</field> + <field name="condition">not check_produce() and not check_buy() and not check_move()</field> </record> <record id="trans_make_to_stock_make_done" model="workflow.transition"> |