diff --git a/tailbone/templates/mobile/receiving/receive_row.mako b/tailbone/templates/mobile/receiving/receive_row.mako index 53d8820f..7987e9de 100644 --- a/tailbone/templates/mobile/receiving/receive_row.mako +++ b/tailbone/templates/mobile/receiving/receive_row.mako @@ -30,12 +30,12 @@ % if batch.order_quantities_known: - ordered + shipped % if allow_cases: - ${h.pretty_quantity(row.cases_ordered or 0)} / + ${h.pretty_quantity(row.cases_shipped or 0)} / % endif - ${h.pretty_quantity(row.units_ordered or 0)} + ${h.pretty_quantity(row.units_shipped or 0)} % endif diff --git a/tailbone/views/purchasing/batch.py b/tailbone/views/purchasing/batch.py index 9bec164d..39106e13 100644 --- a/tailbone/views/purchasing/batch.py +++ b/tailbone/views/purchasing/batch.py @@ -613,6 +613,8 @@ class PurchasingBatchView(BatchMasterView): g.set_type('upc', 'gpc') g.set_type('cases_ordered', 'quantity') g.set_type('units_ordered', 'quantity') + g.set_type('cases_shipped', 'quantity') + g.set_type('units_shipped', 'quantity') g.set_type('cases_received', 'quantity') g.set_type('units_received', 'quantity') g.set_type('po_total', 'currency') @@ -624,6 +626,10 @@ class PurchasingBatchView(BatchMasterView): g.filters['cases_ordered'].label = "Cases Ordered" g.set_label('units_ordered', "Units Ord.") g.filters['units_ordered'].label = "Units Ordered" + g.set_label('cases_shipped', "Cases Shp.") + g.filters['cases_shipped'].label = "Cases Shipped" + g.set_label('units_shipped', "Units Shp.") + g.filters['units_shipped'].label = "Units Shipped" g.set_label('cases_received', "Cases Rec.") g.filters['cases_received'].label = "Cases Received" g.set_label('units_received', "Units Rec.") @@ -670,6 +676,8 @@ class PurchasingBatchView(BatchMasterView): f.set_type('case_quantity', 'quantity') f.set_type('cases_ordered', 'quantity') f.set_type('units_ordered', 'quantity') + f.set_type('cases_shipped', 'quantity') + f.set_type('units_shipped', 'quantity') f.set_type('cases_received', 'quantity') f.set_type('units_received', 'quantity') f.set_type('cases_damaged', 'quantity') diff --git a/tailbone/views/purchasing/receiving.py b/tailbone/views/purchasing/receiving.py index aa32e7c8..fc81acd7 100644 --- a/tailbone/views/purchasing/receiving.py +++ b/tailbone/views/purchasing/receiving.py @@ -219,8 +219,8 @@ class ReceivingBatchView(PurchasingBatchView): 'description', 'size', 'department_name', - 'cases_ordered', - 'units_ordered', + 'cases_shipped', + 'units_shipped', 'cases_received', 'units_received', # 'po_total', @@ -241,6 +241,8 @@ class ReceivingBatchView(PurchasingBatchView): 'case_quantity', 'cases_ordered', 'units_ordered', + 'cases_shipped', + 'units_shipped', 'cases_received', 'units_received', 'cases_damaged',