From 7314d159d32d5ad742c4fd34a83856fa483e0c1d Mon Sep 17 00:00:00 2001 From: Dmitriy Shesterkin Date: Fri, 26 May 2017 18:07:10 +0300 Subject: [PATCH] fix payment assignment --- src/docs/forms/platejka.py | 10 ++++++---- src/docs/views/base_views.py | 10 ++++++---- src/docs/views/platejka.py | 10 ++++++---- src/dokumentor/static/js/docs/common/calc_nds.js | 3 +-- .../templates/docs/parts/form_field_client.html | 2 +- src/dokumentor/templates/docs/platejka/js.html | 6 ++++-- src/dokumentor/templates/docs/platejka/list.html | 1 + 7 files changed, 25 insertions(+), 17 deletions(-) diff --git a/src/docs/forms/platejka.py b/src/docs/forms/platejka.py index 7c22b3d..3c151da 100644 --- a/src/docs/forms/platejka.py +++ b/src/docs/forms/platejka.py @@ -43,10 +43,12 @@ class PlatejkaForm(BaseModelForm): # поля становятся обязательными в зависимости от того, какой тип платежки выбран platej_type = cleaned_data.get('platej_type') - if platej_type == consts.PLATEJ_TYPE_COMMERCE: # коммерческое (перевод денег) - nds_value = cleaned_data.get('nds_value') - - if not nds_value: set_field_error(self, 'nds_value') + # коммерческое (перевод денег) + if platej_type == consts.PLATEJ_TYPE_COMMERCE: + pass + # nds_value = cleaned_data.get('nds_value') + # + # if not nds_value: set_field_error(self, 'nds_value') elif platej_type == consts.PLATEJ_TYPE_TAX: # налоги tax_status = cleaned_data.get('tax_status') diff --git a/src/docs/views/base_views.py b/src/docs/views/base_views.py index 2c4bba8..b3937af 100644 --- a/src/docs/views/base_views.py +++ b/src/docs/views/base_views.py @@ -276,6 +276,7 @@ class BaseViews(object): 'form': form, 'client_form': ClientForm(), } + self.update_list_dict(dictionary) return render(self.request, self.TEMPLATE_ADD, dictionary) def copy(self, *args, **kwargs): @@ -338,10 +339,11 @@ class BaseViews(object): obj.delete() success = True result = {'title': u'Удаление документа', - 'msg': u'Удалён документ:
%s №%d от %s' % (self.PADEJI['imenit'], del_num, del_date), - 'success': success, - 'del_id': del_id, - } + 'msg': u'Удалён документ:
%s №%d от %s' % + (self.PADEJI['imenit'], del_num, del_date), + 'success': success, + 'del_id': del_id, + } return HttpResponse(json.dumps(result), content_type='application/json') def prepare(self, obj, export_to=None): diff --git a/src/docs/views/platejka.py b/src/docs/views/platejka.py index 7d09451..bebd34f 100644 --- a/src/docs/views/platejka.py +++ b/src/docs/views/platejka.py @@ -1,7 +1,9 @@ # -*- coding: utf-8 -*- -from ..models import Platejka -from ..forms import PlatejkaForm -from ..filters import PlatejkaFilterSet +from django.conf import settings + +from docs.models import Platejka +from docs.forms import PlatejkaForm +from docs.filters import PlatejkaFilterSet from .base_views import BaseViews @@ -55,4 +57,4 @@ class PlatejkaViews(BaseViews): def update_list_dict(self, dictionary): """Здесь можно изменить словарь параметров перед передачей его в шаблон вывода списка документов.""" - pass + dictionary['dadata_api_key'] = settings.DADATA_API_KEY diff --git a/src/dokumentor/static/js/docs/common/calc_nds.js b/src/dokumentor/static/js/docs/common/calc_nds.js index abfdbe5..0aed7b8 100644 --- a/src/dokumentor/static/js/docs/common/calc_nds.js +++ b/src/dokumentor/static/js/docs/common/calc_nds.js @@ -1,4 +1,3 @@ function calc_nds(summa, nds_rate) { - return summa * nds_rate/100; - } + return summa * nds_rate/100; } diff --git a/src/dokumentor/templates/docs/parts/form_field_client.html b/src/dokumentor/templates/docs/parts/form_field_client.html index 9112f18..4707541 100644 --- a/src/dokumentor/templates/docs/parts/form_field_client.html +++ b/src/dokumentor/templates/docs/parts/form_field_client.html @@ -1,4 +1,4 @@ -{% comment %} + {% comment %} field - поле required - отметить, что поле обязательное? label - заголовок поля (по умолчанию, `Контрагент`) diff --git a/src/dokumentor/templates/docs/platejka/js.html b/src/dokumentor/templates/docs/platejka/js.html index 214bec3..3b2bcea 100644 --- a/src/dokumentor/templates/docs/platejka/js.html +++ b/src/dokumentor/templates/docs/platejka/js.html @@ -1,4 +1,6 @@ +{% load static %} +{% include 'docs/stub_js.html' %} {% block form_js %} - - + + {% endblock %} diff --git a/src/dokumentor/templates/docs/platejka/list.html b/src/dokumentor/templates/docs/platejka/list.html index a249811..e93dbbb 100644 --- a/src/dokumentor/templates/docs/platejka/list.html +++ b/src/dokumentor/templates/docs/platejka/list.html @@ -1,6 +1,7 @@ {% extends "docs/_base/base_list.html" %} {% block table_header %} + Дата  {% if ordering.order_field == 'doc_date' %}{% if ordering.order_type == 'asc' %}{{ img_asc }}{% else %}{{ img_desc }}{% endif %}{% endif %}