diff --git a/tailbone/templates/purchases/batches/order_form.mako b/tailbone/templates/purchases/batches/order_form.mako
index e6ca382a..c45b252b 100644
--- a/tailbone/templates/purchases/batches/order_form.mako
+++ b/tailbone/templates/purchases/batches/order_form.mako
@@ -158,11 +158,12 @@
% for data in history:
% if data:
- % if data['purchase']['date_ordered']:
- ${data['purchase']['date_ordered'].strftime('%m/%d')}
- % elif data['purchase']['date_received']:
+ % if data['purchase']['date_received']:
Rec.
${data['purchase']['date_received'].strftime('%m/%d')}
+ % elif data['purchase']['date_ordered']:
+ Ord.
+ ${data['purchase']['date_ordered'].strftime('%m/%d')}
% else:
??
% endif
diff --git a/tailbone/views/purchases/batch.py b/tailbone/views/purchases/batch.py
index ab97b1fe..50f7fcf2 100644
--- a/tailbone/views/purchases/batch.py
+++ b/tailbone/views/purchases/batch.py
@@ -366,6 +366,7 @@ class PurchaseBatchView(BatchMasterView):
if batch.mode == self.enum.PURCHASE_BATCH_MODE_ORDERING:
del g.cases_received
del g.units_received
+ del g.has_credits
del g.invoice_total
elif batch.mode in (self.enum.PURCHASE_BATCH_MODE_RECEIVING,
self.enum.PURCHASE_BATCH_MODE_COSTING):
|