unifield-wm

Merge lp:~unifield-team/unifield-wm/uf-2245 into lp:unifield-wm

  1. uf-2245
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 2719
Proposed branch: lp:~unifield-team/unifield-wm/uf-2245
Merge into: lp:unifield-wm
Diff against target: 32 lines (+6/-2)
1 file modified
delivery_mechanism/delivery_mechanism.py (+6/-2)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/uf-2245
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+283576@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 2015-11-23 16:52:52 +0000
3+++ delivery_mechanism/delivery_mechanism.py 2016-01-22 08:32:19 +0000
4@@ -368,6 +368,9 @@
5 'product_id': move.product_id.id,
6 'product_uom': move.product_uom.id,
7 'product_qty': move.product_qty,
8+ 'prodlot_id': move.prodlot_id and move.prodlot_id.id or False,
9+ 'asset_id': move.asset_id and move.asset_id.id or False,
10+ 'expired_date': move.expired_date or False,
11 'location_dest_id': move.location_dest_id.id,
12 'move_cross_docking_ok': move.move_cross_docking_ok,
13 }
14@@ -1224,7 +1227,7 @@
15 if bo_move.product_qty != bo_qty:
16 # Create the corresponding move in the backorder - reset batch - reset asset_id
17 bo_values = {
18- 'asset_id': False,
19+ 'asset_id': data_back['asset_id'],
20 'product_qty': bo_qty,
21 'product_uos_qty': bo_qty,
22 'product_uom': data_back['product_uom'],
23@@ -1232,7 +1235,8 @@
24 'product_id': data_back['product_id'],
25 'location_dest_id': data_back['location_dest_id'],
26 'move_cross_docking_ok': data_back['move_cross_docking_ok'],
27- 'prodlot_id': False,
28+ 'prodlot_id': data_back['prodlot_id'],
29+ 'expired_date': data_back['expired_date'],
30 'state': 'assigned',
31 'move_dest_id': False,
32 'change_reason': False,

Subscribers

People subscribed via source and target branches