Unifield Addons

Merge lp:~unifield-team/unifield-addons/us-798 into lp:unifield-addons

  1. us-798
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4680
Proposed branch: lp:~unifield-team/unifield-addons/us-798
Merge into: lp:unifield-addons
Diff against target: 11 lines (+1/-1)
1 file modified
stock/stock.py (+1/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-addons/us-798
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+283615@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 'stock/stock.py'
2--- stock/stock.py 2015-10-08 14:37:26 +0000
3+++ stock/stock.py 2016-01-22 14:44:44 +0000
4@@ -254,7 +254,7 @@
5 result = 'internal'
6 if (from_location.usage=='internal') and (to_location and to_location.usage in ('customer', 'supplier')):
7 result = 'out'
8- elif (from_location.usage in ('supplier', 'customer')) and (to_location.usage == 'internal'):
9+ elif (from_location.usage in ('supplier', 'customer')) and (to_location.usage in ('internal', 'inventory')):
10 result = 'in'
11 return result
12

Subscribers

People subscribed via source and target branches

to all changes: