Merge lp:~therp-nl/ocb-addons/lp1250053 into lp:ocb-addons

Proposed by Holger Brunn (Therp)
Status: Merged
Approved by: Yannick Vaucher @ Camptocamp
Approved revision: no longer in the source branch.
Merged at revision: 10001
Proposed branch: lp:~therp-nl/ocb-addons/lp1250053
Merge into: lp:ocb-addons
Diff against target: 12 lines (+2/-0)
1 file modified
stock/stock.py (+2/-0)
To merge this branch: bzr merge lp:~therp-nl/ocb-addons/lp1250053
Reviewer Review Type Date Requested Status
Yannick Vaucher @ Camptocamp Approve
Alexandre Fayolle - camptocamp Needs Fixing
Omar (Pexego) code review, no test Approve
Lara (Therp) (community) test Approve
Review via email: mp+197404@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Lara (Therp) (lfreeke) :
review: Approve (test)
Revision history for this message
Omar (Pexego) (omar7r) :
review: Approve (code review, no test)
Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

Hi holger, I tested the fix, and it looks good to me. I was about to merge it when I noticed there is no corresponding MP on the official addons. Could you please create it? Then I'll proceed with merging.

review: Needs Fixing
Revision history for this message
Holger Brunn (Therp) (hbrunn) wrote :

Thanks for the pointer, I added the MP for trunk

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

Fix dupplicated for official addons

LGTM

Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stock/stock.py'
2--- stock/stock.py 2013-11-21 15:32:30 +0000
3+++ stock/stock.py 2013-12-02 15:26:24 +0000
4@@ -863,6 +863,8 @@
5 if all([x.state != 'waiting' for x in pick.move_lines]):
6 return True
7 for move in pick.move_lines:
8+ if (move.state) == 'waiting':
9+ move.check_assign()
10 if (move.state in ('confirmed', 'draft')) and (mt == 'one'):
11 return False
12 if (mt == 'direct') and (move.state == 'assigned') and (move.product_qty):