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

[Holger Brunn (Therp)]

For discussion, please see the bug report

Unmerged revisions

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

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

[MERGE] Merge from trunk test

9702. By Olivier Dony (Odoo) on 2014-04-28

[IMP] product: simplify legacy useless code

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2014-05-02 13:03:52 +0000
+++ purchase/purchase.py	2014-05-06 13:14:02 +0000
@@ -733,6 +733,13 @@
         todo_moves = []
         new_group = self.pool.get("procurement.group").create(cr, uid, {'name': order.name, 'partner_id': order.partner_id.id}, context=context)
 
+        if context is None:
+            context = {}
+
+        context = dict(
+            context,
+            no_store_function=True)
+
         for order_line in order_lines:
             if not order_line.product_id:
                 continue
@@ -742,6 +749,12 @@
                     move = stock_move.create(cr, uid, vals, context=context)
                     todo_moves.append(move)
 
+        for order, model_name, ids, fields in stock_move._store_get_values(
+                cr, uid, todo_moves, list(set(stock_move._columns.keys() +
+                                              stock_move._inherits.values())),
+                context):
+            self.pool[model_name]._store_set_values(cr, uid, ids, fields,
+                                                    context)
         todo_moves = stock_move.action_confirm(cr, uid, todo_moves)
         stock_move.force_assign(cr, uid, todo_moves)