From 8afaf80128407bebd3708d7f7e2e43944bf2688b Mon Sep 17 00:00:00 2001
From: Lance Edgar <lance@edbob.org>
Date: Mon, 19 Dec 2016 16:17:56 -0600
Subject: [PATCH] Various tweaks to purchasing batch views

---
 tailbone/templates/purchases/receiving_worksheet.mako | 4 ++--
 tailbone/views/purchases/batch.py                     | 8 ++++----
 tailbone/views/purchases/core.py                      | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tailbone/templates/purchases/receiving_worksheet.mako b/tailbone/templates/purchases/receiving_worksheet.mako
index 31be83f9..38696dd4 100644
--- a/tailbone/templates/purchases/receiving_worksheet.mako
+++ b/tailbone/templates/purchases/receiving_worksheet.mako
@@ -55,9 +55,9 @@
       Order Date:&nbsp; <strong>${purchase.date_ordered}</strong>
     </p>
     <p class="receiving-info">
-      Received by (name):&nbsp; ____________________
-      <span class="spacer"></span>
       Received on (date):&nbsp; ____________________
+      <span class="spacer"></span>
+      Received by (name):&nbsp; ____________________
     </p>
 
     <table>
diff --git a/tailbone/views/purchases/batch.py b/tailbone/views/purchases/batch.py
index 1b910af3..0193a1fb 100644
--- a/tailbone/views/purchases/batch.py
+++ b/tailbone/views/purchases/batch.py
@@ -324,10 +324,10 @@ class PurchaseBatchView(BatchMasterView):
 
         g.upc.set(label="UPC")
         g.brand_name.set(label="Brand")
-        g.cases_ordered.set(label="Cases Ord.")
-        g.units_ordered.set(label="Units Ord.")
-        g.cases_received.set(label="Cases Rec.")
-        g.units_received.set(label="Units Rec.")
+        g.cases_ordered.set(label="Cases Ord.", renderer=forms.renderers.QuantityFieldRenderer)
+        g.units_ordered.set(label="Units Ord.", renderer=forms.renderers.QuantityFieldRenderer)
+        g.cases_received.set(label="Cases Rec.", renderer=forms.renderers.QuantityFieldRenderer)
+        g.units_received.set(label="Units Rec.", renderer=forms.renderers.QuantityFieldRenderer)
         g.po_total.set(label="Total", renderer=forms.renderers.CurrencyFieldRenderer)
         g.invoice_total.set(label="Total", renderer=forms.renderers.CurrencyFieldRenderer)
         g.append(fa.Field('has_credits', type=fa.types.Boolean, label="Credits?",
diff --git a/tailbone/views/purchases/core.py b/tailbone/views/purchases/core.py
index ca942846..23addd7e 100644
--- a/tailbone/views/purchases/core.py
+++ b/tailbone/views/purchases/core.py
@@ -193,10 +193,10 @@ class PurchaseView(MasterView):
         g.sequence.set(label="Seq")
         g.upc.set(label="UPC")
         g.brand_name.set(label="Brand")
-        g.cases_ordered.set(label="Cases Ord.")
-        g.units_ordered.set(label="Units Ord.")
-        g.cases_received.set(label="Cases Rec.")
-        g.units_received.set(label="Units Rec.")
+        g.cases_ordered.set(label="Cases Ord.", renderer=forms.renderers.QuantityFieldRenderer)
+        g.units_ordered.set(label="Units Ord.", renderer=forms.renderers.QuantityFieldRenderer)
+        g.cases_received.set(label="Cases Rec.", renderer=forms.renderers.QuantityFieldRenderer)
+        g.units_received.set(label="Units Rec.", renderer=forms.renderers.QuantityFieldRenderer)
         g.po_total.set(label="Total", renderer=forms.renderers.CurrencyFieldRenderer)
         g.invoice_total.set(label="Total", renderer=forms.renderers.CurrencyFieldRenderer)