From c04e93ee33508e03613afd2d183de4e0494654b9 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 22 Sep 2010 18:20:36 +0530
Subject: [PATCH] [IMP] stock: Improve the Return picking wizard

bzr revid: sbh@tinyerp.com-20100922125036-4rp33dgc27n0tn4t
---
 addons/stock/wizard/stock_return_picking.py | 36 ++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 504563c230d..9f34bbc5fac 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -158,25 +158,25 @@ class stock_return_picking(osv.osv_memory):
                         'move_lines':[], 'state':'draft', 'type':new_type,
                         'date':date_cur, 'invoice_state':data['invoice_state'],})
             new_location=move.location_dest_id.id
+            if move.state=='done':
+                new_qty = data['return%s' % move.id]
+                returned_qty = move.product_qty
     
-            new_qty = data['return%s' % move.id]
-            returned_qty = move.product_qty
-    
-            for rec in move.move_history_ids2:
-                returned_qty -= rec.product_qty
-    
-            if returned_qty != new_qty:
-                set_invoice_state_to_none = False
-    
-            new_move=move_obj.copy(cr, uid, move.id, {
-                'product_qty': new_qty,
-                '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,
-                'date':date_cur,})
-            move_obj.write(cr, uid, [move.id], {'move_history_ids2':[(4,new_move)]})
-    
+                for rec in move.move_history_ids2:
+                    returned_qty -= rec.product_qty
+        
+                if returned_qty != new_qty:
+                    set_invoice_state_to_none = False
+        
+                new_move=move_obj.copy(cr, uid, move.id, {
+                    'product_qty': new_qty,
+                    '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,
+                    'date':date_cur,})
+                move_obj.write(cr, uid, [move.id], {'move_history_ids2':[(4,new_move)]})
+        
         if set_invoice_state_to_none:
             pick_obj.write(cr, uid, [pick.id], {'invoice_state':'none'})
         if new_picking: