diff --git a/tailbone/templates/products/view.mako b/tailbone/templates/products/view.mako index 41d94854..5abc4d6d 100644 --- a/tailbone/templates/products/view.mako +++ b/tailbone/templates/products/view.mako @@ -209,7 +209,7 @@

Notes

- ${render_field_readonly(form.fieldset.notes)} +
${form.fieldset.notes.render_readonly()}
diff --git a/tailbone/views/products.py b/tailbone/views/products.py index ff6019a8..bf4fcd92 100644 --- a/tailbone/views/products.py +++ b/tailbone/views/products.py @@ -182,6 +182,7 @@ class ProductsView(MasterView): g.sorters['subdepartment'] = g.make_sorter(model.Subdepartment.name) g.sorters['vendor'] = g.make_sorter(model.Vendor.name) g.set_sorter('on_hand', model.ProductInventory.on_hand) + g.set_sorter('on_order', model.ProductInventory.on_order) g.filters['upc'].default_active = True g.filters['upc'].default_verb = 'equal' @@ -219,6 +220,7 @@ class ProductsView(MasterView): g.set_renderer('current_price', self.render_price) g.set_renderer('cost', self.render_cost) g.set_renderer('on_hand', self.render_on_hand) + g.set_renderer('on_order', self.render_on_order) g.set_link('upc') g.set_link('item_id') @@ -262,6 +264,12 @@ class ProductsView(MasterView): return "" return pretty_quantity(inventory.on_hand) + def render_on_order(self, product, column): + inventory = product.inventory + if not inventory: + return "" + return pretty_quantity(inventory.on_order) + def template_kwargs_index(self, **kwargs): if self.print_labels: kwargs['label_profiles'] = Session.query(model.LabelProfile)\