Merge lp:~camptocamp/openobject-addons/6.1-fix-1075559 into lp:openobject-addons/6.1

[Alexandre Fayolle - camptocamp]

fix the computation of the move destination in the stock return picking wizard to avoid loops when the Output location of the warehouse is manually chained to the Customer location.

Unmerged revisions

7084. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-11-27

[FIX] stock_return_picking wizard: improve fix, only unravel if the location of the move is manually chained

7083. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-11-27

[FIX] stock_return_picking wizard: unchain one level of chained moves when computing customer returns

=== modified file 'stock/wizard/stock_return_picking.py'
--- stock/wizard/stock_return_picking.py	2012-06-12 16:15:51 +0000
+++ stock/wizard/stock_return_picking.py	2012-11-27 15:41:26 +0000
@@ -183,6 +183,9 @@
 
             if returned_qty != new_qty:
                 set_invoice_state_to_none = False
+            current_move = move
+            if current_move.move_history_ids2 and move.location_id.chained_auto_packing == 'manual':
+                current_move = current_move.move_history_ids2[0]
             if new_qty:
                 returned_lines += 1
                 new_move=move_obj.copy(cr, uid, move.id, {
@@ -190,7 +193,7 @@
                     'product_uos_qty': uom_obj._compute_qty(cr, uid, move.product_uom.id,
                         new_qty, move.product_uos.id),
                     'picking_id':new_picking, 'state':'draft',
-                    'location_id':new_location, 'location_dest_id':move.location_id.id,
+                    'location_id':new_location, 'location_dest_id':current_move.location_id.id,
                     'date':date_cur,})
                 move_obj.write(cr, uid, [move.id], {'move_history_ids2':[(4,new_move)]})
         if not returned_lines: