diff --git a/tailbone/views/batch/delproduct.py b/tailbone/views/batch/delproduct.py index 775e2e79..bcb0795b 100644 --- a/tailbone/views/batch/delproduct.py +++ b/tailbone/views/batch/delproduct.py @@ -53,6 +53,7 @@ class DeleteProductBatchView(BatchMasterView): 'size', 'department_name', 'subdepartment_name', + 'present_in_scale', 'status_code', ] @@ -67,6 +68,7 @@ class DeleteProductBatchView(BatchMasterView): 'department_name', 'subdepartment_number', 'subdepartment_name', + 'present_in_scale', 'status_code', 'status_text', ] @@ -74,7 +76,7 @@ class DeleteProductBatchView(BatchMasterView): def row_grid_extra_class(self, row, i): if row.status_code == row.STATUS_PRODUCT_NOT_FOUND: return 'warning' - if row.status_code == row.STATUS_DEPARTMENT_NOT_ALLOWED: + if row.status_code == row.STATUS_DELETE_NOT_ALLOWED: return 'notice' diff --git a/tailbone/views/departments.py b/tailbone/views/departments.py index cc793ede..d242b51d 100644 --- a/tailbone/views/departments.py +++ b/tailbone/views/departments.py @@ -58,6 +58,7 @@ class DepartmentView(MasterView): 'product', 'personnel', 'exempt_from_gross_sales', + 'allow_product_deletions', ] def configure_grid(self, g):