Merge lp:~yann-papouin/ocb-addons/6.1-bug-1104766-ignore-canceled-moves into lp:ocb-addons/6.1

[Yann Papouin]

[Holger Brunn (Therp) (hbrunn)]

lines 8ff differ from the fix proposed against, but that's a good thing in my opinion

review: Approve (code review)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

forward port of bug fix in 6.1

Thanks

review: Approve (code review, no test)

[Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter)]

PEP8:
l.11 W603 '<>' is deprecated, use '!='
l.14 E231 missing whitespace after ','
l.14 E231 missing whitespace after ':'

review: Needs Fixing (code review, pep8)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Missed the target with my comment :/

Already merged

=== modified file 'stock/wizard/stock_return_picking.py'
--- stock/wizard/stock_return_picking.py	2013-12-02 12:17:08 +0000
+++ stock/wizard/stock_return_picking.py	2013-12-04 16:35:49 +0000
@@ -72,9 +72,10 @@
                     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 line.state <> 'cancel':
+                    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
@@ -128,7 +129,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