Fixed merge issues

This commit is contained in:
David Taylor
2016-07-10 12:50:14 +01:00
parent 03f7709769
commit c1b416251c
4 changed files with 12 additions and 13 deletions

View File

@@ -100,7 +100,6 @@ class InvoiceArchive(generic.ListView):
model = models.Invoice
template_name = 'RIGS/invoice_list_archive.html'
paginate_by = 25
template_name="RIGS/invoice_archive.html"
def get_queryset(self):
q = self.request.GET.get('q', "")