diff --git a/quicktill/tillweb/templates/tillweb/deliverylist.html b/quicktill/tillweb/templates/tillweb/deliverylist.html
deleted file mode 100644
index 46b99e0..0000000
--- a/quicktill/tillweb/templates/tillweb/deliverylist.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% if pager.items %}
-
-
-
-
- ID |
- Date |
-{% if exclude_column != "supplier" %}Supplier | {% endif %}
- Document |
- Confirmed? |
-
-
-
-{% for d in pager.items %}
-
-{{d.id}} |
-{{d.date}} |
-{% if exclude_column != "supplier" %}
-{{d.supplier.name}} |
-{% endif %}
-{{d.docnumber}} |
-{{d.checked|yesno:"Yes,No"}} |
-{% endfor %}
-
-
-
-
-{{pager.as_html}}
-{% endif %}
diff --git a/quicktill/tillweb/templates/tillweb/supplier.html b/quicktill/tillweb/templates/tillweb/supplier.html
index dafdb36..f859ffb 100644
--- a/quicktill/tillweb/templates/tillweb/supplier.html
+++ b/quicktill/tillweb/templates/tillweb/supplier.html
@@ -28,13 +28,47 @@
Deliveries
-{% with exclude_column="supplier" %}
-{% if pager.items %}
-{% include "tillweb/deliverylist.html" %}
-{% else %}
-There have not been any deliveries from this supplier.
-{% endif %}
-{% endwith %}
+
+
+
+ ID |
+ Date |
+ Document |
+ Confirmed? |
+
+
+
+
+
+
{% if supplier.logs %}
Log entries
diff --git a/quicktill/tillweb/views.py b/quicktill/tillweb/views.py
index ba6ba1f..f2ac69f 100644
--- a/quicktill/tillweb/views.py
+++ b/quicktill/tillweb/views.py
@@ -1018,7 +1018,6 @@ def supplier(request, info, supplierid):
raise Http404
deliveries = td.s.query(Delivery)\
- .order_by(desc(Delivery.id))\
.filter(Delivery.supplier == s)
form = None
@@ -1060,12 +1059,10 @@ def supplier(request, info, supplierid):
else:
form = SupplierForm(initial=initial)
- pager = Pager(request, deliveries)
return ('supplier.html', {
'tillobject': s,
'supplier': s,
'form': form,
- 'pager': pager,
'can_delete': can_delete,
})