From dc00c1ea7892a4baf24a38a021a5defb64888c49 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Tue, 18 Sep 2012 16:57:52 +0530 Subject: [PATCH] [IMP] stock: solved issue of return shipment bzr revid: cha@tinyerp.com-20120918112752-8uxqchz0dxjt6vhj --- addons/stock/wizard/stock_return_picking.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py index bc4cf652cdb..22bee56903e 100644 --- a/addons/stock/wizard/stock_return_picking.py +++ b/addons/stock/wizard/stock_return_picking.py @@ -72,9 +72,10 @@ class stock_return_picking(osv.osv_memory): res.update({'invoice_state': 'none'}) return_history = self.get_return_history(cr, uid, record_id, context) for line in pick.move_lines: - qty = line.product_qty - return_history[line.id] - if qty > 0: - result1.append({'product_id': line.product_id.id, 'quantity': qty,'move_id':line.id}) + if (return_history.get(line.id) is not None) and (line.product_qty * line.product_uom.factor > return_history[line.id]): + qty = line.product_qty - return_history[line.id] + if qty > 0: + result1.append({'product_id': line.product_id.id, 'quantity': qty,'move_id':line.id}) if 'product_return_moves' in fields: res.update({'product_return_moves': result1}) return res