From abbb20e49e38f5ebab30c99aca2629e26a79a50c Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Sun, 10 Jul 2016 11:23:06 +0100
Subject: [PATCH] More invoice UI improvements, makes colour coding of invoice
 vs events clearer

---
 RIGS/templates/RIGS/event_invoice.html |  2 +-
 RIGS/templates/RIGS/invoice_list.html  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/RIGS/templates/RIGS/event_invoice.html b/RIGS/templates/RIGS/event_invoice.html
index cd080a74..fcbe5e87 100644
--- a/RIGS/templates/RIGS/event_invoice.html
+++ b/RIGS/templates/RIGS/event_invoice.html
@@ -26,7 +26,7 @@
             <table class="table table-hover">
                 <thead>
                 <tr>
-                    <th>#</th>
+                    <th>Event #</th>
                     <th>Start Date</th>
                     <th>Event Name</th>
                     <th>Client</th>
diff --git a/RIGS/templates/RIGS/invoice_list.html b/RIGS/templates/RIGS/invoice_list.html
index 7dc6d8ee..2f34b6c9 100644
--- a/RIGS/templates/RIGS/invoice_list.html
+++ b/RIGS/templates/RIGS/invoice_list.html
@@ -16,7 +16,7 @@
             <table class="table table-hover">
                 <thead>
                 <tr>
-                    <th>#</th>
+                    <th>Invoice #</th>
                     <th>Event</th>
                     <th>Client</th>
                     <th>Event Date</th>
@@ -27,8 +27,9 @@
                 </thead>
                 <tbody>
                 {% for object in object_list %}
-                    <tr class="{% if object.void %}danger{% elif object.balance == 0 %}success{% endif %}">
-                        <td>{{ object.pk }}</td>
+                    <tr>
+                        <td class="{% if object.is_closed %}success{% else %}warning{% endif %}">{{ object.pk }}<br>
+                        <span class="text-muted">{% if object.void %}(VOID){% elif object.is_closed %}(PAID){% else %}(O/S){% endif %}</span></td>
                         <td class="
                             {% if object.event.cancelled %}
                                 active text-muted
@@ -43,8 +44,7 @@
                                 danger
                             {% endif %}
                             "><a href="{% url 'event_detail' object.event.pk %}">N{{ object.event.pk|stringformat:"05d" }}</a>: {{ object.event.name }} <br>
-                            <span class="text-muted">{{ object.event.get_status_display }}
-                            {% if not object.event.mic %}(No MIC){% endif %}
+                            <span class="text-muted">{{ object.event.get_status_display }}{% if not object.event.mic %}, No MIC{% endif %}
                             </span></td>
                         </td>
                         <td>{% if object.event.organisation %}