Merge lp:~openerp-dev/openobject-addons/6.1-opw-590227 into lp:openobject-addons/6.1

[Ravish(OpenERP)]

Hello,

Fix the issue of : "Need to run scheduler multiple times"

Thank you..

Unmerged revisions

7191. By Ravish(OpenERP) on 2013-03-25

[MERGE]Merged with 6.1

7190. By Sylvain Garancher on 2013-03-25

[FIX] Need to run scheduler many time

=== modified file 'mrp/procurement.py'
--- mrp/procurement.py	2011-09-17 16:41:25 +0000
+++ mrp/procurement.py	2013-03-25 06:48:22 +0000
@@ -25,6 +25,8 @@
 from osv import osv
 from tools.translate import _
 import netsvc
+import itertools
+from collections import defaultdict
 
 class procurement_order(osv.osv):
     _inherit = 'procurement.order'
@@ -104,7 +106,55 @@
                 move_obj.write(cr, uid, [res_id],
                         {'location_id': procurement.location_id.id})
         return res
-    
+
+    def _procure_orderpoint_confirm(self, cr, uid, automatic=False, use_new_cursor=False, \
+                                    context=None, user_id=False, orderpoint_ids=None):
+        orderpoint_obj = self.pool.get('stock.warehouse.orderpoint')
+        mrp_bom_obj = self.pool.get('mrp.bom')
+
+        # List all components of each product
+        bom_ids = mrp_bom_obj.search(cr, uid, [('bom_id', '=', False), ('method', '=', 'stock')], context=context)
+        bom_contents = defaultdict(set)
+        for bom in mrp_bom_obj.browse(cr, uid, bom_ids, context=context):
+            bom_contents[bom.product_id.id] |= set([tmp_bom.product_id.id for tmp_bom in bom.bom_lines])
+
+        # Order product by level of bom
+        product_by_level = {}
+        current_level = 0
+        while bom_contents:
+            # List all produced products to process
+            current_product_ids = set(bom_contents.keys())
+            # List all components to process
+            current_product_components = set(itertools.chain.from_iterable(bom_contents.values()))
+            # List products to process for the current level
+            current_product_level = current_product_ids - current_product_components
+            # Protect against recursive boms : Add products which are in products AND components to current level
+            current_product_level |= current_product_ids & current_product_components
+            product_by_level[current_level] = list(current_product_level)
+            current_level += 1
+            # Remove the processed products from the list
+            for product_id in current_product_level:
+                del bom_contents[product_id]
+
+        # Compute all bom products, ordered by level
+        for level, product_ids in sorted(product_by_level.items()):
+            orderpoint_ids = orderpoint_obj.search(cr, uid, [('product_id', 'in', product_ids)], context=context)
+            super(procurement_order, self)._procure_orderpoint_confirm(
+                cr, uid, automatic=automatic, use_new_cursor=use_new_cursor, \
+                context=context, user_id=user_id, orderpoint_ids=orderpoint_ids)
+
+        # Confirm all new procurements
+        self._procure_confirm(cr, uid, use_new_cursor=use_new_cursor, context=context)
+
+        # Compute non bom products
+        product_ids = list(set(itertools.chain.from_iterable(product_by_level.values())))
+        orderpoint_ids = orderpoint_obj.search(cr, uid, [('product_id', 'not in', product_ids)], context=context)
+        ret = super(procurement_order, self)._procure_orderpoint_confirm(
+            cr, uid, automatic=automatic, use_new_cursor=use_new_cursor, \
+            context=context, user_id=user_id, orderpoint_ids=orderpoint_ids)
+
+        return ret
+
 procurement_order()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'procurement/schedulers.py'
--- procurement/schedulers.py	2012-03-16 13:40:52 +0000
+++ procurement/schedulers.py	2013-03-25 06:48:22 +0000
@@ -217,7 +217,7 @@
                 'origin': orderpoint.name}
 
     def _procure_orderpoint_confirm(self, cr, uid, automatic=False,\
-            use_new_cursor=False, context=None, user_id=False):
+            use_new_cursor=False, context=None, user_id=False, orderpoint_ids=None):
         '''
         Create procurement based on Orderpoint
         use_new_cursor: False or the dbname
@@ -242,10 +242,13 @@
         report = []
         offset = 0
         ids = [1]
+        orderpoint_domain = []
+        if orderpoint_ids is not None:
+            orderpoint_domain = [('id', 'in', orderpoint_ids)]
         if automatic:
             self.create_automatic_op(cr, uid, context=context)
         while ids:
-            ids = orderpoint_obj.search(cr, uid, [], offset=offset, limit=100)
+            ids = orderpoint_obj.search(cr, uid, orderpoint_domain, offset=offset, limit=100)
             for op in orderpoint_obj.browse(cr, uid, ids, context=context):
                 if op.procurement_id.state != 'exception':
                     if op.procurement_id and op.procurement_id.purchase_id and op.procurement_id.purchase_id.state in ('draft', 'confirmed'):