Merge lp://qastaging/~camptocamp/ocb-addons/7.0-fix-lp-1204832old-RDE into lp://qastaging/ocb-addons

Proposed by Romain Deheele - Camptocamp
Status: Superseded
Proposed branch: lp://qastaging/~camptocamp/ocb-addons/7.0-fix-lp-1204832old-RDE
Merge into: lp://qastaging/ocb-addons
Diff against target: 31 lines (+13/-4)
1 file modified
stock/stock.py (+13/-4)
To merge this branch: bzr merge lp://qastaging/~camptocamp/ocb-addons/7.0-fix-lp-1204832old-RDE
Reviewer Review Type Date Requested Status
Serpent Consulting Services (community) Needs Fixing
Stefan Rijnhart (Opener) Needs Fixing
Christophe CHAUVET code review, not test Approve
Cristian Salamea (community) Approve
Review via email: mp+181224@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2013-09-13.

Description of the change

Hello,

This branch fixes bug #1204832: avoids gap on stock.picking.out sequence when chained picking setup

https://code.launchpad.net/~openerp-dev/openobject-addons/7.0-opw-595832-pna/+merge/178709

Romain

To post a comment you must log in.
Revision history for this message
Cristian Salamea (ovnicraft) wrote :

I see the fix (in official addons ) is still fix commited.

LGTM, diff is the same from OPW.

Regards,

review: Approve
Revision history for this message
Christophe CHAUVET (christophe-chauvet) wrote :

Hi

The code seem correct

Regards,

review: Approve (code review, not test)
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

I think the diff is missing this revision which was added later on: http://bazaar.launchpad.net/~openerp-dev/openobject-addons/7.0-opw-595832-pna/revision/9350. Although this is a trivial change, this will give a conflict if the OPW gets merged in a later point in time.

Note that we would not get a conflict if the OPW was cherrypicked into this branch using bzr. Please consider always using cherrypicking when you port from other branches.

BTW. the merger should attribute the original committer of the OPW.

So please adopt the change in line 12 from the OPW.

review: Needs Fixing
Revision history for this message
Serpent Consulting Services (serpent-consulting-services) wrote :

if old_ptype == 'internal' :
17 + model_name = 'stock.picking'
18 + else :
19 + model_name = 'stock.picking.' + old_ptype

Should be optimized:

model_name = 'stock.picking' + ( old_ptype != 'internal' and ('.' + old_ptype) or '')

AND
if pick_name will always be True, so should not be needed.
Instead this should be inline:

new_pick_name = picking.type == 'out' and seq_obj.get(cr, uid, 'stock.picking.' + ptype) or pick_name

Hope this helps.

(else and : should be together..pep8)

Thanks.

review: Needs Fixing

Unmerged revisions

9414. By Romain Deheele - Camptocamp

[FIX] fix bug #1204832: avoids gap on stock.picking.out sequence when chained picking setup

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.