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

[jftempo]

=== modified file 'bin/addons/stock/stock.py'
--- bin/addons/stock/stock.py	2016-05-24 08:44:23 +0000
+++ bin/addons/stock/stock.py	2016-07-21 08:20:10 +0000
@@ -432,7 +432,7 @@
                           WHERE location_dest_id=%s AND
                                 location_id<>%s AND
                                 product_id=%s AND
-                                state='done'
+                                state='done' AND (expired_date is null or expired_date >= now())
                           GROUP BY product_uom
                        """,
                        (id, id, product_id))
@@ -443,6 +443,7 @@
                                 location_dest_id<>%s AND
                                 product_id=%s AND
                                 state in ('done', 'assigned')
+                                AND (expired_date is null or expired_date >= now())
                           GROUP BY product_uom
                        """,
                        (id, id, product_id))