From e5129e0316b1d6c4efa2001cd08baf2b49f02534 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 14 Dec 2011 16:01:44 +0530
Subject: [PATCH] [FIX] procurement: procurement of service product should not
 go from act_produce_check to act_make_done step.

bzr revid: hmo@tinyerp.com-20111214103144-iadq4ee2gw5fwnhd
---
 addons/procurement/procurement.py           | 9 +++++++--
 addons/procurement/procurement_workflow.xml | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 207a542df76..14b057fe4d9 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -154,11 +154,16 @@ class procurement_order(osv.osv):
             return {'value': v}
         return {}
 
-    def check_product(self, cr, uid, ids):
+    def check_product(self, cr, uid, ids, context=None):
         """ Checks product type.
         @return: True or False
         """
-        return all(procurement.product_id.type in ('product', 'consu') for procurement in self.browse(cr, uid, ids))
+        res = False
+        for procurement in self.browse(cr, uid, ids, context=context):
+            product = procurement.product_id
+            if product.type in ('product', 'consu'):
+                res = True
+        return res
 
     def check_move_cancel(self, cr, uid, ids, context=None):
         """ Checks if move is cancelled or not.
diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml
index 8bf1e4f9e16..ed0aff2d4f5 100644
--- a/addons/procurement/procurement_workflow.xml
+++ b/addons/procurement/procurement_workflow.xml
@@ -183,6 +183,7 @@
         <record id="trans_produce_make_done" model="workflow.transition">
             <field name="act_from" ref="act_produce_check"/>
             <field name="act_to" ref="procurement.act_make_done"/>
+            <field name="condition">check_product()</field>
         </record>
         <record id="trans_produce_service_make_done" model="workflow.transition">
             <field name="act_from" ref="act_produce_service"/>