diff --git a/models/acc_operation.py b/models/acc_operation.py index 7aaefab940edc40f2712cc06bb3c3abcd72f7ba5..06ead37ba371c89231c2892c7728f632291bc524 100644 --- a/models/acc_operation.py +++ b/models/acc_operation.py @@ -157,6 +157,9 @@ class AccOperation(models.Model): if scale == "semestre": date_end = end_month date_start = end_month - relativedelta(months=6) + elif scale == "year": + date_end = end_month + date_start = end_month.replace(month=1, day=1) elif scale == "week": date_start = last_day_end - relativedelta(days=7) date_end = last_day_end @@ -1115,7 +1118,7 @@ class AccOperation(models.Model): return chart_data @api.model - def graph_view(self, domain, scale, first_day, last_day, acc_counter_id=None): + def graph_view(self, domain, scale, date_start, date_end, acc_counter_id=None): """ Fonction appelée lors du chargement de la vue Qweb :param domain: représente le champ recherche de la vue @@ -1130,16 +1133,13 @@ class AccOperation(models.Model): if operation_ids: # Get date start and date end depending on type of scale - if first_day and last_day: - date_start = fields.Datetime.to_datetime(first_day) - date_end = fields.Datetime.to_datetime(last_day) - date_end = date_utils.end_of(date_end, "day") - elif first_day: - date_start, date_end = operation_ids.get_last_day("day") - date_end = date_utils.end_of(date_end, "day") - else: + if date_start and date_end: + date_start = fields.Datetime.to_datetime(date_start) + date_end = fields.Datetime.to_datetime(date_end) + if not date_start and not date_end: date_start, date_end = operation_ids.get_last_day("month") - date_end = date_utils.end_of(date_end, "day") + if not date_end: + date_start, date_end = operation_ids.get_last_day("day") counter_ids = None if acc_counter_id: