mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-01-21 07:48:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2356 from opensourcepos/stock-type-visibility

Browse Source 
Allow user excluded from item kit maintenance to maintain stock type.
This commit is contained in:
Steve Ireland
2019-02-09 13:02:08 -05:00
committed by GitHub
parent 929f3e63fc 03fe400e9e
commit a33db6f055
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/Items.php
View File

@@ -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();

4
application/views/items/form.php
View File

@@ -52,7 +52,6 @@
</script>
</div>
<?php if ($item_kits_enabled == '1'): ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->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')); ?>
<div class="col-xs-8">
@@ -86,6 +85,7 @@
'type'=>'radio',
'id'=>'item_type',
'value'=>0,
'disabled'=>$item_type_disabled,
'checked'=>$item_info->item_type == ITEM)
); ?> <?php echo $this->lang->line('items_standard'); ?>
</label>
@@ -95,6 +95,7 @@
'type'=>'radio',
'id'=>'item_type',
'value'=>1,
'disabled'=>$item_type_disabled,
'checked'=>$item_info->item_type == ITEM_KIT)
); ?> <?php echo $this->lang->line('items_kit'); ?>
</label>
@@ -131,7 +132,6 @@
?>
</div>
</div>
<?php endif; ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('items_supplier'), 'supplier', array('class'=>'control-label col-xs-3')); ?>