Merge lp:~therp-nl/openobject-addons/lp1155569 into lp:openobject-addons

[Holger Brunn (Therp)]

[FIX] don't include adjacent bom's products into check for recursion

Unmerged revisions

8796. By Holger Brunn (Therp) on 2013-03-15

[FIX] don't include adjacent bom's products into check for recursion

=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2013-03-05 11:14:50 +0000
+++ mrp/mrp.py	2013-03-15 11:48:37 +0000
@@ -244,19 +244,17 @@
         return True
 
     def _check_product(self, cr, uid, ids, context=None):
-        all_prod = []
         boms = self.browse(cr, uid, ids, context=context)
-        def check_bom(boms):
+        def check_bom(boms, all_prod):
             res = True
             for bom in boms:
                 if bom.product_id.id in all_prod:
-                    res = res and False
-                all_prod.append(bom.product_id.id)
+                    return False
                 lines = bom.bom_lines
                 if lines:
-                    res = res and check_bom([bom_id for bom_id in lines if bom_id not in boms])
+                    res = res and check_bom([bom_id for bom_id in lines if bom_id not in boms], all_prod + [bom.product_id.id])
             return res
-        return check_bom(boms)
+        return check_bom(boms, [])
 
     _constraints = [
         (_check_recursion, 'Error ! You cannot create recursive BoM.', ['parent_id']),