From 732681b5456d0fcf9acdb8d13d3af1d111cecda8 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Wed, 25 Jan 2017 11:15:17 -0600 Subject: [PATCH] Tweaks to order form template etc., for purchasing batch --- tailbone/templates/purchases/batches/order_form.mako | 7 ++++--- tailbone/views/purchases/batch.py | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) 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):