Merge lp:~unifield-team/unifield-server/us-1760 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 4146
Proposed branch: lp:~unifield-team/unifield-server/us-1760
Merge into: lp:unifield-server
Diff against target: 12 lines (+1/-1)
1 file modified
bin/addons/msf_outgoing/msf_outgoing.py (+1/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1760
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+314813@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 'bin/addons/msf_outgoing/msf_outgoing.py'
2--- bin/addons/msf_outgoing/msf_outgoing.py 2016-12-19 14:10:19 +0000
3+++ bin/addons/msf_outgoing/msf_outgoing.py 2017-01-16 10:09:16 +0000
4@@ -656,7 +656,7 @@
5 'backorder_id': picking.id,
6 'shipment_id': False,
7 'move_lines': [],
8- 'description_ppl': description_ppl, # US-803: added the description
9+ 'description_ppl': description_ppl or picking.description_ppl, # US-803: added the description
10 }
11 # Update context for copy
12 context.update({

Subscribers

People subscribed via source and target branches

to all changes: