Fixed merge issues

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

RIGS/templates/RIGS/invoice_archive.html

@@ -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 %}

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>

RIGS/templates/RIGS/invoice_list_archive.html

@@ -11,3 +11,14 @@ 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 %}