From bb3b2ab637eeb259b96e8298995dd86aa5c1cb93 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 15 Oct 2010 15:27:25 +0200
Subject: [PATCH] [FIX] stock_location: avoid possible recursion in workflow,
 plus make source location required for pulled flow

bzr revid: odo@openerp.com-20101015132725-2cwi0tiwb4xbjhmw
---
 addons/stock_location/procurement_pull.py     | 2 --
 addons/stock_location/stock_location_view.xml | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/stock_location/procurement_pull.py b/addons/stock_location/procurement_pull.py
index 8b780d7a7a6..31316bf4eae 100644
--- a/addons/stock_location/procurement_pull.py
+++ b/addons/stock_location/procurement_pull.py
@@ -42,8 +42,6 @@ class procurement_order(osv.osv):
         for procurement in self.browse(cr, uid, ids):
             for line in procurement.product_id.flow_pull_ids:
                 if line.location_id==procurement.location_id:
-                    if not line.location_src_id:
-                        self.write(cr, uid, procurement.id, {'message': _('No source location defined to generate the picking !')})
                     return (line.type_proc=='move') and (line.location_src_id)
         return False
 
diff --git a/addons/stock_location/stock_location_view.xml b/addons/stock_location/stock_location_view.xml
index eca4ade39fa..96d3fd84809 100644
--- a/addons/stock_location/stock_location_view.xml
+++ b/addons/stock_location/stock_location_view.xml
@@ -43,7 +43,7 @@
                     <page string="Logistic Flow">
                         <field name="flow_pull_ids" editable="bottom" colspan="4" nolabel="1">
                             <tree string="Pulled flows">
-                                <field name="location_id"/>
+                                <field name="location_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
                                 <field name="type_proc"/>
                                 <field name="name"/>
                                 <field name="company_id" groups="base.group_multi_company"/>
@@ -59,7 +59,7 @@
                                 <field name="company_id" groups="base.group_multi_company"/>
                                 <newline/>
                                 <group col="4" colspan="4" attrs="{'invisible':[('type_proc','!=','move')]}">
-                                    <field name="location_src_id"/>
+                                    <field name="location_src_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
                                     <field name="picking_type"/>
                                     <field name="partner_address_id"/>
                                     <field name="procure_method"/>