From 960e5d1e673359cf396cb8b946bfce1faf0b8d25 Mon Sep 17 00:00:00 2001
From: Dmitriy Shesterkin <mitri4@bk.ru>
Date: Fri, 4 Aug 2017 22:29:52 +0300
Subject: [PATCH] orsering field

---
 templates/docs/nakladn/as_pdf.html | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/templates/docs/nakladn/as_pdf.html b/templates/docs/nakladn/as_pdf.html
index 53ddec1..e39bbea 100644
--- a/templates/docs/nakladn/as_pdf.html
+++ b/templates/docs/nakladn/as_pdf.html
@@ -110,11 +110,25 @@
         {# строка 3 #}
         <tr>
             <td colspan="8" class="bottom bottom_border">
+            {% if not obj.sender  %}
                 {{ profile.get_company_name|safe }}, {{ profile.address|safe }},
                 ИНН {{ 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.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 %}
+                р/с {{ obj.sender.bank_account }} в {{ obj.sender.bank_name|safe }},
+                БИК {{ obj.sender.bank_bik }},
+                к/с {{ obj.sender.bank_korr_account }}
+            {% endif %}
             </td>
             <td width="6%" class="right bottom">по ОКПО</td>
             <td width="13%" class="center left_border_2 right_border_2 bottom_border">{{ profile.okpo }}</td>
@@ -143,6 +157,7 @@
             <td width="1%"></td>
             <td colspan="2" class="bottom">Грузополучатель</td>
             <td colspan="5" class="bottom bottom_border">
+
             {% if not obj.receiver  %}
                 {{ obj.client.short_name }}, {{ obj.client.address|safe }},
                 ИНН {{ obj.client.inn }},
@@ -168,6 +183,7 @@
                 БИК {{ obj.receiver.bank_bik }},
                 к/с {{ obj.receiver.bank_korr_account }}
             {% endif %}
+
             </td>
             <td width="6%" class="right bottom">по ОКПО</td>
             <td width="13%" class="center left_border_2 right_border_2 bottom_border">
@@ -187,7 +203,6 @@
             <td width="1%"></td>
             <td width="8%" class="bottom">Поставщик</td>
             <td colspan="6" class="bottom bottom_border">
-            {% if not obj.sender  %}
                 {{ profile.get_company_name|safe }}, {{ profile.address|safe }},
                  ИНН {{ profile.inn }},
               {% if profile.kpp %}
@@ -197,19 +212,6 @@
                 р/с {{ obj.bank_account.account }} в {{ obj.bank_account.name|safe }},
                 БИК {{ obj.bank_account.bik }},
                 к/с {{ obj.bank_account.korr_account }}
-            {% else %}
-                {{ 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 %}
-                р/с {{ obj.sender.bank_account }} в {{ obj.sender.bank_name|safe }},
-                БИК {{ obj.sender.bank_bik }},
-                к/с {{ obj.sender.bank_korr_account }}
-            {% endif %}
             </td>
             <td width="13%" class="right bottom">по ОКПО</td>
         </tr>