Merge lp:~dorian-kemps/unifield-server/US-2083 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 4468
Proposed branch: lp:~dorian-kemps/unifield-server/US-2083
Merge into: lp:unifield-server
Diff against target: 19 lines (+2/-0)
1 file modified
bin/addons/msf_outgoing/msf_outgoing.py (+2/-0)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-2083
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+328385@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
=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
--- bin/addons/msf_outgoing/msf_outgoing.py 2017-05-12 12:52:14 +0000
+++ bin/addons/msf_outgoing/msf_outgoing.py 2017-08-16 10:25:08 +0000
@@ -864,6 +864,7 @@
864 """864 """
865 cp_vals = {865 cp_vals = {
866 'product_qty': return_qty,866 'product_qty': return_qty,
867 'date_expected': datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
867 'line_number': move.line_number,868 'line_number': move.line_number,
868 'location_dest_id': move.initial_location.id,869 'location_dest_id': move.initial_location.id,
869 'from_pack': family.to_pack - family.selected_number + 1,870 'from_pack': family.to_pack - family.selected_number + 1,
@@ -4335,6 +4336,7 @@
43354336
4336 move_values = {4337 move_values = {
4337 'product_qty': initial_qty,4338 'product_qty': initial_qty,
4339 'date_expected': datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
4338 }4340 }
43394341
4340 if not initial_qty:4342 if not initial_qty:

Subscribers

People subscribed via source and target branches