From 78c3642fa103b58df43b5a723ac3c25a8642d6a6 Mon Sep 17 00:00:00 2001
From: Dmitriy Shesterkin <mitri4@bk.ru>
Date: Mon, 25 Dec 2017 14:27:02 +0300
Subject: [PATCH] change doc change factura

---
 src/xls_templates/faktura.xls      | Bin 40960 -> 40448 bytes
 templates/docs/faktura/as_pdf.html |  22 +++++++++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/xls_templates/faktura.xls b/src/xls_templates/faktura.xls
index 942362f00c9bf2ca31c09b6c5ba9206194511380..1a803851a3e81122d32d596ed70aca9d8fcbccbc 100644
GIT binary patch
delta 4798
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

delta 5056
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

diff --git a/templates/docs/faktura/as_pdf.html b/templates/docs/faktura/as_pdf.html
index ceb8c9d..6b0b85f 100644
--- a/templates/docs/faktura/as_pdf.html
+++ b/templates/docs/faktura/as_pdf.html
@@ -92,7 +92,7 @@
     Приложение №1 к постановлению Правительства Российской Федерации от 26 декабря 2011 г. № 1137
 </div>
 <div class="right font_7">
-  (в редакции постановления Правительства Российской Федерации от 25 мая 2017 г. № 625)
+  (в ред. Постановления Правительства РФ от 19.08.2017 № 981)
 </div>
 <div class="right font_7">
 
@@ -256,10 +256,10 @@
             <td width="15%"></td>
             <td width="10%"></td>
         </tr>
-        {% if profile.is_org %} {# Орг #}
+{#        {% if profile.is_org %} {# Орг #}
         <tr>
             <td width="25%">
-                {{ profile.get_boss_title_faktura_10_2017 }}
+                Руководитель организации или иное уполномоченное лицо
             </td>
             <td width="15%" class="bottom_border">
                 {% if obj.add_sign_and_stamp and profile.boss_sign %} {# TODO передавать флаг из вьюхи #}
@@ -267,13 +267,16 @@
                 {% endif %}
             </td>
             <td width="10%">
+              {% if profile.is_org %}
                 ({{ profile.get_boss_fio }}) {# фио руководителя #}
+              {% endif %}
             </td>
 
         {# подпись главбуха: a) всегда для организации, b) для ИП - если задана #}
 
             <td width="25%">Главный бухгалтер или иное уполномоченное лицо</td>
             <td width="15%" class="bottom_border">
+            {% if profile.is_org %}
                 {% if obj.add_sign_and_stamp %} {# TODO передавать флаг из вьюхи #}
                     {% if profile.glavbuh_sign %}
                         <img src="{{ profile.glavbuh_sign.path }}" /> {# подпись главбуха #}
@@ -285,38 +288,47 @@
                         {% endif %}
                     {% endif %}
                 {% endif %}
+            {% endif %}
             </td>
             <td width="10%">
+              {% if profile.is_org %}
                 {{ profile.get_glavbuh_fio|default:profile.get_boss_fio }} {# фио главбуха #}
+              {% endif %}
             </td>
         </tr>
-        {% else %}
+{#        {% else %}#}
         <tr>
             <td width="25%">
                 {{ profile.get_boss_title_faktura_10_2017 }}
             </td>
             <td width="15%" class="bottom_border">
+
                 {% if obj.add_sign_and_stamp and profile.boss_sign %} {# TODO передавать флаг из вьюхи #}
                     <img src="{{ profile.boss_sign.path }}" /> {# подпись руководителя #}
                 {% endif %}
+
             </td>
             <td width="10%">
+              {% if not profile.is_org %}
                 {{ profile.get_boss_fio }} {# фио руководителя #}
+              {% endif %}
             </td>
             <td colspan="3" class="bottom_border">
                 {{  profile.svid_gos_reg }}
             </td>
         </tr>
-        {% endif %}
+{#        {% endif %}#}
 
         {# --------------------------------------------------------------------- #}
 
         <tr>
             <td width="25%"></td>
             <td colspan="2" class="left">
+              {% if not profile.is_org %}
                 {% if obj.add_sign_and_stamp and profile.stamp %} {# TODO передавать флаг из вьюхи #}
                     <img src="{{ profile.stamp.path }}" /> {# печать #}
                 {% endif %}
+              {% endif %}
             </td>
             <td colspan="2"></td>
         </tr>