Merged Air51/dokumentor.ru into master

project/templates/docs/nakladn/as_pdf.html

@@ -73,10 +73,10 @@
         {# строка 3 #}
         <tr>
             <td colspan="8" class="bottom bottom_border">
-                {{ profile.get_company_name|safe }} , {{ profile.address|safe }} ,
-                ИНН {{ profile.get_inn_and_kpp }} , тел. {{ profile.get_full_phone }} ,
-                р/с {{ obj.bank_account.account }} в {{ obj.bank_account.name|safe }} ,
-                {{ obj.bank_account.address|safe }} , БИК {{ obj.bank_account.bik }} ,
+                {{ profile.get_company_name|safe }}, {{ profile.address|safe }},
+                ИНН {{ profile.get_inn_and_kpp }}, тел. {{ profile.get_full_phone }},
+                р/с {{ obj.bank_account.account }} в {{ obj.bank_account.name|safe }},
+                БИК {{ obj.bank_account.bik }},
                 корр/с {{ obj.bank_account.korr_account }}
             </td>
             <td class="right bottom">по ОКПО</td>
@@ -105,11 +105,11 @@
             <td></td>
             <td colspan="2" class="bottom">Грузополучатель</td>
             <td colspan="5" class="bottom bottom_border">
-                {{ obj.client.name|safe }} , {{ obj.client.address|safe }} ,
-                ИНН {{ obj.client.get_inn_and_kpp }} ,
-                тел. {{ obj.client.contact_phone }} ,
-                р/с {{ obj.client.bank_account }} в {{ obj.client.bank_name|safe }} ,
-                {{ obj.client.bank_address|safe }} , БИК {{ obj.client.bank_bik }} ,
+                {{ obj.client.name|safe }}, {{ obj.client.address|safe }},
+                ИНН {{ obj.client.get_inn_and_kpp }},
+                тел. {{ obj.client.contact_phone }},
+                р/с {{ obj.client.bank_account }} в {{ obj.client.bank_name|safe }},
+                БИК {{ obj.client.bank_bik }},
                 корр/с {{ obj.client.bank_korr_account }}
             </td>
             <td class="right bottom">по ОКПО</td>
@@ -127,10 +127,10 @@
             <td></td>
             <td class="bottom">Поставщик</td>
             <td colspan="6" class="bottom bottom_border">
-                {{ profile.get_company_name|safe }} , {{ profile.address|safe }} ,
-                ИНН {{ profile.get_inn_and_kpp }} , тел. {{ profile.get_full_phone }} ,
-                р/с {{ obj.bank_account.account }} в {{ obj.bank_account.name|safe }} ,
-                {{ obj.bank_account.address|safe }} , БИК {{ obj.bank_account.bik }} ,
+                {{ profile.get_company_name|safe }}, {{ profile.address|safe }},
+                ИНН {{ profile.get_inn_and_kpp }}, тел. {{ profile.get_full_phone }},
+                р/с {{ obj.bank_account.account }} в {{ obj.bank_account.name|safe }},
+                БИК {{ obj.bank_account.bik }},
                 корр/с {{ obj.bank_account.korr_account }}
             </td>
             <td class="right bottom">по ОКПО</td>
@@ -147,11 +147,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.contact_phone }} ,
-                р/с {{ obj.client.bank_account }} в {{ obj.client.bank_name|safe }} ,
-                {{ obj.client.bank_address|safe }} , БИК {{ obj.client.bank_bik }} ,
+                {{ obj.client.name|safe }}, {{ obj.client.address|safe }},
+                ИНН {{ obj.client.get_inn_and_kpp }},
+                тел. {{ obj.client.contact_phone }},
+                р/с {{ obj.client.bank_account }} в {{ obj.client.bank_name|safe }},
+                БИК {{ obj.client.bank_bik }},
                 корр/с {{ obj.client.bank_korr_account }}
             </td>
             <td class="right bottom bottom_border">по ОКПО</td>