diff --git a/project/docs/models/aktrabot.py b/project/docs/models/aktrabot.py index b524382..cf4dcda 100644 --- a/project/docs/models/aktrabot.py +++ b/project/docs/models/aktrabot.py @@ -8,8 +8,8 @@ from .mixins import SignedStatusFieldMixin, InvoiceFieldMixin class AktRabot(BaseInvoiceModel, SignedStatusFieldMixin, InvoiceFieldMixin): """Акт выполн. работ.""" class Meta(BaseInvoiceModel.Meta): - verbose_name = u'Акт выполн. работ' - verbose_name_plural = u'Акты выполн. работ' + verbose_name = u'Акт выполненных работ' + verbose_name_plural = u'Акты выполненных работ' class AktRabotItem(BaseItemInvoiceModel): diff --git a/project/myauth/views.py b/project/myauth/views.py index 3e94e7b..e72581e 100644 --- a/project/myauth/views.py +++ b/project/myauth/views.py @@ -219,7 +219,7 @@ def login(request): #form_prefix = 'login' form_prefix = '' template_name = 'myauth/login.html' - success_url = 'customer_index' + success_url = 'customer_profile_view' if request.method == 'POST': form = form_class(data=request.POST, prefix=form_prefix) if form.is_valid(): diff --git a/project/settings.py b/project/settings.py index 7a6bd17..c29f337 100644 --- a/project/settings.py +++ b/project/settings.py @@ -51,7 +51,11 @@ USE_I18N = True # If you set this to False, Django will not format dates, numbers and # 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. USE_TZ = True diff --git a/project/static/css/style.css b/project/static/css/style.css index 5a49a8d..7ef7a38 100644 --- a/project/static/css/style.css +++ b/project/static/css/style.css @@ -283,7 +283,7 @@ ul.messagelist li.error { background-image: url(../img/icon-error.gif); } .errorlist { font-size: 8pt; overflow: hidden; } .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 label {font-style:italic;font-size:16px;} @@ -300,12 +300,13 @@ fieldset { } textarea { width: 99%; } -input[type=text], input[type=email], input[type=password], select, textarea { border: 1px inset #8c8c8c; } -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], select, textarea { border: 2px inset #d8d8d8; } +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; } -.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 .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; } .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; } #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 .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; } .doc-panel {background:#fff;} @@ -382,13 +385,16 @@ a.delete { vertical-align: top; } .profile-filters-form .accounts ul li span.name { margin-left: 25px; } .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_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; } +.doc-form #client .hilight {font-size:25px;} .doc-form #saldo_debit input { margin-left: 12px; } .doc-form #saldo_credit input { margin-left: 5px; } .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 ul li { float: left; } -.doc-form table.list td.name input[type=text] { width: 284px; } -.doc-form table.list td.qty input[type=text] { width: 68px; } -.doc-form table.list td.units input[type=text] { width: 50px; } -.doc-form table.list td.units_kod input[type=text] { width: 20px; } -.doc-form table.list td.price input[type=text] { width: 72px; } -.doc-form table.list td.total_price input[type=text] { width: 84px; } -.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.list td.ntd input[type=text] { width: 84px; } - -.doc-form table.list.aktsverki td.name input[type=text] { width: 432px; } -.doc-form table.list.aktsverki td.debit input[type=text] { width: 96px; } -.doc-form table.list.aktsverki td.credit input[type=text] { width: 96px; } - -.doc-form table.list.dover td.name input[type=text] { width: 432px; } -.doc-form table.list.dover td.qty input[type=text] { width: 96px; } -.doc-form table.list.dover td.units input[type=text] { width: 96px; } +.doc-form table.doc-list {border-collapse:collapse;position:relative;} +.doc-form table.doc-list td {border:4px solid #fff;} +.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.doc-list .itogo-td1 {border-right:2px solid #313942;} +.doc-form table.doc-list .itogo-td2 {border-left:2px solid #313942;} +.doc-form table.doc-list .add-row {position:absolute;bottom:5px;} + +.doc-form table.doc-list th {font-weight:normal;text-align:left;font-size:14px;} + +.doc-form table.doc-list td.name { width: 590px; } +.doc-form table.doc-list td.name input[type=text] { width: 584px; } +.doc-form table.factura-doc-list td.name { width: 260px; } +.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.doc-list td.qty input { width: 135px; } +.doc-form table.doc-list td.units { width: 90px; } +.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 textarea { width: 99%; margin-left: 2px; } .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%; } #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.yellow {background:#fed13e;} #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 {color:#fff;} #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 a{color:#fed13e;} #menu .other_docs_menu {position:absolute;top:50px;z-index:50;} #menu .other_docs_menu li {display:block;} diff --git a/project/static/img/icon-add.png b/project/static/img/icon-add.png new file mode 100644 index 0000000..0766184 Binary files /dev/null and b/project/static/img/icon-add.png differ diff --git a/project/static/img/icon-calendar.png b/project/static/img/icon-calendar.png new file mode 100644 index 0000000..c5e9b59 Binary files /dev/null and b/project/static/img/icon-calendar.png differ diff --git a/project/static/js/client.commons.js b/project/static/js/client.commons.js index 0449417..5298d0e 100644 --- a/project/static/js/client.commons.js +++ b/project/static/js/client.commons.js @@ -86,7 +86,7 @@ function setup_client_delete_links(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() { var link = $(this); diff --git a/project/static/js/lib/jquery.formset.js b/project/static/js/lib/jquery.formset.js index d4aaeeb..463bc44 100644 --- a/project/static/js/lib/jquery.formset.js +++ b/project/static/js/lib/jquery.formset.js @@ -195,8 +195,8 @@ prefix: 'form', // The form prefix for your django formset min_num: 0, // Minimum count rows formTemplate: null, // The jQuery selection cloned to generate new form instances - addText: '+ Добавить строку', // Text for the add link - deleteText: 'Удалить', // Text for the delete link + addText: 'Добавить строку', // Text for the add link + deleteText: '', // Text for the delete link addCssClass: 'add-row', // CSS class applied to the add link deleteCssClass: 'delete-row', // CSS class applied to the delete link formCssClass: 'dynamic-form', // CSS class applied to each form in a formset diff --git a/project/templates/customer/bank_accounts/delete.html b/project/templates/customer/bank_accounts/delete.html index 7c7ee2a..e76e25b 100644 --- a/project/templates/customer/bank_accounts/delete.html +++ b/project/templates/customer/bank_accounts/delete.html @@ -9,8 +9,6 @@ № {{ account.account }}

-
-
{% csrf_token %} {% if referer %}{% endif %} diff --git a/project/templates/customer/bank_accounts/edit.html b/project/templates/customer/bank_accounts/edit.html index f91cd55..e8e7bb9 100644 --- a/project/templates/customer/bank_accounts/edit.html +++ b/project/templates/customer/bank_accounts/edit.html @@ -11,7 +11,5 @@ Удалить -
- {% include "customer/bank_accounts/form.html" %} {% endblock %} diff --git a/project/templates/customer/bank_accounts/form.html b/project/templates/customer/bank_accounts/form.html index 89bc344..caf63fb 100644 --- a/project/templates/customer/bank_accounts/form.html +++ b/project/templates/customer/bank_accounts/form.html @@ -29,12 +29,11 @@ {% endif %} {% if field|widget_type != "Textarea" %} - {% if field.help_text %}
{{ field.help_text }}{% endif %} + {% if field.help_text %}

{{ field.help_text }}

{% endif %} {% endif %} {% if field.name != "id_is_main" %} -
{% endif %} {% endfor %} diff --git a/project/templates/customer/bank_accounts/list.html b/project/templates/customer/bank_accounts/list.html index 96a3c4f..f27c70b 100644 --- a/project/templates/customer/bank_accounts/list.html +++ b/project/templates/customer/bank_accounts/list.html @@ -7,12 +7,11 @@
{% if page %} -

diff --git a/project/templates/customer/clients/delete.html b/project/templates/customer/clients/delete.html index 63aa05e..0857e88 100644 --- a/project/templates/customer/clients/delete.html +++ b/project/templates/customer/clients/delete.html @@ -9,8 +9,6 @@ {{ client.name }}, ИНН {{ client.inn }}

-
- {% csrf_token %} diff --git a/project/templates/customer/clients/edit.html b/project/templates/customer/clients/edit.html index 4b9d79f..888b104 100644 --- a/project/templates/customer/clients/edit.html +++ b/project/templates/customer/clients/edit.html @@ -11,7 +11,5 @@ Удалить -
- {% include "customer/clients/form.html" %} {% endblock %} diff --git a/project/templates/customer/clients/list.html b/project/templates/customer/clients/list.html index 859b500..00e08a2 100644 --- a/project/templates/customer/clients/list.html +++ b/project/templates/customer/clients/list.html @@ -6,7 +6,7 @@

Добавление и список контрагентов

- + Добавить контрагента
diff --git a/project/templates/customer/index.html b/project/templates/customer/index.html index 1576ca2..21d7caf 100644 --- a/project/templates/customer/index.html +++ b/project/templates/customer/index.html @@ -5,12 +5,12 @@ {% block content %}

Личный кабинет

- Реквизиты

- Расчётные счета

- Контрагенты

- Лицензии

- Сменить пароль

- Сменить e-mail

+ Реквизиты + Расчётные счета + Контрагенты + Лицензии + Сменить пароль + Сменить e-mail
diff --git a/project/templates/customer/profile/edit.html b/project/templates/customer/profile/edit.html index 239be9c..7f132b2 100644 --- a/project/templates/customer/profile/edit.html +++ b/project/templates/customer/profile/edit.html @@ -28,7 +28,6 @@
{{ form.boss_surname }} {{ form.boss_name }} {{ form.boss_midname }} -
Будет подставляться в создаваемые документы. {{ form.boss_surname.errors }} {{ form.boss_name.errors }} {{ form.boss_midname.errors }}
@@ -44,7 +43,6 @@
{{ form.name }} {{ form.name.errors }} -
Будет подставляться в создаваемые документы.
@@ -59,7 +57,6 @@
{{ form.full_name }} {{ form.full_name.errors }} -
Как в учредительных документах.
@@ -119,7 +116,6 @@
{{ form.svid_gos_reg }} -
Требуется для счет-фактуры. {{ form.svid_gos_reg.errors }}
@@ -160,7 +156,6 @@
{{ form.boss_surname }} {{ form.boss_name }} {{ form.boss_midname }} -
Используется для строки "подпись" в документах. {{ form.boss_surname.errors }} {{ form.boss_name.errors }} {{ form.boss_midname.errors }}
@@ -189,7 +184,6 @@
{{ form.glavbuh_surname }} {{ form.glavbuh_name }} {{ form.glavbuh_midname }} -
Используется для строки "подпись" в документах. {{ form.glavbuh_surname.errors }} {{ form.glavbuh_name.errors }} {{ form.glavbuh_midname.errors }}
@@ -215,7 +209,6 @@ @@ -238,7 +231,6 @@ @@ -254,9 +246,8 @@ @@ -274,7 +265,6 @@
{{ form.address }} -
Будет подставляться в создаваемые счета, акты и накладные. {{ form.address.errors }}
@@ -288,7 +278,6 @@
{{ form.jur_address }} -
Как в учредительных документах. {{ form.jur_address.errors }}
@@ -302,7 +291,6 @@
{{ form.real_address }} -
Используется только для карточки компании. {{ form.real_address.errors }}
@@ -364,21 +352,21 @@
{% if form.boss_sign.value %} +

{# если уже есть картинка, показать ее #} -
+

{% endif %} {{ form.boss_sign }} -
Подпись руководителя. {{ form.boss_sign.errors }}
{% if form.glavbuh_sign.value %} +

{# если уже есть картинка, показать ее #} -
+

{% endif %} {{ form.glavbuh_sign }} -
Подпись бухгалтера. {{ form.glavbuh_sign.errors }}
@@ -392,8 +380,9 @@
{% if form.stamp.value %} +

{# если уже есть картинка, показать ее #} -
+

{% endif %} {{ form.stamp }} {{ form.stamp.errors }} @@ -407,8 +396,9 @@
{% if form.logo.value %} +

{# если уже есть картинка, показать ее #} -
+

{% endif %} {{ form.logo }} {{ form.logo.errors }} diff --git a/project/templates/customer/profile/end_order.html b/project/templates/customer/profile/end_order.html index 9ce586c..b8546ec 100755 --- a/project/templates/customer/profile/end_order.html +++ b/project/templates/customer/profile/end_order.html @@ -12,8 +12,8 @@
{% if success %}

Спасибо!

- Ваш заказ № {{ order_num }} принят!
- Наш менеджер свяжется с Вами в ближайшее время.
+

Ваш заказ № {{ order_num }} принят!

+

Наш менеджер свяжется с Вами в ближайшее время.

{% else %} {{ message }} {% endif %} diff --git a/project/templates/customer/profile/license_list.html b/project/templates/customer/profile/license_list.html index c40d866..e03d075 100644 --- a/project/templates/customer/profile/license_list.html +++ b/project/templates/customer/profile/license_list.html @@ -3,8 +3,8 @@ {% block title %}Мои счета{% endblock %} {% block content %} -Купить лицензию

-Оплаченные лицензии

+

Купить лицензию

+

Оплаченные лицензии

Выписанные счета

Номер
diff --git a/project/templates/customer/profile/paid_list.html b/project/templates/customer/profile/paid_list.html index a67805c..a5f106b 100644 --- a/project/templates/customer/profile/paid_list.html +++ b/project/templates/customer/profile/paid_list.html @@ -3,8 +3,8 @@ {% block title %}История расчётов{% endblock %} {% block content %} -Купить лицензию

-Все счета

+

Купить лицензию

+

Все счета

История оплат

Дата оплаты
@@ -23,7 +23,7 @@
{% if license.pay_sum %}{{ license.pay_sum }}{% else %}-{% endif %}
{{ license.get_term }}
{% if license.date_from %}{{ license.date_from }} - {{ license.date_to }}{% else %}-{% endif %}
-
{{ license.get_status_display }}
{{ license.get_paid_status|default:'' }}
+
{{ license.get_status_display }}

{{ license.get_paid_status|default:'' }}

Разные документы
diff --git a/project/templates/docs/_base/base_delete.html b/project/templates/docs/_base/base_delete.html index 959e783..b1095e2 100644 --- a/project/templates/docs/_base/base_delete.html +++ b/project/templates/docs/_base/base_delete.html @@ -9,8 +9,6 @@ {{ obj }}

-
- {% csrf_token %} diff --git a/project/templates/docs/_base/base_edit.html b/project/templates/docs/_base/base_edit.html index a509d74..a32f13b 100644 --- a/project/templates/docs/_base/base_edit.html +++ b/project/templates/docs/_base/base_edit.html @@ -12,11 +12,9 @@

Редактировать {{ padeji.vinit }}

- Удалить -
- {% include form_template %} +
{% include form_template %}
{% endblock %} {% block dialogs %} diff --git a/project/templates/docs/_base/base_list.html b/project/templates/docs/_base/base_list.html index 5f5ea7c..2850227 100644 --- a/project/templates/docs/_base/base_list.html +++ b/project/templates/docs/_base/base_list.html @@ -14,7 +14,7 @@
- + Создать {{ padeji.vinit }}
diff --git a/project/templates/docs/aktrabot/form.html b/project/templates/docs/aktrabot/form.html index 8d59762..8ae537f 100644 --- a/project/templates/docs/aktrabot/form.html +++ b/project/templates/docs/aktrabot/form.html @@ -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" %} {% if formset %} -
{% include 'docs/parts/form_tbl_items.html' %} {% endif %}
diff --git a/project/templates/docs/aktrabot/list.html b/project/templates/docs/aktrabot/list.html index 3d4b306..996d1b7 100644 --- a/project/templates/docs/aktrabot/list.html +++ b/project/templates/docs/aktrabot/list.html @@ -29,7 +29,5 @@ {% endblock %} {% block panel_copy %} - Копию акта
-
- + Копию акта {% endblock %} diff --git a/project/templates/docs/aktsverki/form.html b/project/templates/docs/aktsverki/form.html index 22d595b..e3b2474 100644 --- a/project/templates/docs/aktsverki/form.html +++ b/project/templates/docs/aktsverki/form.html @@ -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.end_date id="end_date" classes="field left" required="True" %} -
Входящее сальдо
diff --git a/project/templates/docs/aktsverki/form_tbl_items.html b/project/templates/docs/aktsverki/form_tbl_items.html index ea1ae95..3869213 100644 --- a/project/templates/docs/aktsverki/form_tbl_items.html +++ b/project/templates/docs/aktsverki/form_tbl_items.html @@ -1,11 +1,11 @@ {# табличная часть акта сверки #} -
+
- - - - + + + + {% for iform in formset %} diff --git a/project/templates/docs/docs.html b/project/templates/docs/docs.html index d495646..d6f1ec5 100644 --- a/project/templates/docs/docs.html +++ b/project/templates/docs/docs.html @@ -8,28 +8,14 @@ {% if url_invoice_list %}Счета{% else %}Счета{% endif %} -

- {% if url_faktura_list %}Счета-фактуры{% else %}Счета-фактуры{% endif %} -

- {% if url_nakladn_list %}Накладные{% else %}Накладные{% endif %} -

- {% if url_aktrabot_list %}Акты выполненных работ{% else %}Акты выполненных работ{% endif %} -

- {% if url_platejka_list %}Платежные поручения{% else %}Платежные поручения{% endif %} -

- {% if url_dover_list %}Доверенности{% else %}Доверенности{% endif %} -

- {% if url_aktsverki_list %}Акты сверки{% else %}Акты сверки{% endif %} - -

diff --git a/project/templates/docs/dover/form.html b/project/templates/docs/dover/form.html index 7489901..2561766 100644 --- a/project/templates/docs/dover/form.html +++ b/project/templates/docs/dover/form.html @@ -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_date id="dover_doc_date" classes="field left" label="От" required="True" %} -
Кому выдана доверенность
@@ -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_date id="dover_passport_date" classes="field" label="Дата выдачи" label_inline="True" required="True" %} -
Список ТМЦ для получения
diff --git a/project/templates/docs/faktura/form.html b/project/templates/docs/faktura/form.html index b19a7ae..00b5736 100644 --- a/project/templates/docs/faktura/form.html +++ b/project/templates/docs/faktura/form.html @@ -34,11 +34,12 @@
{% include 'docs/parts/form_field.html' with field=form.nds_value id="nds_value" classes="left" label="НДС" no_clear_after="True" %} - {% if formset %} -
- {% include 'docs/parts/faktura_form_tbl_items.html' %} - {% endif %}
+ {% if formset %} +
+ {% include 'docs/parts/faktura_form_tbl_items.html' %} +
+ {% endif %} {% endblock %} diff --git a/project/templates/docs/invoice/form.html b/project/templates/docs/invoice/form.html index 18d1f65..f1ab8ce 100644 --- a/project/templates/docs/invoice/form.html +++ b/project/templates/docs/invoice/form.html @@ -13,12 +13,13 @@
{% include 'docs/parts/form_field.html' with field=form.nds_value id="nds_value" classes="left" label="НДС" no_clear_after="True" %} +
- {% if formset %} -
- {% include 'docs/parts/form_tbl_items.html' %} - {% endif %} + {% if formset %} +
+ {% include 'docs/parts/form_tbl_items.html' %}
+ {% endif %}
{% include 'docs/parts/form_field.html' with field=form.doc_text id="doc_text" classes="field" label="Дополнительные условия" %} diff --git a/project/templates/docs/nakladn/form.html b/project/templates/docs/nakladn/form.html index ffac784..9363383 100644 --- a/project/templates/docs/nakladn/form.html +++ b/project/templates/docs/nakladn/form.html @@ -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" %} {% if formset %} -
{% include 'docs/parts/form_tbl_items.html' %} {% endif %}
diff --git a/project/templates/docs/parts/faktura_form_tbl_items.html b/project/templates/docs/parts/faktura_form_tbl_items.html index 6995852..27c1a37 100644 --- a/project/templates/docs/parts/faktura_form_tbl_items.html +++ b/project/templates/docs/parts/faktura_form_tbl_items.html @@ -1,15 +1,15 @@ {# табличная часть документа #} -
Наименование операции, документыДебетКредитУдалитьНаименование операции, документыДебетКредитУдалить
+
- + - - - + + + - - + + {% for iform in formset.forms %} @@ -59,19 +59,21 @@ {% endfor %} - - - + + + {% comment %} + {% endcomment %}
НаименованиеНаименование Ед. изм.Кол-воЦенаСуммаКол-воЦенаСумма Страна№ таможенной декларацииУдалить№ таможенной декларации
+ ИтогоИтого
Без НДС
{{ formset.management_form }} diff --git a/project/templates/docs/parts/form_buttons.html b/project/templates/docs/parts/form_buttons.html index 0002e47..53f3f0f 100644 --- a/project/templates/docs/parts/form_buttons.html +++ b/project/templates/docs/parts/form_buttons.html @@ -1,6 +1,6 @@
{% if not is_ajax %} - + {% else %} diff --git a/project/templates/docs/parts/form_client_choices.html b/project/templates/docs/parts/form_client_choices.html index fcacfce..cc38c33 100644 --- a/project/templates/docs/parts/form_client_choices.html +++ b/project/templates/docs/parts/form_client_choices.html @@ -1,4 +1,4 @@

{{ label }}

- {{ label1|default:'Он же' }}
-{{ label2|default:'Стороннее лицо' }}
+ {{ label1|default:'Он же' }} +{{ label2|default:'Стороннее лицо' }} Не указывать diff --git a/project/templates/docs/parts/form_field.html b/project/templates/docs/parts/form_field.html index 46637da..3b4f011 100644 --- a/project/templates/docs/parts/form_field.html +++ b/project/templates/docs/parts/form_field.html @@ -12,9 +12,12 @@ no_clear_after - не добавлять очистку float после бло {% if label %}{{ label }}:{% if required %} *{% endif %}{% endif %} - {% if not label_inline %}
{% endif %} - {{ field }} - {% if help %}
{{ help }}{% endif %} + {% if label_inline %} + {{ field }} + {% else %} +

{{ field }}

+ {% endif %} + {% if help %}

{{ help }}

{% endif %} {% if not is_ajax %}{{ field.errors }}{% endif %}
{% if not no_clear_after %}
{% endif %} diff --git a/project/templates/docs/parts/form_field_client.html b/project/templates/docs/parts/form_field_client.html index a812e8c..2376e68 100644 --- a/project/templates/docs/parts/form_field_client.html +++ b/project/templates/docs/parts/form_field_client.html @@ -7,12 +7,13 @@ no_clear_after - не добавлять очистку float после бло {% endcomment %}
- {{ label|default:"Контрагент" }}:{% if required %} *{% endif %}
- {{ field }} - - - ДобавитьДобавить контрагента - + {{ label|default:"Контрагент" }}:{% if required %} *{% endif %} +

+ {{ field }} + + Добавить контрагента + +

{{ form.client.errors }} {% if not is_ajax %}{{ form.client.errors }}{% endif %} diff --git a/project/templates/docs/parts/form_tbl_items.html b/project/templates/docs/parts/form_tbl_items.html index 6123580..b18b3e3 100644 --- a/project/templates/docs/parts/form_tbl_items.html +++ b/project/templates/docs/parts/form_tbl_items.html @@ -1,13 +1,13 @@ {# табличная часть документа #} - +
- - - - - - + + + + + + {% for iform in formset %} @@ -33,17 +33,19 @@ - - + + + {% comment %} + {% endcomment %}
НаименованиеКол-воЕд. изм.ЦенаСуммаУдалитьНаименование:Количество:Ед. изм.:Цена:Сумма:
ИтогоИтого
Без НДС
{{ formset.management_form }} diff --git a/project/templates/docs/platejka/list.html b/project/templates/docs/platejka/list.html index 31b80bd..78035bd 100644 --- a/project/templates/docs/platejka/list.html +++ b/project/templates/docs/platejka/list.html @@ -33,6 +33,5 @@ {% endblock %} {% block panel_copy %} - Копию плат. поручения
-
+ Копию плат. поручения {% endblock %} diff --git a/project/templates/menu/menu.html b/project/templates/menu/menu.html index 565c2b3..2d0fa18 100644 --- a/project/templates/menu/menu.html +++ b/project/templates/menu/menu.html @@ -35,6 +35,7 @@ {% endif %}
  • Другие документы +{% if user.is_anonymous %} +{% else %} + +{% endif %}
  • МОИ РЕКВИЗИТЫ diff --git a/project/templates/pages/index.html b/project/templates/pages/index.html index 73fcb58..5b07d19 100644 --- a/project/templates/pages/index.html +++ b/project/templates/pages/index.html @@ -16,7 +16,7 @@

    Подключите бесплатный пробный период на 45 дней без ограничений функциональности сервиса!

    - Попробовать бесплатно
    + Попробовать бесплатно
    {% endif %}