diff --git a/project/docs/admin.py b/project/docs/admin.py
index 56fd642..92add40 100644
--- a/project/docs/admin.py
+++ b/project/docs/admin.py
@@ -50,6 +50,13 @@ class FakturaAdmin(admin.ModelAdmin):
'client__name', 'client__inn', 'client__contact_email')
+class PlatejkaAdmin(admin.ModelAdmin):
+ list_display = ('doc_num', 'doc_date', 'company', 'client',)
+ list_filter = ('doc_date',)
+ search_fields = ('doc_info', 'company__name', 'company__inn', 'company__email',
+ 'client__name', 'client__inn', 'client__contact_email')
+
+
class MeasureAdmin(admin.ModelAdmin):
list_display = ('order', 'code', 'name', 'full_name',)
list_display_links = ('code', 'name', 'full_name',)
@@ -80,3 +87,4 @@ admin.site.register(models.AktSverki)
admin.site.register(models.Nakladn, NakladnAdmin)
admin.site.register(models.Dover)
admin.site.register(models.Faktura, FakturaAdmin)
+admin.site.register(models.Platejka, PlatejkaAdmin)
diff --git a/project/templates/docs/nakladn/as_pdf.html b/project/templates/docs/nakladn/as_pdf.html
index ce02f76..8ae1b45 100644
--- a/project/templates/docs/nakladn/as_pdf.html
+++ b/project/templates/docs/nakladn/as_pdf.html
@@ -74,10 +74,10 @@
|
{{ profile.get_company_name|safe }}, {{ profile.address|safe }},
- ИНН {{ profile.get_inn_and_kpp }}, тел. {{ profile.get_full_phone }},
+ ИНН/КПП {{ 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 }}
+ к/с {{ obj.bank_account.korr_account }}
|
по ОКПО |
{{ profile.ip_kod_okpo }} |
@@ -110,7 +110,7 @@
тел. {{ obj.client.contact_phone }},
р/с {{ obj.client.bank_account }} в {{ obj.client.bank_name|safe }},
БИК {{ obj.client.bank_bik }},
- корр/с {{ obj.client.bank_korr_account }}
+ к/с {{ obj.client.bank_korr_account }}
по ОКПО |
{{ obj.client.kod_okpo }} |
@@ -131,7 +131,7 @@
ИНН {{ 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 }}
+ к/с {{ obj.bank_account.korr_account }}
по ОКПО |
@@ -152,7 +152,7 @@
тел. {{ obj.client.contact_phone }},
р/с {{ obj.client.bank_account }} в {{ obj.client.bank_name|safe }},
БИК {{ obj.client.bank_bik }},
- корр/с {{ obj.client.bank_korr_account }}
+ к/с {{ obj.client.bank_korr_account }}
по ОКПО |
diff --git a/project/templates/docs/platejka/list.html b/project/templates/docs/platejka/list.html
index 5b50bf6..4b6fcfe 100644
--- a/project/templates/docs/platejka/list.html
+++ b/project/templates/docs/platejka/list.html
@@ -32,6 +32,3 @@
{% endblock %}
-{% block panel_copy %}
- Копию плат. поручения
-{% endblock %}
diff --git a/project/xls_templates/nakladn.xls b/project/xls_templates/nakladn.xls
index 3432ade..3ff47ee 100644
Binary files a/project/xls_templates/nakladn.xls and b/project/xls_templates/nakladn.xls differ