From def8ea7c15bf6a87b397bf6b68ca5907a5a3f3ec Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Tue, 5 Oct 2021 16:12:48 -0400 Subject: [PATCH] Some tweaks for invoice costing batch views --- tailbone/views/purchasing/batch.py | 6 +++++- tailbone/views/purchasing/costing.py | 26 ++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/tailbone/views/purchasing/batch.py b/tailbone/views/purchasing/batch.py index 1d42f08d..95c12bb1 100644 --- a/tailbone/views/purchasing/batch.py +++ b/tailbone/views/purchasing/batch.py @@ -660,7 +660,10 @@ class PurchasingBatchView(BatchMasterView): row.STATUS_ORDERED_RECEIVED_DIFFER, row.STATUS_TRUCKDUMP_UNCLAIMED, row.STATUS_TRUCKDUMP_PARTCLAIMED, - row.STATUS_OUT_OF_STOCK): + row.STATUS_OUT_OF_STOCK, + row.STATUS_ON_PO_NOT_INVOICE, + row.STATUS_ON_INVOICE_NOT_PO, + row.STATUS_COST_INCREASE): return 'notice' def configure_row_form(self, f): @@ -694,6 +697,7 @@ class PurchasingBatchView(BatchMasterView): f.set_type('po_total', 'currency') f.set_type('po_total_calculated', 'currency') f.set_type('invoice_unit_cost', 'currency') + f.set_type('catalog_unit_cost', 'currency') # upc f.set_type('upc', 'gpc') diff --git a/tailbone/views/purchasing/costing.py b/tailbone/views/purchasing/costing.py index 0f07d77d..149e0442 100644 --- a/tailbone/views/purchasing/costing.py +++ b/tailbone/views/purchasing/costing.py @@ -108,8 +108,6 @@ class CostingBatchView(PurchasingBatchView): 'description', 'size', 'department_name', - 'cases_shipped', - 'units_shipped', 'cases_received', 'units_received', 'catalog_unit_cost', @@ -119,6 +117,30 @@ class CostingBatchView(PurchasingBatchView): 'status_code', ] + row_form_fields = [ + 'sequence', + 'upc', + 'item_id', + 'product', + 'vendor_code', + 'brand_name', + 'description', + 'size', + 'department_name', + 'case_quantity', + 'cases_received', + 'units_received', + 'po_line_number', + 'po_unit_cost', + 'po_total', + 'invoice_line_number', + 'invoice_unit_cost', + 'invoice_total', + 'invoice_total_calculated', + 'catalog_unit_cost', + 'status_code', + ] + @property def batch_mode(self): return self.enum.PURCHASE_BATCH_MODE_COSTING