diff --git a/models/enercoop_operation.py b/models/enercoop_operation.py index 167872a68b58015c5c3e194dda7290781c87b1f3..a00fabf7d2311f0c190784f85929ad7673d2aa45 100644 --- a/models/enercoop_operation.py +++ b/models/enercoop_operation.py @@ -426,7 +426,7 @@ class EnercoopOperation(models.Model): # Get all data group by curves type and date cdc_ids = self.env['enercoop.enedis.cdc'].sudo().read_group( [('enercoop_operation_id', 'in', self.ids), - ('date_slot', '>', date_start), + ('date_slot', '>=', date_start), ('date_slot', '<', date_end), '|', ('enercoop_counter_id', '=', False), ('enercoop_counter_id', '=', enercoop_counter_id.id) ], @@ -436,7 +436,7 @@ class EnercoopOperation(models.Model): if type == 'week': cdc_histo_ids = self.env['enercoop.enedis.cdc'].sudo().read_group( [('enercoop_operation_id', 'in', self.ids), - ('date_slot', '>', date_start), + ('date_slot', '>=', date_start), ('date_slot', '<', date_end), '|', ('enercoop_counter_id', '=', False), ('enercoop_counter_id', '=', enercoop_counter_id.id) ], @@ -446,7 +446,7 @@ class EnercoopOperation(models.Model): # Get the date for the abscissa axis cdc_date_ids = self.env['enercoop.enedis.cdc'].sudo().read_group( [('enercoop_operation_id', 'in', self.ids), - ('date_slot', '>', date_start), + ('date_slot', '>=', date_start), ('date_slot', '<', date_end), '|', ('enercoop_counter_id', '=', False), ('enercoop_counter_id', '=', enercoop_counter_id.id) ], @@ -457,7 +457,7 @@ class EnercoopOperation(models.Model): if type == 'day': cdc_date_histo_ids = self.env['enercoop.enedis.cdc'].sudo().read_group( [('enercoop_operation_id', 'in', self.ids), - ('date_slot', '>', date_start), + ('date_slot', '>=', date_start), ('date_slot', '<', date_end), '|', ('enercoop_counter_id', '=', False), ('enercoop_counter_id', '=', enercoop_counter_id.id) ], @@ -476,7 +476,7 @@ class EnercoopOperation(models.Model): if type == 'week': cdc_histo_ids = self.env['enercoop.enedis.cdc'].sudo().read_group( [('enercoop_operation_id', 'in', self.ids), - ('date_slot', '>', date_start), + ('date_slot', '>=', date_start), ('date_slot', '<', date_end) ], ['power', 'enercoop_operation_id', 'date_slot'], @@ -485,7 +485,7 @@ class EnercoopOperation(models.Model): # Get the date for the abscissa axis cdc_date_ids = self.env['enercoop.enedis.cdc'].sudo().read_group( [('enercoop_operation_id', 'in', self.ids), - ('date_slot', '>', date_start), + ('date_slot', '>=', date_start), ('date_slot', '<', date_end), ], ['enercoop_operation_id', 'date_slot'], @@ -495,7 +495,7 @@ class EnercoopOperation(models.Model): if type == 'day': cdc_date_histo_ids = self.env['enercoop.enedis.cdc'].sudo().read_group( [('enercoop_operation_id', 'in', self.ids), - ('date_slot', '>', date_start), + ('date_slot', '>=', date_start), ('date_slot', '<', date_end), ], ['enercoop_operation_id', 'date_slot'], @@ -560,7 +560,7 @@ class EnercoopOperation(models.Model): AND A.enercoop_operation_id IN %s AND ( A.enercoop_counter_id = %s OR A.enercoop_counter_id = NULL ) - AND A.date_slot > %s + AND A.date_slot >= %s AND A.date_slot < %s GROUP BY A.comp_data_type, A.date_slot ORDER BY A.comp_data_type, A.date_slot ASC; @@ -578,7 +578,7 @@ class EnercoopOperation(models.Model): JOIN enercoop_operation E ON E.id = A.enercoop_operation_id WHERE A.enercoop_operation_id IS NOT NULL AND A.enercoop_operation_id IN %s - AND A.date_slot > %s + AND A.date_slot >= %s AND A.date_slot < %s GROUP BY A.comp_data_type, A.date_slot ORDER BY A.comp_data_type, A.date_slot ASC; @@ -605,7 +605,7 @@ class EnercoopOperation(models.Model): if enercoop_counter_id: bilan_cdc = self.env['enercoop.enedis.cdc'].sudo().read_group( [('enercoop_operation_id', 'in', self.ids), - ('date_slot', '>', date_start), + ('date_slot', '>=', date_start), ('date_slot', '<', date_end), '|', ('enercoop_counter_id', '=', False), ('enercoop_counter_id', '=', enercoop_counter_id.id)], ['power', 'enercoop_operation_id'], @@ -613,7 +613,7 @@ class EnercoopOperation(models.Model): else: bilan_cdc = self.env['enercoop.enedis.cdc'].sudo().read_group( [('enercoop_operation_id', 'in', self.ids), - ('date_slot', '>', date_start), + ('date_slot', '>=', date_start), ('date_slot', '<', date_end)], ['power', 'enercoop_operation_id'], ['comp_data_type'], orderby='comp_data_type', lazy=False)