diff --git a/src/docs/forms/faktura.py b/src/docs/forms/faktura.py index 1b96830..43be389 100644 --- a/src/docs/forms/faktura.py +++ b/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() } diff --git a/src/docs/views/faktura.py b/src/docs/views/faktura.py index 2abce85..129df97 100644 --- a/src/docs/views/faktura.py +++ b/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 diff --git a/src/dokumentor/static/css/style.css b/src/dokumentor/static/css/style.css index 2e1c362..73f1822 100644 --- a/src/dokumentor/static/css/style.css +++ b/src/dokumentor/static/css/style.css @@ -856,3 +856,7 @@ input[type=number] { display:none; margin-top: 5px; } + +.nds_block__inline { + display: inline-block; +} diff --git a/src/dokumentor/templates/docs/faktura/form.html b/src/dokumentor/templates/docs/faktura/form.html index 953b83b..59dc04e 100644 --- a/src/dokumentor/templates/docs/faktura/form.html +++ b/src/dokumentor/templates/docs/faktura/form.html @@ -32,7 +32,8 @@
- {% 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' %} diff --git a/src/dokumentor/templates/docs/faktura/form_tbl_items.html b/src/dokumentor/templates/docs/faktura/form_tbl_items.html index 2fbfef0..bba1eba 100644 --- a/src/dokumentor/templates/docs/faktura/form_tbl_items.html +++ b/src/dokumentor/templates/docs/faktura/form_tbl_items.html @@ -57,22 +57,25 @@ {% endfor %} - + - Итого - + НДС + - {% comment %} - - Без НДС - + + + Итого + + + + - {% endcomment %} + {{ formset.management_form }}