From 2693c9603b5aba899e3ce0abbdb2dccf98c5f2a6 Mon Sep 17 00:00:00 2001
From: Andrey <andrey.goo@gmail.com>
Date: Thu, 9 Mar 2017 17:11:50 +0300
Subject: [PATCH 1/3] docs: a few renames in pdf and xls templates of nakladn

---
 project/templates/docs/nakladn/as_pdf.html |  10 +++++-----
 project/xls_templates/nakladn.xls          | Bin 36864 -> 37376 bytes
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/templates/docs/nakladn/as_pdf.html b/project/templates/docs/nakladn/as_pdf.html
index ce02f76..8ae1b45 100644
--- a/project/templates/docs/nakladn/as_pdf.html
+++ b/project/templates/docs/nakladn/as_pdf.html
@@ -74,10 +74,10 @@
         <tr>
             <td colspan="8" class="bottom bottom_border">
                 {{ profile.get_company_name|safe }}, {{ profile.address|safe }},
-                ИНН {{ profile.get_inn_and_kpp }}, тел. {{ profile.get_full_phone }},
+                ИНН/КПП {{ 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 }}
+                к/с {{ obj.bank_account.korr_account }}
             </td>
             <td class="right bottom">по ОКПО</td>
             <td class="center left_border_2 right_border_2 bottom_border">{{ profile.ip_kod_okpo }}</td>
@@ -110,7 +110,7 @@
                 тел. {{ obj.client.contact_phone }},
                 р/с {{ obj.client.bank_account }} в {{ obj.client.bank_name|safe }},
                 БИК {{ obj.client.bank_bik }},
-                корр/с {{ obj.client.bank_korr_account }}
+                к/с {{ obj.client.bank_korr_account }}
             </td>
             <td class="right bottom">по ОКПО</td>
             <td class="center left_border_2 right_border_2 bottom_border">{{ obj.client.kod_okpo }}</td>
@@ -131,7 +131,7 @@
                 ИНН {{ 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 }}
+                к/с {{ obj.bank_account.korr_account }}
             </td>
             <td class="right bottom">по ОКПО</td>
         </tr>
@@ -152,7 +152,7 @@
                 тел. {{ obj.client.contact_phone }},
                 р/с {{ obj.client.bank_account }} в {{ obj.client.bank_name|safe }},
                 БИК {{ obj.client.bank_bik }},
-                корр/с {{ obj.client.bank_korr_account }}
+                к/с {{ obj.client.bank_korr_account }}
             </td>
             <td class="right bottom bottom_border">по ОКПО</td>
         </tr>
diff --git a/project/xls_templates/nakladn.xls b/project/xls_templates/nakladn.xls
index 3432ade9a212597b6e49c3370cb95b24cd5a8eca..3ff47eecbf2a506be47947f1e0443be75c8f50ae 100644
GIT binary patch
delta 7287
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
P)8Eysd!UiuEAaR)aA*)U

delta 7224
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
CxRFZ$


From e595d71fdf57d434230e931f483444a6917a469a Mon Sep 17 00:00:00 2001
From: Andrey <andrey.goo@gmail.com>
Date: Thu, 9 Mar 2017 18:20:33 +0300
Subject: [PATCH 2/3] docs: platejka admin

---
 project/docs/admin.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/project/docs/admin.py b/project/docs/admin.py
index 56fd642..92add40 100644
--- a/project/docs/admin.py
+++ b/project/docs/admin.py
@@ -50,6 +50,13 @@ class FakturaAdmin(admin.ModelAdmin):
         'client__name', 'client__inn', 'client__contact_email')
 
 
+class PlatejkaAdmin(admin.ModelAdmin):
+    list_display = ('doc_num', 'doc_date', 'company', 'client',)
+    list_filter = ('doc_date',)
+    search_fields = ('doc_info', 'company__name', 'company__inn', 'company__email',
+        'client__name', 'client__inn', 'client__contact_email')
+
+
 class MeasureAdmin(admin.ModelAdmin):
     list_display = ('order', 'code', 'name', 'full_name',)
     list_display_links = ('code', 'name', 'full_name',)
@@ -80,3 +87,4 @@ admin.site.register(models.AktSverki)
 admin.site.register(models.Nakladn, NakladnAdmin)
 admin.site.register(models.Dover)
 admin.site.register(models.Faktura, FakturaAdmin)
+admin.site.register(models.Platejka, PlatejkaAdmin)

From b6dc2614a7a7a004ed744ed2272e9189a38f3023 Mon Sep 17 00:00:00 2001
From: Andrey <andrey.goo@gmail.com>
Date: Thu, 9 Mar 2017 18:28:30 +0300
Subject: [PATCH 3/3] docs: small fix on platejka list template

---
 project/templates/docs/platejka/list.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/project/templates/docs/platejka/list.html b/project/templates/docs/platejka/list.html
index 5b50bf6..4b6fcfe 100644
--- a/project/templates/docs/platejka/list.html
+++ b/project/templates/docs/platejka/list.html
@@ -32,6 +32,3 @@
     </td></tr></tfoot>
 {% endblock %}
 
-{% block panel_copy %}
-    <a href="{{ url_copy }}" title="Копию плат. поручения">Копию плат. поручения</a>
-{% endblock %}