fix error on date and cms's signals

2017-05-10 18:30:37 +02:00
parent 087e3614fa
commit 3a4c80e196
3 changed files with 6 additions and 4 deletions
--- a/aircox/models.py
+++ b/aircox/models.py
@ -602,7 +602,9 @@ class Schedule(models.Model):
        """
        Set the time of a datetime to the schedule's one
        """
-        return date.replace(hour = self.date.hour, minute = self.date.minute)
+        date = date.replace(hour = self.date.hour, minute = self.date.minute,
+                            second = 0)
+        return date if tz.is_aware(date) else tz.make_aware(date)

    def dates_of_month(self, date = None):
        """