OpenERP Community Backports (Addons)

Merge lp:~yann-papouin/ocb-addons/7.0-bug-1137541-partial-picking-move-destination into lp:ocb-addons

  1. 7.0-bug-1137541-partial-picking-move-destination
  2. Merge into 7.0
Proposed by Yann Papouin
Status: Merged
Approved by: Holger Brunn (Therp)
Approved revision: no longer in the source branch.
Merged at revision: 10038
Proposed branch: lp:~yann-papouin/ocb-addons/7.0-bug-1137541-partial-picking-move-destination
Merge into: lp:ocb-addons
Diff against target: 21 lines (+2/-2)
1 file modified
stock/stock.py (+2/-2)
To merge this branch: bzr merge lp:~yann-papouin/ocb-addons/7.0-bug-1137541-partial-picking-move-destination
Reviewer Review Type Date Requested Status
Sandy Carter (http://www.savoirfairelinux.com) code review, pep8 Approve
Yannick Vaucher @ Camptocamp code review, no tests Approve
Holger Brunn (Therp) code review Approve
Review via email: mp+210155@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Holger Brunn (Therp) (hbrunn) wrote :

same as in 6.1-ocb

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

forward port of bug fix in 6.1

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

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 2014-03-04 13:08:40 +0000
3+++ stock/stock.py 2014-03-10 09:25:34 +0000
4@@ -1341,7 +1341,7 @@
5 'product_uos_qty': product_qty, #TODO: put correct uos_qty
6 'picking_id' : new_picking,
7 'state': 'assigned',
8- 'move_dest_id': False,
9+ 'move_dest_id': move.move_dest_id.id,
10 'price_unit': move.price_unit,
11 'product_uom': product_uoms[move.id]
12 }
13@@ -2782,7 +2782,7 @@
14 'product_uos_qty': product_qty,
15 'picking_id' : move.picking_id.id,
16 'state': 'assigned',
17- 'move_dest_id': False,
18+ 'move_dest_id': move.move_dest_id.id,
19 'price_unit': move.price_unit,
20 }
21 prodlot_id = prodlot_ids[move.id]