diff --git a/src/docs/forms/aktrabot.py b/src/docs/forms/aktrabot.py
index 362b250..b06796c 100644
--- a/src/docs/forms/aktrabot.py
+++ b/src/docs/forms/aktrabot.py
@@ -11,8 +11,11 @@ class AktRabotForm(BaseModelForm):
"""Форма редактирования акта выполн. работ."""
class Meta:
model = AktRabot
- fields = ('doc_num', 'doc_date',
- 'bank_account', 'client', 'invoice',
+ fields = (
+ 'doc_num',
+ 'doc_date',
+ 'client',
+ 'invoice',
'nds_value',
'doc_text',
)
diff --git a/src/docs/forms/faktura.py b/src/docs/forms/faktura.py
index 0155e86..1b96830 100644
--- a/src/docs/forms/faktura.py
+++ b/src/docs/forms/faktura.py
@@ -19,13 +19,23 @@ class FakturaForm(BaseModelForm):
class Meta:
model = Faktura
- fields = ('doc_num', 'doc_date',
- 'plat_doc_num', 'plat_doc_date',
- 'fix_doc_num', 'fix_doc_date',
- 'bank_account', 'client', 'invoice',
+ fields = (
+ 'doc_num',
+ 'doc_date',
+ 'plat_doc_num',
+ 'plat_doc_date',
+ 'fix_doc_num',
+ 'fix_doc_date',
+ 'client',
+ 'invoice',
'doc_reason',
'nds_value',
- 'doc_text', 'fixes', 'avance', 'currency', 'sender', 'receiver',
+ 'doc_text',
+ 'fixes',
+ 'avance',
+ 'currency',
+ 'sender',
+ 'receiver',
)
_radioselect = forms.RadioSelect
_textarea = forms.Textarea(attrs={'cols': 80, 'rows': 3})
diff --git a/src/docs/forms/invoice.py b/src/docs/forms/invoice.py
index 31701ad..789f811 100644
--- a/src/docs/forms/invoice.py
+++ b/src/docs/forms/invoice.py
@@ -12,11 +12,14 @@ class InvoiceForm(BaseModelForm):
class Meta:
model = Invoice
- fields = ('doc_num', 'doc_date',
- 'bank_account', 'client',
- 'nds_value',
- 'doc_text',
- )
+ fields = (
+ 'doc_num',
+ 'doc_date',
+ 'bank_account',
+ 'client',
+ 'nds_value',
+ 'doc_text',
+ )
_radioselect = forms.RadioSelect
_textarea = forms.Textarea(attrs={'cols': 80, 'rows': 3})
widgets = {
diff --git a/src/docs/migrations/0002_auto_20170520_0018.py b/src/docs/migrations/0002_auto_20170520_0018.py
new file mode 100644
index 0000000..b512e53
--- /dev/null
+++ b/src/docs/migrations/0002_auto_20170520_0018.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('docs', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='aktrabot',
+ name='bank_account',
+ field=models.ForeignKey(verbose_name='Расчётный счёт', blank=True, related_name='+', to='customer.BankAccount'),
+ ),
+ migrations.AlterField(
+ model_name='faktura',
+ name='bank_account',
+ field=models.ForeignKey(verbose_name='Расчётный счёт', blank=True, related_name='+', to='customer.BankAccount'),
+ ),
+ migrations.AlterField(
+ model_name='invoice',
+ name='bank_account',
+ field=models.ForeignKey(verbose_name='Расчётный счёт', blank=True, related_name='+', to='customer.BankAccount'),
+ ),
+ migrations.AlterField(
+ model_name='nakladn',
+ name='bank_account',
+ field=models.ForeignKey(verbose_name='Расчётный счёт', blank=True, related_name='+', to='customer.BankAccount'),
+ ),
+ ]
diff --git a/src/docs/migrations/0003_auto_20170520_0021.py b/src/docs/migrations/0003_auto_20170520_0021.py
new file mode 100644
index 0000000..5c640f7
--- /dev/null
+++ b/src/docs/migrations/0003_auto_20170520_0021.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('docs', '0002_auto_20170520_0018'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='aktrabot',
+ name='bank_account',
+ field=models.ForeignKey(verbose_name='Расчётный счёт', blank=True, null=True, related_name='+', to='customer.BankAccount'),
+ ),
+ migrations.AlterField(
+ model_name='faktura',
+ name='bank_account',
+ field=models.ForeignKey(verbose_name='Расчётный счёт', blank=True, null=True, related_name='+', to='customer.BankAccount'),
+ ),
+ migrations.AlterField(
+ model_name='invoice',
+ name='bank_account',
+ field=models.ForeignKey(verbose_name='Расчётный счёт', blank=True, null=True, related_name='+', to='customer.BankAccount'),
+ ),
+ migrations.AlterField(
+ model_name='nakladn',
+ name='bank_account',
+ field=models.ForeignKey(verbose_name='Расчётный счёт', blank=True, null=True, related_name='+', to='customer.BankAccount'),
+ ),
+ ]
diff --git a/src/docs/models/base_models.py b/src/docs/models/base_models.py
index 6d6355c..b140657 100644
--- a/src/docs/models/base_models.py
+++ b/src/docs/models/base_models.py
@@ -64,7 +64,9 @@ class BaseInvoiceModel(BaseNdsModel):
"""Расширение абстрактной модели бух.формы - по типу счета.
Доп. поля под расчетный счет и дополнительные условия.
"""
- bank_account = models.ForeignKey(BankAccount, related_name='+', verbose_name=u'Расчётный счёт')
+ bank_account = models.ForeignKey(BankAccount, related_name='+',
+ verbose_name=u'Расчётный счёт',
+ blank=True, null=True )
doc_text = models.TextField(u'Дополнительные условия', max_length=1000, blank=True, default='')
class Meta(BaseNdsModel.Meta):
diff --git a/src/dokumentor/templates/docs/aktrabot/form.html b/src/dokumentor/templates/docs/aktrabot/form.html
index ee24308..34d5f71 100644
--- a/src/dokumentor/templates/docs/aktrabot/form.html
+++ b/src/dokumentor/templates/docs/aktrabot/form.html
@@ -6,11 +6,12 @@
{% 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.bank_account id="bank_account" classes="field" label="Расчётный счёт" %}
+ {% include 'docs/parts/form_field.html' with field=form.bank_account %} {% comment %} TODO: fix frontend {% endcomment %}
+
-
+
{% include 'docs/parts/form_field_client.html' with field=form.client required="True" is_ajax="True" %}
{% include 'docs/parts/form_field.html' with field=form.invoice id="invoice" classes="field" label="Создать акт по счёту" %}
@@ -23,7 +24,7 @@
{% endif %}
-
+
{% endblock %}
{% block js %}
diff --git a/src/dokumentor/templates/docs/faktura/form.html b/src/dokumentor/templates/docs/faktura/form.html
index 04a820f..32d785a 100644
--- a/src/dokumentor/templates/docs/faktura/form.html
+++ b/src/dokumentor/templates/docs/faktura/form.html
@@ -6,7 +6,7 @@
{% 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.bank_account id="bank_account" classes="field" label="Расчётный счёт" %}
+ {% include 'docs/parts/form_field.html' with field=form.bank_account %}
{% 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" %}
diff --git a/src/dokumentor/templates/docs/invoice/form.html b/src/dokumentor/templates/docs/invoice/form.html
index b8ecced..3583aa7 100644
--- a/src/dokumentor/templates/docs/invoice/form.html
+++ b/src/dokumentor/templates/docs/invoice/form.html
@@ -23,37 +23,3 @@
{% endblock %}
-{% block js %}
-{% comment %}{% endcomment %}
-{% endblock %}