unifield-wm

Merge lp:~unifield-team/unifield-wm/utp-1019 into lp:unifield-wm

  1. utp-1019
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 2202
Proposed branch: lp:~unifield-team/unifield-wm/utp-1019
Merge into: lp:unifield-wm
Diff against target: 18 lines (+3/-3)
1 file modified
delivery_mechanism/delivery_mechanism.py (+3/-3)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/utp-1019
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+223268@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'delivery_mechanism/delivery_mechanism.py'
2--- delivery_mechanism/delivery_mechanism.py 2014-05-21 14:40:47 +0000
3+++ delivery_mechanism/delivery_mechanism.py 2014-06-16 16:14:01 +0000
4@@ -899,11 +899,11 @@
5 if out_move_id:
6 out_move = move_obj.browse(cr, uid, out_move_id, context=context)
7 cond1 = out_move.picking_id.subtype == 'standard'
8- tmp_cond = out_move.picking_id.has_picking_ticket_in_progress(context=context)[out_move.picking_id.id]
9- cond2 = out_move.picking_id.subtype == 'picking' and tmp_cond
10+ cond2 = out_move.picking_id.subtype == 'picking'
11+ cond3 = cond2 and out_move.picking_id.has_picking_ticket_in_progress(context=context)[out_move.picking_id.id]
12 if out_move.picking_id.subtype in ('standard', 'picking') and out_move.picking_id.type == 'out' and not out_move.product_qty:
13 # replace the stock move in the procurement order by the non cancelled stock move
14- if (cond1 or cond2) and out_move.picking_id and out_move.picking_id.sale_id:
15+ if (cond1 or cond3) and out_move.picking_id and out_move.picking_id.sale_id:
16 sale_id = out_move.picking_id.sale_id.id
17 move_id = move_obj.search(cr, uid, [('picking_id.type', '=', 'out'),
18 ('picking_id.subtype', 'in', ('standard', 'picking')),

Subscribers

People subscribed via source and target branches