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

Proposed by Yann Papouin
Status: Merged
Merged at revision: 6830
Proposed branch: lp://staging/~yann-papouin/ocb-addons/6.1-bug-1104766-ignore-canceled-moves
Merge into: lp://staging/ocb-addons/6.1
Diff against target: 25 lines (+5/-4)
1 file modified
stock/wizard/stock_return_picking.py (+5/-4)
To merge this branch: bzr merge lp://staging/~yann-papouin/ocb-addons/6.1-bug-1104766-ignore-canceled-moves
Reviewer Review Type Date Requested Status
Sandy Carter (http://www.savoirfairelinux.com) code review, pep8 Needs Fixing
Yannick Vaucher @ Camptocamp code review, no test Approve
Holger Brunn (Therp) code review Approve
Review via email: mp+197753@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Holger Brunn (Therp) (hbrunn) wrote :

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

review: Approve (code review)
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :

forward port of bug fix in 6.1

Thanks

review: Approve (code review, no test)
Revision history for this message
Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter) wrote :

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)
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :

Missed the target with my comment :/

Already merged

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches