Merge lp:~unifield-team/unifield-server/qt-us-2292 into lp:unifield-server

[Quentin THEURET @Amaris]

=== modified file 'bin/addons/consumption_calculation/consumption_calculation.py'
--- bin/addons/consumption_calculation/consumption_calculation.py	2017-01-31 15:03:10 +0000
+++ bin/addons/consumption_calculation/consumption_calculation.py	2017-02-23 08:12:35 +0000
@@ -1654,13 +1654,16 @@
         for id in ids:
             res[id] = 0.00
             if from_date and to_date:
-                rcr_domain = ['&', '&', ('product_id', '=', id), ('rac_id.cons_location_id', 'in', location_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 
-                              '|', '&', ('rac_id.period_from', '<=', to_date), ('rac_id.period_from', '>=', from_date),
-                              # All lines with a report started before the period  and finished after the period
-                              '&', ('rac_id.period_from', '<=', from_date), ('rac_id.period_to', '>=', to_date)]
+                rac_ids = self.pool.get('real.average.consumption').search(cr, uid, [
+                    ('cons_location_id', 'in', location_ids),
+                    # All lines with a report started out the period and finished in the period
+                    '|', '&', ('period_to', '>=', from_date), ('period_to', '<=', to_date),
+                    #  All lines with a report started in the period and finished out the period
+                    '|', '&', ('period_from', '<=', to_date), ('period_from', '>=', from_date),
+                    #  All lines with a report started before the period  and finished after the period
+                    '&', ('period_from', '<=', from_date), ('period_to', '>=', to_date)
+                ])
+                rcr_domain = [('product_id', '=', id), ('rac_id', 'in', rac_ids)]
 
                 rcr_line_ids = self.pool.get('real.average.consumption.line').search(cr, uid, rcr_domain, context=context)
                 for line in self.pool.get('real.average.consumption.line').browse(cr, uid, rcr_line_ids, context=context):
 
=== modified file 'bin/addons/consumption_calculation/history_consumption.py'
--- bin/addons/consumption_calculation/history_consumption.py	2016-10-12 10:07:50 +0000
+++ bin/addons/consumption_calculation/history_consumption.py	2017-02-23 08:12:35 +0000
@@ -148,8 +148,8 @@
                                            'location_id',
                                            'id',
                                            'nomen_manda_0',
-                                           'sublist_id']
-                                           , context=context)
+                                           'sublist_id'],
+                          context=context)
         product_ids = []
 
         # Update the locations in context
@@ -242,6 +242,23 @@
         import pooler
         new_cr = pooler.get_db(cr.dbname).cursor()
 
+        res = self.browse(cr, uid, ids[0], context=context)
+        if res.consumption_type == 'rac':
+            cr.execute('''
+            SELECT distinct(product_id)
+            FROM real_average_consumption_line
+            WHERE move_id IS NOT NULL
+            ''')
+        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', []))))
+        product_ids = [x[0] for x in cr.fetchall()]
+
         # split ids into slices to not read a lot record in the same time (memory)
         ids_len = len(product_ids)
         slice_len = 500
@@ -260,6 +277,7 @@
             except Exception, e:
                 logging.getLogger('history.consumption').warn('Exception in read average', exc_info=True)
                 new_cr.rollback()
+
         self.write(new_cr, uid, ids, {'status': 'ready'}, context=context)
 
         new_cr.commit()
@@ -549,7 +567,7 @@
                                         ('consumption_id', '=', obj_id)]
                     if context.get('amc') == 'AMC':
                         cons_prod_domain.append(('cons_type', '=', 'amc'))
-                        cons_id = cons_prod_obj.search(cr, uid, cons_prod_domain, context=context)
+                        cons_id = cons_prod_obj.search(cr, uid, cons_prod_domain, order='NO_ORDER', limit=1, context=context)
                         if cons_id:
                             consumption = cons_prod_obj.browse(cr, uid, cons_id[0], context=context).value
                         else:
@@ -561,7 +579,7 @@
                                                            'value': consumption}, context=context)
                     else:
                         cons_prod_domain.append(('cons_type', '=', 'fmc'))
-                        cons_id = cons_prod_obj.search(cr, uid, cons_prod_domain, context=context)
+                        cons_id = cons_prod_obj.search(cr, uid, cons_prod_domain, order='NO_ORDER', limit=1, context=context)
                         if cons_id:
                             consumption = cons_prod_obj.browse(cr, uid, cons_id[0], context=context).value
                         else:
@@ -581,7 +599,7 @@
                                     ('consumption_id', '=', obj_id),
                                     ('cons_type', '=', context.get('amc') == 'AMC' and 'amc' or 'fmc')]
                 r.update({'average': round(total_consumption/float(len(context.get('months'))),2)})
-                cons_id = cons_prod_obj.search(cr, uid, cons_prod_domain, context=context)
+                cons_id = cons_prod_obj.search(cr, uid, cons_prod_domain, order='NO_ORDER', limit=1, context=context)
                 if cons_id:
                     cons_prod_obj.write(cr, uid, cons_id, {'value': r['average']}, context=context)
                 else:
@@ -664,10 +682,10 @@
 
     _columns = {
         'consumption_id': fields.many2one('product.history.consumption', string='Consumption id', select=1, ondelete='cascade'),
-        'product_id': fields.many2one('product.product', string='Product'),
-        'name': fields.char(size=64, string='Name'),
-        'value': fields.float(digits=(16,2), string='Value', select=1),
-        'cons_type': fields.selection([('amc', 'AMC'), ('fmc', 'FMC')], string='Consumption type'),
+        'product_id': fields.many2one('product.product', string='Product', select=1),
+        'name': fields.char(size=64, string='Name', select=1),
+        'value': fields.float(digits=(16,2), string='Value'),
+        'cons_type': fields.selection([('amc', 'AMC'), ('fmc', 'FMC')], string='Consumption type', select=1),
     }
 
     def read(self, cr, uid, ids, fields, context=None, load='_classic_read'):