diff --git a/application/controllers/Items.php b/application/controllers/Items.php
index ed93a29d5..6575a408a 100644
--- a/application/controllers/Items.php
+++ b/application/controllers/Items.php
@@ -180,6 +180,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);
 
 		$item_info = $this->Item->get_info($item_id);
 		foreach(get_object_vars($item_info) as $property => $value)
diff --git a/application/libraries/Sale_lib.php b/application/libraries/Sale_lib.php
index 3b43657ab..a9ccee78d 100644
--- a/application/libraries/Sale_lib.php
+++ b/application/libraries/Sale_lib.php
@@ -683,7 +683,7 @@ class Sale_lib
 				$print_option = '2'; // Do not include in list
 			}
 
-			$result &= $this->add_item($item_kit_item['item_id'], $item_kit_item['quantity'], $item_location, $discount, $price, null, null, null, $print_option, $print_option, $item_kit_item['stock_type']);
+			$result &= $this->add_item($item_kit_item['item_id'], $item_kit_item['quantity'], $item_location, $discount, $price, null, null, null, $print_option, $item_kit_item['stock_type']);
 
 			if($stock_warning == null)
 			{
diff --git a/application/views/items/form.php b/application/views/items/form.php
index d99214fc9..d848d06e8 100644
--- a/application/views/items/form.php
+++ b/application/views/items/form.php
@@ -46,6 +46,7 @@
 			</div>
 		</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">
@@ -93,8 +94,9 @@
 				</label>
 			</div>
 		</div>
+		<?php endif; ?>
 
-		<div class="form-group form-group-sm">
+        <div class="form-group form-group-sm">
 			<?php echo form_label($this->lang->line('items_supplier'), 'supplier', array('class'=>'control-label col-xs-3')); ?>
 			<div class='col-xs-8'>
 				<?php echo form_dropdown('supplier_id', $suppliers, $selected_supplier, array('class'=>'form-control')); ?>
diff --git a/database/3.0.2_to_3.1.0.sql b/database/3.0.2_to_3.1.0.sql
index d42c2ff22..8529c5b18 100644
--- a/database/3.0.2_to_3.1.0.sql
+++ b/database/3.0.2_to_3.1.0.sql
@@ -25,7 +25,7 @@ ALTER TABLE `ospos_sales_suspended_items`
 
 INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
 ('date_or_time_format', ''),
-('sales_quote_format', 'Q%m{QSEQ:6}'),
+('sales_quote_format', 'Q%y{QSEQ:6}'),
 ('default_register_mode', 'sale'),
 ('last_used_invoice_number', '0'),
 ('last_used_quote_number', '0'),
diff --git a/database/database.sql b/database/database.sql
index d928c3fb4..2aa0546eb 100644
--- a/database/database.sql
+++ b/database/database.sql
@@ -50,7 +50,7 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
 ('line_sequence', '0'),
 ('recv_invoice_format', '$CO'),
 ('sales_invoice_format', '$CO'),
-('sales_quote_format', 'Q%m{QSEQ:6}'),
+('sales_quote_format', 'Q%y{QSEQ:6}'),
 ('invoice_email_message', 'Dear $CU, In attachment the receipt for sale $INV'),
 ('invoice_default_comments', 'This is a default comment'),
 ('print_silently', '1'),
diff --git a/database/tables.sql b/database/tables.sql
index f7f67c390..fc88d83bb 100644
--- a/database/tables.sql
+++ b/database/tables.sql
@@ -50,7 +50,7 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
 ('line_sequence', '0'),
 ('recv_invoice_format', '$CO'),
 ('sales_invoice_format', '$CO'),
-('sales_quote_format', 'Q%m{QSEQ:6}'),
+('sales_quote_format', 'Q%y{QSEQ:6}'),
 ('invoice_email_message', 'Dear $CU, In attachment the receipt for sale $INV'),
 ('invoice_default_comments', 'This is a default comment'),
 ('print_silently', '1'),