Merge lp:~camptocamp/openobject-addons/7.0-fix-1238508-nbi into lp:openobject-addons/7.0

[Nicolas Bessi - Camptocamp]

Fix of bug 1238508

[lp:~camptocamp/openobject-addons/7.0-fix-1238508-nbi]

9518. By Alexandre Fayolle - camptocamp on 2013-10-14

[IMP] add yaml test for the fix

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

works fine, and I added a test

review: Approve (code review, automated test)

Unmerged revisions

9518. By Alexandre Fayolle - camptocamp on 2013-10-14

[IMP] add yaml test for the fix

9517. By Nicolas Bessi - Camptocamp on 2013-10-11

[FIX] ensure that move are directly in state done after beeing confirmed in order to fix propagation of chaining

=== modified file 'stock/__openerp__.py'
--- stock/__openerp__.py	2013-08-23 11:58:51 +0000
+++ stock/__openerp__.py	2013-10-14 13:30:33 +0000
@@ -94,6 +94,7 @@
 #        'test/opening_stock.yml',
 #        'test/shipment.yml',
 #        'test/stock_report.yml',
+        'test/stock_move_chain_validation.yml',
     ],
     'installable': True,
     'application': True,

=== modified file 'stock/stock.py'
--- stock/stock.py	2013-10-04 10:52:18 +0000
+++ stock/stock.py	2013-10-14 13:30:33 +0000
@@ -2383,7 +2383,6 @@
                 todo.append(move.id)
         if todo:
             self.action_confirm(cr, uid, todo, context=context)
-            todo = []
 
         for move in self.browse(cr, uid, ids, context=context):
             if move.state in ['done','cancel']:
@@ -2407,12 +2406,11 @@
 
             self._create_product_valuation_moves(cr, uid, move, context=context)
             if move.state not in ('confirmed','done','assigned'):
-                todo.append(move.id)
-
-        if todo:
-            self.action_confirm(cr, uid, todo, context=context)
-
-        self.write(cr, uid, move_ids, {'state': 'done', 'date': time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)}, context=context)
+                self.action_confirm(cr, uid, [move.id], context=context)
+            self.write(cr, uid, [move.id], 
+                       {'state': 'done', 
+                       'date': time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)}, 
+                       context=context)
         for id in move_ids:
              wf_service.trg_trigger(uid, 'stock.move', id, cr)
 

=== added file 'stock/test/stock_move_chain_validation.yml'
--- stock/test/stock_move_chain_validation.yml	1970-01-01 00:00:00 +0000
+++ stock/test/stock_move_chain_validation.yml	2013-10-14 13:30:33 +0000
@@ -0,0 +1,98 @@
+-
+ I create an outgoing move for 2 LCD17
+-
+  !record {model: stock.move, id: dest_move_lcd17}:
+     product_qty: 2
+     product_id: product.product_product_7
+     product_uom: product.product_uom_unit
+     location_id: stock_location_components
+     location_dest_id: stock_location_customers
+-
+ I create 2 moves for 1 LCD17 chained with the outgoing one
+-
+  !record {model: stock.move, id: move_lcd17_1}:
+     product_qty: 1
+     product_id: product.product_product_7
+     product_uom: product.product_uom_unit
+     location_id: stock_location_stock
+     location_dest_id: stock_location_components
+     move_dest_id: dest_move_lcd17
+-
+  !record {model: stock.move, id: move_lcd17_2}:
+     product_qty: 1
+     product_id: product.product_product_7
+     product_uom: product.product_uom_unit
+     location_id: stock_location_stock
+     location_dest_id: stock_location_components
+     move_dest_id: dest_move_lcd17
+-
+ I confirm all moves
+-
+ !python {model: stock.move}: |
+   self.action_confirm(cr, uid, [ref('stock.dest_move_lcd17'),ref('stock.move_lcd17_1'),ref('stock.move_lcd17_2')], context=context)
+-
+  I process the 2 moves chained with the outgoing move
+-
+ !python {model: stock.move}: |
+   self.action_done(cr, uid, [ref('stock.move_lcd17_1'),ref('stock.move_lcd17_2')], context=context)
+-
+  the outgoing move must be assigned
+-
+ !python {model: stock.move}: |
+   move = self.browse(cr, uid, ref('stock.dest_move_lcd17'), context=context)
+   assert move.state == 'assigned', "out move was not assigned when internal moves where processed"
+-
+ I create an outgoing move for 2 LCD17
+-
+  !record {model: stock.move, id: dest_move2_lcd17}:
+     product_qty: 2
+     product_id: product.product_product_7
+     product_uom: product.product_uom_unit
+     location_id: stock_location_components
+     location_dest_id: stock_location_customers
+-
+ I create 2 moves for 1 LCD17 chained with the outgoing one
+-
+  !record {model: stock.move, id: move2_lcd17_1}:
+     product_qty: 1
+     product_id: product.product_product_7
+     product_uom: product.product_uom_unit
+     location_id: stock_location_stock
+     location_dest_id: stock_location_components
+     move_dest_id: dest_move2_lcd17
+-
+  !record {model: stock.move, id: move2_lcd17_2}:
+     product_qty: 1
+     product_id: product.product_product_7
+     product_uom: product.product_uom_unit
+     location_id: stock_location_stock
+     location_dest_id: stock_location_components
+     move_dest_id: dest_move2_lcd17
+-
+ I confirm all moves
+-
+ !python {model: stock.move}: |
+   self.action_confirm(cr, uid, [ref('stock.dest_move2_lcd17'),ref('stock.move2_lcd17_1'),ref('stock.move2_lcd17_2')], context=context)
+-
+  I process the 1st move chained with the outgoing move
+-
+ !python {model: stock.move}: |
+   self.action_done(cr, uid, [ref('stock.move2_lcd17_1')], context=context)
+-
+  the outgoing move must not be assigned
+-
+ !python {model: stock.move}: |
+   move = self.browse(cr, uid, ref('stock.dest_move2_lcd17'), context=context)
+   assert move.state != 'assigned', "out move was assigned when only 1st internal moves where processed"
+-
+  I process the 2nd move chained with the outgoing move
+-
+ !python {model: stock.move}: |
+   self.action_done(cr, uid, [ref('stock.move2_lcd17_2')], context=context)
+-
+  the outgoing move must not be assigned
+-
+ !python {model: stock.move}: |
+   move = self.browse(cr, uid, ref('stock.dest_move2_lcd17'), context=context)
+   assert move.state == 'assigned', "out move was not assigned when internal moves where processed"
+