Merge lp:~therp-nl/openobject-addons/trunk-wms-mrp-performance into lp:~openerp-dev/openobject-addons/trunk-wms

[Holger Brunn (Therp)]

Unmerged revisions

9713. By Holger Brunn (Therp) on 2014-05-11

[FIX] safeguard against empty context

9712. By Holger Brunn (Therp) on 2014-05-11

[IMP] performance tweaks

9711. By Holger Brunn (Therp) on 2014-05-06

[IMP] defer processing store function fields when bulk creating stock
moves

9710. By Quentin (OpenERP) <email address hidden> on 2014-05-05

[FIX] warehouse config for resuply warehouses

9709. By Quentin (OpenERP) <email address hidden> on 2014-05-05

[FIX] fixes

9708. By Quentin (OpenERP) <email address hidden> on 2014-05-05

[REV] revert of a partially wrong commit introduced in a previous merge with trunk and detected during the code review

9707. By Quentin (OpenERP) <email address hidden> on 2014-05-05

[REF] product: get_price_history refactored and moved in product.template object

9706. By Josse Colpaert (OpenERP) on 2014-05-05

[IMP] Correct js assets for barcode scanner

9705. By Josse Colpaert (OpenERP) on 2014-05-02

[IMP] Picking type instead of warehouse in PoS

9704. By Josse Colpaert (OpenERP) on 2014-05-02

[DEL] Delete boards

=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2014-05-08 11:59:17 +0000
+++ mrp/mrp.py	2014-05-12 07:44:38 +0000
@@ -1044,17 +1044,28 @@
         """
         uncompute_ids = filter(lambda x: x, [not x.product_lines and x.id or False for x in self.browse(cr, uid, ids, context=context)])
         self.action_compute(cr, uid, uncompute_ids, context=context)
+        stock_moves = []
         for production in self.browse(cr, uid, ids, context=context):
             self._make_production_produce_line(cr, uid, production, context=context)
 
-            stock_moves = []
             for line in production.product_lines:
-                stock_move_id = self._make_production_consume_line(cr, uid, line, context=context)
+                stock_move_id = self._make_production_consume_line(
+                    cr, uid, line, context=dict(context or {},
+                                                no_store_function=True))
                 if stock_move_id:
                     stock_moves.append(stock_move_id)
-            if stock_moves:
-                self.pool.get('stock.move').action_confirm(cr, uid, stock_moves, context=context)
-            production.write({'state': 'confirmed'}, context=context)
+        
+        stock_move = self.pool['stock.move']
+        if stock_moves:
+            stock_move.action_confirm(cr, uid, stock_moves, context=context)
+
+        for order, model_name, _ids, fields in stock_move._store_get_values(
+                cr, uid, stock_moves, list(set(stock_move._columns.keys() +
+                                              stock_move._inherits.values())),
+                context):
+            self.pool[model_name]._store_set_values(cr, uid, _ids, fields,
+                                                    context)        
+        self.write(cr, uid, ids, {'state': 'confirmed'}, context=context)
         return 0
 
     def action_assign(self, cr, uid, ids, context=None):