diff options
| author | Paramjit Singh Sahota <psa@tinyerp.com> | 2013-12-24 11:01:25 +0530 |
|---|---|---|
| committer | Paramjit Singh Sahota <psa@tinyerp.com> | 2013-12-24 11:01:25 +0530 |
| commit | 18d8368ee11eef0a74bacdb8f293414331bfa8da (patch) | |
| tree | fc21df70cbd2901396c2bcf2fee0b52d750abd43 /addons/procurement/procurement_workflow.xml | |
| parent | 5900672160c2bd5ae1d9257f20dbb5c51a193996 (diff) | |
| parent | 123185757f51ee7e146d7295864556999d2a6938 (diff) | |
[MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-al
bzr revid: psa@tinyerp.com-20131224053125-3lrogsrgd3ccp0i6
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"> |