diff options
| author | Christophe Simonis <chs@openerp.com> | 2013-11-25 16:00:54 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2013-11-25 16:00:54 +0100 |
| commit | bb1e256f5b24bb4fc4b64e1fa973f86a30e4bace (patch) | |
| tree | 95f1de1c67b507b0d10786d04aa0f98bcd22243a /addons/procurement/procurement_workflow.xml | |
| parent | f148061b9455e39d3b3e6f316a5c7d586e1aad88 (diff) | |
| parent | 7baee2822180db919e6754f04c0fa9bc8aaafe92 (diff) | |
[MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
bzr revid: chs@openerp.com-20131125150054-b135qshkx6icakgk
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"> |