Merged Air51/dokumentor.ru into master

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):
@@ -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)

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)