Merge branch 'devel' of https://github.com/nerosketch/djing into devel

abonapp/models.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from datetime import datetime
 from django.core.exceptions import ValidationError
 from django.utils import timezone
 from django.db import models
@@ -292,7 +291,7 @@ class Abon(UserProfile):
     def activate_next_tariff(self, author):
         ats = AbonTariff.objects.filter(abon=self).order_by('tariff_priority')
 
-        nw = timezone.make_aware(datetime.now())
+        nw = timezone.now()
 
         for at in ats:
             # услуга не активна, продолжаем

tariff_app/custom_tariffs.py

@@ -40,7 +40,7 @@ class TariffDefault(TariffBase):
         last_day = monthrange(nw.year, nw.month)[1]
         last_month_date = datetime(year=nw.year, month=nw.month, day=last_day,
                                    hour=23, minute=59, second=59)
-        return timezone.make_aware(last_month_date)
+        return last_month_date
 
     @staticmethod
     def description():
@@ -67,7 +67,7 @@ class TariffCp(TariffDp):
         nw = timezone.now()
         long_long_time = datetime(year=nw.year+10, month=nw.month, day=nw.day,
                                   hour=23, minute=59, second=59)
-        return timezone.make_aware(long_long_time)
+        return long_long_time
 
     @staticmethod
     def description():