Merge lp://qastaging/~openerp-dev/openobject-addons/7.0-opw-595832-pna into lp://qastaging/openobject-addons/7.0

Hello Pinakin,

The merge proposed seems to fix the issue. just a nit that needs to be corrected.

@line:12 no need to browse the picking as the variable picking will have the browse_record instance so you can directly access the name.

Thanks,
Naresh Soni,
OpenERP Enterprise Services !

Hello Sir,

Thanks for review.

I updated code as per suggestion.

Thanks,
pna

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.

Hello Pinakin,

Merge this branch in actual addons branch (rev9518) leads to a conflict.
Could you update/modify your branch to avoid this conflict?

Best Regards,

Romain

Hello Pinakin,

Could you consider the next branch : https://code.launchpad.net/~camptocamp/ocb-addons/7.0-fix-updated-lp-1204832-RDE
Your actual proposed branch causes a conflict when you merge it in official addons.
rev 9592 takes in account your commits without conflict when you will merge it.
rev 9593 brings some improvements proposed by Serpent Consulting Services.

Thanks in advance,

Romain

The case is getting old, and is based on old addons base.
It seems to me that the easier is to delete this branch and create a new branch by merging my proposed branch.

Best Regards,

Romain