From c1b416251cbf8797f9576d40a585f217b795db76 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Sun, 10 Jul 2016 12:50:14 +0100
Subject: [PATCH] Fixed merge issues

---
 RIGS/finance.py                               |  1 -
 RIGS/templates/RIGS/invoice_archive.html      | 12 ------------
 RIGS/templates/RIGS/invoice_list.html         |  1 +
 RIGS/templates/RIGS/invoice_list_archive.html | 11 +++++++++++
 4 files changed, 12 insertions(+), 13 deletions(-)
 delete mode 100644 RIGS/templates/RIGS/invoice_archive.html

diff --git a/RIGS/finance.py b/RIGS/finance.py
index b945dfa2..c5d10fe8 100644
--- a/RIGS/finance.py
+++ b/RIGS/finance.py
@@ -100,7 +100,6 @@ class InvoiceArchive(generic.ListView):
     model = models.Invoice
     template_name = 'RIGS/invoice_list_archive.html'
     paginate_by = 25
-    template_name="RIGS/invoice_archive.html"
 
     def get_queryset(self):
         q = self.request.GET.get('q', "")
diff --git a/RIGS/templates/RIGS/invoice_archive.html b/RIGS/templates/RIGS/invoice_archive.html
deleted file mode 100644
index 2860254b..00000000
--- a/RIGS/templates/RIGS/invoice_archive.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% extends 'RIGS/invoice_list.html' %}
-
-{% block search %}
-	<div class="col-sm-3 col-sm-offset-9">
-		<form class="form form-horizontal col-sm-12">
-		    <div class="form-group">
-		        <input type="search" name="q" placeholder="Search" value="{{ request.GET.q }}"
-		               class="form-control"/>
-		    </div>
-		</form>
-	</div>
-{% endblock %}
\ No newline at end of file
diff --git a/RIGS/templates/RIGS/invoice_list.html b/RIGS/templates/RIGS/invoice_list.html
index 2f34b6c9..c31023cd 100644
--- a/RIGS/templates/RIGS/invoice_list.html
+++ b/RIGS/templates/RIGS/invoice_list.html
@@ -12,6 +12,7 @@
                 {% paginator %}
             </div>
         {% endif %}
+        {% block search %}{% endblock %}
         <div class="table-responsive col-sm-12">
             <table class="table table-hover">
                 <thead>
diff --git a/RIGS/templates/RIGS/invoice_list_archive.html b/RIGS/templates/RIGS/invoice_list_archive.html
index 77bab204..f0335f2f 100644
--- a/RIGS/templates/RIGS/invoice_list_archive.html
+++ b/RIGS/templates/RIGS/invoice_list_archive.html
@@ -10,4 +10,15 @@ All Invoices
 
 {% block description %}
 <p>This page displays all invoices: outstanding, paid, and void</p>
+{% endblock %}
+
+{% block search %}
+	<div class="col-sm-3 col-sm-offset-9">
+		<form class="form form-horizontal col-sm-12">
+		    <div class="form-group">
+		        <input type="search" name="q" placeholder="Search" value="{{ request.GET.q }}"
+		               class="form-control"/>
+		    </div>
+		</form>
+	</div>
 {% endblock %}
\ No newline at end of file