add nds methot to faktura

src/docs/forms/faktura.py

@@ -30,6 +30,7 @@ class FakturaForm(BaseModelForm):
             'invoice',
             'doc_reason',
             'nds_value',
+            'nds_method',
             'doc_text',
             'fixes',
             'avance',
@@ -42,6 +43,7 @@ class FakturaForm(BaseModelForm):
         widgets = {
             'doc_text': _textarea,
             'currency': autocomplete_light.ChoiceWidget('ACCurrency'),
+            'nds_method': forms.RadioSelect()
         }
 
 

src/docs/views/faktura.py

@@ -72,9 +72,9 @@ class FakturaViews(BaseItemsViews, AddByInvoiceMethodMixin):
         # строки табличной части
         for item in obj_items:
             item.clean_price = utils.calc_clean_price(item)
-            item.clean_total_price = utils.calc_clean_total_price(item)
-            item.total_nds = utils.calc_total_nds(item)
-            item.full_total_price = utils.calc_full_total_price(item)
+            item.clean_total_price = utils.get_clean_total_price(item)
+            item.total_nds = utils.get_total_nds(item)
+            item.full_total_price = utils.get_full_total_price(item)
             # итого табличной части
             obj.sum_total_nds += item.total_nds
             obj.sum_full_total_price += item.full_total_price

src/dokumentor/static/css/style.css

@@ -856,3 +856,7 @@ input[type=number] {
 	display:none;
 	margin-top: 5px;
 }
+
+.nds_block__inline {
+	display: inline-block;
+}

src/dokumentor/templates/docs/faktura/form.html

@@ -32,7 +32,8 @@
     </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" label="НДС" no_clear_after="True" %}
+        {% include 'docs/parts/form_field.html' with field=form.nds_value id="nds_value" classes="left nds_block__inline" label="НДС" no_clear_after="True" %}
+        {% include 'docs/parts/form_field.html' with field=form.nds_method id="nds_method" classes="left nds-method hidden" no_clear_after="True" %}
 
         {% if formset %}
             {% include 'docs/faktura/form_tbl_items.html' %}

src/dokumentor/templates/docs/faktura/form_tbl_items.html

@@ -57,22 +57,25 @@
         </tr>
     {% endfor %}
 
-    <tr>
+  <tr id="blockTotalNds" class="hidden">
         <td colspan="3">
         </td>
-        <td class="itogo-td itogo-td1"><span>Итого</span></td>
-        <td class="itogo-td itogo-td2"><span id="itogo"></span></td>
+        <td class="itogo-nds-td"><span>НДС</span></td>
+        <td class="itogo-nds-td"><span id="totalNds"></span></td>
         <td></td>
     </tr>
 
-    {% comment %}
     <tr>
-        <td colspan="3"></td>
-        <td align="right"><b id="itogo_nds_text">Без НДС</b></td>
-        <td><b id="itogo_nds"></b></td>
+        <td colspan="3">
+        </td>
+        <td class="itogo-td itogo-td1"><span>Итого</span></td>
+        <td class="itogo-td itogo-td2">
+          <span id="itogo"></span>
+          <span id="decryption"></span>
+        </td>
         <td></td>
     </tr>
-    {% endcomment %}
+
 </table>
 
 {{ formset.management_form }}