doc actions

remotes/origin/yandex
Bachurin Sergey 12 years ago
parent fd83e641a6
commit 9bf8babe41
  1. 3
      project/docs/views/base_views.py
  2. 1
      project/docs/views/invoice.py
  3. 11
      project/templates/docs/_base/base_list.html
  4. 6
      project/templates/docs/_base/preview.html
  5. 5
      project/templates/docs/aktrabot/list.html
  6. 1
      project/templates/docs/aktsverki/list.html
  7. 1
      project/templates/docs/dover/list.html
  8. 5
      project/templates/docs/faktura/list.html
  9. 7
      project/templates/docs/invoice/list.html
  10. 5
      project/templates/docs/nakladn/list.html
  11. 22
      project/templates/docs/parts/doc_actions.html
  12. 18
      project/templates/docs/parts/doc_actions2nd.html
  13. 8
      project/templates/docs/parts/invoice_create_docs.html
  14. 2
      project/templates/docs/platejka/list.html

@ -85,6 +85,7 @@ class BaseViews(object):
TEMPLATE_FORM = 'docs/_base/base_form.html'
TEMPLATE_IMG = 'docs/_base/preview.html'
TEMPLATE_FORM_JS = 'docs/stub_js.html'
TEMPLATE_CREATE_DOCS = ''
TEMPLATE_EMAIL = 'docs/email/base_email.html'
TEMPLATE_EMAIL_FORM = 'docs/email/base_email_form.html'
@ -227,6 +228,7 @@ class BaseViews(object):
'filters': filters,
'obj_list_count_before_filtering': obj_list_count_before_filtering,
'email_form': email_form,
'template_create_docs': self.TEMPLATE_CREATE_DOCS,
}
self.update_list_dict(dictionary)
return render(self.request, self.TEMPLATE_LIST, dictionary)
@ -413,6 +415,7 @@ class BaseViews(object):
'padeji': self.PADEJI,
'padeji_mnoj': self.PADEJI_MNOJ,
'url_prefix': self.URL_PREFIX,
'template_create_docs': self.TEMPLATE_CREATE_DOCS,
}
return render(self.request, self.TEMPLATE_IMG, dictionary)
except:

@ -37,6 +37,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'
# для генерации pdf/xls
PDF_TEMPLATE = 'docs/invoice/as_pdf.html'

@ -81,7 +81,18 @@
<div class="list-col2">
{% 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 %}
<div id="doc_panel_{{ obj.pk }}" class="doc-panel hidden" style="">
{% include "docs/parts/doc_actions.html" %}
{% block panel_copy %}
{% if template_create_docs%}
{% include template_create_docs %}
{% endif %}
{% endblock %}
{% include "docs/parts/doc_actions2nd.html" %}
</div>
{% endfor %}
<div class="filters">
Фильтр списка

@ -21,6 +21,12 @@
</div>
<div class="list-col2">
{% include "docs/parts/doc_actions.html" %}
{% block panel_copy %}
{% if template_create_docs%}
{% include template_create_docs %}
{% endif %}
{% endblock %}
{% include "docs/parts/doc_actions2nd.html" %}
</div>
<div class="clear"></div>

@ -32,9 +32,4 @@
<a href="{{ url_copy }}" title="Копию акта">Копию акта</a><br />
<br />
{% block panel_copy_extra %}
{% comment %}<a href="{{ url_sfv_by_invoice }}" title="Счёт-фактуру">Счёт-фактуру</a>
<br />{% endcomment %}
<span style="color:#666">Счёт-фактуру</span><br />
{% endblock %}
{% endblock %}

@ -28,4 +28,3 @@
<tfoot><tr><td colspan="5"></td></tr></tfoot>
{% endblock %}
{% block panel_copy_extra %}{% endblock %}

@ -35,4 +35,3 @@
Вы ещё не создали ни одной {{ padeji.rodit }}. <a id="add-new" href="{{ url_add }}">Создать</a>.
{% endblock %}
{% block panel_copy_extra %}{% endblock %}

@ -32,8 +32,3 @@
Вы ещё не создали ни одной {{ padeji.rodit }}. <a id="add-new" href="{{ url_add }}">Создать</a>.
{% endblock %}
{% block panel_copy_extra %}
{% comment %}<a href="{{ url_sfv_by_invoice }}" title="Счёт-фактуру">Счёт-фактуру</a>
<br />{% endcomment %}
<span style="color:#666">Счёт-фактуру</span><br />
{% endblock %}

@ -10,10 +10,3 @@
<td><a href="#" class="toggle_doc_status doc_status{{ obj.closed_status }}" data-doctype="invoice" data-attr="closed_status">{{ obj.get_closed_status_display }}</a></td>
{% endblock %}
{% block panel_copy_extra %}
<a href="{{ url_aktrabot_by_invoice }}" title="Акт по счёту">Акт по счёту</a><br />
<br />
<a href="{{ url_nakladn_by_invoice }}" title="Накладную">Накладную</a><br />
<br />
<a href="{{ url_faktura_by_invoice }}" title="Счёт-фактуру">Счёт-фактуру</a> <br />
{% endblock %}

@ -32,8 +32,3 @@
Вы ещё не создали ни одной {{ padeji.rodit }}. <a id="add-new" href="{{ url_add }}">Создать</a>.
{% endblock %}
{% block panel_copy_extra %}
{% comment %}<a href="{{ url_sfv_by_invoice }}" title="Счёт-фактуру">Счёт-фактуру</a>
<br />{% endcomment %}
<span style="color:#666">Счёт-фактуру</span><br />
{% endblock %}

@ -1,8 +1,5 @@
{% 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 %}
@ -11,7 +8,6 @@
{% 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 %}
<div id="doc_panel_{{ obj.pk }}" class="doc-panel" style="">
<div style="font-size: 15px;">Скачать</div>
<hr />
@ -32,24 +28,6 @@
<hr />
{% block panel_copy %}
<a class="doc" href="{{ url_copy }}" title="Копию {{ padeji.rodit }}">Копию {{ padeji.rodit }}</a><br />
<br />
{% block panel_copy_extra %}{% endblock %}
{% endblock %}
<hr />
<a class="doc email-link" href="{{ url_email }}">
<img src="{{ STATIC_URL }}img/icon-email.gif" title="Отправить" alt="Отправить" />Отправить</a><br />
<br />
<a class="doc edit-link" href="{{ url_edit }}">
<img src="{{ STATIC_URL }}img/icon-edit.gif" title="Редактировать" alt="Редактировать" />Редактировать</a><br />
<br />
<a class="doc delete-link" href="{{ url_delete }}">
<img src="{{ STATIC_URL }}img/icon-delete.gif" title="Удалить" alt="Удалить" />Удалить</a><br />
</div>

@ -0,0 +1,18 @@
{% 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 %}
<hr />
<a class="doc email-link" href="{{ url_email }}">
<img src="{{ STATIC_URL }}img/icon-email.gif" title="Отправить" alt="Отправить" />Отправить</a><br />
<br />
<a class="doc edit-link" href="{{ url_edit }}">
<img src="{{ STATIC_URL }}img/icon-edit.gif" title="Редактировать" alt="Редактировать" />Редактировать</a><br />
<br />
<a class="doc delete-link" href="{{ url_delete }}">
<img src="{{ STATIC_URL }}img/icon-delete.gif" title="Удалить" alt="Удалить" />Удалить</a><br />

@ -0,0 +1,8 @@
{% 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 %}
<a href="{{ url_aktrabot_by_invoice }}" title="Акт по счёту">Акт по счёту</a><br />
<br />
<a href="{{ url_nakladn_by_invoice }}" title="Накладную">Накладную</a><br />
<br />
<a href="{{ url_faktura_by_invoice }}" title="Счёт-фактуру">Счёт-фактуру</a> <br />

@ -33,6 +33,4 @@
{% block panel_copy %}
<a href="{{ url_copy }}" title="Копию плат. поручения">Копию плат. поручения</a><br />
<br />
{% block panel_copy_extra %}{% endblock %}
{% endblock %}

Loading…
Cancel
Save