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

[Quentin THEURET @Amaris]

=== modified file 'bin/addons/consumption_calculation/history_consumption.py'
--- bin/addons/consumption_calculation/history_consumption.py	2017-03-06 17:14:31 +0000
+++ bin/addons/consumption_calculation/history_consumption.py	2017-03-10 09:49:09 +0000
@@ -251,12 +251,11 @@
             ''')
         else:
             cr.execute('''
-              SELECT distinct(product_id)
-              FROM stock_move
-              WHERE state = 'done'
-                AND
-                (location_id IN %s OR location_dest_id IN %s)
-            ''', (tuple(context.get('location_id', [])), tuple(context.get('location_id', []))))
+              SELECT distinct(s.product_id)
+              FROM stock_move s
+                LEFT JOIN stock_location l ON l.id = s.location_id OR l.id = s.location_dest_id
+              WHERE l.usage in ('customer', 'internal')
+            ''')
         product_ids = [x[0] for x in cr.fetchall()]
 
         # split ids into slices to not read a lot record in the same time (memory)