From 063f9582cea009e21f6b50fc569953a13d966646 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 7 Mar 2017 14:44:29 +0300 Subject: [PATCH 1/3] docs: commented unused classes in admin --- project/docs/admin.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/project/docs/admin.py b/project/docs/admin.py index 2f98fad..55a321d 100644 --- a/project/docs/admin.py +++ b/project/docs/admin.py @@ -4,9 +4,9 @@ from django.contrib import admin import models -class InvoiceItemInline(admin.TabularInline): - model = models.InvoiceItem - extra = 0 +#class InvoiceItemInline(admin.TabularInline): +# model = models.InvoiceItem +# extra = 0 class InvoiceAdmin(admin.ModelAdmin): @@ -17,9 +17,9 @@ class InvoiceAdmin(admin.ModelAdmin): #inlines = (InvoiceItemInline,) -class NakladnItemInline(admin.TabularInline): - model = models.NakladnItem - extra = 0 +#class NakladnItemInline(admin.TabularInline): +# model = models.NakladnItem +# extra = 0 class NakladnAdmin(admin.ModelAdmin): @@ -30,9 +30,9 @@ class NakladnAdmin(admin.ModelAdmin): #inlines = (NakladnItemInline,) -class AktRabotItemInline(admin.TabularInline): - model = models.AktRabotItem - extra = 0 +#class AktRabotItemInline(admin.TabularInline): +# model = models.AktRabotItem +# extra = 0 class AktRabotAdmin(admin.ModelAdmin): From e653ab1f3a946e8c8f4d62afc2d0f18fb6eaf821 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 7 Mar 2017 14:48:46 +0300 Subject: [PATCH 2/3] docs: added faktura to admin --- project/docs/admin.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/project/docs/admin.py b/project/docs/admin.py index 55a321d..56fd642 100644 --- a/project/docs/admin.py +++ b/project/docs/admin.py @@ -43,6 +43,13 @@ class AktRabotAdmin(admin.ModelAdmin): #inlines = (AktRabotItemInline,) +class FakturaAdmin(admin.ModelAdmin): + list_display = ('doc_num', 'doc_date', 'company', 'client',) + list_filter = ('doc_date',) + search_fields = ('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',) @@ -72,3 +79,4 @@ admin.site.register(models.AktRabot, AktRabotAdmin) admin.site.register(models.AktSverki) admin.site.register(models.Nakladn, NakladnAdmin) admin.site.register(models.Dover) +admin.site.register(models.Faktura, FakturaAdmin) From cf3c9504c26923a0f349ac7c326df7843169d1fe Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 7 Mar 2017 15:37:45 +0300 Subject: [PATCH 3/3] docs: don't sign by default --- project/docs/views/base_views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/docs/views/base_views.py b/project/docs/views/base_views.py index f5e4108..cc2bfed 100644 --- a/project/docs/views/base_views.py +++ b/project/docs/views/base_views.py @@ -364,7 +364,7 @@ class BaseViews(object): 'obj_items': None, 'profile': profile, 'main_account': main_account, - 'doc_sign': kwargs.get('doc_sign', True), + 'doc_sign': kwargs.get('doc_sign', False), } c1 = time() pdf = render_pdf_to_string(self.request, self.PDF_TEMPLATE, params) @@ -808,7 +808,7 @@ class BaseItemsViews(BaseViews): 'obj_items': obj_items, 'profile': profile, 'main_account': main_account, - 'doc_sign': kwargs.get('doc_sign', True), + 'doc_sign': kwargs.get('doc_sign', False), } c1 = time() pdf = render_pdf_to_string(self.request, self.PDF_TEMPLATE, params)