From 03fe400e9e96d26724e6f8de7cc02ce2ea9f9fda Mon Sep 17 00:00:00 2001 From: Steve Ireland Date: Sat, 9 Feb 2019 11:51:52 -0500 Subject: [PATCH] Allow user excluded from item kit maintenance to maintain stock type. --- application/controllers/Items.php | 2 +- application/views/items/form.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/controllers/Items.php b/application/controllers/Items.php index cda2bd3b3..518cd2391 100644 --- a/application/controllers/Items.php +++ b/application/controllers/Items.php @@ -193,7 +193,7 @@ class Items extends Secure_Controller $data['item_tax_info'] = $this->xss_clean($this->Item_taxes->get_info($item_id)); $data['default_tax_1_rate'] = ''; $data['default_tax_2_rate'] = ''; - $data['item_kits_enabled'] = $this->Employee->has_grant('item_kits', $this->Employee->get_logged_in_employee_info()->person_id); + $data['item_type_disabled'] = !$this->Employee->has_grant('item_kits', $this->Employee->get_logged_in_employee_info()->person_id); $data['definition_values'] = $this->Attribute->get_attributes_by_item($item_id); $data['definition_names'] = $this->Attribute->get_definition_names(); diff --git a/application/views/items/form.php b/application/views/items/form.php index d27aa0b84..30cab1291 100644 --- a/application/views/items/form.php +++ b/application/views/items/form.php @@ -52,7 +52,6 @@ -
lang->line('items_stock_type'), 'stock_type', !empty($basic_version) ? array('class'=>'required control-label col-xs-3') : array('class'=>'control-label col-xs-3')); ?>
@@ -86,6 +85,7 @@ 'type'=>'radio', 'id'=>'item_type', 'value'=>0, + 'disabled'=>$item_type_disabled, 'checked'=>$item_info->item_type == ITEM) ); ?> lang->line('items_standard'); ?> @@ -95,6 +95,7 @@ 'type'=>'radio', 'id'=>'item_type', 'value'=>1, + 'disabled'=>$item_type_disabled, 'checked'=>$item_info->item_type == ITEM_KIT) ); ?> lang->line('items_kit'); ?> @@ -131,7 +132,6 @@ ?>
-
lang->line('items_supplier'), 'supplier', array('class'=>'control-label col-xs-3')); ?>