From 62a956a80b871089af361860ca069fd15710747a Mon Sep 17 00:00:00 2001
From: http <http@localhost.localdomain>
Date: Wed, 24 May 2017 15:29:36 +0300
Subject: [PATCH] =?UTF-8?q?FIXBUG:=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB=20=D0=BF=D1=80=D0=BE=D0=B1=D0=BB=D0=B5=D0=BC=D1=83?=
 =?UTF-8?q?=20=D1=81=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B9=20=D0=B7=D0=BE=D0=BD=D0=BE=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 abonapp/models.py            | 3 +--
 tariff_app/custom_tariffs.py | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/abonapp/models.py b/abonapp/models.py
index 0ac2a8e..3e0fb45 100644
--- a/abonapp/models.py
+++ b/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:
             # услуга не активна, продолжаем
diff --git a/tariff_app/custom_tariffs.py b/tariff_app/custom_tariffs.py
index a9888d2..630ce4a 100644
--- a/tariff_app/custom_tariffs.py
+++ b/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():