Merge lp:~dorian-kemps/unifield-server/US-5925 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/consumption_calculation/consumption_calculation.py'
--- bin/addons/consumption_calculation/consumption_calculation.py	2019-02-07 08:29:30 +0000
+++ bin/addons/consumption_calculation/consumption_calculation.py	2019-04-24 15:17:33 +0000
@@ -1855,7 +1855,7 @@
         # Search all real consumption line included in the period
         # If no period found, take all stock moves
         if from_date and to_date:
-            rcr_domain = ['&', '&', ('rac_id.state', '!=', 'cancel'), ('product_id', 'in', ids),
+            rcr_domain = ['&', '&', ('rac_id.state', 'not in', ['draft', 'cancel']), ('product_id', 'in', ids),
                           # All lines with a report started out the period and finished in the period
                           '|', '&', ('rac_id.period_to', '>=', from_date), ('rac_id.period_to', '<=', to_date),
                           # All lines with a report started in the period and finished out the period