Merge lp:~openerp-dev/openobject-addons/6.1-sale-mrp-perf-mat into lp:openobject-addons/6.1

[Martin Trigaux (OpenERP)]

Trying to improve performances for confirmation of sale confirmation, opw 598233

Unmerged revisions

7253. By Martin Trigaux (OpenERP) on 2013-09-24

[FIX] sale: initiate list

7252. By Martin Trigaux (OpenERP) on 2013-09-24

[IMP] sale: revert commented block

7251. By Martin Trigaux (OpenERP) on 2013-09-24

[IMP] stock: performance improvements while confirming stock moves with many lines

=== modified file 'sale/sale.py'
--- sale/sale.py	2012-10-09 12:16:14 +0000
+++ sale/sale.py	2013-10-11 08:31:46 +0000
@@ -817,7 +817,7 @@
         picking_obj = self.pool.get('stock.picking')
         procurement_obj = self.pool.get('procurement.order')
         proc_ids = []
-
+        stock_move_ids = []
         for line in order_lines:
             if line.state == 'done':
                 continue
@@ -828,7 +828,8 @@
                 if line.product_id.product_tmpl_id.type in ('product', 'consu'):
                     if not picking_id:
                         picking_id = picking_obj.create(cr, uid, self._prepare_order_picking(cr, uid, order, context=context))
-                    move_id = move_obj.create(cr, uid, self._prepare_order_line_move(cr, uid, order, line, picking_id, date_planned, context=context))
+                    move_id = move_obj.create(cr, uid, self._prepare_order_line_move(cr, uid, order, line, False, date_planned, context=context))
+                    stock_move_ids.append(move_id)
                 else:
                     # a service has no stock move
                     move_id = False
@@ -837,14 +838,13 @@
                 proc_ids.append(proc_id)
                 line.write({'procurement_id': proc_id})
                 self.ship_recreate(cr, uid, order, line, move_id, proc_id)
-
+        if picking_id:
+            move_obj.write(cr, uid, stock_move_ids, {'picking_id': picking_id}, context=context)
         wf_service = netsvc.LocalService("workflow")
         if picking_id:
             wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
-
         for proc_id in proc_ids:
             wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
-
         val = {}
         if order.state == 'shipping_except':
             val['state'] = 'progress'
 
=== modified file 'stock/stock.py'
--- stock/stock.py	2013-10-02 13:19:11 +0000
+++ stock/stock.py	2013-10-11 08:31:46 +0000
@@ -1947,7 +1947,6 @@
                     'location_id': move.location_dest_id.id,
                     'location_dest_id': loc.id,
                     'date_moved': time.strftime('%Y-%m-%d'),
-                    'picking_id': pickid,
                     'state': 'waiting',
                     'company_id': company_id or res_obj._company_default_get(cr, uid, 'stock.company', context=context)  ,
                     'move_history_ids': [],
@@ -1960,6 +1959,7 @@
                 })
                 new_moves.append(self.browse(cr, uid, [new_id])[0])
             if pickid:
+                move_obj.write(cr, uid, [m.id for m in new_moves], {'picking_id': pickid}, context=context)
                 wf_service.trg_validate(uid, 'stock.picking', pickid, 'button_confirm', cr)
         if new_moves:
             new_moves += self.create_chained_picking(cr, uid, new_moves, context)