delete bank accoun in documents form

src/docs/forms/aktrabot.py

@@ -11,8 +11,11 @@ class AktRabotForm(BaseModelForm):
     """Форма редактирования акта выполн. работ."""
     class Meta:
         model = AktRabot
-        fields = ('doc_num', 'doc_date',
+        fields = (
-            'bank_account', 'client', 'invoice',
+            'doc_num',
+            'doc_date',
+            'client',
+            'invoice',
             'nds_value',
             'doc_text',
         )

src/docs/forms/faktura.py

@@ -19,13 +19,23 @@ class FakturaForm(BaseModelForm):
 
     class Meta:
         model = Faktura
-        fields = ('doc_num', 'doc_date',
+        fields = (
-            'plat_doc_num', 'plat_doc_date',
+            'doc_num',
-            'fix_doc_num', 'fix_doc_date',
+            'doc_date',
-            'bank_account', 'client', 'invoice',
+            '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})

src/docs/forms/invoice.py

@@ -12,11 +12,14 @@ class InvoiceForm(BaseModelForm):
 
     class Meta:
         model = Invoice
-        fields = ('doc_num', 'doc_date',
+        fields = (
-                  'bank_account', 'client',
+            'doc_num',
-                  'nds_value',
+            'doc_date',
-                  'doc_text',
+            'bank_account',
-                  )
+            'client',
+            'nds_value',
+            'doc_text',
+        )
         _radioselect = forms.RadioSelect
         _textarea = forms.Textarea(attrs={'cols': 80, 'rows': 3})
         widgets = {

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'),
+        ),
+    ]

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'),
+        ),
+    ]

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):

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

@@ -6,11 +6,12 @@
     <div class="block" style="border-bottom: 1px solid #777; padding: 0 20px 15px 0; margin-top: 0;">
         {% 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 %}
+
     </div>
 
     <div class="block" style="border-bottom: 1px solid #777; padding: 0 20px 5px 0;">
-        
+
         {% 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="Создать акт по счёту" %}
     </div>
@@ -23,7 +24,7 @@
         {% endif %}
     </div>
 
-    
+
 {% endblock %}
 
 {% block js %}

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

@@ -6,7 +6,7 @@
     <div class="block" style="border-bottom: 1px solid #777; padding: 0 20px 15px 0; margin-top: 0;">
         {% 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  %}
     </div>
     <div class="block" style="border-bottom: 1px solid #777; padding: 0 20px 15px 0; margin-top: 0;">
         {% 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" %}

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

@@ -23,37 +23,3 @@
     </div>
 {% endblock %}
 
-{% block js %}
-{% comment %}<script type="text/javascript">
-    {% include 'docs/_common_js/add_line_handler.js' %}
-    {% include 'docs/_common_js/calc_nds.js' %}
-    {% include 'docs/_common_js/calc_summa.js' %}
-    {% include 'docs/_common_js/calc_itogo.js' %}
-    {% include 'docs/_common_js/calc_itogo_nds.js' %}
-
-    function set_events() {
-        $("#tbl_items tr.row td.qty input").blur(calc_summa);
-        $("#tbl_items tr.row td.price input").blur(calc_summa);
-
-        $("#tbl_items tr.row td.qty input").blur(calc_itogo);
-        $("#tbl_items tr.row td.price input").blur(calc_itogo);
-        $("#tbl_items tr.row td.total_price input").blur(calc_itogo);
-
-        //$('input[name=nds_type]').change(calc_itogo_nds);
-        $('#id_nds_value').change(calc_itogo_nds);
-
-        $("#tbl_items tr.row td.qty input").blur(calc_itogo_nds);
-        $("#tbl_items tr.row td.price input").blur(calc_itogo_nds);
-        $("#tbl_items tr.row td.total_price input").blur(calc_itogo_nds);
-    }
-
-    $(document).ready(function() {
-        EnterToTab.init(document.getElementById('invoice'), true);
-        $("#id_doc_date").datepicker({dateFormat:'dd.mm.yy'});
-        set_events();
-        calc_itogo();
-        calc_itogo_nds();
-        add_line_handler();
-    });
-</script>{% endcomment %}
-{% endblock %}