Unifield Server

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

  1. us-1121
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 3878
Proposed branch: lp:~unifield-team/unifield-server/us-1121
Merge into: lp:unifield-server
Diff against target: 20 lines (+2/-1)
1 file modified
bin/addons/stock/stock.py (+2/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1121
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+300706@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/stock/stock.py'
2--- bin/addons/stock/stock.py 2016-05-24 08:44:23 +0000
3+++ bin/addons/stock/stock.py 2016-07-21 08:20:10 +0000
4@@ -432,7 +432,7 @@
5 WHERE location_dest_id=%s AND
6 location_id<>%s AND
7 product_id=%s AND
8- state='done'
9+ state='done' AND (expired_date is null or expired_date >= now())
10 GROUP BY product_uom
11 """,
12 (id, id, product_id))
13@@ -443,6 +443,7 @@
14 location_dest_id<>%s AND
15 product_id=%s AND
16 state in ('done', 'assigned')
17+ AND (expired_date is null or expired_date >= now())
18 GROUP BY product_uom
19 """,
20 (id, id, product_id))

Subscribers

People subscribed via source and target branches

to all changes: