Unifield Server

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

  1. us-2271
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4173
Proposed branch: lp:~unifield-team/unifield-server/us-2271
Merge into: lp:unifield-server
Diff against target: 11 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-2271
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+315336@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 2017-01-17 13:31:02 +0000
3+++ bin/addons/msf_outgoing/msf_outgoing.py 2017-01-23 10:23:41 +0000
4@@ -5007,7 +5007,7 @@
5 values['amount'] = pf_memory['total_amount'] / num_of_packs
6 values['total_weight'] = pf_memory['weight'] * num_of_packs
7 values['total_volume'] = (pf_memory['length'] * pf_memory['width'] * pf_memory['height'] * num_of_packs) / 1000.0
8- values['state'] = pf_memory['state']
9+ values['fake_state'] = pf_memory['state']
10
11 result[pf_memory['id']] = values
12

Subscribers

People subscribed via source and target branches

to all changes: