diff --git a/project/customer/admin.py b/project/customer/admin.py index fcd9be3..dc49a05 100644 --- a/project/customer/admin.py +++ b/project/customer/admin.py @@ -53,7 +53,7 @@ class ClientAdmin(admin.ModelAdmin): (u'ИП', {'fields': ['okpo',]}), (u'Организация', {'fields': ['kpp',]}), (u'Банковские реквизиты', - {'fields': ['bank_bik', 'bank_name', 'bank_address', 'bank_korr_account', 'bank_account',]}), + {'fields': ['bank_bik', 'bank_name', 'bank_korr_account', 'bank_account',]}), (u'Контакты', {'fields': ['contact_name', 'contact_email', 'contact_phone', 'contact_skype', 'contact_other',]}), diff --git a/project/customer/forms.py b/project/customer/forms.py index 645e98f..c90db17 100644 --- a/project/customer/forms.py +++ b/project/customer/forms.py @@ -177,10 +177,9 @@ class BankAccountForm(forms.ModelForm): """Форма редактирования расчетных счетов.""" class Meta: model = models.BankAccount - fields = ('bik', 'name', 'short_name', 'address', 'korr_account', 'account', 'is_main', 'company') + fields = ('bik', 'name', 'short_name', 'korr_account', 'account', 'is_main', 'company') _textarea = forms.Textarea(attrs={'cols': 80, 'rows': 3}) - widgets = {'name': _textarea, 'short_name': _textarea, 'address': _textarea, 'company': forms.HiddenInput()} - #widgets = {'name': _textarea, 'address': _textarea,} + widgets = {'name': _textarea, 'short_name': _textarea, 'company': forms.HiddenInput()} def __init__(self, *args, **kwargs): super(BankAccountForm, self).__init__(*args, **kwargs) @@ -193,6 +192,7 @@ class BankAccountAdminForm(BankAccountForm): """Форма редактирования расчетных счетов - для админки.""" class Meta(BankAccountForm.Meta): fields = None + exclude = ('address',) class BankAccountListForm(forms.Form): @@ -213,7 +213,7 @@ class ClientForm(forms.ModelForm): model = models.Client fields = ('name', 'inn', 'kpp', 'ogrn', 'okpo', 'address', # банковские реквизиты - 'bank_bik', 'bank_name', 'bank_address', 'bank_korr_account', 'bank_account', + 'bank_bik', 'bank_name', 'bank_korr_account', 'bank_account', # контакты 'contact_name', 'contact_email', 'contact_phone', 'contact_skype', 'contact_other', ) @@ -222,7 +222,6 @@ class ClientForm(forms.ModelForm): #'name': _textarea, #'address': _textarea, 'bank_name': _textarea, - #'bank_address': _textarea, #'contact_other': _textarea, } @@ -241,6 +240,7 @@ class ClientAdminForm(ClientForm): """Форма редактирования контрагентов - для админки.""" class Meta(ClientForm.Meta): fields = None + exclude = ('bank_address',) class ClientsListForm(forms.Form): diff --git a/project/customer/models.py b/project/customer/models.py index 5fb929f..0ecc6ce 100644 --- a/project/customer/models.py +++ b/project/customer/models.py @@ -261,7 +261,7 @@ class BankAccount(models.Model): bik = models.CharField(u'БИК', max_length=10) name = models.CharField(u'Наименование банка', max_length=256) short_name = models.CharField(u'Сокращенное название банка', max_length=100, blank=True, default='') - address = models.CharField(u'Местонахождение', max_length=256) + address = models.CharField(u'Местонахождение', max_length=256, blank=True, default='') # TODO delete field? korr_account = models.CharField(u'Корр. счет', max_length=20) account = models.CharField(u'Расчетный счет', max_length=20) @@ -314,7 +314,7 @@ class Client(models.Model): # банковские реквизиты bank_bik = models.CharField(u'БИК', max_length=10, blank=True, default='') bank_name = models.CharField(u'Наименование банка', max_length=256, blank=True, default='') - bank_address = models.CharField(u'Местонахождение', max_length=256, blank=True, default='') + bank_address = models.CharField(u'Местонахождение', max_length=256, blank=True, default='') # TODO delete field? bank_korr_account = models.CharField(u'Корр. счет', max_length=20, blank=True, default='') bank_account = models.CharField(u'Расчетный счет', max_length=20, blank=True, default='') diff --git a/project/templates/customer/clients/form.html b/project/templates/customer/clients/form.html index ae5d576..2968e1d 100644 --- a/project/templates/customer/clients/form.html +++ b/project/templates/customer/clients/form.html @@ -106,6 +106,7 @@
+ {% comment %}