Merge branch 'hotfixes'

Rapid fix for incorrect addition

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()

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")

RIGS/templates/RIGS/event_detail.html

@@ -110,7 +110,7 @@
                     {% if event.is_rig %}
                         <dt>Event MIC</dt>
                         <dd>
-                            {% if perms.RIGS.view_profile %}
+                            {% if event.mic and perms.RIGS.view_profile %}
                                 <a href="{% url 'profile_detail' event.mic.pk %}" class="modal-href">
                                     {{ event.mic.name }}
                                 </a>