Merge lp:~openerp-dev/openobject-addons/trunk-bug-1104766-hip into lp:openobject-addons

[Hiral Patel (OpenERP)]

[Ajay Patel (OpenERP) (ajay-openerp)]

seems ok..

Thanks,
Amit

review: Approve

Unmerged revisions

8518. By Hiral Patel (OpenERP) on 2013-01-25

[trunk][FIX] Product Return Canceled

=== modified file 'stock/wizard/stock_return_picking.py'
--- stock/wizard/stock_return_picking.py	2012-12-18 17:55:47 +0000
+++ stock/wizard/stock_return_picking.py	2013-01-25 12:40:31 +0000
@@ -128,7 +128,7 @@
                     # a valid return move will be the exact opposite of ours:
                     #     (src location, dest location) <=> (dest location, src location))
                     if rec.location_dest_id.id == m.location_id.id \
-                        and rec.location_id.id == m.location_dest_id.id:
+                        and rec.location_id.id == m.location_dest_id.id and rec.state != 'cancel':
                         return_history[m.id] += (rec.product_qty * rec.product_uom.factor)
         return return_history