From d0678ad0aed25c2eb113424d8720f25fff26086f Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 8 Mar 2017 18:39:23 +0300 Subject: [PATCH 1/2] docs: removed bank address from nakladn --- project/templates/docs/nakladn/as_pdf.html | 36 ++++++++++----------- project/xls_templates/nakladn.xls | Bin 36864 -> 36864 bytes 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/project/templates/docs/nakladn/as_pdf.html b/project/templates/docs/nakladn/as_pdf.html index b077f50..ce02f76 100644 --- a/project/templates/docs/nakladn/as_pdf.html +++ b/project/templates/docs/nakladn/as_pdf.html @@ -73,10 +73,10 @@ {# строка 3 #} - {{ profile.get_company_name|safe }} , {{ profile.address|safe }} , - ИНН {{ profile.get_inn_and_kpp }} , тел. {{ profile.get_full_phone }} , - р/с {{ obj.bank_account.account }} в {{ obj.bank_account.name|safe }} , - {{ obj.bank_account.address|safe }} , БИК {{ obj.bank_account.bik }} , + {{ profile.get_company_name|safe }}, {{ profile.address|safe }}, + ИНН {{ profile.get_inn_and_kpp }}, тел. {{ profile.get_full_phone }}, + р/с {{ obj.bank_account.account }} в {{ obj.bank_account.name|safe }}, + БИК {{ obj.bank_account.bik }}, корр/с {{ obj.bank_account.korr_account }} по ОКПО @@ -105,11 +105,11 @@ Грузополучатель - {{ obj.client.name|safe }} , {{ obj.client.address|safe }} , - ИНН {{ obj.client.get_inn_and_kpp }} , - тел. {{ obj.client.contact_phone }} , - р/с {{ obj.client.bank_account }} в {{ obj.client.bank_name|safe }} , - {{ obj.client.bank_address|safe }} , БИК {{ obj.client.bank_bik }} , + {{ obj.client.name|safe }}, {{ obj.client.address|safe }}, + ИНН {{ obj.client.get_inn_and_kpp }}, + тел. {{ obj.client.contact_phone }}, + р/с {{ obj.client.bank_account }} в {{ obj.client.bank_name|safe }}, + БИК {{ obj.client.bank_bik }}, корр/с {{ obj.client.bank_korr_account }} по ОКПО @@ -127,10 +127,10 @@ Поставщик - {{ profile.get_company_name|safe }} , {{ profile.address|safe }} , - ИНН {{ profile.get_inn_and_kpp }} , тел. {{ profile.get_full_phone }} , - р/с {{ obj.bank_account.account }} в {{ obj.bank_account.name|safe }} , - {{ obj.bank_account.address|safe }} , БИК {{ obj.bank_account.bik }} , + {{ profile.get_company_name|safe }}, {{ profile.address|safe }}, + ИНН {{ profile.get_inn_and_kpp }}, тел. {{ profile.get_full_phone }}, + р/с {{ obj.bank_account.account }} в {{ obj.bank_account.name|safe }}, + БИК {{ obj.bank_account.bik }}, корр/с {{ obj.bank_account.korr_account }} по ОКПО @@ -147,11 +147,11 @@ Плательщик - {{ obj.client.name|safe }} , {{ obj.client.address|safe }} , - ИНН {{ obj.client.get_inn_and_kpp }} , - тел. {{ obj.client.contact_phone }} , - р/с {{ obj.client.bank_account }} в {{ obj.client.bank_name|safe }} , - {{ obj.client.bank_address|safe }} , БИК {{ obj.client.bank_bik }} , + {{ obj.client.name|safe }}, {{ obj.client.address|safe }}, + ИНН {{ obj.client.get_inn_and_kpp }}, + тел. {{ obj.client.contact_phone }}, + р/с {{ obj.client.bank_account }} в {{ obj.client.bank_name|safe }}, + БИК {{ obj.client.bank_bik }}, корр/с {{ obj.client.bank_korr_account }} по ОКПО diff --git a/project/xls_templates/nakladn.xls b/project/xls_templates/nakladn.xls index f0996cb94683e8486aabf111f6e0ee6cc0b334b1..3432ade9a212597b6e49c3370cb95b24cd5a8eca 100644 GIT binary patch delta 725 zcmZWkT}YE*6h7zszRk@~-7Fn*lFsehB=+ML{jP|uD0KT4SagvWiIBSGG}CEXh70T_ zaG8hDn`9S4N}<9VQPI!3Gz_EbMR(okh2BI8VeeMrMd$FI^SsY_&Uw$9$_S~9u%r`E zWqQGcxJFjd@n1C2oM_-|N>V5%mi|L!(k=?_qOuJ@*cp8*006G!8~g>a&1-=i=XORX zkSAefO@krmgE+K70{q~GjlJsMMw`(FnLQHtG^=Q#3mUnwUIpvX3>qt6c(?>43`u9C zpyY@9V1y`bRh|&Onb~2}S}A+uY?rW~K6-Nmf^*;09W7nQ6>bL$j{)w9d~V zhlM8G7K*uB$mj{uMNbmz$f_JgH*G4lG^Etfw4%}vCCs%CxW+ zKE*nY`9!?UrUI*o!>sevGV+`M^s0>QgyClFpiAL8?4*HkJ;vxsID~Qf9=79k5+l!W zfEFW7I7nNO5ZG_R{019dEMN(J2}GS@V_4 zh)MRe<*sxPAjsv{xaTdy7u13V4uAnf8FZXNkh$w3EZX`~V^eEC7cFN2v?72kROEXK zR>R{RK4Uya6TSp{)V?5M4+Z0GhHhT@4aK16xdFOpDSi$U>}R}KnCxDdOyu-1UOZDb r{S`&FnJ^eA>o1ucnHA@%WLg}lV%d@B<@C<4qhxwa_!VQ@X)XQ%6`jy< delta 799 zcmZWlT}YEr7=GXH`?lPsZj!ET{xrA6^xO8WK?P#e)(`o)Sr8@tfM{sBTFd-TEJxIZ zR2IHe)J5$gqbMpl5CxeQMF>iC??rZFLqfZ>5IdWS7o7vodC&7c@AJOrB$7fRDZI)O zFvWC&8BtGmanpZjrYEA2vkA#XQ)13alq;=9!PO{t9uSuL-U$GJ6X}9LM(j{*FvYp0 zzFWu-VM4FL5VS%R8XyJ%P+)#7yIklnIUu=40(Y~EHrlT-WX8*9aZRVG;Do{@AYn+_ zB?YAbTm=*SrGxd28@0KeP-BkKXS zdjYa7bldO76pi=`b)Pl^+^+%n$)^2Vwb;ovZ2Kl+6H8TmMSgo*IgYv}{wwd{4&=~> z%6rVULopamW~d-o!9oqHm0DDZdQ=%t(U4k-&GbceW0dC95T2$$wG+?K;p%7DMHp7G zo5JA`UZ5LcC-%^A_$eRyctph(8j6JQJk3O$*vbqwcMZDsOqmJH3)1ffh7S3`P)bP|GO<8{f5c>|xz&jU%;ja^3hCfK~)B2>I!n%qrnn z&fixVWnGOn3D41BbAvI?*+tNUj-P&rkr3UBXIWKLFAT<}bcwR=nc9z&D6-!%qmfL3 m?7`kgqS0-jm%Uat*84m!D-rK#t>+SIAGjhsj Date: Tue, 7 Mar 2017 15:37:45 +0300 Subject: [PATCH 2/2] docs: don't sign by default --- project/docs/views/base_views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/docs/views/base_views.py b/project/docs/views/base_views.py index f5e4108..cc2bfed 100644 --- a/project/docs/views/base_views.py +++ b/project/docs/views/base_views.py @@ -364,7 +364,7 @@ class BaseViews(object): 'obj_items': None, 'profile': profile, 'main_account': main_account, - 'doc_sign': kwargs.get('doc_sign', True), + 'doc_sign': kwargs.get('doc_sign', False), } c1 = time() pdf = render_pdf_to_string(self.request, self.PDF_TEMPLATE, params) @@ -808,7 +808,7 @@ class BaseItemsViews(BaseViews): 'obj_items': obj_items, 'profile': profile, 'main_account': main_account, - 'doc_sign': kwargs.get('doc_sign', True), + 'doc_sign': kwargs.get('doc_sign', False), } c1 = time() pdf = render_pdf_to_string(self.request, self.PDF_TEMPLATE, params)