mitri4
/
dokumentor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add gov in template

Browse Source
prod
Dmitriy Shesterkin 9 years ago
parent 5f88ccc9fa
commit 9d0b48fbde
6 changed files with 49 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/docs/forms/faktura.py
  2. 7
      src/docs/models/faktura.py
  3. 10
      static/css/style.css
  4. 18
      templates/docs/faktura/as_pdf.html
  5. 9
      templates/docs/faktura/form.html
  6. 12
      templates/docs/stub_js.html

2
src/docs/forms/faktura.py
Unescape View File

@ -45,6 +45,8 @@ class FakturaForm(BaseModelForm):
'currency', 'currency',
'sender', 'sender',
'receiver', 'receiver',
'government',
'government_description'
) )
_radioselect = forms.RadioSelect _radioselect = forms.RadioSelect
_textarea = forms.Textarea(attrs={'cols': 80, 'rows': 3}) _textarea = forms.Textarea(attrs={'cols': 80, 'rows': 3})

7
src/docs/models/faktura.py
Unescape View File

@ -38,6 +38,13 @@ class Faktura(BaseInvoiceModel, SignedStatusFieldMixin, InvoiceFieldMixin, Linke
plat_doc_date = models.DateField('Дата платёжного документа', blank=True, null=True) plat_doc_date = models.DateField('Дата платёжного документа', blank=True, null=True)
fix_doc_num = models.PositiveIntegerField('Номер исправления', null=True, blank=True) fix_doc_num = models.PositiveIntegerField('Номер исправления', null=True, blank=True)
fix_doc_date = models.DateField('Дата исправления', blank=True, null=True) fix_doc_date = models.DateField('Дата исправления', blank=True, null=True)
government = models.BooleanField('Госконтракт', default=False)
government_description = models.CharField(
'Идентификатор госконтракта, договора',
max_length=256,
blank=True,
default=''
)
def get_consignor_and_address(self): def get_consignor_and_address(self):
"""Отправитель и адрес """Отправитель и адрес

10
static/css/style.css
Unescape View File

@ -877,7 +877,8 @@ input[type=number] {
.doc-form select#id_currency {width: 330px;height: 40px;font-size: 25px;margin-left: 0;padding-left: 2px;} .doc-form select#id_currency {width: 330px;height: 40px;font-size: 25px;margin-left: 0;padding-left: 2px;}
.fixes__wrapper, .fixes__wrapper,
.avance__wrapper { .avance__wrapper,
.government__wrapper {
padding-bottom: 7px; padding-bottom: 7px;
font-size: 15px; font-size: 15px;
} }
@ -923,7 +924,8 @@ input[type=number] {
} }
#fixes, #fixes,
#avance { #avance,
#government {
cursor: pointer; cursor: pointer;
font-style: normal; font-style: normal;
} }
@ -1151,3 +1153,7 @@ input[type=number] {
#id_doc_reason { #id_doc_reason {
width: 570px; width: 570px;
} }
#id_government_description {
width: 325px;
}

18
templates/docs/faktura/as_pdf.html
Unescape View File

@ -89,20 +89,20 @@
<body> <body>
<div class="right font_7"> <div class="right font_7">
Приложение №1 Приложение №1 к постановлению Правительства Российской Федерации от 26 декабря 2011 г. № 1137
</div> </div>
<div class="right font_7"> <div class="right font_7">
К постановлению Правительства (в редакции постановления Правительства Российской Федерации от 25 мая 2017 г. № 625)
</div> </div>
<div class="right font_7"> <div class="right font_7">
Российской Федерации
</div> </div>
<div class="right font_7"> <div class="right font_7">
от 26 декабря 2011 г.№ 1137
</div> </div>
{# шапка документа #} {# шапка документа #}
<div style="margin-top:1ex;"> <div style="margin-top:16ex;">
<table class="left font_8"> <table class="left font_8">
{# строка 1 #} {# строка 1 #}
<tr> <tr>
@ -209,6 +209,14 @@
{{ obj.currency.name }}, {{ obj.currency.code }} {{ obj.currency.name }}, {{ obj.currency.code }}
</td> </td>
</tr> </tr>
<tr>
<td width="1%"></td>
<td colspan="2" class="bottom">Идентефикатор государственного контракта, договора (соглашения)</td>
<td colspan="4" class="bottom bottom_border">
{{ obj.government_description }}
</td>
</tr>
{# строка 16 #} {# строка 16 #}
{# строка 17 #} {# строка 17 #}
{# строка 18 #} {# строка 18 #}

9
templates/docs/faktura/form.html
Unescape View File

@ -6,20 +6,25 @@
{% include 'docs/parts/form_field.html' with field=form.doc_num id="doc_num" classes="left" label="Номер" required="True" no_clear_after="True" %} {% include 'docs/parts/form_field.html' with field=form.doc_num id="doc_num" classes="left" label="Номер" required="True" no_clear_after="True" %}
{% include 'docs/parts/form_field.html' with field=form.doc_date id="doc_date" classes="left" label="Дата создания" required="True" no_clear_after="True"%} {% include 'docs/parts/form_field.html' with field=form.doc_date id="doc_date" classes="left" label="Дата создания" required="True" no_clear_after="True"%}
{% include 'docs/parts/form_field.html' with field=form.bank_account %} {% include 'docs/parts/form_field.html' with field=form.bank_account %}
<div class="fixes__wrapper"><label id="fixes" for="id_fixes"><input id="id_fixes" name="fixes" type="checkbox"> Исправления</label></div> <div class="fixes__wrapper"><label id="fixes" for="id_fixes">{{ form.fixes }} Исправления</label></div>
<div id='fix_block' class="block{% if not form.fixes.value %} hidden{% endif %}"> <div id='fix_block' class="block{% if not form.fixes.value %} hidden{% endif %}">
{% include 'docs/parts/form_field.html' with field=form.fix_doc_num id="fix_doc_num" classes="left" label="Номер исправления" required="True" no_clear_after="True" %} {% include 'docs/parts/form_field.html' with field=form.fix_doc_num id="fix_doc_num" classes="left" label="Номер исправления" required="True" no_clear_after="True" %}
{% include 'docs/parts/form_field.html' with field=form.fix_doc_date id="fix_doc_date" classes="left" label="Дата исправления" required="True" no_clear_after="True" %} {% include 'docs/parts/form_field.html' with field=form.fix_doc_date id="fix_doc_date" classes="left" label="Дата исправления" required="True" no_clear_after="True" %}
<div class="fixes__comment">Номера исправлений должны начинаться с 1 для каждой счет-фактуры в отдельности.</div> <div class="fixes__comment">Номера исправлений должны начинаться с 1 для каждой счет-фактуры в отдельности.</div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div class="avance__wrapper"><label id="avance" for="id_avance"><input id="id_avance" name="avance" type="checkbox"> Аванс</label></div> <div class="avance__wrapper"><label id="avance" for="id_avance">{{ form.avance }} Аванс</label></div>
<div id='avance_block' class="block{% if not form.fixes.value %} hidden{% endif %}"> <div id='avance_block' class="block{% if not form.fixes.value %} hidden{% endif %}">
{% include 'docs/parts/form_field.html' with field=form.plat_doc_num id="plat_doc_num" classes="left" label="К плат. док-ту №" required="True" no_clear_after="True" %} {% include 'docs/parts/form_field.html' with field=form.plat_doc_num id="plat_doc_num" classes="left" label="К плат. док-ту №" required="True" no_clear_after="True" %}
{% include 'docs/parts/form_field.html' with field=form.plat_doc_date id="plat_doc_date" classes="left" label="Дата документа" required="True" no_clear_after="True" %} {% include 'docs/parts/form_field.html' with field=form.plat_doc_date id="plat_doc_date" classes="left" label="Дата документа" required="True" no_clear_after="True" %}
<div class="avance__comment">Платежное поручение, кассовый чек, приходный ордер и т.п.Заполняется только при наличии аванса.</div> <div class="avance__comment">Платежное поручение, кассовый чек, приходный ордер и т.п.Заполняется только при наличии аванса.</div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div class="government__wrapper"><label id="government" for="id_government">{{ form.government }} Госконтракт</div>
<div id='government_block' class="block{% if not form.government_description.value %} hidden{% endif %}">
{% include 'docs/parts/form_field.html' with field=form.government_description id="government_description" classes="left" label="Идентификатор госконтракта, договора" required="True" no_clear_after="True" %}
<div class="clear"></div>
</div>
{% include 'docs/parts/form_field.html' with field=form.currency id="currency" classes="field" label="Валюта документа" %} {% include 'docs/parts/form_field.html' with field=form.currency id="currency" classes="field" label="Валюта документа" %}
</div> </div>

12
templates/docs/stub_js.html
Unescape View File

@ -214,6 +214,12 @@
$('#fix_block').hide(); $('#fix_block').hide();
} }
if ($('#id_government').is(':checked')){
$('#government_block').show();
} else {
$('#government_block').hide();
}
if ($('#id_avance').is(':checked')){ if ($('#id_avance').is(':checked')){
$('#avance_block').show(); $('#avance_block').show();
} else { } else {
@ -232,6 +238,12 @@
$('#plat_doc_date').val(''); $('#plat_doc_date').val('');
}); });
$('#id_government').change(function(){
$('#government_block').toggle();
$('#id_government_description').val('');
});
function displayInvoiceBlock(visibly) { function displayInvoiceBlock(visibly) {
var invoiceBlock = $('#invoice'); var invoiceBlock = $('#invoice');

Write Preview
Loading…
Cancel
Save