diff --git a/project/docs/views/base_views.py b/project/docs/views/base_views.py index a9a59a4..5734c3c 100644 --- a/project/docs/views/base_views.py +++ b/project/docs/views/base_views.py @@ -87,6 +87,7 @@ class BaseViews(object): TEMPLATE_IMG = 'docs/_base/preview.html' TEMPLATE_FORM_JS = 'docs/stub_js.html' TEMPLATE_CREATE_DOCS = '' + TEMPLATE_DOCS_LIST = '' TEMPLATE_EMAIL = 'docs/email/base_email.html' TEMPLATE_EMAIL_FORM = 'docs/email/base_email_form.html' @@ -231,6 +232,7 @@ class BaseViews(object): 'obj_list_count_before_filtering': obj_list_count_before_filtering, 'email_form': email_form, 'template_create_docs': self.TEMPLATE_CREATE_DOCS, + 'template_docs_list': self.TEMPLATE_DOCS_LIST, 'maybe_sign': self.MAYBE_SIGNED, } self.update_list_dict(dictionary) @@ -339,7 +341,7 @@ class BaseViews(object): if self.request.method == 'POST': obj.delete() success = True - result = {'title': u'Удаление документа', + result = {'title': u'Удаление документа', 'msg': u'Удалён документ:
%s №%d от %s' % (self.PADEJI['imenit'], del_num, del_date), 'success': success, 'del_id': del_id, @@ -434,9 +436,10 @@ class BaseViews(object): 'padeji_mnoj': self.PADEJI_MNOJ, 'url_prefix': self.URL_PREFIX, 'template_create_docs': self.TEMPLATE_CREATE_DOCS, + 'template_docs_list': self.TEMPLATE_DOCS_LIST, 'email_form': email_form, 'maybe_sign': self.MAYBE_SIGNED, - } + } return render(self.request, self.TEMPLATE_IMG, dictionary) except: raise @@ -717,7 +720,7 @@ class BaseItemsViews(BaseViews): d.pop('created_at', None) d.pop('updated_at', None) kwargs['initial_items'].append(d) - + self.set_item_formset_class(extra_count=len(kwargs['initial_items'])) return self.add(self.request, *args, **kwargs) diff --git a/project/docs/views/invoice.py b/project/docs/views/invoice.py index ca6d5f1..56b4013 100644 --- a/project/docs/views/invoice.py +++ b/project/docs/views/invoice.py @@ -40,6 +40,7 @@ class InvoiceViews(BaseItemsViews): TEMPLATE_LIST = 'docs/invoice/list.html' TEMPLATE_FORM = 'docs/invoice/form.html' TEMPLATE_CREATE_DOCS = 'docs/parts/invoice_create_docs.html' + TEMPLATE_DOCS_LIST = 'docs/parts/invoice_docs_list.html' # для генерации pdf/xls PDF_TEMPLATE = 'docs/invoice/as_pdf.html' diff --git a/project/templates/docs/_base/base_list.html b/project/templates/docs/_base/base_list.html index 071764d..0b833c8 100644 --- a/project/templates/docs/_base/base_list.html +++ b/project/templates/docs/_base/base_list.html @@ -46,17 +46,7 @@ {% for obj in page.object_list %} - {% url url_prefix|add:'edit' id=obj.pk as url_edit %} - {% url url_prefix|add:'copy' id=obj.pk as url_copy %} - {% url url_prefix|add:'delete' id=obj.pk as url_delete %} - {% url url_prefix|add:'email' id=obj.pk as url_email %} {% url url_prefix|add:'img' id=obj.pk as url_img %} - {% url url_prefix|add:'pdf' id=obj.pk as url_pdf %} - {% url url_prefix|add:'xls' id=obj.pk as url_xls %} - - {% url 'docs_aktrabot_add_by_invoice' invoice_id=obj.pk as url_aktrabot_by_invoice %} - {% url 'docs_nakladn_add_by_invoice' invoice_id=obj.pk as url_nakladn_by_invoice %} - {% url 'docs_faktura_add_by_invoice' invoice_id=obj.pk as url_faktura_by_invoice %} {% block table_obj_cells %} @@ -88,19 +78,29 @@
{% for obj in page.object_list %} - {% url 'docs_aktrabot_add_by_invoice' invoice_id=obj.pk as url_aktrabot_by_invoice %} - {% url 'docs_nakladn_add_by_invoice' invoice_id=obj.pk as url_nakladn_by_invoice %} - {% url 'docs_faktura_add_by_invoice' invoice_id=obj.pk as url_faktura_by_invoice %} {% endfor %} +
Фильтр списка diff --git a/project/templates/docs/_base/preview.html b/project/templates/docs/_base/preview.html index f182a3c..1caef5b 100644 --- a/project/templates/docs/_base/preview.html +++ b/project/templates/docs/_base/preview.html @@ -22,13 +22,25 @@
- {% include "docs/parts/doc_actions.html" %} + {% include "docs/parts/doc_actions.html" %} + + {% if template_docs_list %} + {% include template_docs_list %} + {% endif %} + + {% url url_prefix|add:'copy' id=obj.pk as url_copy %} + +
Создать
+ + Копию {{ padeji.rodit }} + {% block panel_copy %} {% if template_create_docs %} {% include template_create_docs %} {% endif %} {% endblock %} - {% include "docs/parts/doc_actions2nd.html" %} + + {% include "docs/parts/doc_actions2nd.html" %}
diff --git a/project/templates/docs/parts/doc_actions.html b/project/templates/docs/parts/doc_actions.html index afa8b12..2c3bca7 100644 --- a/project/templates/docs/parts/doc_actions.html +++ b/project/templates/docs/parts/doc_actions.html @@ -1,27 +1,17 @@ +{% url url_prefix|add:'img' id=obj.pk as url_img %} +{% url url_prefix|add:'pdf' id=obj.pk as url_pdf %} +{% url url_prefix|add:'xls' id=obj.pk as url_xls %} - {% url url_prefix|add:'copy' id=obj.pk as url_copy %} - {% url url_prefix|add:'img' id=obj.pk as url_img %} - {% url url_prefix|add:'pdf' id=obj.pk as url_pdf %} - {% url url_prefix|add:'xls' id=obj.pk as url_xls %} +
Скачать документ
- {% url 'docs_aktrabot_add_by_invoice' invoice_id=obj.pk as url_aktrabot_by_invoice %} - {% url 'docs_nakladn_add_by_invoice' invoice_id=obj.pk as url_nakladn_by_invoice %} - {% url 'docs_faktura_add_by_invoice' invoice_id=obj.pk as url_faktura_by_invoice %} +{% if not images %} + Предпросмотр {{ padeji.rodit }} +{% endif %} -
Скачать документ
+
- {% if not images %} - - Предпросмотр {{ padeji.rodit }} - {% endif %} -
- - Документ в PDF - - Документ в Excel -
+Документ в PDF -
Создать
- - Копию {{ padeji.rodit }} + Документ в Excel +
diff --git a/project/templates/docs/parts/doc_actions2nd.html b/project/templates/docs/parts/doc_actions2nd.html index 7992419..7fb90e0 100644 --- a/project/templates/docs/parts/doc_actions2nd.html +++ b/project/templates/docs/parts/doc_actions2nd.html @@ -1,15 +1,13 @@ +{% url url_prefix|add:'edit' id=obj.pk as url_edit %} +{% url url_prefix|add:'delete' id=obj.pk as url_delete %} +{% url url_prefix|add:'email' id=obj.pk as url_email %} - {% url url_prefix|add:'edit' id=obj.pk as url_edit %} - {% url url_prefix|add:'delete' id=obj.pk as url_delete %} - {% url url_prefix|add:'email' id=obj.pk as url_email %} +
Действия с документом
- + - - Редактировать документ +Редактировать документ - - Удалить документ +Удалить документ -
+
diff --git a/project/templates/docs/parts/invoice_create_docs.html b/project/templates/docs/parts/invoice_create_docs.html index c9ca74c..02af408 100644 --- a/project/templates/docs/parts/invoice_create_docs.html +++ b/project/templates/docs/parts/invoice_create_docs.html @@ -1,21 +1,9 @@ {% url 'docs_aktrabot_add_by_invoice' invoice_id=obj.pk as url_aktrabot_by_invoice %} {% url 'docs_nakladn_add_by_invoice' invoice_id=obj.pk as url_nakladn_by_invoice %} {% url 'docs_faktura_add_by_invoice' invoice_id=obj.pk as url_faktura_by_invoice %} + Акт выполненных работ -{% if obj.docs_for_invoice.AktRabot %} -{% for akt in obj.docs_for_invoice.AktRabot %} -{{ akt }} -{% endfor %} -{% endif %} + Накладную -{% if obj.docs_for_invoice.Nakladn %} -{% for nakladn in obj.docs_for_invoice.Nakladn %} -{{ nakladn }} -{% endfor %} -{% endif %} + Счёт-фактуру -{% if obj.docs_for_invoice.Faktura %} -{% for faktura in obj.docs_for_invoice.Faktura %} -{{ faktura }} -{% endfor %} -{% endif %} diff --git a/project/templates/docs/parts/invoice_docs_list.html b/project/templates/docs/parts/invoice_docs_list.html new file mode 100644 index 0000000..dff2cc2 --- /dev/null +++ b/project/templates/docs/parts/invoice_docs_list.html @@ -0,0 +1,13 @@ +
Связанные документы
+ +{% for akt in obj.docs_for_invoice.AktRabot %} + {{ akt }} +{% endfor %} + +{% for nakladn in obj.docs_for_invoice.Nakladn %} + {{ nakladn }} +{% endfor %} + +{% for faktura in obj.docs_for_invoice.Faktura %} + {{ faktura }} +{% endfor %}