mitri4
/
dokumentor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

css

Browse Source
remotes/origin/yandex
Bachurin Sergey 11 years ago
parent da8ba9ab8d
commit cbf8fc7569
41 changed files with 166 additions and 155 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      project/docs/models/aktrabot.py
  2. 2
      project/myauth/views.py
  3. 6
      project/settings.py
  4. 83
      project/static/css/style.css
  5. BIN
      project/static/img/icon-add.png
  6. BIN
      project/static/img/icon-calendar.png
  7. 2
      project/static/js/client.commons.js
  8. 4
      project/static/js/lib/jquery.formset.js
  9. 2
      project/templates/customer/bank_accounts/delete.html
  10. 2
      project/templates/customer/bank_accounts/edit.html
  11. 3
      project/templates/customer/bank_accounts/form.html
  12. 3
      project/templates/customer/bank_accounts/list.html
  13. 2
      project/templates/customer/clients/delete.html
  14. 2
      project/templates/customer/clients/edit.html
  15. 2
      project/templates/customer/clients/list.html
  16. 12
      project/templates/customer/index.html
  17. 30
      project/templates/customer/profile/edit.html
  18. 4
      project/templates/customer/profile/end_order.html
  19. 4
      project/templates/customer/profile/license_list.html
  20. 6
      project/templates/customer/profile/paid_list.html
  21. 2
      project/templates/docs/_base/base_delete.html
  22. 4
      project/templates/docs/_base/base_edit.html
  23. 2
      project/templates/docs/_base/base_list.html
  24. 1
      project/templates/docs/aktrabot/form.html
  25. 4
      project/templates/docs/aktrabot/list.html
  26. 1
      project/templates/docs/aktsverki/form.html
  27. 10
      project/templates/docs/aktsverki/form_tbl_items.html
  28. 14
      project/templates/docs/docs.html
  29. 2
      project/templates/docs/dover/form.html
  30. 9
      project/templates/docs/faktura/form.html
  31. 9
      project/templates/docs/invoice/form.html
  32. 1
      project/templates/docs/nakladn/form.html
  33. 22
      project/templates/docs/parts/faktura_form_tbl_items.html
  34. 2
      project/templates/docs/parts/form_buttons.html
  35. 4
      project/templates/docs/parts/form_client_choices.html
  36. 9
      project/templates/docs/parts/form_field.html
  37. 13
      project/templates/docs/parts/form_field_client.html
  38. 20
      project/templates/docs/parts/form_tbl_items.html
  39. 3
      project/templates/docs/platejka/list.html
  40. 14
      project/templates/menu/menu.html
  41. 2
      project/templates/pages/index.html

4
project/docs/models/aktrabot.py
Unescape View File

@ -8,8 +8,8 @@ from .mixins import SignedStatusFieldMixin, InvoiceFieldMixin
class AktRabot(BaseInvoiceModel, SignedStatusFieldMixin, InvoiceFieldMixin): class AktRabot(BaseInvoiceModel, SignedStatusFieldMixin, InvoiceFieldMixin):
"""Акт выполн. работ.""" """Акт выполн. работ."""
class Meta(BaseInvoiceModel.Meta): class Meta(BaseInvoiceModel.Meta):
verbose_name = u'Акт выполн. работ' verbose_name = u'Акт выполненных работ'
verbose_name_plural = u'Акты выполн. работ' verbose_name_plural = u'Акты выполненных работ'
class AktRabotItem(BaseItemInvoiceModel): class AktRabotItem(BaseItemInvoiceModel):

2
project/myauth/views.py
Unescape View File

@ -219,7 +219,7 @@ def login(request):
#form_prefix = 'login' #form_prefix = 'login'
form_prefix = '' form_prefix = ''
template_name = 'myauth/login.html' template_name = 'myauth/login.html'
success_url = 'customer_index' success_url = 'customer_profile_view'
if request.method == 'POST': if request.method == 'POST':
form = form_class(data=request.POST, prefix=form_prefix) form = form_class(data=request.POST, prefix=form_prefix)
if form.is_valid(): if form.is_valid():

6
project/settings.py
Unescape View File

@ -51,7 +51,11 @@ USE_I18N = True
# If you set this to False, Django will not format dates, numbers and # If you set this to False, Django will not format dates, numbers and
# calendars according to the current locale. # calendars according to the current locale.
USE_L10N = True USE_L10N = False
DECIMAL_SEPARATOR = '.'
DATE_FORMAT = 'd.m.Y'
DATE_INPUT_FORMATS = ('%d.%m.%Y', '%d.%m.%Y', '%Y-%m-%d')
# If you set this to False, Django will not use timezone-aware datetimes. # If you set this to False, Django will not use timezone-aware datetimes.
USE_TZ = True USE_TZ = True

83
project/static/css/style.css
Unescape View File

@ -283,7 +283,7 @@ ul.messagelist li.error { background-image: url(../img/icon-error.gif); }
.errorlist { font-size: 8pt; overflow: hidden; } .errorlist { font-size: 8pt; overflow: hidden; }
.errorlist li { color: red; } .errorlist li { color: red; }
.help-text { font-size: 8pt; color: #666666; } .help-text { font-size: 8pt; color: #666666; display:block;padding:10px;}
form { font-size: small; padding: 0; margin: 0; } form { font-size: small; padding: 0; margin: 0; }
form label {font-style:italic;font-size:16px;} form label {font-style:italic;font-size:16px;}
@ -300,12 +300,13 @@ fieldset {
} }
textarea { width: 99%; } textarea { width: 99%; }
input[type=text], input[type=email], input[type=password], select, textarea { border: 1px inset #8c8c8c; } input[type=text], input[type=number], input[type=email], input[type=password], select, textarea { border: 2px inset #d8d8d8; }
input[type=text], input[type=email], input[type=password], textarea, option { padding-left: 2px; margin-left: 2px; } input[type=text], input[type=number], input[type=email], input[type=password], textarea, option { padding-left: 2px; margin-left: 2px; }
.long-input input { width: 350px; } .long-input input { width: 350px; }
.block { margin: 10px 0; } .block {margin: 10px 0;overflow:hidden;}
.bt {border-top:#313942 1px solid; padding-top:15px;}
.client-form .col1 { float: left; width: 350px; } .client-form .col1 { float: left; width: 350px; }
.client-form .col2 { float: left; width: 370px; } .client-form .col2 { float: left; width: 370px; }
@ -347,9 +348,9 @@ input[type=text], input[type=email], input[type=password], textarea, option { pa
ul { clear: both; list-style: none; margin: 0; padding: 0; } ul { clear: both; list-style: none; margin: 0; padding: 0; }
.nav {display:block;margin:20px;} .nav {display:block;margin:20px;}
.has-datepicker { background: url(../img/icon-calendar.gif) no-repeat scroll right center transparent; } .has-datepicker { background: url(../img/icon-calendar.png) no-repeat scroll right 5px center #f8f8f8; }
.profile-form input#id_ip_reg_date { background: url(../img/icon-calendar.gif) no-repeat scroll right center transparent; } .profile-form input#id_ip_reg_date { background: url(../img/icon-calendar.png) no-repeat scroll right center transparent; }
#id_phone_code, #id_fax_code { width: 60px; } #id_phone_code, #id_fax_code { width: 60px; }
#accounts .account-delete a { text-decoration: none; } #accounts .account-delete a { text-decoration: none; }
@ -357,7 +358,9 @@ ul { clear: both; list-style: none; margin: 0; padding: 0; }
#accounts .account-add img { vertical-align: middle; margin-right: 6px; } #accounts .account-add img { vertical-align: middle; margin-right: 6px; }
#accounts .main { color: green; font-size: 11px; text-align: center; padding-left: 10px; vertical-align: top; } #accounts .main { color: green; font-size: 11px; text-align: center; padding-left: 10px; vertical-align: top; }
.add-link img { vertical-align: middle; margin-right: 6px; } .add-link, .add-row {background:url(../img/icon-add.png) no-repeat left;padding:5px 0 5px 26px;line-height:22px;display:inline-block;}
.add-link {margin-left:10px;}
.add-row {margin-top:4px;}
.edit-link a, .delete-link a { text-decoration: none; } .edit-link a, .delete-link a { text-decoration: none; }
.doc-panel {background:#fff;} .doc-panel {background:#fff;}
@ -382,13 +385,16 @@ a.delete { vertical-align: top; }
.profile-filters-form .accounts ul li span.name { margin-left: 25px; } .profile-filters-form .accounts ul li span.name { margin-left: 25px; }
.div-doc-form {background:#fff;padding:15px;box-shadow: 0 0 5px #ddd;} .div-doc-form {background:#fff;padding:15px;box-shadow: 0 0 5px #ddd;}
.doc-form input[type=text], input[type=email], input[type=password], textarea, option { padding-left: 2px; margin-left: 0; } .doc-form input[type=text], .doc-form input[type=email], .doc-form input[type=number], .doc-form input[type=password], .doc-form textarea, .doc-form option {padding-left:2px;margin-left:0;height:36px;font-size:25px;}
#id_client_text {width:406px;}
#id_client-wrapper {display:inline;}
.doc-form #doc_date, .doc-form #doc_date,
.doc-form #doc_mesto, .doc-form #end_date, .doc-form #doc_mesto, .doc-form #end_date,
.doc-form #doc_expire_date, .doc-form #dover_doc_date, .doc-form #dover_passport_num .doc-form #doc_expire_date, .doc-form #dover_doc_date, .doc-form #dover_passport_num, .doc-form #plat_doc_date
{ margin-left: 10px; } { margin-left: 10px; }
.doc-form #client .hilight {font-size:25px;}
.doc-form #saldo_debit input { margin-left: 12px; } .doc-form #saldo_debit input { margin-left: 12px; }
.doc-form #saldo_credit input { margin-left: 5px; } .doc-form #saldo_credit input { margin-left: 5px; }
.doc-form #saldo_debit .errorlist, .doc-form #saldo_credit .errorlist { margin-left: 83px; } .doc-form #saldo_debit .errorlist, .doc-form #saldo_credit .errorlist { margin-left: 83px; }
@ -423,28 +429,49 @@ a.delete { vertical-align: top; }
.doc-form #nds_type { padding-top: 16px; } .doc-form #nds_type { padding-top: 16px; }
.doc-form #nds_type ul li { float: left; } .doc-form #nds_type ul li { float: left; }
.doc-form table.list td.name input[type=text] { width: 284px; } .doc-form table.doc-list {border-collapse:collapse;position:relative;}
.doc-form table.list td.qty input[type=text] { width: 68px; } .doc-form table.doc-list td {border:4px solid #fff;}
.doc-form table.list td.units input[type=text] { width: 50px; } .doc-form table.doc-list .itogo-td {background:#313942;height:30px;font-size:20px;color:#fff;padding:5px 10px;border-bottom:2px solid #313942;border-top:2px solid #313942;}
.doc-form table.list td.units_kod input[type=text] { width: 20px; } .doc-form table.doc-list .itogo-td1 {border-right:2px solid #313942;}
.doc-form table.list td.price input[type=text] { width: 72px; } .doc-form table.doc-list .itogo-td2 {border-left:2px solid #313942;}
.doc-form table.list td.total_price input[type=text] { width: 84px; } .doc-form table.doc-list .add-row {position:absolute;bottom:5px;}
.doc-form table.list td.country_code input[type=text] { width: 24px; }
.doc-form table.list td.country_name input[type=text] { width: 84px; } .doc-form table.doc-list th {font-weight:normal;text-align:left;font-size:14px;}
.doc-form table.list td.ntd input[type=text] { width: 84px; }
.doc-form table.doc-list td.name { width: 590px; }
.doc-form table.list.aktsverki td.name input[type=text] { width: 432px; } .doc-form table.doc-list td.name input[type=text] { width: 584px; }
.doc-form table.list.aktsverki td.debit input[type=text] { width: 96px; } .doc-form table.factura-doc-list td.name { width: 260px; }
.doc-form table.list.aktsverki td.credit input[type=text] { width: 96px; } .doc-form table.factura-doc-list td.name input[type=text] { width: 250px; }
.doc-form table.doc-list td.qty { width: 140px; }
.doc-form table.list.dover td.name input[type=text] { width: 432px; } .doc-form table.doc-list td.qty input { width: 135px; }
.doc-form table.list.dover td.qty input[type=text] { width: 96px; } .doc-form table.doc-list td.units { width: 90px; }
.doc-form table.list.dover td.units input[type=text] { width: 96px; } .doc-form table.doc-list td.units input { width: 86px; }
.doc-form table.doc-list td.units_kod input { width: 80px; }
.doc-form table.doc-list td.price { width: 128px;}
.doc-form table.doc-list td.price input { width: 132px; }
.doc-form table.doc-list td.total_price { width: 128px; }
.doc-form table.doc-list td.total_price input { width: 132px; }
.doc-form table.doc-list td.country_code input { width: 48px; }
.doc-form table.doc-list td.country_name input { width: 84px; }
.doc-form table.doc-list td.ntd input { width: 84px; }
.doc-form table.doc-list td.DELETE {width: 48px;}
.doc-form table.doc-list.aktsverki td.name input[type=text] { width: 432px; }
.doc-form table.doc-list.aktsverki td.debit input[type=text] { width: 96px; }
.doc-form table.doc-list.aktsverki td.credit input[type=text] { width: 96px; }
.doc-form table.doc-list.dover td.name input[type=text] { width: 432px; }
.doc-form table.doc-list.dover td.qty input[type=text] { width: 96px; }
.doc-form table.doc-list.dover td.units input[type=text] { width: 96px; }
.doc-form .buttons input[name=submit] {padding:10px 40px 10px 75px;background:url(../img/save.png) no-repeat left 30px center #fed13e;color:#4e5661;font-weight:normal;font-family:"Arial Narrow", Arial, sans-serif;}
.doc-email-form input#id_to { width: 99% } .doc-email-form input#id_to { width: 99% }
.doc-email-form textarea { width: 99%; margin-left: 2px; } .doc-email-form textarea { width: 99%; margin-left: 2px; }
.doc-email-form #doc_format ul li { display: inline; } .doc-email-form #doc_format ul li { display: inline; }
.delete-row {display:inline-block;width:21px;height:21px;background:url(../img/close.png) no-repeat center center;}
.filters #id_client, .filters #id_invoice { width: 99%; } .filters #id_client, .filters #id_invoice { width: 99%; }
#dialogs { display: none; } #dialogs { display: none; }
@ -512,11 +539,13 @@ div.blockMsg { width: 100%; height: 100%; top: 0; left: 0; text-align: center; }
#menu ul li {display:table-cell;height:50px;background:#313942;font-family:"Arial Narrow", Arial, sans-serif;font-size:16px;vertical-align:middle;border-right:solid 1px #272b31;border-left: solid 1px #434a52} #menu ul li {display:table-cell;height:50px;background:#313942;font-family:"Arial Narrow", Arial, sans-serif;font-size:16px;vertical-align:middle;border-right:solid 1px #272b31;border-left: solid 1px #434a52}
#menu ul li.yellow {background:#fed13e;} #menu ul li.yellow {background:#fed13e;}
#menu ul li.yellow a, #menu ul li.yellow span {color:#313942;} #menu ul li.yellow a, #menu ul li.yellow span {color:#313942;}
#menu ul li.yellow.selected{background:url('../img/menu-selected2.png') #fed13e no-repeat bottom center;} #menu ul li.yellow.selected {background:url('../img/menu-selected2.png') #fed13e no-repeat bottom center;}
#menu ul li.yellow.selected a {color:#313942;}
#menu ul li a, #menu ul li span {text-decoration:none;padding:0 25px;} #menu ul li a, #menu ul li span {text-decoration:none;padding:0 25px;}
#menu ul li a {color:#fff;} #menu ul li a {color:#fff;}
#menu ul li span{color:#fed13e;} #menu ul li span{color:#fed13e;}
#menu ul li.selected{background:url('../img/menu-selected.png') #313942 no-repeat bottom center; } #menu ul li.selected{background:url('../img/menu-selected.png') #313942 no-repeat bottom center; }
#menu ul li.selected a{color:#fed13e;}
#menu .other_docs_menu {position:absolute;top:50px;z-index:50;} #menu .other_docs_menu {position:absolute;top:50px;z-index:50;}
#menu .other_docs_menu li {display:block;} #menu .other_docs_menu li {display:block;}

BIN
project/static/img/icon-add.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 540 B

BIN
project/static/img/icon-calendar.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 730 B

2
project/static/js/client.commons.js
Unescape View File

@ -86,7 +86,7 @@ function setup_client_delete_links(form, reload_on_success) {
} }
function setup_client_add_link(form, reload_on_success) { function setup_client_add_link(form, reload_on_success) {
$('a.client.add-link').each(function() { $('a.client.add-client-link').each(function() {
$(this).click(function() { $(this).click(function() {
var link = $(this); var link = $(this);

4
project/static/js/lib/jquery.formset.js
Unescape View File

@ -195,8 +195,8 @@
prefix: 'form', // The form prefix for your django formset prefix: 'form', // The form prefix for your django formset
min_num: 0, // Minimum count rows min_num: 0, // Minimum count rows
formTemplate: null, // The jQuery selection cloned to generate new form instances formTemplate: null, // The jQuery selection cloned to generate new form instances
addText: '+ Добавить строку', // Text for the add link addText: 'Добавить строку', // Text for the add link
deleteText: 'Удалить', // Text for the delete link deleteText: '', // Text for the delete link
addCssClass: 'add-row', // CSS class applied to the add link addCssClass: 'add-row', // CSS class applied to the add link
deleteCssClass: 'delete-row', // CSS class applied to the delete link deleteCssClass: 'delete-row', // CSS class applied to the delete link
formCssClass: 'dynamic-form', // CSS class applied to each form in a formset formCssClass: 'dynamic-form', // CSS class applied to each form in a formset

2
project/templates/customer/bank_accounts/delete.html
Unescape View File

@ -9,8 +9,6 @@
№ {{ account.account }} № {{ account.account }}
</p> </p>
<br />
<form action="" method="post"> <form action="" method="post">
{% csrf_token %} {% csrf_token %}
{% if referer %}<input type="hidden" value="{{ referer }}" name="referer">{% endif %} {% if referer %}<input type="hidden" value="{{ referer }}" name="referer">{% endif %}

2
project/templates/customer/bank_accounts/edit.html
Unescape View File

@ -11,7 +11,5 @@
<a class="delete" href="{% url 'customer_bank_accounts_delete' account.pk %}">Удалить</a> <a class="delete" href="{% url 'customer_bank_accounts_delete' account.pk %}">Удалить</a>
<br />
{% include "customer/bank_accounts/form.html" %} {% include "customer/bank_accounts/form.html" %}
{% endblock %} {% endblock %}

3
project/templates/customer/bank_accounts/form.html
Unescape View File

@ -29,12 +29,11 @@
{% endif %} {% endif %}
{% if field|widget_type != "Textarea" %} {% if field|widget_type != "Textarea" %}
{% if field.help_text %}<br /><span class="help_text">{{ field.help_text }}</span>{% endif %} {% if field.help_text %}<p><span class="help_text">{{ field.help_text }}</span></p>{% endif %}
{% endif %} {% endif %}
</div> </div>
{% if field.name != "id_is_main" %} {% if field.name != "id_is_main" %}
<br />
{% endif %} {% endif %}
{% endfor %} {% endfor %}

3
project/templates/customer/bank_accounts/list.html
Unescape View File

@ -7,12 +7,11 @@
<div> <div>
<a id="account_add_link" class="account add-link" href="{% url 'customer_bank_accounts_add' %}"> <a id="account_add_link" class="account add-link" href="{% url 'customer_bank_accounts_add' %}">
<img src="{{ STATIC_URL }}img/icon-add.gif" alt="Добавить" title="Добавить расчётный счёт" />Добавить расчётный счёт <img src="{{ STATIC_URL }}img/icon-add.png" alt="Добавить" title="Добавить расчётный счёт" />Добавить расчётный счёт
</a> </a>
</div> </div>
{% if page %} {% if page %}
<br /><br />
<table id="accounts" class="list"> <table id="accounts" class="list">
<tr> <tr>

2
project/templates/customer/clients/delete.html
Unescape View File

@ -9,8 +9,6 @@
{{ client.name }}, ИНН {{ client.inn }} {{ client.name }}, ИНН {{ client.inn }}
</p> </p>
<br />
<form action="" method="post"> <form action="" method="post">
{% csrf_token %} {% csrf_token %}
<input type="hidden" name="post" value="yes" /> <input type="hidden" name="post" value="yes" />

2
project/templates/customer/clients/edit.html
Unescape View File

@ -11,7 +11,5 @@
<a class="delete" href="{% url 'customer_clients_delete' client.pk %}">Удалить</a> <a class="delete" href="{% url 'customer_clients_delete' client.pk %}">Удалить</a>
<br />
{% include "customer/clients/form.html" %} {% include "customer/clients/form.html" %}
{% endblock %} {% endblock %}

2
project/templates/customer/clients/list.html
Unescape View File

@ -6,7 +6,7 @@
<h2>Добавление и список контрагентов</h2> <h2>Добавление и список контрагентов</h2>
<div class='content-white'> <div class='content-white'>
<div class='btn yellow-btn docs-btn'> <div class='btn yellow-btn docs-btn'>
<a class="client add-link" href="{% url 'customer_clients_add' %}" title="Добавить контрагента"> <a class="client add-client-link" href="{% url 'customer_clients_add' %}" title="Добавить контрагента">
Добавить контрагента Добавить контрагента
</a> </a>
</div> </div>

12
project/templates/customer/index.html
Unescape View File

@ -5,12 +5,12 @@
{% block content %} {% block content %}
<div style="float:left;"> <div style="float:left;">
<h2>Личный кабинет</h2> <h2>Личный кабинет</h2>
<a href="{% url 'customer_profile_view' %}">Реквизиты</a><br /><br /> <a href="{% url 'customer_profile_view' %}">Реквизиты</a>
<a href="{% url 'customer_bank_accounts_list' %}">Расчётные счета</a><br /><br /> <a href="{% url 'customer_bank_accounts_list' %}">Расчётные счета</a>
<a href="{% url 'customer_clients_list' %}">Контрагенты</a><br /><br /> <a href="{% url 'customer_clients_list' %}">Контрагенты</a>
<a href="{% url 'customer_license_list' %}">Лицензии</a><br /><br /> <a href="{% url 'customer_license_list' %}">Лицензии</a>
<a href="{% url 'myauth_change_password' %}">Сменить пароль</a><br /><br /> <a href="{% url 'myauth_change_password' %}">Сменить пароль</a>
<a href="{% url 'myauth_change_email' %}">Сменить e-mail</a><br /><br /> <a href="{% url 'myauth_change_email' %}">Сменить e-mail</a>
</div> </div>
<div style="float:left; margin-left: 40px; border-left: 1px solid; padding-left: 20px;"> <div style="float:left; margin-left: 40px; border-left: 1px solid; padding-left: 20px;">

30
project/templates/customer/profile/edit.html
Unescape View File

@ -28,7 +28,6 @@
</div> </div>
<div style="float: left; width: 480px;"> <div style="float: left; width: 480px;">
{{ form.boss_surname }} {{ form.boss_name }} {{ form.boss_midname }} {{ form.boss_surname }} {{ form.boss_name }} {{ form.boss_midname }}
<br />
<span class="help-text">Будет подставляться в создаваемые документы.</span> <span class="help-text">Будет подставляться в создаваемые документы.</span>
{{ form.boss_surname.errors }} {{ form.boss_name.errors }} {{ form.boss_midname.errors }} {{ form.boss_surname.errors }} {{ form.boss_name.errors }} {{ form.boss_midname.errors }}
</div> </div>
@ -44,7 +43,6 @@
<div class="long-input" style="float: left;"> <div class="long-input" style="float: left;">
{{ form.name }} {{ form.name }}
{{ form.name.errors }} {{ form.name.errors }}
<br />
<span class="help-text">Будет подставляться в создаваемые документы.</span> <span class="help-text">Будет подставляться в создаваемые документы.</span>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
@ -59,7 +57,6 @@
<div class="long-input" style="float: left;"> <div class="long-input" style="float: left;">
{{ form.full_name }} {{ form.full_name }}
{{ form.full_name.errors }} {{ form.full_name.errors }}
<br />
<span class="help-text">Как в учредительных документах.</span> <span class="help-text">Как в учредительных документах.</span>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
@ -119,7 +116,6 @@
</div> </div>
<div class="long-input" style="float: left;"> <div class="long-input" style="float: left;">
{{ form.svid_gos_reg }} {{ form.svid_gos_reg }}
<br />
<span class="help-text">Требуется для счет-фактуры.</span> <span class="help-text">Требуется для счет-фактуры.</span>
{{ form.svid_gos_reg.errors }} {{ form.svid_gos_reg.errors }}
</div> </div>
@ -160,7 +156,6 @@
</div> </div>
<div style="float: left; width: 480px;"> <div style="float: left; width: 480px;">
{{ form.boss_surname }} {{ form.boss_name }} {{ form.boss_midname }} {{ form.boss_surname }} {{ form.boss_name }} {{ form.boss_midname }}
<br />
<span class="help-text">Используется для строки "подпись" в документах.</span> <span class="help-text">Используется для строки "подпись" в документах.</span>
{{ form.boss_surname.errors }} {{ form.boss_name.errors }} {{ form.boss_midname.errors }} {{ form.boss_surname.errors }} {{ form.boss_name.errors }} {{ form.boss_midname.errors }}
</div> </div>
@ -189,7 +184,6 @@
</div> </div>
<div style="float: left;"> <div style="float: left;">
{{ form.glavbuh_surname }} {{ form.glavbuh_name }} {{ form.glavbuh_midname }} {{ form.glavbuh_surname }} {{ form.glavbuh_name }} {{ form.glavbuh_midname }}
<br />
<span class="help-text">Используется для строки "подпись" в документах.</span> <span class="help-text">Используется для строки "подпись" в документах.</span>
{{ form.glavbuh_surname.errors }} {{ form.glavbuh_name.errors }} {{ form.glavbuh_midname.errors }} {{ form.glavbuh_surname.errors }} {{ form.glavbuh_name.errors }} {{ form.glavbuh_midname.errors }}
</div> </div>
@ -215,7 +209,6 @@
<td class="account-info" style="width: 350px; vertical-align: top; padding: 0;"> <td class="account-info" style="width: 350px; vertical-align: top; padding: 0;">
<a id="account_edit_link_{{ account.pk }}" href="{% url 'customer_bank_accounts_edit' id=account.pk %}" title="Редактировать расчётный счёт">{{ account.account }}</a> <a id="account_edit_link_{{ account.pk }}" href="{% url 'customer_bank_accounts_edit' id=account.pk %}" title="Редактировать расчётный счёт">{{ account.account }}</a>
<br />
в <span id="account_bank_name_{{ account.pk }}">{{ account.name }}</span> в <span id="account_bank_name_{{ account.pk }}">{{ account.name }}</span>
</td> </td>
@ -238,7 +231,6 @@
<td class="account-info" style="width: 350px; vertical-align: top; padding: 0;"> <td class="account-info" style="width: 350px; vertical-align: top; padding: 0;">
<a id="account_edit_link_0" href="{% url 'customer_bank_accounts_edit' id=0 %}" title="Редактировать расчётный счёт">нет</a> <a id="account_edit_link_0" href="{% url 'customer_bank_accounts_edit' id=0 %}" title="Редактировать расчётный счёт">нет</a>
<br />
в <span id="account_bank_name_0">нет</span> в <span id="account_bank_name_0">нет</span>
</td> </td>
@ -254,9 +246,8 @@
<tr> <tr>
<td></td> <td></td>
<td class="account-add"> <td class="account-add">
<br /> <a id="account_add_link" class="add-link" href="{% url 'customer_bank_accounts_add' %}" title="Добавить расчётный счёт">
<a id="account_add_link" href="{% url 'customer_bank_accounts_add' %}" title="Добавить расчётный счёт"> <img src="{{ STATIC_URL }}img/icon-add.png" alt="Добавить" title="Добавить расчётный счёт" />Добавить расчётный счёт
<img src="{{ STATIC_URL }}img/icon-add.gif" alt="Добавить" title="Добавить расчётный счёт" />Добавить расчётный счёт
</a> </a>
</td> </td>
<td></td> <td></td>
@ -274,7 +265,6 @@
</div> </div>
<div class="long-input" style="float: left;"> <div class="long-input" style="float: left;">
{{ form.address }} {{ form.address }}
<br />
<span class="help-text">Будет подставляться в создаваемые счета, акты и накладные.</span> <span class="help-text">Будет подставляться в создаваемые счета, акты и накладные.</span>
{{ form.address.errors }} {{ form.address.errors }}
</div> </div>
@ -288,7 +278,6 @@
</div> </div>
<div class="long-input" style="float: left;"> <div class="long-input" style="float: left;">
{{ form.jur_address }} {{ form.jur_address }}
<br />
<span class="help-text">Как в учредительных документах.</span> <span class="help-text">Как в учредительных документах.</span>
{{ form.jur_address.errors }} {{ form.jur_address.errors }}
</div> </div>
@ -302,7 +291,6 @@
</div> </div>
<div class="long-input" style="float: left;"> <div class="long-input" style="float: left;">
{{ form.real_address }} {{ form.real_address }}
<br />
<span class="help-text">Используется только для карточки компании.</span> <span class="help-text">Используется только для карточки компании.</span>
{{ form.real_address.errors }} {{ form.real_address.errors }}
</div> </div>
@ -364,21 +352,21 @@
<div style="float: left;"> <div style="float: left;">
<div id="boss_sign"> <div id="boss_sign">
{% if form.boss_sign.value %} {% if form.boss_sign.value %}
<p>
<img src="{{ form.boss_sign.value.url }}" /> {# если уже есть картинка, показать ее #} <img src="{{ form.boss_sign.value.url }}" /> {# если уже есть картинка, показать ее #}
<br /> </p>
{% endif %} {% endif %}
{{ form.boss_sign }} {{ form.boss_sign }}
<br />
<span class="help-text">Подпись руководителя.</span> <span class="help-text">Подпись руководителя.</span>
{{ form.boss_sign.errors }} {{ form.boss_sign.errors }}
</div> </div>
<div id="glavbuh_sign" class="field"> <div id="glavbuh_sign" class="field">
{% if form.glavbuh_sign.value %} {% if form.glavbuh_sign.value %}
<p>
<img src="{{ form.glavbuh_sign.value.url }}" /> {# если уже есть картинка, показать ее #} <img src="{{ form.glavbuh_sign.value.url }}" /> {# если уже есть картинка, показать ее #}
<br /> </p>
{% endif %} {% endif %}
{{ form.glavbuh_sign }} {{ form.glavbuh_sign }}
<br />
<span class="help-text">Подпись бухгалтера.</span> <span class="help-text">Подпись бухгалтера.</span>
{{ form.glavbuh_sign.errors }} {{ form.glavbuh_sign.errors }}
</div> </div>
@ -392,8 +380,9 @@
</div> </div>
<div style="float: left;"> <div style="float: left;">
{% if form.stamp.value %} {% if form.stamp.value %}
<p>
<img src="{{ form.stamp.value.url }}" /> {# если уже есть картинка, показать ее #} <img src="{{ form.stamp.value.url }}" /> {# если уже есть картинка, показать ее #}
<br /> </p>
{% endif %} {% endif %}
{{ form.stamp }} {{ form.stamp }}
{{ form.stamp.errors }} {{ form.stamp.errors }}
@ -407,8 +396,9 @@
</div> </div>
<div style="float: left;"> <div style="float: left;">
{% if form.logo.value %} {% if form.logo.value %}
<p>
<img src="{{ form.logo.value.url }}" /> {# если уже есть картинка, показать ее #} <img src="{{ form.logo.value.url }}" /> {# если уже есть картинка, показать ее #}
<br /> </p>
{% endif %} {% endif %}
{{ form.logo }} {{ form.logo }}
{{ form.logo.errors }} {{ form.logo.errors }}

4
project/templates/customer/profile/end_order.html
Unescape View File

@ -12,8 +12,8 @@
<div id="content"> <div id="content">
{% if success %} {% if success %}
<h2>Спасибо!</h2> <h2>Спасибо!</h2>
Ваш заказ <strong>№ {{ order_num }}</strong> принят!<br/> <p>Ваш заказ <strong>№ {{ order_num }}</strong> принят!</p>
Наш менеджер свяжется с Вами в ближайшее время.<br/> <p>Наш менеджер свяжется с Вами в ближайшее время.</p>
{% else %} {% else %}
{{ message }} {{ message }}
{% endif %} {% endif %}

4
project/templates/customer/profile/license_list.html
Unescape View File

@ -3,8 +3,8 @@
{% block title %}Мои счета{% endblock %} {% block title %}Мои счета{% endblock %}
{% block content %} {% block content %}
<a href="{% url 'customer_order_license' %}">Купить лицензию</a><br /><br /> <p><a href="{% url 'customer_order_license' %}">Купить лицензию</a></p>
<a href="{% url 'customer_paid_list' %}">Оплаченные лицензии</a><br /><br /> <p><a href="{% url 'customer_paid_list' %}">Оплаченные лицензии</a></p>
<h1>Выписанные счета</h1> <h1>Выписанные счета</h1>
<div class='header'> <div class='header'>
<div class='w100 left'>Номер</div> <div class='w100 left'>Номер</div>

6
project/templates/customer/profile/paid_list.html
Unescape View File

@ -3,8 +3,8 @@
{% block title %}История расчётов{% endblock %} {% block title %}История расчётов{% endblock %}
{% block content %} {% block content %}
<a href="{% url 'customer_order_license' %}">Купить лицензию</a><br /><br /> <p><a href="{% url 'customer_order_license' %}">Купить лицензию</a></p>
<a href="{% url 'customer_license_list' %}">Все счета</a><br /><br /> <p><a href="{% url 'customer_license_list' %}">Все счета</a></p>
<h1>История оплат</h1> <h1>История оплат</h1>
<div class='header'> <div class='header'>
<div class='w100 left'>Дата оплаты</div> <div class='w100 left'>Дата оплаты</div>
@ -23,7 +23,7 @@
<div class='w100 left'>{% if license.pay_sum %}{{ license.pay_sum }}{% else %}-{% endif %}</div> <div class='w100 left'>{% if license.pay_sum %}{{ license.pay_sum }}{% else %}-{% endif %}</div>
<div class='w100 left'>{{ license.get_term }}</div> <div class='w100 left'>{{ license.get_term }}</div>
<div class='w200 left'>{% if license.date_from %}{{ license.date_from }} - {{ license.date_to }}{% else %}-{% endif %}</div> <div class='w200 left'>{% if license.date_from %}{{ license.date_from }} - {{ license.date_to }}{% else %}-{% endif %}</div>
<div class='w100 left'>{{ license.get_status_display }}<br />{{ license.get_paid_status|default:'' }}</div> <div class='w100 left'>{{ license.get_status_display }}<p>{{ license.get_paid_status|default:'' }}</p></div>
<div class='w100 left'>Разные документы</div> <div class='w100 left'>Разные документы</div>
<div class='clear'></div> <div class='clear'></div>
</div> </div>

2
project/templates/docs/_base/base_delete.html
Unescape View File

@ -9,8 +9,6 @@
{{ obj }} {{ obj }}
</p> </p>
<br />
<form action="" method="post"> <form action="" method="post">
{% csrf_token %} {% csrf_token %}
<input type="hidden" name="post" value="yes" /> <input type="hidden" name="post" value="yes" />

4
project/templates/docs/_base/base_edit.html
Unescape View File

@ -12,11 +12,9 @@
<h2 style="display:inline">Редактировать {{ padeji.vinit }}</h2> <h2 style="display:inline">Редактировать {{ padeji.vinit }}</h2>
<a class="delete" href="{{ url_delete }}">Удалить</a>
<div class="clear"></div> <div class="clear"></div>
{% include form_template %} <div class="div-doc-form">{% include form_template %}</div>
{% endblock %} {% endblock %}
{% block dialogs %} {% block dialogs %}

2
project/templates/docs/_base/base_list.html
Unescape View File

@ -14,7 +14,7 @@
<div class='content-white'> <div class='content-white'>
<div class="btn yellow-btn docs-btn"> <div class="btn yellow-btn docs-btn">
<a class="{{ model_name|default:"document" }} add-link" href="{{ url_add }}" title="Создать {{ padeji.vinit }}"> <a class="{{ model_name|default:"document" }} add-doc-link" href="{{ url_add }}" title="Создать {{ padeji.vinit }}">
Создать {{ padeji.vinit }} Создать {{ padeji.vinit }}
</a> </a>
</div> </div>

1
project/templates/docs/aktrabot/form.html
Unescape View File

@ -18,7 +18,6 @@
{% include 'docs/parts/form_field.html' with field=form.nds_value id="nds_value" classes="left" label="НДС" no_clear_after="True" %} {% include 'docs/parts/form_field.html' with field=form.nds_value id="nds_value" classes="left" label="НДС" no_clear_after="True" %}
{% if formset %} {% if formset %}
<br />
{% include 'docs/parts/form_tbl_items.html' %} {% include 'docs/parts/form_tbl_items.html' %}
{% endif %} {% endif %}
</div> </div>

4
project/templates/docs/aktrabot/list.html
Unescape View File

@ -29,7 +29,5 @@
{% endblock %} {% endblock %}
{% block panel_copy %} {% block panel_copy %}
<a href="{{ url_copy }}" title="Копию акта">Копию акта</a><br /> <a href="{{ url_copy }}" title="Копию акта">Копию акта</a>
<br />
{% endblock %} {% endblock %}

1
project/templates/docs/aktsverki/form.html
Unescape View File

@ -14,7 +14,6 @@
{% include 'docs/parts/form_field.html' with field=form.start_date id="start_date" classes="field left" label="Период" required="True" no_clear_after="True" %} {% include 'docs/parts/form_field.html' with field=form.start_date id="start_date" classes="field left" label="Период" required="True" no_clear_after="True" %}
{% include 'docs/parts/form_field.html' with field=form.end_date id="end_date" classes="field left" required="True" %} {% include 'docs/parts/form_field.html' with field=form.end_date id="end_date" classes="field left" required="True" %}
<br />
<div style="font-size: 14px;">Входящее сальдо</div> <div style="font-size: 14px;">Входящее сальдо</div>
</div> </div>

10
project/templates/docs/aktsverki/form_tbl_items.html
Unescape View File

@ -1,11 +1,11 @@
{# табличная часть акта сверки #} {# табличная часть акта сверки #}
<table id="tbl_items" class="list aktsverki"> <table id="tbl_items" class="doc-list aktsverki">
<tr> <tr>
<th style="width: 436px">Наименование операции, документы</th> <th>Наименование операции, документы</th>
<th style="width: 100px">Дебет</th> <th>Дебет</th>
<th style="width: 100px">Кредит</th> <th>Кредит</th>
<th style="width: 44px; text-align: center">Удалить</th> <th>Удалить</th>
</tr> </tr>
{% for iform in formset %} {% for iform in formset %}

14
project/templates/docs/docs.html
Unescape View File

@ -8,28 +8,14 @@
{% if url_invoice_list %}<a href="{{ url_invoice_list }}">Счета</a>{% else %}Счета{% endif %} {% if url_invoice_list %}<a href="{{ url_invoice_list }}">Счета</a>{% else %}Счета{% endif %}
<br /><br />
{% if url_faktura_list %}<a href="{{ url_faktura_list }}">Счета-фактуры</a>{% else %}Счета-фактуры{% endif %} {% if url_faktura_list %}<a href="{{ url_faktura_list }}">Счета-фактуры</a>{% else %}Счета-фактуры{% endif %}
<br /><br />
{% if url_nakladn_list %}<a href="{{ url_nakladn_list }}">Накладные</a>{% else %}Накладные{% endif %} {% if url_nakladn_list %}<a href="{{ url_nakladn_list }}">Накладные</a>{% else %}Накладные{% endif %}
<br /><br />
{% if url_aktrabot_list %}<a href="{{ url_aktrabot_list }}">Акты выполненных работ</a>{% else %}Акты выполненных работ{% endif %} {% if url_aktrabot_list %}<a href="{{ url_aktrabot_list }}">Акты выполненных работ</a>{% else %}Акты выполненных работ{% endif %}
<br /><br />
{% if url_platejka_list %}<a href="{{ url_platejka_list }}">Платежные поручения</a>{% else %}Платежные поручения{% endif %} {% if url_platejka_list %}<a href="{{ url_platejka_list }}">Платежные поручения</a>{% else %}Платежные поручения{% endif %}
<br /><br />
{% if url_dover_list %}<a href="{{ url_dover_list }}">Доверенности</a>{% else %}Доверенности{% endif %} {% if url_dover_list %}<a href="{{ url_dover_list }}">Доверенности</a>{% else %}Доверенности{% endif %}
<br /><br />
{% if url_aktsverki_list %}<a href="{{ url_aktsverki_list }}">Акты сверки</a>{% else %}Акты сверки{% endif %} {% if url_aktsverki_list %}<a href="{{ url_aktsverki_list }}">Акты сверки</a>{% else %}Акты сверки{% endif %}
<br /><br />

2
project/templates/docs/dover/form.html
Unescape View File

@ -15,7 +15,6 @@
{% include 'docs/parts/form_field.html' with field=form.dover_doc id="dover_doc" classes="field left" label="По документу №" required="True" no_clear_after="True" %} {% include 'docs/parts/form_field.html' with field=form.dover_doc id="dover_doc" classes="field left" label="По документу №" required="True" no_clear_after="True" %}
{% include 'docs/parts/form_field.html' with field=form.dover_doc_date id="dover_doc_date" classes="field left" label="От" required="True" %} {% include 'docs/parts/form_field.html' with field=form.dover_doc_date id="dover_doc_date" classes="field left" label="От" required="True" %}
<br />
<div style="font-size: 14px;">Кому выдана доверенность</div> <div style="font-size: 14px;">Кому выдана доверенность</div>
</div> </div>
@ -28,7 +27,6 @@
{% include 'docs/parts/form_field.html' with field=form.dover_passport_org id="dover_passport_org" classes="field" label="Кем выдан" label_inline="True" required="True" %} {% include 'docs/parts/form_field.html' with field=form.dover_passport_org id="dover_passport_org" classes="field" label="Кем выдан" label_inline="True" required="True" %}
{% include 'docs/parts/form_field.html' with field=form.dover_passport_date id="dover_passport_date" classes="field" label="Дата выдачи" label_inline="True" required="True" %} {% include 'docs/parts/form_field.html' with field=form.dover_passport_date id="dover_passport_date" classes="field" label="Дата выдачи" label_inline="True" required="True" %}
<br />
<div style="font-size: 14px;">Список ТМЦ для получения</div> <div style="font-size: 14px;">Список ТМЦ для получения</div>
</div> </div>

9
project/templates/docs/faktura/form.html
Unescape View File

@ -34,11 +34,12 @@
<div class="block" style="border-bottom: 1px solid #777; padding: 0 20px 15px 0;"> <div class="block" style="border-bottom: 1px solid #777; padding: 0 20px 15px 0;">
{% include 'docs/parts/form_field.html' with field=form.nds_value id="nds_value" classes="left" label="НДС" no_clear_after="True" %} {% include 'docs/parts/form_field.html' with field=form.nds_value id="nds_value" classes="left" label="НДС" no_clear_after="True" %}
{% if formset %}
<br />
{% include 'docs/parts/faktura_form_tbl_items.html' %}
{% endif %}
</div> </div>
{% if formset %}
<div class="block" style="border-bottom: 1px solid #777; padding: 0 20px 15px 0;">
{% include 'docs/parts/faktura_form_tbl_items.html' %}
</div>
{% endif %}
{% endblock %} {% endblock %}

9
project/templates/docs/invoice/form.html
Unescape View File

@ -13,12 +13,13 @@
<div class="block"> <div class="block">
{% include 'docs/parts/form_field.html' with field=form.nds_value id="nds_value" classes="left" label="НДС" no_clear_after="True" %} {% include 'docs/parts/form_field.html' with field=form.nds_value id="nds_value" classes="left" label="НДС" no_clear_after="True" %}
</div>
{% if formset %} {% if formset %}
<br /> <div class="block bt">
{% include 'docs/parts/form_tbl_items.html' %} {% include 'docs/parts/form_tbl_items.html' %}
{% endif %}
</div> </div>
{% endif %}
<div class="block"> <div class="block">
{% include 'docs/parts/form_field.html' with field=form.doc_text id="doc_text" classes="field" label="Дополнительные условия" %} {% include 'docs/parts/form_field.html' with field=form.doc_text id="doc_text" classes="field" label="Дополнительные условия" %}

1
project/templates/docs/nakladn/form.html
Unescape View File

@ -22,7 +22,6 @@
{% include 'docs/parts/form_field.html' with field=form.nds_value id="nds_value" classes="left" label="НДС" no_clear_after="True" %} {% include 'docs/parts/form_field.html' with field=form.nds_value id="nds_value" classes="left" label="НДС" no_clear_after="True" %}
{% if formset %} {% if formset %}
<br />
{% include 'docs/parts/form_tbl_items.html' %} {% include 'docs/parts/form_tbl_items.html' %}
{% endif %} {% endif %}
</div> </div>

22
project/templates/docs/parts/faktura_form_tbl_items.html
Unescape View File

@ -1,15 +1,15 @@
{# табличная часть документа #} {# табличная часть документа #}
<table id="tbl_items" class="list"> <table id="tbl_items" class="factura-doc-list doc-list">
<tr> <tr>
<th style="width: 318px">Наименование</th> <th>Наименование</th>
<th colspan='2'>Ед. изм.</th> <th colspan='2'>Ед. изм.</th>
<th style="width: 72px">Кол-во</th> <th>Кол-во</th>
<th style="width: 76px">Цена</th> <th>Цена</th>
<th style="width: 88px">Сумма</th> <th>Сумма</th>
<th colspan='2'>Страна</th> <th colspan='2'>Страна</th>
<th style="width: 20px">№ таможенной декларации</th> <th>№ таможенной декларации</th>
<th style="width: 44px; text-align: center">Удалить</th> <th></th>
</tr> </tr>
{% for iform in formset.forms %} {% for iform in formset.forms %}
@ -59,19 +59,21 @@
{% endfor %} {% endfor %}
<tr> <tr>
<td colspan="3"> <td colspan="4">
</td> </td>
<td align="right"><b>Итого</b></td> <td class="itogo-td itogo-td1"><span>Итого</span></td>
<td><b id="itogo"></b></td> <td class="itogo-td itogo-td2"><span id="itogo"></span></td>
<td></td> <td></td>
</tr> </tr>
{% comment %}
<tr> <tr>
<td colspan="3"></td> <td colspan="3"></td>
<td align="right"><b id="itogo_nds_text">Без НДС</b></td> <td align="right"><b id="itogo_nds_text">Без НДС</b></td>
<td><b id="itogo_nds"></b></td> <td><b id="itogo_nds"></b></td>
<td></td> <td></td>
</tr> </tr>
{% endcomment %}
</table> </table>
{{ formset.management_form }} {{ formset.management_form }}

2
project/templates/docs/parts/form_buttons.html
Unescape View File

@ -1,6 +1,6 @@
<div class="buttons"> <div class="buttons">
{% if not is_ajax %} {% if not is_ajax %}
<input type="submit" name="submit" value="Сохранить" /> <input class="btn save_btn" type="submit" name="submit" value="Сохранить {{ padeji.imenit }}" />
<input type="submit" name="_cancel" value="Отмена" /> <input type="submit" name="_cancel" value="Отмена" />
{% else %} {% else %}
<button type="submit" role="button" name="submit">Сохранить</button> <button type="submit" role="button" name="submit">Сохранить</button>

4
project/templates/docs/parts/form_client_choices.html
Unescape View File

@ -1,4 +1,4 @@
<p>{{ label }}</p> <p>{{ label }}</p>
<input type="radio" name="{{ client_group|default:'client_group' }}" value="he_is"{% if default == 'he_is' %} checked{% endif %}> {{ label1|default:'Он же' }}<br> <input type="radio" name="{{ client_group|default:'client_group' }}" value="he_is"{% if default == 'he_is' %} checked{% endif %}> {{ label1|default:'Он же' }}
<input type="radio" name="{{ client_group|default:'client_group' }}" value="another"{% if default == 'another' %} checked{% endif %}>{{ label2|default:'Стороннее лицо' }}<br> <input type="radio" name="{{ client_group|default:'client_group' }}" value="another"{% if default == 'another' %} checked{% endif %}>{{ label2|default:'Стороннее лицо' }}
<input type="radio" name="{{ client_group|default:'client_group' }}" value="nobody"{% if default == 'nobody' %} checked{% endif %}> Не указывать <input type="radio" name="{{ client_group|default:'client_group' }}" value="nobody"{% if default == 'nobody' %} checked{% endif %}> Не указывать

9
project/templates/docs/parts/form_field.html
Unescape View File

@ -12,9 +12,12 @@ no_clear_after - не добавлять очистку float после бло
<div{% if id %} id="{{ id }}"{% endif %}{% if classes %} class="{{ classes }}"{% endif %}> <div{% if id %} id="{{ id }}"{% endif %}{% if classes %} class="{{ classes }}"{% endif %}>
{% if label %}{{ label }}:{% if required %} <span class="required">*</span>{% endif %}{% endif %} {% if label %}{{ label }}:{% if required %} <span class="required">*</span>{% endif %}{% endif %}
{% if not label_inline %}<br />{% endif %} {% if label_inline %}
{{ field }} {{ field }}
{% if help %}<br /><span class="help-text">{{ help }}</span>{% endif %} {% else %}
<p>{{ field }}</p>
{% endif %}
{% if help %}<p><span class="help-text">{{ help }}</span></p>{% endif %}
{% if not is_ajax %}{{ field.errors }}{% endif %} {% if not is_ajax %}{{ field.errors }}{% endif %}
</div> </div>
{% if not no_clear_after %}<div class="clear"></div>{% endif %} {% if not no_clear_after %}<div class="clear"></div>{% endif %}

13
project/templates/docs/parts/form_field_client.html
Unescape View File

@ -7,12 +7,13 @@ no_clear_after - не добавлять очистку float после бло
{% endcomment %} {% endcomment %}
<div id={{ id|default:"client" }} class="field"> <div id={{ id|default:"client" }} class="field">
{{ label|default:"Контрагент" }}:{% if required %} <span class="required">*</span>{% endif %}<br /> {{ label|default:"Контрагент" }}:{% if required %} <span class="required">*</span>{% endif %}
{{ field }} <p>
{{ field }}
<a class="client add-link" style="margin-left: 10px; vertical-align: top;" href="{% url 'customer_clients_add' %}" title="Добавить контрагента"> <a class="client add-link" href="{% url 'customer_clients_add' %}" title="Добавить контрагента">
<img src="{{ STATIC_URL }}img/icon-add.gif" alt="Добавить" title="Добавить контрагента" />Добавить контрагента Добавить контрагента
</a> </a>
</p>
{{ form.client.errors }} {{ form.client.errors }}
{% if not is_ajax %}{{ form.client.errors }}{% endif %} {% if not is_ajax %}{{ form.client.errors }}{% endif %}

20
project/templates/docs/parts/form_tbl_items.html
Unescape View File

@ -1,13 +1,13 @@
{# табличная часть документа #} {# табличная часть документа #}
<table id="tbl_items" class="list"> <table id="tbl_items" class="doc-list">
<tr> <tr>
<th style="width: 338px">Наименование</th> <th>Наименование:</th>
<th style="width: 72px">Кол-во</th> <th>Количество:</th>
<th style="width: 54px">Ед. изм.</th> <th>Ед. изм.:</th>
<th style="width: 76px">Цена</th> <th>Цена:</th>
<th style="width: 88px">Сумма</th> <th>Сумма:</th>
<th style="width: 44px; text-align: center">Удалить</th> <th></th>
</tr> </tr>
{% for iform in formset %} {% for iform in formset %}
@ -33,17 +33,19 @@
<tr> <tr>
<td colspan="3"> <td colspan="3">
</td> </td>
<td align="right"><b>Итого</b></td> <td class="itogo-td itogo-td1"><span>Итого</span></td>
<td><b id="itogo"></b></td> <td class="itogo-td itogo-td2"><span id="itogo"></span></td>
<td></td> <td></td>
</tr> </tr>
{% comment %}
<tr> <tr>
<td colspan="3"></td> <td colspan="3"></td>
<td align="right"><b id="itogo_nds_text">Без НДС</b></td> <td align="right"><b id="itogo_nds_text">Без НДС</b></td>
<td><b id="itogo_nds"></b></td> <td><b id="itogo_nds"></b></td>
<td></td> <td></td>
</tr> </tr>
{% endcomment %}
</table> </table>
{{ formset.management_form }} {{ formset.management_form }}

3
project/templates/docs/platejka/list.html
Unescape View File

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

14
project/templates/menu/menu.html
Unescape View File

@ -35,6 +35,7 @@
{% endif %} {% endif %}
<li id="other_docs"> <li id="other_docs">
<a href="#" id="other_docs_a">Другие документы</a> <a href="#" id="other_docs_a">Другие документы</a>
{% if user.is_anonymous %}
<ul class="other_docs_menu hidden"> <ul class="other_docs_menu hidden">
{% for child in children|slice:"4:" %} {% for child in children|slice:"4:" %}
<li class="child{% if child.selected %} selected{% endif %}{% if child.ancestor %} ancestor{% endif %}{% if child.sibling %} sibling{% endif %}{% if child.descendant %} descendant{% endif %}"> <li class="child{% if child.selected %} selected{% endif %}{% if child.ancestor %} ancestor{% endif %}{% if child.sibling %} sibling{% endif %}{% if child.descendant %} descendant{% endif %}">
@ -42,6 +43,19 @@
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
{% else %}
<ul class="other_docs_menu hidden">
<li class="child{% if request.path == url_aktsverki_list %} selected{% endif %}">
<a href="{{ url_aktsverki_list }}">АКТЫ СВЕРКИ</a>
</li>
<li class="child{% if request.path == url_dover_list %} selected{% endif %}">
<a href="{{ url_dover_list }}">ДОВЕРЕННОСТИ</a>
</li>
<li class="child{% if request.path == url_platejka_list %} selected{% endif %}">
<a href="{{ url_platejka_list }}">ПЛАТЁЖНЫЕ ПОРУЧЕНИЯ</a>
</li>
</ul>
{% endif %}
</li> </li>
<li class="yellow child{% if request.path == customer_profile_view %} selected{% endif %}"> <li class="yellow child{% if request.path == customer_profile_view %} selected{% endif %}">
<a href="{{ customer_profile_view }}">МОИ РЕКВИЗИТЫ</a> <a href="{{ customer_profile_view }}">МОИ РЕКВИЗИТЫ</a>

2
project/templates/pages/index.html
Unescape View File

@ -16,7 +16,7 @@
<div class="index-banner-btn"> <div class="index-banner-btn">
<p>Подключите бесплатный пробный период на 45 дней <p>Подключите бесплатный пробный период на 45 дней
без ограничений функциональности сервиса!</p> без ограничений функциональности сервиса!</p>
<a class="index-register" href="{% url 'myauth_register' %}">Попробовать бесплатно</a><br /> <a class="index-register" href="{% url 'myauth_register' %}">Попробовать бесплатно</a>
</div> </div>
{% endif %} {% endif %}
</div> </div>

Write Preview
Loading…
Cancel
Save