Merge lp:~serpentcs/openobject-addons/fix-1319281-stock into lp:openobject-addons/7.0

[Serpent Consulting Services]

Unmerged revisions

10066. By Serpent Consulting Services on 2014-06-11

[FIX] stock : when doing a return, only DONE moves should be considered

=== modified file 'stock/wizard/stock_return_picking.py'
--- stock/wizard/stock_return_picking.py	2013-09-09 15:25:01 +0000
+++ stock/wizard/stock_return_picking.py	2014-06-11 15:36:38 +0000
@@ -73,8 +73,9 @@
                     res.update({'invoice_state': '2binvoiced'})
                 else:
                     res.update({'invoice_state': 'none'})
-            return_history = self.get_return_history(cr, uid, record_id, context)       
-            for line in pick.move_lines:
+            return_history = self.get_return_history(cr, uid, record_id, context)
+            LINES = [x for x in pick.move_lines if x.state == 'done']
+            for line in LINES:
                 qty = line.product_qty - return_history.get(line.id, 0)
                 if qty > 0:
                     result1.append({'product_id': line.product_id.id, 'quantity': qty,'move_id':line.id, 'prodlot_id': line.prodlot_id and line.prodlot_id.id or False})