Hiral Patel (OpenERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-bug-1104766-hip into 
lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #1104766 in OpenERP Addons: "Product Return Canceled"
  https://bugs.launchpad.net/openobject-addons/+bug/1104766

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1104766-hip/+merge/144917
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1104766-hip/+merge/144917
Your team OpenERP R&D Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-1104766-hip.
=== 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
 

_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to     : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help   : https://help.launchpad.net/ListHelp

Reply via email to