From 8d03c4a64fd4cbc2f7dd2241247a65d0912bfc06 Mon Sep 17 00:00:00 2001
From: Dmitriy Shesterkin <mitri4@bk.ru>
Date: Thu, 6 Jul 2017 12:08:00 +0300
Subject: [PATCH] fix error, requirements

---
 Makefile               | 7 ++++++-
 requirements/base.txt  | 3 +++
 requirements/local.txt | 1 -
 src/customer/models.py | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index cc5d4df..9c06df8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all help build virtualenv requirements-local loaddata run migrate shell collectstatic clean worker qa update-develop upgrade-develop
+.PHONY: all help build virtualenv requirements-local loaddata run migrate shell collectstatic clean worker qa flush update-develop upgrade-develop
 
 # target: all - Default target. Does nothing.
 all:
@@ -78,6 +78,11 @@ flower:
 qa:
 	pytest
 
+# target: flush - clean database
+flush:
+	python3 manage.py flush
+
+
 # target: update-develop - Run push change in repo develop branch and deploy for develop server with restart only web container
 update-develop:
 	git push origin develop
diff --git a/requirements/base.txt b/requirements/base.txt
index b7696bb..294d2e4 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -72,5 +72,8 @@ redis==2.10.5
 trans==2.1.0
 python-decouple==3.0
 numpy==1.13.0
+django-cleanup==1.0.0
 flower==0.9.2
 raven==6.1.0
+django-debug-toolbar==1.5
+sqlparse==0.2.3
diff --git a/requirements/local.txt b/requirements/local.txt
index 10335e2..7f6cdd0 100644
--- a/requirements/local.txt
+++ b/requirements/local.txt
@@ -1,6 +1,5 @@
 -r base.txt
 ipython==2.1.0
-django-debug-toolbar==1.5
 sqlparse==0.2.3
 django-eml-email-backend==0.1
 ipdb==0.10.3
diff --git a/src/customer/models.py b/src/customer/models.py
index 8675185..9fcf8f2 100644
--- a/src/customer/models.py
+++ b/src/customer/models.py
@@ -644,7 +644,7 @@ class License(models.Model):
                            f'{left.days} {numeral.choose_plural(left.days, "день, дня, дней")}'
             else:
                 left_str = f'{left.days} {numeral.choose_plural(left.days, "день, дня, дней")}'
-                remain_str = numeral.choose_plural(left.days, "остался, осталось, осталось")
+            remain_str = numeral.choose_plural(left.days, "остался, осталось, осталось")
             return f'Лицензия активна, {remain_str} {left_str}'
         elif self.status == 3:
             return 'Время истекло'