From e6a3c81bb96b6dd37f67b42d965c90599eefc111 Mon Sep 17 00:00:00 2001 From: Erik Stein Date: Fri, 19 Jul 2019 14:02:16 +0200 Subject: [PATCH] Fixed last of month calculation. --- CHANGES | 3 +++ shared/utils/models/events.py | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 93725fa..15f485a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +0.2.28 2019-07-19 +- Fixed last of month calculation. + 0.2.27 2019-06-19 - Deprecated get_short_title, use get_short_name. diff --git a/shared/utils/models/events.py b/shared/utils/models/events.py index a48b39b..f127b53 100644 --- a/shared/utils/models/events.py +++ b/shared/utils/models/events.py @@ -6,6 +6,7 @@ from django.utils.translation import ugettext_lazy as _ from ..conf import USE_TRANSLATABLE_FIELDS from ..dateformat import format_partial_date, format_date_range +from ..dates import get_last_of_month if USE_TRANSLATABLE_FIELDS: @@ -42,8 +43,8 @@ class RuntimeBehaviour: setattr(self, self.start_date_field_name, MIN_DATE) if self.until_year_value: - setattr(self, self.end_date_field_name, datetime.date( - self.until_year_value, self.until_month_value or 12, self.until_day_value or 31)) + d = datetime.date(self.until_year_value, self.until_month_value or 12, 1) + setattr(self, self.end_date_field_name, get_last_of_month(d)) else: setattr(self, self.end_date_field_name, MAX_DATE)