diff --git a/application/helpers/table_helper.php b/application/helpers/table_helper.php
index fa5cd198f..dab383109 100644
--- a/application/helpers/table_helper.php
+++ b/application/helpers/table_helper.php
@@ -358,10 +358,10 @@ function get_item_data_row($item,$controller)
 		}
 	}
 	$table_data_row.='<td align="center" width="55px">' . $image . '</td>';
-	$table_data_row.='<td width="5%">'.anchor($controller_name."/view/$item->item_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_update'))).'</td>';		
+	$table_data_row.='<td width="5%">'.anchor($controller_name."/view/$item->item_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'data-modal','data-toggle'=>'modal','data-target'=>'#ajaxModal','title'=>$CI->lang->line($controller_name.'_update'))).'</td>';
 
 	$table_data_row.='<td width="10%">'.anchor($controller_name."/inventory/$item->item_id/width:$width", $CI->lang->line('common_inv'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_count')))./*'</td>';//inventory count	
-	$table_data_row.='<td width="5%">'*/'&nbsp;&nbsp;&nbsp;&nbsp;'.anchor($controller_name."/count_details/$item->item_id/width:$width", $CI->lang->line('common_det'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_details_count'))).'</td>';//inventory details	
+	$table_data_row.='<td width="5%">'*/'&nbsp;&nbsp;&nbsp;&nbsp;'.anchor($controller_name."/count_details/$item->item_id/width:$width", $CI->lang->line('common_det'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_details_count'))).'</td>';//inventory details
 	
 	$table_data_row.='</tr>';
 
diff --git a/application/views/items/form.php b/application/views/items/form.php
index ddf011cbd..4e53470c6 100644
--- a/application/views/items/form.php
+++ b/application/views/items/form.php
@@ -1,384 +1,403 @@
-<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
-<ul id="error_message_box" class="error_message_box"></ul>
+<div class="modal-dialog" id="myModal" tabindex="-1" role="dialog">
+	<div class="modal-content">
+		<div class="modal-header">
+			<?php echo $this->lang->line("items_basic_information"); ?>
+			<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+		</div>
+		<div class="modal-body" >
+			<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+			<ul id="error_message_box" class="error_message_box"></ul>
 
-<?php echo form_open('items/save/'.$item_info->item_id,array('id'=>'item_form', 'enctype'=>'multipart/form-data')); ?>
-	<fieldset id="item_basic_info">
-		<legend><?php echo $this->lang->line("items_basic_information"); ?></legend>
+			<?php echo form_open('items/save/'.$item_info->item_id,array('id'=>'item_form', 'enctype'=>'multipart/form-data', 'data-target' => 'ajaxModal')); ?>
+			<fieldset id="item_basic_info">
 
-		<div class="field_row clearfix">
-		<?php echo form_label($this->lang->line('items_item_number').':', 'item_number',array('class'=>'wide')); ?>
-		<div class='form_field'>
-		<?php echo form_input(array(
-			'name'=>'item_number',
-			'class'=>'item_number',
-			'id'=>'item_number',
-			'value'=>$item_info->item_number)
-		);?>
-		</div>
-		</div>
-
-		<div class="field_row clearfix">
-		<?php echo form_label($this->lang->line('items_name').':', 'name',array('class'=>'required wide')); ?>
-		<div class='form_field'>
-			<?php echo form_input(array(
-				'name'=>'name',
-				'id'=>'name',
-				'value'=>$item_info->name)
-			);?>
-		</div>
-	</div>
-
-	<div class="field_row clearfix">
-		<?php echo form_label($this->lang->line('items_category').':', 'category',array('class'=>'required wide')); ?>
-		<div class='form_field'>
-			<?php echo form_input(array(
-				'name'=>'category',
-				'id'=>'category',
-				'value'=>$item_info->category)
-			);?>
-		</div>
-	</div>
-
-	<div class="field_row clearfix">
-		<?php echo form_label($this->lang->line('items_supplier').':', 'supplier',array('class'=>'required wide')); ?>
-		<div class='form_field'>
-			<?php echo form_dropdown('supplier_id', $suppliers, $selected_supplier);?>
-		</div>
-	</div>
-
-	<div class="field_row clearfix">
-		<?php echo form_label($this->lang->line('items_cost_price').':', 'cost_price',array('class'=>'required wide')); ?>
-		<div class='form_field'>
-			<?php echo form_input(array(
-				'name'=>'cost_price',
-				'size'=>'8',
-				'id'=>'cost_price',
-				'value'=>$item_info->cost_price)
-			);?>
-		</div>
-	</div>
-
-	<div class="field_row clearfix">
-		<?php echo form_label($this->lang->line('items_unit_price').':', 'unit_price',array('class'=>'required wide')); ?>
-		<div class='form_field'>
-			<?php echo form_input(array(
-				'name'=>'unit_price',
-				'size'=>'8',
-				'id'=>'unit_price',
-				'value'=>$item_info->unit_price)
-			);?>
-		</div>
-	</div>
-
-	<div class="field_row clearfix">
-		<?php echo form_label($this->lang->line('items_tax_1').':', 'tax_percent_1',array('class'=>'wide')); ?>
-		<div class='form_field'>
-			<?php echo form_input(array(
-				'name'=>'tax_names[]',
-				'id'=>'tax_name_1',
-				'size'=>'8',
-				'value'=> isset($item_tax_info[0]['name']) ? $item_tax_info[0]['name'] : $this->config->item('default_tax_1_name'))
-			);?>
-		</div>
-		<div class='form_field'>
-			<?php echo form_input(array(
-				'name'=>'tax_percents[]',
-				'id'=>'tax_percent_name_1',
-				'size'=>'3',
-				'value'=> isset($item_tax_info[0]['percent']) ? $item_tax_info[0]['percent'] : $default_tax_1_rate)
-			);?>
-			%
-		</div>
-	</div>
-
-	<div class="field_row clearfix">
-	<?php echo form_label($this->lang->line('items_tax_2').':', 'tax_percent_2',array('class'=>'wide')); ?>
-		<div class='form_field'>
-			<?php echo form_input(array(
-				'name'=>'tax_names[]',
-				'id'=>'tax_name_2',
-				'size'=>'8',
-				'value'=> isset($item_tax_info[1]['name']) ? $item_tax_info[1]['name'] : $this->config->item('default_tax_2_name'))
-			);?>
-		</div>
-		<div class='form_field'>
-			<?php echo form_input(array(
-				'name'=>'tax_percents[]',
-				'id'=>'tax_percent_name_2',
-				'size'=>'3',
-				'value'=> isset($item_tax_info[1]['percent']) ? $item_tax_info[1]['percent'] : $default_tax_2_rate)
-			);?>
-			%
-		</div>
-	</div>
-
-	<?php
-	foreach($stock_locations as $key=>$location_detail)
-	{
-	?>
-		<div class="field_row clearfix">
-		<?php echo form_label($this->lang->line('items_quantity').' '.$location_detail['location_name'] .':', 
-								$key.'_quantity',
-								array('class'=>'required wide')); ?>
-			<div class='form_field'>
-				<?php echo form_input(array(
-					'name'=>$key.'_quantity',
-					'id'=>$key.'_quantity',
-					'class'=>'quantity',
-					'size'=>'8',
-					'value'=>isset($item_info->item_id)?$location_detail['quantity']:0)
-				);?>
-			</div>
-		</div>
-	<?php
-	}
-	?>
-
-	<div class="field_row clearfix">
-		<?php echo form_label($this->lang->line('items_receiving_quantity').':', 'receiving_quantity',array('class'=>'wide')); ?>
-		<div class='form_field'>
-			<?php echo form_input(array(
-				'name'=>'receiving_quantity',
-				'id'=>'receiving_quantity',
-				'size'=>'8',
-				'value'=>$item_info->receiving_quantity)
-			);?>
-		</div>
-	</div>
-
-	<div class="field_row clearfix">
-		<?php echo form_label($this->lang->line('items_reorder_level').':', 'reorder_level',array('class'=>'required wide')); ?>
-		<div class='form_field'>
-			<?php echo form_input(array(
-				'name'=>'reorder_level',
-				'id'=>'reorder_level',
-				'size'=>'8',
-				'value'=>!isset($item_info->item_id)?0:$item_info->reorder_level)
-			);?>
-		</div>
-	</div>
-
-	<div class="field_row clearfix">
-		<?php echo form_label($this->lang->line('items_description').':', 'description',array('class'=>'wide')); ?>
-		<div class='form_field'>
-			<?php echo form_textarea(array(
-				'name'=>'description',
-				'id'=>'description',
-				'value'=>$item_info->description,
-				'rows'=>'5',
-				'cols'=>'17')
-			);?>
-		</div>
-	</div>
-
-	<div class="field_row clearfix">
-		<?php echo form_label($this->lang->line('items_image').':', 'item_image',array('class'=>'wide')); ?>
-		<div class='form_field'>
-			<?php echo form_upload('item_image');?>
-		</div>
-	</div>
-
-	<div class="field_row clearfix">
-		<?php echo form_label($this->lang->line('items_allow_alt_description').':', 'allow_alt_description',array('class'=>'wide')); ?>
-		<div class='form_field'>
-			<?php echo form_checkbox(array(
-				'name'=>'allow_alt_description',
-				'id'=>'allow_alt_description',
-				'value'=>1,
-				'checked'=>($item_info->allow_alt_description)? 1  :0)
-			);?>
-		</div>
-	</div>
-
-	<div class="field_row clearfix">
-		<?php echo form_label($this->lang->line('items_is_serialized').':', 'is_serialized',array('class'=>'wide')); ?>
-		<div class='form_field'>
-			<?php echo form_checkbox(array(
-				'name'=>'is_serialized',
-				'id'=>'is_serialized',
-				'value'=>1,
-				'checked'=>($item_info->is_serialized)? 1 : 0)
-			);?>
-		</div>
-	</div>
-
-	<div class="field_row clearfix">
-		<?php echo form_label($this->lang->line('items_is_deleted').':', 'is_deleted',array('class'=>'wide')); ?>
-		<div class='form_field'>
-			<?php echo form_checkbox(array(
-				'name'=>'is_deleted',
-				'id'=>'is_deleted',
-				'value'=>1,
-				'checked'=>($item_info->deleted)? 1 : 0)
-			);?>
-		</div>
-	</div>
-
-	<?php for ($i = 0; $i < 11; $i++) 
-	{ 
-	?>
-		<?php
-		if($this->config->item('custom'.$i.'_name') != null)
-		{
-			$item_arr = (array)$item_info;
-			?>
-			<div class="field_row clearfix">
-				<?php echo form_label($this->config->item('custom'.$i.'_name').':', 'custom'.$i,array('class'=>'wide')); ?>
-				<div class='form_field'>
-					<?php echo form_input(array(
-						'name'=>'custom'.$i,
-						'id'=>'custom'.$i,
-						'value'=>$item_arr['custom'.$i])
-					);?>
+				<div class="field_row clearfix">
+					<?php echo form_label($this->lang->line('items_item_number').':', 'item_number',array('class'=>'wide')); ?>
+					<div class='form_field'>
+						<?php echo form_input(array(
+								'name'=>'item_number',
+								'class'=>'item_number',
+								'id'=>'item_number',
+								'value'=>$item_info->item_number)
+						);?>
+					</div>
 				</div>
-			</div>
-			<?php 
-		}
-	}
-	?>
 
-	<?php
-	echo form_submit(array(
-		'name'=>'submit',
-		'id'=>'submit',
-		'value'=>$this->lang->line('common_submit'),
-		'class'=>'btn btn-primary btn-sm pull-right')
-	);
-	echo form_submit(array(
-		'name'=>'continue',
-		'id'=>'continue',
-		'value'=>$this->lang->line('common_new'),
-		'class'=>'btn btn-default btn-sm pull-right',
-		'style'=>'margin-right: 10px;')
-	);
-	?>
-	</fieldset>
-<?php echo form_close(); ?>
+				<div class="field_row clearfix">
+					<?php echo form_label($this->lang->line('items_name').':', 'name',array('class'=>'required wide')); ?>
+					<div class='form_field'>
+						<?php echo form_input(array(
+								'name'=>'name',
+								'id'=>'name',
+								'value'=>$item_info->name)
+						);?>
+					</div>
+				</div>
 
-<script type='text/javascript'>
-//validation and submit handling
-$(document).ready(function()
-{
-    $("#continue").click(function()
-  	{
-        stay_open = true;
-    });
-    	    
-    $("#submit").click(function()
-    {
-        stay_open = false;
-    });
-	
-	var no_op = function(event, data, formatted){};
-	$("#category").autocomplete("<?php echo site_url('items/suggest_category');?>",{max:100,minChars:0,delay:10}).result(no_op).search();
+				<div class="field_row clearfix">
+					<?php echo form_label($this->lang->line('items_category').':', 'category',array('class'=>'required wide')); ?>
+					<div class='form_field'>
+						<?php echo form_input(array(
+								'name'=>'category',
+								'id'=>'category',
+								'value'=>$item_info->category)
+						);?>
+					</div>
+				</div>
 
-	<?php for ($i = 0; $i < 11; $i++) 
-	{ 
-	?>
-	$("#custom"+<?php echo $i; ?>).autocomplete("<?php echo site_url('items/suggest_custom'.$i);?>",{max:100,minChars:0,delay:10}).result(no_op).search();
-	<?php 
-	}
-	?>
+				<div class="field_row clearfix">
+					<?php echo form_label($this->lang->line('items_supplier').':', 'supplier',array('class'=>'required wide')); ?>
+					<div class='form_field'>
+						<?php echo form_dropdown('supplier_id', $suppliers, $selected_supplier);?>
+					</div>
+				</div>
 
-	$.validator.addMethod("item_number", function(value, element) 
-	{
-		return JSON.parse($.ajax(
-		{
-			  type: 'POST',
-			  url: '<?php echo site_url($controller_name . "/check_item_number")?>',
-			  data: {'item_id' : '<?php echo $item_info->item_id; ?>', 'item_number' : $(element).val() },
-			  success: function(response) 
-			  {
-				  success=response.success;
-			  },
-			  async:false,
-			  dataType: 'json'
-        }).responseText).success;
-        
-    }, '<?php echo $this->lang->line("items_item_number_duplicate"); ?>');
-	
-	$('#item_form').validate({
-		submitHandler:function(form)
-		{
-			$(form).ajaxSubmit({
-				success:function(response)
+				<div class="field_row clearfix">
+					<?php echo form_label($this->lang->line('items_cost_price').':', 'cost_price',array('class'=>'required wide')); ?>
+					<div class='form_field'>
+						<?php echo form_input(array(
+								'name'=>'cost_price',
+								'size'=>'8',
+								'id'=>'cost_price',
+								'value'=>$item_info->cost_price)
+						);?>
+					</div>
+				</div>
+
+				<div class="field_row clearfix">
+					<?php echo form_label($this->lang->line('items_unit_price').':', 'unit_price',array('class'=>'required wide')); ?>
+					<div class='form_field'>
+						<?php echo form_input(array(
+								'name'=>'unit_price',
+								'size'=>'8',
+								'id'=>'unit_price',
+								'value'=>$item_info->unit_price)
+						);?>
+					</div>
+				</div>
+
+				<div class="field_row clearfix">
+					<?php echo form_label($this->lang->line('items_tax_1').':', 'tax_percent_1',array('class'=>'wide')); ?>
+					<div class='form_field'>
+						<?php echo form_input(array(
+								'name'=>'tax_names[]',
+								'id'=>'tax_name_1',
+								'size'=>'8',
+								'value'=> isset($item_tax_info[0]['name']) ? $item_tax_info[0]['name'] : $this->config->item('default_tax_1_name'))
+						);?>
+					</div>
+					<div class='form_field'>
+						<?php echo form_input(array(
+								'name'=>'tax_percents[]',
+								'id'=>'tax_percent_name_1',
+								'size'=>'3',
+								'value'=> isset($item_tax_info[0]['percent']) ? $item_tax_info[0]['percent'] : $default_tax_1_rate)
+						);?>
+						%
+					</div>
+				</div>
+
+				<div class="field_row clearfix">
+					<?php echo form_label($this->lang->line('items_tax_2').':', 'tax_percent_2',array('class'=>'wide')); ?>
+					<div class='form_field'>
+						<?php echo form_input(array(
+								'name'=>'tax_names[]',
+								'id'=>'tax_name_2',
+								'size'=>'8',
+								'value'=> isset($item_tax_info[1]['name']) ? $item_tax_info[1]['name'] : $this->config->item('default_tax_2_name'))
+						);?>
+					</div>
+					<div class='form_field'>
+						<?php echo form_input(array(
+								'name'=>'tax_percents[]',
+								'id'=>'tax_percent_name_2',
+								'size'=>'3',
+								'value'=> isset($item_tax_info[1]['percent']) ? $item_tax_info[1]['percent'] : $default_tax_2_rate)
+						);?>
+						%
+					</div>
+				</div>
+
+				<?php
+				foreach($stock_locations as $key=>$location_detail)
 				{
-					if (stay_open) 
+					?>
+					<div class="field_row clearfix">
+						<?php echo form_label($this->lang->line('items_quantity').' '.$location_detail['location_name'] .':',
+							$key.'_quantity',
+							array('class'=>'required wide')); ?>
+						<div class='form_field'>
+							<?php echo form_input(array(
+									'name'=>$key.'_quantity',
+									'id'=>$key.'_quantity',
+									'class'=>'quantity',
+									'size'=>'8',
+									'value'=>isset($item_info->item_id)?$location_detail['quantity']:0)
+							);?>
+						</div>
+					</div>
+					<?php
+				}
+				?>
+
+				<div class="field_row clearfix">
+					<?php echo form_label($this->lang->line('items_receiving_quantity').':', 'receiving_quantity',array('class'=>'wide')); ?>
+					<div class='form_field'>
+						<?php echo form_input(array(
+								'name'=>'receiving_quantity',
+								'id'=>'receiving_quantity',
+								'size'=>'8',
+								'value'=>$item_info->receiving_quantity)
+						);?>
+					</div>
+				</div>
+
+				<div class="field_row clearfix">
+					<?php echo form_label($this->lang->line('items_reorder_level').':', 'reorder_level',array('class'=>'required wide')); ?>
+					<div class='form_field'>
+						<?php echo form_input(array(
+								'name'=>'reorder_level',
+								'id'=>'reorder_level',
+								'size'=>'8',
+								'value'=>!isset($item_info->item_id)?0:$item_info->reorder_level)
+						);?>
+					</div>
+				</div>
+
+				<div class="field_row clearfix">
+					<?php echo form_label($this->lang->line('items_description').':', 'description',array('class'=>'wide')); ?>
+					<div class='form_field'>
+						<?php echo form_textarea(array(
+								'name'=>'description',
+								'id'=>'description',
+								'value'=>$item_info->description,
+								'rows'=>'5',
+								'cols'=>'17')
+						);?>
+					</div>
+				</div>
+
+				<div class="field_row clearfix">
+					<?php echo form_label($this->lang->line('items_image').':', 'item_image',array('class'=>'wide')); ?>
+					<div class='form_field'>
+						<?php echo form_upload('item_image');?>
+					</div>
+				</div>
+
+				<div class="field_row clearfix">
+					<?php echo form_label($this->lang->line('items_allow_alt_description').':', 'allow_alt_description',array('class'=>'wide')); ?>
+					<div class='form_field'>
+						<?php echo form_checkbox(array(
+								'name'=>'allow_alt_description',
+								'id'=>'allow_alt_description',
+								'value'=>1,
+								'checked'=>($item_info->allow_alt_description)? 1  :0)
+						);?>
+					</div>
+				</div>
+
+				<div class="field_row clearfix">
+					<?php echo form_label($this->lang->line('items_is_serialized').':', 'is_serialized',array('class'=>'wide')); ?>
+					<div class='form_field'>
+						<?php echo form_checkbox(array(
+								'name'=>'is_serialized',
+								'id'=>'is_serialized',
+								'value'=>1,
+								'checked'=>($item_info->is_serialized)? 1 : 0)
+						);?>
+					</div>
+				</div>
+
+				<div class="field_row clearfix">
+					<?php echo form_label($this->lang->line('items_is_deleted').':', 'is_deleted',array('class'=>'wide')); ?>
+					<div class='form_field'>
+						<?php echo form_checkbox(array(
+								'name'=>'is_deleted',
+								'id'=>'is_deleted',
+								'value'=>1,
+								'checked'=>($item_info->deleted)? 1 : 0)
+						);?>
+					</div>
+				</div>
+
+				<?php for ($i = 0; $i < 11; $i++)
+				{
+					?>
+					<?php
+					if($this->config->item('custom'.$i.'_name') != null)
 					{
-						// set action of item_form to url without item id, so a new one can be created
-				        $("#item_form").attr("action", "<?php echo site_url("items/save/")?>");
-						// use a whitelist of fields to minimize unintended side effects
-						$(':text, :password, :file, #description, #item_form').not('.quantity, #reorder_level, #tax_name_1,' + 
-								'#tax_percent_name_1, #reference_number, #name, #cost_price, #unit_price, #taxed_cost_price, #taxed_unit_price').val('');  
-						// de-select any checkboxes, radios and drop-down menus
-						$(':input', '#item_form').not('#item_category_id').removeAttr('checked').removeAttr('selected');
+						$item_arr = (array)$item_info;
+						?>
+						<div class="field_row clearfix">
+							<?php echo form_label($this->config->item('custom'.$i.'_name').':', 'custom'.$i,array('class'=>'wide')); ?>
+							<div class='form_field'>
+								<?php echo form_input(array(
+										'name'=>'custom'.$i,
+										'id'=>'custom'.$i,
+										'value'=>$item_arr['custom'.$i])
+								);?>
+							</div>
+						</div>
+						<?php
 					}
-					else
+				}
+				?>
+
+				<?php
+				echo form_submit(array(
+						'name'=>'submit',
+						'id'=>'submit',
+						'value'=>$this->lang->line('common_submit'),
+						'class'=>'btn btn-primary btn-sm pull-right')
+				);
+				echo form_submit(array(
+						'name'=>'continue',
+						'id'=>'continue',
+						'value'=>$this->lang->line('common_new'),
+						'class'=>'btn btn-default btn-sm pull-right',
+						'style'=>'margin-right: 10px;')
+				);
+				?>
+			</fieldset>
+			<?php echo form_close(); ?>
+
+			<script type='text/javascript'>
+				//validation and submit handling
+				$(document).ready(function()
+				{
+					$("#continue").click(function()
 					{
-						tb_remove();
-					}
-					post_item_form_submit(response, stay_open);	
-				},
-				dataType:'json'
-			});
+						stay_open = true;
+					});
 
-		},
-		errorLabelContainer: "#error_message_box",
- 		wrapper: "li",
-		rules:
-		{
-			name:"required",
-			category:"required",
-			item_number: { item_number: true },
-			cost_price:
-			{
-				required:true,
-				number:true
-			},
+					$("#submit").click(function()
+					{
+						stay_open = false;
+					});
 
-			unit_price:
-			{
-				required:true,
-				number:true
-			},
-			tax_percent:
-			{
-				required:true,
-				number:true
-			},
-			reorder_level:
-			{
-				required:true,
-				number:true
-			}
-			
-   		},
-		messages:
-		{
-			name:"<?php echo $this->lang->line('items_name_required'); ?>",
-			category:"<?php echo $this->lang->line('items_category_required'); ?>",
-			cost_price:
-			{
-				required:"<?php echo $this->lang->line('items_cost_price_required'); ?>",
-				number:"<?php echo $this->lang->line('items_cost_price_number'); ?>"
-			},
-			unit_price:
-			{
-				required:"<?php echo $this->lang->line('items_unit_price_required'); ?>",
-				number:"<?php echo $this->lang->line('items_unit_price_number'); ?>"
-			},
-			tax_percent:
-			{
-				required:"<?php echo $this->lang->line('items_tax_percent_required'); ?>",
-				number:"<?php echo $this->lang->line('items_tax_percent_number'); ?>"
-			},
-			reorder_level:
-			{
-				required:"<?php echo $this->lang->line('items_reorder_level_required'); ?>",
-				number:"<?php echo $this->lang->line('items_reorder_level_number'); ?>"
-			}
+					var no_op = function(event, data, formatted){};
+					$("#category").autocomplete("<?php echo site_url('items/suggest_category');?>",{max:100,minChars:0,delay:10}).result(no_op).search();
 
-		}
-	});
-});
-</script>
+					<?php for ($i = 0; $i < 11; $i++)
+                    {
+                    ?>
+					$("#custom"+<?php echo $i; ?>).autocomplete("<?php echo site_url('items/suggest_custom'.$i);?>",{max:100,minChars:0,delay:10}).result(no_op).search();
+					<?php
+                    }
+                    ?>
+
+					$.validator.addMethod("item_number", function(value, element)
+					{
+						return JSON.parse($.ajax(
+							{
+								type: 'POST',
+								url: '<?php echo site_url($controller_name . "/check_item_number")?>',
+								data: {'item_id' : '<?php echo $item_info->item_id; ?>', 'item_number' : $(element).val() },
+								success: function(response)
+								{
+									success=response.success;
+								},
+								async:false,
+								dataType: 'json'
+							}).responseText).success;
+
+					}, '<?php echo $this->lang->line("items_item_number_duplicate"); ?>');
+
+					$('#item_form').validate({
+						submitHandler:function(form)
+						{
+							debugger;;
+							var $form = $(form);
+							var $target = $(".modal");
+
+							$.ajax({
+								type: $form.attr('method'),
+								url: $form.attr('action'),
+								data: $form.serialize(),
+
+								success: function(response, status) {
+									if (stay_open)
+									{
+										// set action of item_form to url without item id, so a new one can be created
+										$("#item_form").attr("action", "<?php echo site_url("items/save/")?>");
+										// use a whitelist of fields to minimize unintended side effects
+										$(':text, :password, :file, #description, #item_form').not('.quantity, #reorder_level, #tax_name_1,' +
+											'#tax_percent_name_1, #reference_number, #name, #cost_price, #unit_price, #taxed_cost_price, #taxed_unit_price').val('');
+										// de-select any checkboxes, radios and drop-down menus
+										$(':input', '#item_form').not('#item_category_id').removeAttr('checked').removeAttr('selected');
+									}
+									else
+									{
+										$target.modal('hide');
+									}
+									post_item_form_submit(response, stay_open);
+								}
+							});
+
+							event.preventDefault();
+
+						},
+						errorLabelContainer: "#error_message_box",
+						wrapper: "li",
+						rules:
+						{
+							name:"required",
+							category:"required",
+							item_number: { item_number: true },
+							cost_price:
+							{
+								required:true,
+								number:true
+							},
+
+							unit_price:
+							{
+								required:true,
+								number:true
+							},
+							tax_percent:
+							{
+								required:true,
+								number:true
+							},
+							reorder_level:
+							{
+								required:true,
+								number:true
+							}
+
+						},
+						messages:
+						{
+							name:"<?php echo $this->lang->line('items_name_required'); ?>",
+							category:"<?php echo $this->lang->line('items_category_required'); ?>",
+							cost_price:
+							{
+								required:"<?php echo $this->lang->line('items_cost_price_required'); ?>",
+								number:"<?php echo $this->lang->line('items_cost_price_number'); ?>"
+							},
+							unit_price:
+							{
+								required:"<?php echo $this->lang->line('items_unit_price_required'); ?>",
+								number:"<?php echo $this->lang->line('items_unit_price_number'); ?>"
+							},
+							tax_percent:
+							{
+								required:"<?php echo $this->lang->line('items_tax_percent_required'); ?>",
+								number:"<?php echo $this->lang->line('items_tax_percent_number'); ?>"
+							},
+							reorder_level:
+							{
+								required:"<?php echo $this->lang->line('items_reorder_level_required'); ?>",
+								number:"<?php echo $this->lang->line('items_reorder_level_number'); ?>"
+							}
+
+						}
+					});
+
+				});
+			</script>
+
+		</div>
+	</div>
+</div>
diff --git a/application/views/items/manage.php b/application/views/items/manage.php
index 14f91f5fb..1b0475110 100644
--- a/application/views/items/manage.php
+++ b/application/views/items/manage.php
@@ -57,7 +57,7 @@ $(document).ready(function()
         do_search(true);
         return false;
     });
-    
+
     resize_thumbs();
 });
 
diff --git a/js/common.js b/js/common.js
index 79b7dc209..10e9111ef 100644
--- a/js/common.js
+++ b/js/common.js
@@ -1,4 +1,4 @@
-function get_dimensions() 
+function get_dimensions()
 {
 	var dims = {width:0,height:0};
 	
diff --git a/js/manage_tables.js b/js/manage_tables.js
index 5bfa1b719..b9b370dc1 100644
--- a/js/manage_tables.js
+++ b/js/manage_tables.js
@@ -386,4 +386,19 @@ function get_visible_checkbox_ids()
 		row_ids.push($(this).val());
 	});
 	return row_ids;
-}
\ No newline at end of file
+}
+
+$(document).ready(function()
+{
+	$('[data-toggle="modal"]').click(
+		function(e) {
+			$('#myModal').remove();
+			e.preventDefault();
+			var $this = $(this)
+				, $remote = $this.data('remote') || $this.attr('href')
+				, $modal = $('<div class="modal" id="ajaxModal"><div class="modal-body"></div></div>');
+			$('body').append($modal);
+			$modal.modal({backdrop: 'static', keyboard: false});
+			$modal.load($remote);
+		});
+});
\ No newline at end of file
diff --git a/templates/flatly/css/style.css b/templates/flatly/css/style.css
index 967273bc5..fba8ed20c 100644
--- a/templates/flatly/css/style.css
+++ b/templates/flatly/css/style.css
@@ -74,4 +74,15 @@ table.tablesorter thead tr th, table.tablesorter tfoot tr th
 	{
         display: none !important;
     }
+}
+
+.modal-dialog
+{
+	overflow-y: initial !important
+}
+
+.modal-body
+{
+	height: 500px;
+	overflow-y: auto;
 }
\ No newline at end of file
diff --git a/templates/spacelab/css/style.css b/templates/spacelab/css/style.css
index 875c3d2d8..d72bf4e32 100644
--- a/templates/spacelab/css/style.css
+++ b/templates/spacelab/css/style.css
@@ -158,3 +158,4 @@ table.tablesorter thead tr th, table.tablesorter tfoot tr th {
 		padding: 10px 10px 9px;
 	}
 }
+