diff --git a/project/static/css/style.css b/project/static/css/style.css index 95427d6..f0eae62 100644 --- a/project/static/css/style.css +++ b/project/static/css/style.css @@ -475,8 +475,6 @@ a.delete { vertical-align: top; } .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; } @@ -491,6 +489,11 @@ a.delete { vertical-align: top; } .doc-form table.doc-list td.ntd input { width: 84px; } .doc-form table.doc-list td.DELETE {width: 48px;} +.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.factura-doc-list td.units input { width: 166px; } +.doc-form table.factura-doc-list td.country_name input { width: 132px; } + .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; } diff --git a/project/templates/base.html b/project/templates/base.html index 9da693e..d79bec1 100644 --- a/project/templates/base.html +++ b/project/templates/base.html @@ -9,7 +9,7 @@ {% block title %}{% endblock %} | Документор - + {% render_block "css" %} diff --git a/project/templates/docs/faktura/form.html b/project/templates/docs/faktura/form.html index 00b5736..62a8b85 100644 --- a/project/templates/docs/faktura/form.html +++ b/project/templates/docs/faktura/form.html @@ -32,14 +32,12 @@
- {% 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" label="НДС" no_clear_after="True" %} + {% if formset %} + {% include 'docs/faktura/form_tbl_items.html' %} + {% endif %}
- {% if formset %} -
- {% include 'docs/parts/faktura_form_tbl_items.html' %} -
- {% endif %} {% endblock %} diff --git a/project/templates/docs/parts/faktura_form_tbl_items.html b/project/templates/docs/faktura/form_tbl_items.html similarity index 85% rename from project/templates/docs/parts/faktura_form_tbl_items.html rename to project/templates/docs/faktura/form_tbl_items.html index 27c1a37..2fbfef0 100644 --- a/project/templates/docs/parts/faktura_form_tbl_items.html +++ b/project/templates/docs/faktura/form_tbl_items.html @@ -3,11 +3,11 @@ - + - + @@ -16,6 +16,7 @@ {{ iform.id }} {{ iform.parent }} + - - + -
НаименованиеЕд. изм.Ед. изм. Кол-во Цена СуммаСтранаСтрана № таможенной декларации
{{ iform.name.errors }} {{ iform.name }} @@ -24,9 +25,8 @@ {{ iform.units.errors }} {{ iform.units }} - {{ iform.units_kod.errors }} - {{ iform.units_kod }} + {{ iform.qty.errors }} @@ -40,14 +40,13 @@ {{ iform.total_price.errors }} {{ iform.total_price }} - {{ iform.country_code.errors }} - {{ iform.country_code }} - {{ iform.country_name.errors }} {{ iform.country_name }} {{ iform.ntd.errors }} {{ iform.ntd }} @@ -59,7 +58,7 @@ {% endfor %}
+ Итого