From a757f0bbc41e6526f4a4736f3f0a35d4c3190ed3 Mon Sep 17 00:00:00 2001
From: Dmitriy Shesterkin <mitri4@bk.ru>
Date: Fri, 4 Aug 2017 22:18:28 +0300
Subject: [PATCH] inn and kpp separately

---
 src/customer/models.py             |  7 ++++++
 templates/docs/nakladn/as_pdf.html | 36 +++++++++++++++++++++---------
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/customer/models.py b/src/customer/models.py
index 5c6c386..2853118 100644
--- a/src/customer/models.py
+++ b/src/customer/models.py
@@ -479,6 +479,13 @@ class Client(models.Model):
             return f'{self.inn}/{kpp}'
         return self.inn
 
+    @property
+    def short_name(self):
+        if self.name_short_dadata:
+            return self.name_short_dadata
+        else:
+            return self.name
+
 
 class UserProfileFilters(models.Model):
     """
diff --git a/templates/docs/nakladn/as_pdf.html b/templates/docs/nakladn/as_pdf.html
index 7dc2a7d..53ddec1 100644
--- a/templates/docs/nakladn/as_pdf.html
+++ b/templates/docs/nakladn/as_pdf.html
@@ -111,7 +111,7 @@
         <tr>
             <td colspan="8" class="bottom bottom_border">
                 {{ profile.get_company_name|safe }}, {{ profile.address|safe }},
-                ИНН/КПП {{ profile.get_inn_and_kpp }},{% if profile.get_full_phone %} тел. {{ profile.get_full_phone }},{% endif %}
+                ИНН {{ profile.inn }}, КПП {% if profile.kpp %}{{ profile.kpp }}{% endif %},{% if profile.get_full_phone %} тел. {{ profile.get_full_phone }},{% endif %}
                 р/с {{ obj.bank_account.account }} в {{ obj.bank_account.name|safe }},
                 БИК {{ obj.bank_account.bik }},
                 к/с {{ obj.bank_account.korr_account }}
@@ -144,8 +144,11 @@
             <td colspan="2" class="bottom">Грузополучатель</td>
             <td colspan="5" class="bottom bottom_border">
             {% if not obj.receiver  %}
-                {{ obj.client.name|safe }}, {{ obj.client.address|safe }},
-                ИНН {{ obj.client.get_inn_and_kpp }},
+                {{ obj.client.short_name }}, {{ obj.client.address|safe }},
+                ИНН {{ obj.client.inn }},
+              {% if obj.client.kpp %}
+                КПП {{ obj.client.kpp }},
+              {% endif %}
               {% if obj.client.contact_phone %}
                 тел. {{ obj.client.contact_phone }},
               {% endif %}
@@ -153,8 +156,11 @@
                 БИК {{ obj.client.bank_bik }},
                 к/с {{ obj.client.bank_korr_account }}
             {% else %}
-               {{ obj.receiver.name|safe }}, {{ obj.receiver.address|safe }},
-                ИНН {{ obj.receiver.get_inn_and_kpp }},
+               {{ obj.receiver.short_name|safe }}, {{ obj.receiver.address|safe }},
+                ИНН {{ obj.receiver.inn }},
+              {% if obj.receiver.kpp %}
+                КПП {{ obj.receiver.kpp }},
+              {% endif %}
               {% if obj.receiver.contact_phone %}
                 тел. {{ obj.receiver.contact_phone }},
               {% endif %}
@@ -183,13 +189,20 @@
             <td colspan="6" class="bottom bottom_border">
             {% if not obj.sender  %}
                 {{ profile.get_company_name|safe }}, {{ profile.address|safe }},
-                ИНН/КПП {{ profile.get_inn_and_kpp }},{% if profile.get_full_phone %} тел. {{ profile.get_full_phone }},{% endif %}
+                 ИНН {{ profile.inn }},
+              {% if profile.kpp %}
+                КПП {{ profile.kpp }},
+              {% endif %}
+              {% if profile.get_full_phone %} тел. {{ profile.get_full_phone }},{% endif %}
                 р/с {{ obj.bank_account.account }} в {{ obj.bank_account.name|safe }},
                 БИК {{ obj.bank_account.bik }},
                 к/с {{ obj.bank_account.korr_account }}
             {% else %}
-                {{ obj.sender.name|safe }}, {{ obj.sender.address|safe }},
-                ИНН {{ obj.sender.get_inn_and_kpp }},
+                {{ obj.sender.short_name|safe }}, {{ obj.sender.address|safe }},
+                ИНН {{ obj.sender.inn }},
+              {% if obj.sender.kpp %}
+                КПП {{ obj.sender.kpp }},
+              {% endif %}
               {% if obj.sender.contact_phone %}
                 тел. {{ obj.sender.contact_phone }},
               {% endif %}
@@ -214,8 +227,11 @@
             <td></td>
             <td class="bottom">Плательщик</td>
             <td colspan="6" class="bottom bottom_border">
-                {{ obj.client.name|safe }}, {{ obj.client.address|safe }},
-                ИНН/КПП {{ obj.client.get_inn_and_kpp }},
+                {{ obj.client.short_name }}, {{ obj.client.address|safe }},
+                 ИНН {{ obj.client.inn }},
+              {% if obj.client.kpp %}
+                КПП {{ obj.client.kpp }},
+              {% endif %}
               {% if obj.client.contact_phone %}
                 тел. {{ obj.client.contact_phone }},
               {% endif %}