Unifield Server

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

  1. us-1657
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 3961
Proposed branch: lp:~unifield-team/unifield-server/us-1657
Merge into: lp:unifield-server
Diff against target: 21 lines (+2/-2)
1 file modified
bin/addons/stock/stock.py (+2/-2)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1657
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+305002@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-08-26 12:47:12 +0000
3+++ bin/addons/stock/stock.py 2016-09-06 13:26:39 +0000
4@@ -436,7 +436,7 @@
5 WHERE location_dest_id=%s AND
6 location_id<>%s AND
7 product_id=%s AND
8- state='done' AND (expired_date is null or expired_date >= now())
9+ state='done' AND (expired_date is null or expired_date >= CURRENT_DATE)
10 GROUP BY product_uom
11 """,
12 (id, id, product_id))
13@@ -447,7 +447,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+ AND (expired_date is null or expired_date >= CURRENT_DATE)
19 GROUP BY product_uom
20 """,
21 (id, id, product_id))

Subscribers

People subscribed via source and target branches

to all changes: