From 68a012af472015277cbf3b5ac52e6c470144c846 Mon Sep 17 00:00:00 2001
From: Dmitriy Shesterkin <mitri4@bk.ru>
Date: Tue, 25 Jul 2017 23:01:23 +0300
Subject: [PATCH] fix

---
 src/xls_templates/invoice.xls      | Bin 16896 -> 0 bytes
 templates/docs/faktura/as_pdf.html |  55 ++++++-----------------------
 2 files changed, 11 insertions(+), 44 deletions(-)
 delete mode 100644 src/xls_templates/invoice.xls

diff --git a/src/xls_templates/invoice.xls b/src/xls_templates/invoice.xls
deleted file mode 100644
index 741e66047f98a8bd39b8afd946d2ceeede2086cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16896
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

diff --git a/templates/docs/faktura/as_pdf.html b/templates/docs/faktura/as_pdf.html
index 49d19ac..7c44f97 100644
--- a/templates/docs/faktura/as_pdf.html
+++ b/templates/docs/faktura/as_pdf.html
@@ -132,90 +132,57 @@
         {# строка 3 #}
         <tr>
             <td width="1%"></td>
-            <td colspan="2" class="bottom">Продавец</td>
-            <td colspan="4" class="bottom bottom_border">
-                {{ profile.get_company_name|safe }}
-            </td>
+            <td colspan="8" class="bottom">Продавец {{ profile.get_company_name|safe }}</td>
         </tr>
         {# строка 4 #}
         <tr>
             <td width="1%"></td>
-            <td colspan="2" class="bottom">Адрес</td>
-            <td colspan="4" class="bottom bottom_border">
-                {{ profile.address|safe }}
-            </td>
+            <td colspan="8" class="bottom">Адрес {{ profile.address|safe }}</td>
         </tr>
         {# строка 5 #}
         <tr>
             <td width="1%"></td>
-            <td colspan="2" class="bottom">ИНН/КПП продавца</td>
-            <td colspan="4" class="bottom bottom_border">
-                {{ profile.get_inn_and_kpp }}
-            </td>
+            <td colspan="8" class="bottom">ИНН/КПП продавца {{ profile.get_inn_and_kpp }}</td>
         </tr>
         {# строка 6 #}
         <tr>
             <td width="1%"></td>
-            <td colspan="2" class="bottom">Грузоотправитель и его адрес</td>
-            <td colspan="4" class="bottom bottom_border">
-                {{ obj.get_consignor_and_address|safe }}
-            </td>
+            <td colspan="8" class="bottom">Грузоотправитель и его адрес {{ obj.get_consignor_and_address|safe }}</td>
         </tr>
         {# строка 7 #}
         <tr>
             <td width="1%"></td>
-            <td colspan="2" class="bottom">Грузополучатель и его адрес</td>
-            <td colspan="4" class="bottom bottom_border">
-                {{ obj.get_receiver_and_address|safe }}
-            </td>
+            <td colspan="8" class="bottom">Грузополучатель и его адрес  {{ obj.get_receiver_and_address|safe }}</td>
         </tr>
         {# строка 8 #}
         <tr>
             <td width="1%"></td>
-            <td colspan="2" class="bottom">К платежно-расчетному документу №</td>
-            <td colspan="4" class="bottom bottom_border">
-                {{ obj.plat_doc_num }} от {{ obj.plat_doc_date|date:"d.m.Y" }}
-            </td>
+            <td colspan="8" class="bottom">К платежно-расчетному документу № {{ obj.plat_doc_num }} от {{ obj.plat_doc_date|date:"d.m.Y" }}</td>
         </tr>
         {# строка 9 #}
         <tr>
             <td width="1%"></td>
-            <td colspan="2" class="bottom">Покупатель</td>
-            <td colspan="4" class="bottom bottom_border">
-                {{ obj.client.name|safe }}
-            </td>
+            <td colspan="8" class="bottom">Покупатель {{ obj.client.name|safe }}</td>
         </tr>
         {# строка 10 #}
         <tr>
             <td width="1%"></td>
-            <td colspan="2" class="bottom">Адрес</td>
-            <td colspan="4" class="bottom bottom_border">
-                {{ obj.client.address|safe }}
-            </td>
+            <td colspan="8" class="bottom">Адрес {{ obj.client.address|safe }}</td>
         </tr>
         {# строка 11 #}
         <tr>
             <td width="1%"></td>
-            <td colspan="2" class="bottom">ИНН/КПП покупателя</td>
-            <td colspan="4" class="bottom bottom_border">
-                {{ obj.client.get_inn_and_kpp }}
-            </td>
+            <td colspan="8" class="bottom">ИНН/КПП покупателя  {{ obj.client.get_inn_and_kpp }}</td>
         </tr>
         {# строка 12 #}
         <tr>
             <td width="1%"></td>
-            <td colspan="2" class="bottom">Валюта: наименование, код</td>
-            <td colspan="4" class="bottom bottom_border">
-                {{ obj.currency.name }}, {{ obj.currency.code }}
-            </td>
+            <td colspan="8" class="bottom">Валюта: наименование, код {{ obj.currency.name }}, {{ obj.currency.code }}</td>
         </tr>
 
         <tr>
             <td width="1%"></td>
-            <td colspan="2" class="bottom">Идентефикатор государственного контракта, договора (соглашения)</td>
-            <td colspan="4" class="bottom bottom_border">
-                {{ obj.government_description }}
-            </td>
+            <td colspan="8" class="bottom">Идентефикатор государственного контракта, договора (соглашения) {{ obj.get_consignor_and_address|safe }}</td>
         </tr>
         {# строка 16 #}
         {# строка 17 #}