make finance app

abonapp/locale/ru/LC_MESSAGES/django.po

@@ -531,10 +531,6 @@ msgstr "Флаги абонента"
 msgid "Edit"
 msgstr "Редактировать"
 
-#: templates/abonapp/fin_report.html:7 templates/abonapp/group_list.html:70
-msgid "Fin report"
-msgstr "Финансовый отчёт"
-
 #: templates/abonapp/fin_report.html:12
 msgid "Money by days"
 msgstr "Сумма денег за сутки"

abonapp/templates/abonapp/group_list.html

@@ -65,11 +65,6 @@
                             <span class="glyphicon glyphicon-exclamation-sign"></span> <span class="hidden-xs">{% trans 'List of debtors' %}</span>
                         </a>
                     {% endif %}
-                    {% if request.user.is_superuser %}
-                        <a href="{% url 'abonapp:fin_report' %}" class="btn btn-default">
-                            <span class="glyphicon glyphicon-usd"></span> <span class="hidden-xs">{% trans 'Fin report' %}</span>
-                        </a>
-                    {% endif %}
                     <a href="{% url 'abonapp:vcards' %}" class="btn btn-default">
                         <span class="glyphicon glyphicon-phone"></span>
                         <span class="hidden-xs">{% trans 'Export vCards' %}</span>

finapp/migrations/0001_initial.py

@@ -26,7 +26,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('abonapp', '0009_auto_20181123_1556'),
+        ('abonapp', '0001_squashed_0008_auto_20181115_1206'),
     ]
 
     operations = [

finapp/templates/finapp/payalltimegateway_list.html

@@ -66,6 +66,11 @@
                         <span class="glyphicon glyphicon-plus"></span> {% trans 'Add' %}
                     </a>
                 {% endif %}
+                {% if request.user.is_superuser %}
+                    <a href="{% url 'finapp:fin_report' %}" class="btn btn-default">
+                        <span class="glyphicon glyphicon-usd"></span> <span class="hidden-xs">{% trans 'Fin report' %}</span>
+                    </a>
+                {% endif %}
             </td>
         </tr>
         </tfoot>

finapp/urls.py

@@ -5,21 +5,15 @@ from finapp import views
 app_name = 'finapp'
 
 urlpatterns = [
-    path('', views.AllTimeGatewaysListView.as_view(),
-         name='alltime_gateways_list'),
+    path('', views.AllTimeGatewaysListView.as_view(), name='alltime_gateways_list'),
 
-    # path('fin_report/', views.BasicFinReport.as_view(), name='fin_report'),
-    # path('pay/', views.terminal_pay, name='terminal_pay'),
+    path('fin_report/', views.BasicFinReport.as_view(), name='fin_report'),
 
-    path('add/', views.AddAllTimeGateway.as_view(),
-         name='add_alltime_gateway'),
+    path('add/', views.AddAllTimeGateway.as_view(), name='add_alltime_gateway'),
 
-    path('<slug:pay_slug>/pay_history/', views.PayHistoryListView.as_view(),
-         name='pay_history'),
+    path('<slug:pay_slug>/pay_history/', views.PayHistoryListView.as_view(), name='pay_history'),
 
-    path('<slug:pay_slug>/make_pay/', views.AllTimePay.as_view(),
-         name='all_time_pay'),
+    path('<slug:pay_slug>/make_pay/', views.AllTimePay.as_view(), name='all_time_pay'),
 
-    path('<slug:pay_slug>/edit/', views.EditPayUpdateView.as_view(),
-         name='edit_pay_gw'),
+    path('<slug:pay_slug>/edit/', views.EditPayUpdateView.as_view(), name='edit_pay_gw'),
 ]

finapp/views.py

@@ -177,7 +177,7 @@ class PayHistoryListView(LoginAdminMixin, PermissionRequiredMixin,
     def get_queryset(self):
         pay_history = AllTimePayLog.objects.filter(
             pay_gw__slug=self.kwargs.get('pay_slug')
-        ).order_by('-date_add')
+        ).select_related('abon__group').order_by('-date_add')
         return pay_history
 
     def get_context_data(self, **kwargs):

templates/all_base.html

@@ -50,6 +50,15 @@
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans 'Other' %} <b class="caret"></b></a>
                     <ul class="dropdown-menu">
                         <li><a href="{% url 'acc_app:setup_info' %}"><span class="glyphicon glyphicon-wrench"></span> {% trans 'Settings' %}</a></li>
+
+                        {% if perms.finapp.view_payalltimegateway %}
+                            <li>
+                                <a href="{% url 'finapp:alltime_gateways_list' %}">
+                                    <span class="glyphicon glyphicon-credit-card"></span> {% trans 'Finance' %}
+                                </a>
+                            </li>
+                        {% endif %}
+
                         <li><a href="{% url 'acc_app:logout' %}"><span class="glyphicon glyphicon-log-out"></span> {% trans 'Exit' %}</a></li>
                     </ul>
                 </li>

templates/base.html

@@ -62,15 +62,6 @@
                 </a>
             </li>
 
-            {% if perms.fonapp.view_payalltimegateway %}
-                {% url 'finapp:alltime_gateways_list' as finhome %}
-                <li{% if finhome in request.path %} class="active"{% endif %}>
-                    <a href="{{ finhome }}">
-                        <span class="glyphicon glyphicon-credit-card"></span> {% trans 'Finance' %}
-                    </a>
-                </li>
-            {% endif %}
-
             {% url 'ip_pool:networks' as ippool_home %}
             <li{% if ippool_home in request.path %} class="active"{% endif %}>
                 <a href="{{ ippool_home }}">