arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-23 16:32:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix for incorrect selection of active invoices.

Browse Source 
Make sure waiting shows total across all pages.
This commit is contained in:
Tom Price
2016-05-24 17:49:44 +01:00
parent 7ccc8faf20
commit 6b77393414
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
RIGS/finance.py
View File

@@ -36,7 +36,7 @@ class InvoiceIndex(generic.ListView):
"(SELECT SUM(p.amount) FROM \"RIGS_payment\" AS p WHERE p.invoice_id=\"RIGS_invoice\".id) AS \"payments\", " \ "(SELECT SUM(p.amount) FROM \"RIGS_payment\" AS p WHERE p.invoice_id=\"RIGS_invoice\".id) AS \"payments\", " \
"\"RIGS_invoice\".\"id\", \"RIGS_invoice\".\"event_id\", \"RIGS_invoice\".\"invoice_date\", \"RIGS_invoice\".\"void\" FROM \"RIGS_invoice\") " \ "\"RIGS_invoice\".\"id\", \"RIGS_invoice\".\"event_id\", \"RIGS_invoice\".\"invoice_date\", \"RIGS_invoice\".\"void\" FROM \"RIGS_invoice\") " \
"AS sub " \ "AS sub " \
"WHERE (cost - payments) <> 0.0 AND void = '0'" \ "WHERE (((cost > 0.0) AND (payment_count=0)) OR (cost - payments) <> 0.0) AND void = '0'" \
"ORDER BY invoice_date" "ORDER BY invoice_date"
query = self.model.objects.raw(sql) query = self.model.objects.raw(sql)
@@ -106,19 +106,24 @@ class InvoiceWaiting(generic.ListView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(InvoiceWaiting, self).get_context_data(**kwargs) context = super(InvoiceWaiting, self).get_context_data(**kwargs)
total = 0 total = 0
for obj in context['object_list']: for obj in self.get_objects():
total += obj.sum_total total += obj.sum_total
context['total'] = total context['total'] = total
return context return context
def get_queryset(self): def get_queryset(self):
return self.get_objects()
def get_objects(self):
# @todo find a way to select items # @todo find a way to select items
events = self.model.objects.filter(is_rig=True, end_date__lt=datetime.date.today(), events = self.model.objects.filter(is_rig=True, end_date__lt=datetime.date.today(),
invoice__isnull=True) \ invoice__isnull=True) \
.order_by('start_date') \ .order_by('start_date') \
.select_related('person', .select_related('person',
'organisation', 'organisation',
'venue', 'mic') 'venue', 'mic') \
.prefetch_related('items')
return events return events