From 285e188e672438ca6744e23d2748afa66dc6bffb Mon Sep 17 00:00:00 2001
From: Mohammad Alhashash <alhashash@centrivision.com>
Date: Sun, 23 Jun 2013 10:27:53 +0200
Subject: Fix bug lp:1193779; Pull flows do not create procurement internal
 moves.

bzr revid: alhashash@centrivision.com-20130623082753-n4q6na1qttiiay9z
---
 addons/procurement/procurement_workflow.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/procurement/procurement_workflow.xml')

diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml
index 76b54370ef2..fce74af4f1c 100644
--- a/addons/procurement/procurement_workflow.xml
+++ b/addons/procurement/procurement_workflow.xml
@@ -153,7 +153,7 @@
             -->
             <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">
-- 
cgit v1.2.3


From a382e0cc2e5e2e20c73d8a0aa576bc50afaf46ea Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 12 Nov 2013 16:17:47 +0100
Subject: [FIX] procurement: magic bypass transition was incomplete and
 preventing pulled flows from working

The procurement workflow has a magic `bypass` transition
that acts as a fallback for MTO procurements in case the
necessary modules are not (yet) installed. For example
it will consider a MTO+Buy procurement directly satisfied
if the Purchase module is not yet installed.
However this bypass transition did not properly take
"internal pulled flows" into account, which are added
by the `stock_location` module as a third kind of procurement
type. In this case the bypass would match and never
give stock_location the chance to run.
In order to be consistent with the other procurement
methods, the bypass transition needs to be adapted.

Also updated the check_move() method to make it more
explicit rather than a side-effect.

bzr revid: odo@openerp.com-20131112151747-da67h4yavhz3k29c
---
 addons/procurement/procurement_workflow.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'addons/procurement/procurement_workflow.xml')

diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml
index fce74af4f1c..d4068a6eada 100644
--- a/addons/procurement/procurement_workflow.xml
+++ b/addons/procurement/procurement_workflow.xml
@@ -147,9 +147,11 @@
 
         <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"/>
-- 
cgit v1.2.3