From 4560be158a58907cd5097cfbc99ad7360ece7825 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 23 Apr 2015 23:58:54 +0100
Subject: [PATCH 1/3] Added PO field to event form

---
 RIGS/forms.py                           | 2 +-
 RIGS/models.py                          | 2 +-
 RIGS/templates/RIGS/event_detail.html   | 5 +++++
 RIGS/templates/RIGS/event_form.html     | 8 ++++++++
 RIGS/templates/RIGS/invoice_detail.html | 2 +-
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/RIGS/forms.py b/RIGS/forms.py
index 640a2a15..3f38f9d5 100644
--- a/RIGS/forms.py
+++ b/RIGS/forms.py
@@ -116,4 +116,4 @@ class EventForm(forms.ModelForm):
         fields = ['is_rig', 'name', 'venue', 'start_time', 'end_date', 'start_date',
                   'end_time', 'meet_at', 'access_at', 'description', 'notes', 'mic',
                   'person', 'organisation', 'dry_hire', 'checked_in_by', 'status', 
-                  'collector',]
+                  'collector','purchase_order']
diff --git a/RIGS/models.py b/RIGS/models.py
index 641aeab9..524cc338 100644
--- a/RIGS/models.py
+++ b/RIGS/models.py
@@ -255,7 +255,7 @@ class Event(models.Model, RevisionMixin):
     # Monies
     payment_method = models.CharField(max_length=255, blank=True, null=True)
     payment_received = models.CharField(max_length=255, blank=True, null=True)
-    purchase_order = models.CharField(max_length=255, blank=True, null=True)
+    purchase_order = models.CharField(max_length=255, blank=True, null=True, verbose_name='Purchase Order')
     collector = models.CharField(max_length=255, blank=True, null=True, verbose_name='Collected By')
 
     # Calculated values
diff --git a/RIGS/templates/RIGS/event_detail.html b/RIGS/templates/RIGS/event_detail.html
index d2e57352..fe5a70fa 100644
--- a/RIGS/templates/RIGS/event_detail.html
+++ b/RIGS/templates/RIGS/event_detail.html
@@ -157,6 +157,11 @@
                         <dt>Collected By</dt>
                         <dd>{{ object.collector }}</dd>
                     {% endif %}
+
+                    {% if event.is_rig %}
+                        <dt>Purchase Order</dt>
+                        <dd>{{ object.purchase_order }}</dd>
+                    {% endif %}
                 </dl>
             </div>
         </div>
diff --git a/RIGS/templates/RIGS/event_form.html b/RIGS/templates/RIGS/event_form.html
index 8a691b91..6eb8dc41 100644
--- a/RIGS/templates/RIGS/event_form.html
+++ b/RIGS/templates/RIGS/event_form.html
@@ -363,6 +363,14 @@
                                 {% render_field form.collector class+="form-control" %}
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label for="{{ form.purchase_order.id_for_label }}"
+                                   class="col-sm-4 control-label">{{ form.purchase_order.label }}</label>
+
+                            <div class="col-sm-8">
+                                {% render_field form.purchase_order class+="form-control" %}
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
diff --git a/RIGS/templates/RIGS/invoice_detail.html b/RIGS/templates/RIGS/invoice_detail.html
index 38dd4c97..a36b08b1 100644
--- a/RIGS/templates/RIGS/invoice_detail.html
+++ b/RIGS/templates/RIGS/invoice_detail.html
@@ -57,7 +57,7 @@
                                 <dd>{{ object.checked_in_by.name }}</dd>
                             {% endif %}
 
-                            <dt>PO</dt>
+                            <dt>Purchase Order</dt>
                             <dd>{{ object.event.purchase_order }}</dd>
                         </dl>
                     </div>

From d2cc9b8460106ce85a1f052e11b6724a2bc9f48c Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 24 Apr 2015 01:22:46 +0100
Subject: [PATCH 2/3] Changed to 'PO' and corrected capitalisation in
 'Collected by'

---
 RIGS/models.py                          | 4 ++--
 RIGS/templates/RIGS/invoice_detail.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/RIGS/models.py b/RIGS/models.py
index 524cc338..e84428bb 100644
--- a/RIGS/models.py
+++ b/RIGS/models.py
@@ -255,8 +255,8 @@ class Event(models.Model, RevisionMixin):
     # Monies
     payment_method = models.CharField(max_length=255, blank=True, null=True)
     payment_received = models.CharField(max_length=255, blank=True, null=True)
-    purchase_order = models.CharField(max_length=255, blank=True, null=True, verbose_name='Purchase Order')
-    collector = models.CharField(max_length=255, blank=True, null=True, verbose_name='Collected By')
+    purchase_order = models.CharField(max_length=255, blank=True, null=True, verbose_name='PO')
+    collector = models.CharField(max_length=255, blank=True, null=True, verbose_name='Collected by')
 
     # Calculated values
     """
diff --git a/RIGS/templates/RIGS/invoice_detail.html b/RIGS/templates/RIGS/invoice_detail.html
index 013dfc65..f36d87af 100644
--- a/RIGS/templates/RIGS/invoice_detail.html
+++ b/RIGS/templates/RIGS/invoice_detail.html
@@ -63,7 +63,7 @@
                                 <dd>{{ object.checked_in_by.name }}</dd>
                             {% endif %}
 
-                            <dt>Purchase Order</dt>
+                            <dt>PO</dt>
                             <dd>{{ object.event.purchase_order }}</dd>
                         </dl>
                     </div>

From 3b4547383db76c874d574b2da068ab75d4c82dc4 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 24 Apr 2015 01:24:03 +0100
Subject: [PATCH 3/3] Changed to PO in detail view

---
 RIGS/templates/RIGS/event_detail.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RIGS/templates/RIGS/event_detail.html b/RIGS/templates/RIGS/event_detail.html
index fe5a70fa..d8465be6 100644
--- a/RIGS/templates/RIGS/event_detail.html
+++ b/RIGS/templates/RIGS/event_detail.html
@@ -159,7 +159,7 @@
                     {% endif %}
 
                     {% if event.is_rig %}
-                        <dt>Purchase Order</dt>
+                        <dt>PO</dt>
                         <dd>{{ object.purchase_order }}</dd>
                     {% endif %}
                 </dl>