docs: removed (hid) measure/county code fields from faktura

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; }

project/templates/base.html

@@ -9,7 +9,7 @@
     <title>{% block title %}{% endblock %} | Документор</title>
     <link rel="shortcut icon" href="{{ STATIC_URL }}favicon.ico" />
     <link rel="stylesheet" href="{{ STATIC_URL }}css/ui-lightness/jquery-ui-1.10.3.custom.css" />
-    <link rel="stylesheet" href="{{ STATIC_URL }}css/style.css" />
+    <link rel="stylesheet" href="{{ STATIC_URL }}css/style.css?t=1489534321" />
     {% render_block "css" %}
 
 </head>

project/templates/docs/faktura/form.html

@@ -32,14 +32,12 @@
     </div>
 
     <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" label="НДС" no_clear_after="True" %}
 
+        {% if formset %}
+            {% include 'docs/faktura/form_tbl_items.html' %}
+        {% endif %}
     </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 %}
 

project/templates/docs/faktura/form_tbl_items.html

@@ -3,11 +3,11 @@
 <table id="tbl_items" class="factura-doc-list doc-list">
     <tr>
         <th>Наименование</th>
-        <th colspan='2'>Ед. изм.</th>
+        <th>Ед. изм.</th>
         <th>Кол-во</th>
         <th>Цена</th>
         <th>Сумма</th>
-        <th colspan='2'>Страна</th>
+        <th>Страна</th>
         <th>№ таможенной декларации</th>
         <th></th>
     </tr>
@@ -16,6 +16,7 @@
         <tr class="row_tbl_items row {% cycle 'even' 'odd' %}" {% if iform.DELETE.value %}style='display:none;'{% endif %}>
             {{ iform.id }}
             {{ iform.parent }}
+
             <td class="name">
                 {{ iform.name.errors }}
                 {{ iform.name }}
@@ -24,9 +25,8 @@
                 {{ iform.units.errors }}
                 {{ iform.units }}
             </td>
-            <td class="units_kod">
+            <td class="units_kod" style="display:none; visibility:collapse;">
-                {{ iform.units_kod.errors }}
+                {{ iform.units_kod.as_hidden }}
-                {{ iform.units_kod }}
             </td>
             <td class="qty">
                 {{ iform.qty.errors }}
@@ -40,14 +40,13 @@
                 {{ iform.total_price.errors }}
                 {{ iform.total_price }}
             </td>
-            <td class="country_code">
-                {{ iform.country_code.errors }}
-                {{ iform.country_code }}
-            </td>
             <td class="country_name">
                 {{ iform.country_name.errors }}
                 {{ iform.country_name }}
             </td>
+            <td class="country_code" style="display:none; visibility:collapse;">
+                {{ iform.country_code.as_hidden }}
+            </td>
             <td class="ntd">
                 {{ iform.ntd.errors }}
                 {{ iform.ntd }}
@@ -59,7 +58,7 @@
     {% endfor %}
 
     <tr>
-        <td colspan="4">
+        <td colspan="3">
         </td>
         <td class="itogo-td itogo-td1"><span>Итого</span></td>
         <td class="itogo-td itogo-td2"><span id="itogo"></span></td>