From 57918662c8bfe5f79a696a4f427ddaf1ce57af97 Mon Sep 17 00:00:00 2001
From: Dmitriy Shesterkin <mitri4@bk.ru>
Date: Fri, 26 May 2017 00:43:06 +0300
Subject: [PATCH] task 25

---
 src/dokumentor/templates/docs/_base/base_list.html | 11 ++++++++++-
 src/dokumentor/templates/docs/aktrabot/list.html   | 11 ++++++++++-
 src/dokumentor/templates/docs/aktsverki/list.html  | 11 ++++++++++-
 src/dokumentor/templates/docs/dover/list.html      | 11 ++++++++++-
 src/dokumentor/templates/docs/faktura/list.html    | 11 ++++++++++-
 src/dokumentor/templates/docs/nakladn/list.html    | 11 ++++++++++-
 6 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/src/dokumentor/templates/docs/_base/base_list.html b/src/dokumentor/templates/docs/_base/base_list.html
index c150559..dde426c 100644
--- a/src/dokumentor/templates/docs/_base/base_list.html
+++ b/src/dokumentor/templates/docs/_base/base_list.html
@@ -57,7 +57,16 @@
                                     {% block table_obj_cells %}
                                         <td class='clck'><a href="{{ url_img }}">{{ obj.doc_date|date:"d.m.Y" }}</a></td>
                                         <td class='clck'>{{ obj.doc_num }}</td>
-                                        <td class='clck'>{{ obj.client.name }}</td>
+                                        <td class='clck'>
+                                            {% if obj.client.name_short_dadata %}
+                                                {{ obj.client.name_short_dadata }}
+                                            {% else %}
+                                                {{ obj.client.name }}
+                                            {% endif %}
+                                             {% if obj.client.name_short_self %}
+                                                <br><span style="color: gray; font-size: 11px;">{{ obj.client.name_short_self }}</span>
+                                            {% endif %}
+                                        </td>
                                         <td class='clck'>{{ obj.doc_sum|default:"---" }}</td>
                                     {% endblock %}
 
diff --git a/src/dokumentor/templates/docs/aktrabot/list.html b/src/dokumentor/templates/docs/aktrabot/list.html
index 871df92..8949d8d 100644
--- a/src/dokumentor/templates/docs/aktrabot/list.html
+++ b/src/dokumentor/templates/docs/aktrabot/list.html
@@ -23,7 +23,16 @@
     <td class='clck'><a href="{{ url_img }}">{{ obj.doc_date|date:"d.m.Y" }}</a></td>
     <td class='clck'>{{ obj.doc_num }}</td>
     <td class='clck'>{{ obj.invoice.doc_num }}</td>
-    <td class='clck'>{{ obj.client.name }}</td>
+    <td class='clck'>
+        {% if obj.client.name_short_dadata %}
+            {{ obj.client.name_short_dadata }}
+        {% else %}
+            {{ obj.client.name }}
+        {% endif %}
+         {% if obj.client.name_short_self %}
+            <br><span style="color: gray; font-size: 11px;">{{ obj.client.name_short_self }}</span>
+        {% endif %}
+    </td>
     <td class='clck'>{{ obj.doc_sum|default:"---" }}</td>
     <td><a href="#" class="toggle_doc_status doc_status{{ obj.signed_status }}" data-doctype="aktrabot" data-attr="signed_status">{{ obj.get_signed_status_display }}</a></td>
 {% endblock %}
diff --git a/src/dokumentor/templates/docs/aktsverki/list.html b/src/dokumentor/templates/docs/aktsverki/list.html
index c20712d..fa06959 100644
--- a/src/dokumentor/templates/docs/aktsverki/list.html
+++ b/src/dokumentor/templates/docs/aktsverki/list.html
@@ -17,7 +17,16 @@
 {% block table_obj_cells %}
     <td class='clck'><a href="{{ url_img }}">{{ obj.doc_date|date:"d.m.Y" }}</a></td>
     <td class='clck'>{{ obj.doc_num }}</td>
-    <td class='clck'>{{ obj.client.name }}</td>
+    <td class='clck'>
+        {% if obj.client.name_short_dadata %}
+            {{ obj.client.name_short_dadata }}
+        {% else %}
+            {{ obj.client.name }}
+        {% endif %}
+         {% if obj.client.name_short_self %}
+            <br><span style="color: gray; font-size: 11px;">{{ obj.client.name_short_self }}</span>
+        {% endif %}
+    </td>
     <td class='clck'{% if obj.total_saldo < 0 %} style="color: red;"{% endif %}>{{ obj.total_saldo|default:"---" }}</td>
     <td><a href="#" class="toggle_doc_status doc_status{{ obj.signed_status }}" data-doctype="aktsverki" data-attr="signed_status">{{ obj.get_signed_status_display }}</a></td>
 {% endblock %}
diff --git a/src/dokumentor/templates/docs/dover/list.html b/src/dokumentor/templates/docs/dover/list.html
index c8b7681..c491f71 100644
--- a/src/dokumentor/templates/docs/dover/list.html
+++ b/src/dokumentor/templates/docs/dover/list.html
@@ -22,7 +22,16 @@
     <td class='clck'><a href="{{ url_img }}">{{ obj.doc_date|date:"d.m.Y" }}</a></td>
     <td class='clck'>{{ obj.doc_expire_date|date:"d.m.Y" }}</td>
     <td class='clck'>{{ obj.dover_name }}</td>
-    <td class='clck'>{{ obj.client.name }}</td>
+    <td class='clck'>
+        {% if obj.client.name_short_dadata %}
+            {{ obj.client.name_short_dadata }}
+        {% else %}
+            {{ obj.client.name }}
+        {% endif %}
+         {% if obj.client.name_short_self %}
+            <br><span style="color: gray; font-size: 11px;">{{ obj.client.name_short_self }}</span>
+        {% endif %}
+    </td>
 {% endblock %}
 
 {# важно! tfoot (также как и thead), нужен в js для показа/скрытия боковой панели #}
diff --git a/src/dokumentor/templates/docs/faktura/list.html b/src/dokumentor/templates/docs/faktura/list.html
index 5a966c3..1053cd7 100644
--- a/src/dokumentor/templates/docs/faktura/list.html
+++ b/src/dokumentor/templates/docs/faktura/list.html
@@ -23,7 +23,16 @@
     <td class='clck'><a href="{{ url_img }}">{{ obj.doc_date|date:"d.m.Y" }}</a></td>
     <td class='clck'>{{ obj.doc_num }}</td>
     <td class='clck'>{{ obj.invoice.doc_num }}</td>
-    <td class='clck'>{{ obj.client.name }}</td>
+    <td class='clck'>
+        {% if obj.client.name_short_dadata %}
+            {{ obj.client.name_short_dadata }}
+        {% else %}
+            {{ obj.client.name }}
+        {% endif %}
+         {% if obj.client.name_short_self %}
+            <br><span style="color: gray; font-size: 11px;">{{ obj.client.name_short_self }}</span>
+        {% endif %}
+    </td>
     <td class='clck'>{{ obj.doc_sum|default:"---" }}</td>
     <td><a href="#" class="toggle_doc_status doc_status{{ obj.signed_status }}" data-doctype="faktura" data-attr="signed_status">{{ obj.get_signed_status_display }}</a></td>
 {% endblock %}
diff --git a/src/dokumentor/templates/docs/nakladn/list.html b/src/dokumentor/templates/docs/nakladn/list.html
index f34313d..04e0ab4 100644
--- a/src/dokumentor/templates/docs/nakladn/list.html
+++ b/src/dokumentor/templates/docs/nakladn/list.html
@@ -23,7 +23,16 @@
     <td class='clck'><a href="{{ url_img }}">{{ obj.doc_date|date:"d.m.Y" }}</a></td>
     <td class='clck'>{{ obj.doc_num }}</td>
     <td class='clck'>{{ obj.invoice.doc_num }}</td>
-    <td class='clck'>{{ obj.client.name }}</td>
+    <td class='clck'>
+        {% if obj.client.name_short_dadata %}
+            {{ obj.client.name_short_dadata }}
+        {% else %}
+            {{ obj.client.name }}
+        {% endif %}
+         {% if obj.client.name_short_self %}
+            <br><span style="color: gray; font-size: 11px;">{{ obj.client.name_short_self }}</span>
+        {% endif %}
+    </td>
     <td class='clck'>{{ obj.doc_sum|default:"---" }}</td>
     <td><a href="#" class="toggle_doc_status doc_status{{ obj.signed_status }}" data-doctype="nakladn" data-attr="signed_status">{{ obj.get_signed_status_display }}</a></td>
 {% endblock %}