From 7c2b406d0d24544a44853c031c96eafaaa8c3281 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sat, 11 Apr 2015 03:33:01 -0500 Subject: [PATCH] Fix usage of `Product.unit_of_measure` vs. `Product.weighed`. --- tailbone/reports/ordering_worksheet.mako | 2 +- tailbone/views/reports.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tailbone/reports/ordering_worksheet.mako b/tailbone/reports/ordering_worksheet.mako index 7870fa3f..f6a97dc6 100644 --- a/tailbone/reports/ordering_worksheet.mako +++ b/tailbone/reports/ordering_worksheet.mako @@ -111,7 +111,7 @@ ${cost.product.brand or ''} ${cost.product.description} ${cost.product.size or ''} - ${cost.case_size} ${rattail.enum.UNIT_OF_MEASURE.get(cost.product.unit_of_measure, '')} + ${cost.case_size} ${"LB" if cost.product.weighed else "EA"} ${cost.code or ''} ${'X' if cost.preference == 1 else ''} % for i in range(14): diff --git a/tailbone/views/reports.py b/tailbone/views/reports.py index 377251c5..6a8df2a2 100644 --- a/tailbone/views/reports.py +++ b/tailbone/views/reports.py @@ -172,7 +172,7 @@ class InventoryWorksheet(View): q = q.filter(model.Product.deleted == False) q = q.filter(model.Product.subdepartment == subdepartment) if self.request.params.get('weighted-only'): - q = q.filter(model.Product.unit_of_measure == enum.UNIT_OF_MEASURE_POUND) + q = q.filter(model.Product.weighed == True) if self.request.params.get('exclude-not-for-sale'): q = q.filter(model.Product.not_for_sale == False) q = q.order_by(model.Brand.name, model.Product.description)