diff --git a/RIGS/finance.py b/RIGS/finance.py index a6be584c..e0f7ec7a 100644 --- a/RIGS/finance.py +++ b/RIGS/finance.py @@ -115,6 +115,7 @@ class InvoiceEvent(generic.View): class PaymentCreate(generic.CreateView): model = models.Payment + fields = ['invoice','date','amount','method'] def get_initial(self): initial = super(generic.CreateView, self).get_initial() diff --git a/RIGS/models.py b/RIGS/models.py index 0c06ebbb..3b3024a7 100644 --- a/RIGS/models.py +++ b/RIGS/models.py @@ -297,7 +297,7 @@ class Event(models.Model, RevisionMixin): #total = 0.0 #for item in self.items.filter(cost__gt=0).extra(select="SUM(cost * quantity) AS sum"): # total += item.sum - total = EventItem.objects.filter(event=self).aggregate(sum_total=models.Sum('cost',field="quantity * cost"))['sum_total'] + total = EventItem.objects.filter(event=self).aggregate(sum_total=models.Sum(models.F('cost')*models.F('quantity')))['sum_total'] if total: return total return Decimal("0.00") diff --git a/RIGS/templates/RIGS/event_detail.html b/RIGS/templates/RIGS/event_detail.html index 13d97cf5..c1e21c25 100644 --- a/RIGS/templates/RIGS/event_detail.html +++ b/RIGS/templates/RIGS/event_detail.html @@ -110,7 +110,7 @@ {% if event.is_rig %}
Event MIC
- {% if perms.RIGS.view_profile %} + {% if event.mic and perms.RIGS.view_profile %} {{ event.mic.name }}