From 9777af487bbfb28f061a912756f5f1a8cfa9e2db Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 9 Mar 2017 14:56:41 +0300 Subject: [PATCH 1/2] customer: hid bank address field --- project/customer/admin.py | 2 +- project/customer/forms.py | 10 +++++----- project/customer/models.py | 4 ++-- project/templates/customer/clients/form.html | 2 ++ 4 files changed, 10 insertions(+), 8 deletions(-) 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 %}
Местонахождение{% if form.bank_address.field.required %}*{% endif %}: @@ -116,6 +117,7 @@
+ {% endcomment %}
From 21584f4ca50a1c1a56b390279f6e8ef82d0319e3 Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 9 Mar 2017 15:08:19 +0300 Subject: [PATCH 2/2] platejka: removed bank address --- project/templates/docs/platejka/as_pdf.html | 4 ++-- project/xls_templates/platejka.xls | Bin 25088 -> 25088 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/templates/docs/platejka/as_pdf.html b/project/templates/docs/platejka/as_pdf.html index 3b5c834..775a13e 100644 --- a/project/templates/docs/platejka/as_pdf.html +++ b/project/templates/docs/platejka/as_pdf.html @@ -122,7 +122,7 @@ {# блок 2 -- банк плательщика #} - {{ obj.bank_account.name|safe }} , {{ obj.bank_account.address|safe }} + {{ obj.bank_account.name|safe }} БИК {{ obj.bank_account.bik }} @@ -138,7 +138,7 @@ {# блок 3 -- банк получателя #} - {{ obj.client.bank_name|safe }} , {{ obj.client.bank_address|safe }} + {{ obj.client.bank_name|safe }} БИК {{ obj.client.bank_bik }} diff --git a/project/xls_templates/platejka.xls b/project/xls_templates/platejka.xls index 7a0d4447bf582dd8d3a6e08f97cc22c29a414eb8..ad5ead5ab39bbeb61809d00f989c54cdf6fc884b 100644 GIT binary patch delta 3437 zcmb_eZERCj7=CZNmA3cx_O^6u*Osm8*0uX!A9P=g@2_o)GGO9Fm@pz3V+NA=PhEsEBGr_w#2JB2s44eAC$_ zyTz27&LkhG@LNx3tfxfbYDLn;Q+hR@@sIF?=H{Gc@PDeCZ}>wT(IR};KOx%}(Lbw4 zIAuXR8Fp?|<5z6f8|qkO~H&+EM*HuPisw%)`CwWyr)i_hRT&BK*iHD|Q|U(?>@ z6TX#v-k0MxwTTB*FJDs)eqZj<39h z+Q3g9ek=B|lHmK*)xMKQPaJ>!m7^~lPfSnO@s3zMx5q~-Gc`myzY)(UIsPmj^InM) z-RdOzeGQ-LJ66c9x>T`t9hHYlGXyH>4;Wv^@nl!Nk?N% zP=7sD;dh4OXenrwgKDvLj8;o_6S)4e-1Ssrqn2lrEAu1Z2@4uIXbtV6oNeEU{zKF% zM+eA>H4iNtH58TJIVlDuI^Hn2=5mfcOG zw1+=w$ky$ph&8K%nrQDr@Lvtj=l4;wy9iyF+F^T6D^wg7ucWycU zxp6u_L2c4llH71-VhQNdK{w9zIU2I(7)#7JOslLpwNM_xEKk`@b!Z9H)4e>x%uPw? zxKR#g&}yKrhaxK%_F&Es4a=ER zhnXUqt1@FA^GrI(?#-Jb>r&(qX=5|$i79eXx8?i~Tk)V{PiZ8M84o)4l$Jm|U{5;s z)Phq$5fYoy5f7~oh1l*^gyy2{;y_Fx{quzMFA&l%h0Iz)`sak?ADbU6O+ZSs%aSJW z1f&VflP0i0nt+t1yC_Xy8PWuokR}MDJ$8%*VYChjGZlQb^X8c6-jF)Rxe^V+~QANEfTP$R$OB^jgk`=A1ud z2DiA}hU7&#LsPiw9w)dLC6JYbxDv~hiEhNVKpR9Vhteu$Mt6AeI{9LBhh^O0{Q!BO zQFuYzgmHu$aG+w;z-R+nMWm(lVW^bGEWwC_(QKt;ng(eb_(hnWh+D2%fG?z~O3R<^ zPXzu9BJ;$05ulEq0S=(bZ?do%7Q~@Pq~&_cx5zxpt1U)5ZJ~af(Sb}a!aPNBwbWvd z#Dg8X^JzSrc57@MN?(#pyEW2oLNepHoJx1Rop#tTEro@8?B!P#b8 z$|p-mrqOW}RFm2Y>Y$_=SguVnkI)gCL=KpYE-=>F&a9CPQv*@3hmh>T(J8p1(6i-m zuw3V3^_h1Wf}3x(H1M64kp1mw_F74XP+MXY0kOm=!oJ*Sp*g$Fu@c+GN4yH-qy9=) zl|KHhcOPHr?c^7G_j00l_*`#-zv=1bH+yp7JMyJXq#E81$m7PFwacI!@9B$Geu*Ob zIltWZTG$2g#jPzqw>B03byoVT0xp_H3Oj*Dk0?*BLc0Hl%5$~5&TahO-E#Nx?D=mM gXW{n7IzOM9bg^Uf9ml6Nh4)4e2bD| z4<^RMNIZ!qhG>WhFY-Xr_(BZffd?`0;DZk)Kty9AiN+@kCJ;T}_uZCuYu8oiNqX=1 zo!|NMopZkPefR7Q>Ff>Ziq#}N$lFY-C20)9=Gc<|0A4oBG^<$x4uF64^AZ3^x5n_E zImxG)$USoe_ghrs?L*@&oWE*`G~%pcZ3L1U0{lf?hr671oL4(Bpq;?Ws)qC08dTIq zyd_)lpyI`^WIvu(G`wTC;)tx_CYq1a_**rB-^()oDXVx(vEfI`d3@+-#;~&iThwMe z>-1s2x*PX8`|*Nvs)3uti%t(damFy^4B%tghkrP%IPdrZ?Xn#o+lPcz*@GX*2hrnr z4KHaMq>Ff8TV)!};3KWWq{;bK*Ik=5ieCmJ=5RcWlGigief;>lGpA0?pPGJSCcLmP z0&wO``0b-7631rWoS8eFI66J|){(jClQRVb306Rqs=-HrOZaPWykW!-um-cCZs`FY z2?g!u7J%L)Kqif`-0}SHp(~d4o1rqva1Ht?K}r?=X8fT&sqcgH@ALzm6W$hoFaJG+=vSs7MXmb|cMhg%>$uir$-G z`1z9ksXF|uW5L-2ac(RER*-O_v&E}$N34{;HL$bD(})+;d!fbPw!#?YkuBCil5I3% z)NXJiaEKPqxZT8!!r_{f=8`s&iNY=}ISV!lP?RWJAieNnJQ=eZ^%*XW!4a6MNojI* zj!K?wgX*MLXE9E)Zj-|x*DzUTQD5R)(nyF5EFl3NI0q>$PlyZ=*iY_>gvb=LGPM;) zA|ll3OSp$>iYJz;g-hQReaV(Ti4t!q(iT|Bk}#@bwEv31jI zdA#Zw6=Lfq`!5xDiks~3A(}8+mz&2nW7v1EEVlc4C%3%}lSF&#s9O&i>4CM}R0KS{ z`v(2JRKe`*_3-|iD00jDucxd)Jc|m%!xxb?7U2<#s1Z7`m)Kd)ngc8CSvvU_?IoR< zE2XFXcV%0d^*ST3hM%Q0F19XIH8Y>#>M;<-V`h1j0n8U||V7pI?>mvD$j$pPL) zCG4f>Z-X3wPC?X&9i?G`x_ENEbS$PwjDS@F<5YWW+XW~aophsPs@cd#$T&G9cmd)KbDo=c!4fTTy0i*R zJ7KmJE$NXGknk~1_bLJHCFm%JYNRgCk!z_VBq-eiktD>%qBALu5HVnfQw_~FQ587@w-Mmh(^wB1p*x4q2EQBUHiXLG{?#yNjZ6!9tem`$1 zJkzj`zWuDQK;IJVw=<@a4GSNe=_9Md#?B>6{!Z?vhEE26v?l*P_uci|k~x2Wuua8x ZrW(;S{;5gr%6~q7*exB)|1;Gj{RcA0Ol$xE