From 0dce125f672e1661dc6570031e70f8eb27c97bc2 Mon Sep 17 00:00:00 2001
From: FrancescoUK <francesco.lodolo.uk@gmail.com>
Date: Sat, 27 Feb 2016 21:54:27 +0000
Subject: [PATCH] fix controls sizes in all the forms, fix datetimepicker in
 sales/form and receiving/form, fix item_kits/form (#116)

---
 application/controllers/Sales.php             |   4 +-
 application/views/configs/locale_config.php   |   2 +-
 application/views/customers/excel_import.php  |   8 +-
 application/views/customers/form.php          |  10 +-
 application/views/employees/form.php          |  16 +-
 application/views/giftcards/form.php          |  20 +-
 application/views/giftcards/manage.php        |   4 +-
 application/views/item_kits/form.php          |  46 +-
 application/views/item_kits/manage.php        |   6 +-
 application/views/items/count_details.php     |  14 +-
 application/views/items/excel_import.php      |   8 +-
 application/views/items/form.php              | 451 +++++++++---------
 application/views/items/form_bulk.php         |  50 +-
 application/views/items/inventory.php         |  16 +-
 application/views/items/manage.php            |   6 +-
 application/views/people/form_basic_info.php  |  50 +-
 application/views/people/manage.php           |   4 +-
 application/views/receivings/form.php         |  40 +-
 application/views/receivings/receiving.php    |  10 +-
 application/views/reports/date_input.php      |   4 +-
 .../views/reports/date_input_excel_export.php |   2 +-
 application/views/reports/specific_input.php  |   2 +-
 application/views/sales/form.php              |  43 +-
 application/views/sales/manage.php            |   4 +-
 application/views/sales/register.php          |   6 +-
 application/views/suppliers/form.php          |  14 +-
 application/views/suppliers/manage.php        |   4 +-
 27 files changed, 447 insertions(+), 397 deletions(-)

diff --git a/application/controllers/Sales.php b/application/controllers/Sales.php
index e59ac4e3a..3a623018c 100644
--- a/application/controllers/Sales.php
+++ b/application/controllers/Sales.php
@@ -667,7 +667,9 @@ class Sales extends Secure_area
 	
 	function save($sale_id)
 	{
-		$start_date_formatter = date_create_from_format($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), $this->input->post('date'));
+		$newdate = $this->input->post('date');
+		
+		$start_date_formatter = date_create_from_format($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), $newdate);
 
 		$sale_data = array(
 			'sale_time' => $start_date_formatter->format('Y-m-d H:i:s'),
diff --git a/application/views/configs/locale_config.php b/application/views/configs/locale_config.php
index f66a805b5..a674c305d 100644
--- a/application/views/configs/locale_config.php
+++ b/application/views/configs/locale_config.php
@@ -74,7 +74,7 @@
 			</div>
 
 			<div class="form-group form-group-sm">	
-			<?php echo form_label($this->lang->line('config_timezone'), 'timezone',array('class'=>'control-label col-xs-2')); ?>
+			<?php echo form_label($this->lang->line('config_timezone'), 'timezone', array('class'=>'control-label col-xs-2')); ?>
 				<div class='col-xs-4'>
 				<?php echo form_dropdown('timezone', 
 				 array(
diff --git a/application/views/customers/excel_import.php b/application/views/customers/excel_import.php
index 324fd9da8..90e25cb32 100644
--- a/application/views/customers/excel_import.php
+++ b/application/views/customers/excel_import.php
@@ -1,17 +1,17 @@
-<?php echo form_open_multipart('customers/do_excel_import/',array('id'=>'item_form', 'class'=>'form-horizontal')); ?>
+<?php echo form_open_multipart('customers/do_excel_import/', array('id'=>'item_form', 'class'=>'form-horizontal')); ?>
 	<div id="required_fields_message"><?php echo $this->lang->line('customers_import_items_excel'); ?></div>
 	<ul id="error_message_box" class="error_message_box"></ul>
 	<fieldset id="item_basic_info">
 		<legend><?php echo $this->lang->line('common_import'); ?></legend>
 
-		<div class="form-group">
+		<div class="form-group form-group-sm">
 			<div class="col-xs-6">
 				<a href="<?php echo site_url('customers/excel'); ?>"><?php echo $this->lang->line('common_download_import_template'); ?></a>
 			</div>
 		</div>
 
-		<div class="form-group">
-		<?php echo form_label($this->lang->line('common_import_file_path'), 'name',array('class'=>'control-label col-xs-3')); ?>
+		<div class="form-group form-group-sm">
+		<?php echo form_label($this->lang->line('common_import_file_path'), 'name', array('class'=>'control-label col-xs-3')); ?>
 			<div class='col-xs-6'>
 				<label class="file">
 					<input type="file" id="file_input" name="file_input">
diff --git a/application/views/customers/form.php b/application/views/customers/form.php
index 4b0fd61e0..697514a3c 100644
--- a/application/views/customers/form.php
+++ b/application/views/customers/form.php
@@ -1,22 +1,22 @@
-<?php echo form_open('customers/save/'.$person_info->person_id,array('id'=>'customer_form', 'class'=>'form-horizontal')); ?>
+<?php echo form_open('customers/save/'.$person_info->person_id, array('id'=>'customer_form', 'class'=>'form-horizontal')); ?>
 <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>
 <fieldset id="customer_basic_info">
 	<legend><?php echo $this->lang->line("customers_basic_information"); ?></legend>
 	<?php $this->load->view("people/form_basic_info"); ?>
 
-	<div class="form-group">
+	<div class="form-group form-group-sm">
 	<?php echo form_label($this->lang->line('customers_company_name'), 'company_name', array('class' => 'control-label col-xs-3')); ?>
 		<div class='col-xs-6'>
 		<?php echo form_input(array(
 			'name'=>'company_name',
-			'class'=>'form-control',
+			'class'=>'form-control input-sm',
 			'value'=>$person_info->company_name)
 		);?>
 		</div>
 	</div>
 
-	<div class="form-group">
+	<div class="form-group form-group-sm">
 	<?php echo form_label($this->lang->line('customers_account_number'), 'account_number', array('class' => 'control-label col-xs-3')); ?>
 		<div class='col-xs-6'>
 		<?php echo form_input(array(
@@ -28,7 +28,7 @@
 		</div>
 	</div>
 
-	<div class="form-group">
+	<div class="form-group form-group-sm">
 	<?php echo form_label($this->lang->line('customers_taxable'), 'taxable', array('class' => 'control-label col-xs-3')); ?>
 		<div class='col-xs-1'>
 		<?php echo form_checkbox('taxable', '1', $person_info->taxable == '' ? TRUE : (boolean)$person_info->taxable);?>
diff --git a/application/views/employees/form.php b/application/views/employees/form.php
index 5abac13a6..effdf3b45 100644
--- a/application/views/employees/form.php
+++ b/application/views/employees/form.php
@@ -1,4 +1,4 @@
-<?php echo form_open('employees/save/'.$person_info->person_id,array('id'=>'employee_form', 'class'=> 'form-horizontal')); ?>
+<?php echo form_open('employees/save/'.$person_info->person_id, array('id'=>'employee_form', 'class'=> 'form-horizontal')); ?>
 	<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>
 	<fieldset id="employee_basic_info">
@@ -8,13 +8,13 @@
 
 	<fieldset id="employee_login_info">
 		<legend><?php echo $this->lang->line("employees_login_info"); ?></legend>
-		<div class="form-group">	
-		<?php echo form_label($this->lang->line('employees_username'), 'username',array('class'=>'required control-label col-xs-3')); ?>
+		<div class="form-group form-group-sm">	
+		<?php echo form_label($this->lang->line('employees_username'), 'username', array('class'=>'required control-label col-xs-3')); ?>
 			<div class='col-xs-5'>
 			<?php echo form_input(array(
 				'name'=>'username',
 				'id'=>'username',
-				'class'=>'form-control',
+				'class'=>'form-control input-sm',
 				'value'=>$person_info->username));?>
 			</div>
 		</div>
@@ -23,24 +23,24 @@
 		$password_label_attributes = $person_info->person_id == "" ? array('class'=>'required col-xs-3 control-label'):array();
 		?>
 
-		<div class="form-group">	
+		<div class="form-group form-group-sm">	
 		<?php echo form_label($this->lang->line('employees_password'), 'password',$password_label_attributes); ?>
 			<div class='col-xs-5'>
 			<?php echo form_password(array(
 				'name'=>'password',
 				'id'=>'password',
-				'class'=>'form-control'
+				'class'=>'form-control input-sm'
 			));?>
 			</div>
 		</div>
 
-		<div class="form-group">	
+		<div class="form-group form-group-sm">	
 		<?php echo form_label($this->lang->line('employees_repeat_password'), 'repeat_password',$password_label_attributes); ?>
 			<div class='col-xs-5'>
 			<?php echo form_password(array(
 				'name'=>'repeat_password',
 				'id'=>'repeat_password',
-				'class'=>'form-control'
+				'class'=>'form-control input-sm'
 			));?>
 			</div>
 		</div>
diff --git a/application/views/giftcards/form.php b/application/views/giftcards/form.php
index 7eadf2d16..410620d04 100644
--- a/application/views/giftcards/form.php
+++ b/application/views/giftcards/form.php
@@ -1,41 +1,41 @@
 <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('giftcards/save/'.$giftcard_info->giftcard_id,array('id'=>'giftcard_form', 'class'=>'form-horizontal')); ?>
+<?php echo form_open('giftcards/save/'.$giftcard_info->giftcard_id, array('id'=>'giftcard_form', 'class'=>'form-horizontal')); ?>
 	<fieldset id="giftcard_basic_info" style="padding: 5px;">
 		<legend><?php echo $this->lang->line("giftcards_basic_information"); ?></legend>
 
-		<div class="form-group">
-		<?php echo form_label($this->lang->line('giftcards_person_id').':', 'name',array('class'=>'control-label col-xs-3')); ?>
+		<div class="form-group form-group-sm">
+		<?php echo form_label($this->lang->line('giftcards_person_id').':', 'name', array('class'=>'control-label col-xs-3')); ?>
 			<div class='col-xs-6'>
 			<?php echo form_input(array(
 				'name'=>'person_id',
 				'id'=>'person_id',
-				'class'=>'form-control',
+				'class'=>'form-control input-sm',
 				'value'=>$selected_person)
 			);?>
 			</div>
 		</div>
 
-		<div class="form-group">
-		<?php echo form_label($this->lang->line('giftcards_giftcard_number').':', 'name',array('class'=>'required control-label col-xs-3')); ?>
+		<div class="form-group form-group-sm">
+		<?php echo form_label($this->lang->line('giftcards_giftcard_number').':', 'name', array('class'=>'required control-label col-xs-3')); ?>
 			<div class='col-xs-6'>
 			<?php echo form_input(array(
 				'name'=>'giftcard_number',
 				'id'=>'giftcard_number',
-				'class'=>'form-control',
+				'class'=>'form-control input-sm',
 				'value'=>$giftcard_number)
 			);?>
 			</div>
 		</div>
 
-		<div class="form-group">
-		<?php echo form_label($this->lang->line('giftcards_card_value').':', 'name',array('class'=>'required control-label col-xs-3')); ?>
+		<div class="form-group form-group-sm">
+		<?php echo form_label($this->lang->line('giftcards_card_value').':', 'name', array('class'=>'required control-label col-xs-3')); ?>
 			<div class='col-xs-6'>
 			<?php echo form_input(array(
 				'name'=>'value',
 				'id'=>'value',
-				'class'=>'form-control',
+				'class'=>'form-control input-sm',
 				'value'=>$giftcard_info->value)
 			);?>
 			</div>
diff --git a/application/views/giftcards/manage.php b/application/views/giftcards/manage.php
index a1e2b6c30..973d344d9 100644
--- a/application/views/giftcards/manage.php
+++ b/application/views/giftcards/manage.php
@@ -68,11 +68,11 @@ function post_giftcard_form_submit(response)
 
 <div id="table_action_header">
 	<ul>
-		<li class="float_left"><span><?php echo anchor("$controller_name/delete",$this->lang->line("common_delete"),array('id'=>'delete')); ?></span></li>
+		<li class="float_left"><span><?php echo anchor("$controller_name/delete",$this->lang->line("common_delete"), array('id'=>'delete')); ?></span></li>
 		<li class="float_right">
 			<img src='<?php echo base_url()?>images/spinner_small.gif' alt='spinner' id='spinner' />
 
-			<?php echo form_open("$controller_name/search",array('id'=>'search_form')); ?>
+			<?php echo form_open("$controller_name/search", array('id'=>'search_form')); ?>
 				<input type="text" name ='search' id='search'/>
 				<input type="hidden" name ='limit_from' id='limit_from'/>
 			<?php echo form_close(); ?>
diff --git a/application/views/item_kits/form.php b/application/views/item_kits/form.php
index fb2cd6787..a8cd587f5 100644
--- a/application/views/item_kits/form.php
+++ b/application/views/item_kits/form.php
@@ -1,65 +1,67 @@
 <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('item_kits/save/'.$item_kit_info->item_kit_id,array('id'=>'item_kit_form', 'class' => 'form-horizontal')); ?>
+<?php echo form_open('item_kits/save/'.$item_kit_info->item_kit_id, array('id'=>'item_kit_form', 'class' => 'form-horizontal')); ?>
 
 <fieldset id="item_kit_info">
 	<legend><?php echo $this->lang->line("item_kits_info"); ?></legend>
 
-    <div class="form-group">
-    <?php echo form_label($this->lang->line('item_kits_name').':', 'name',array('class'=>'control-label col-xs-3 required')); ?>
+    <div class="form-group form-group-sm">
+		<?php echo form_label($this->lang->line('item_kits_name').':', 'name', array('class'=>'control-label col-xs-3 required')); ?>
         <div class='col-xs-6'>
         <?php echo form_input(array(
             'name'=>'name',
             'id'=>'name',
-            'class'=>'form-control',
+            'class'=>'form-control input-sm',
             'value'=>$item_kit_info->name)
         );?>
         </div>
     </div>
 
-    <div class="form-group">
-    <?php echo form_label($this->lang->line('item_kits_description').':', 'description',array('class'=>'control-label col-xs-3')); ?>
+    <div class="form-group form-group-sm">
+		<?php echo form_label($this->lang->line('item_kits_description').':', 'description', array('class'=>'control-label col-xs-3')); ?>
         <div class='col-xs-6'>
         <?php echo form_textarea(array(
             'name'=>'description',
             'id'=>'description',
-            'class'=>'form-control',
+            'class'=>'form-control input-sm',
             'value'=>$item_kit_info->description,
             )
         );?>
         </div>
     </div>
 
-
-    <div class="form-group">
-    <?php echo form_label($this->lang->line('item_kits_add_item').':', 'item',array('class'=>'control-label col-xs-3')); ?>
+    <div class="form-group form-group-sm">
+		<?php echo form_label($this->lang->line('item_kits_add_item').':', 'item', array('class'=>'control-label col-xs-3')); ?>
         <div class='col-xs-6'>
             <?php echo form_input(array(
                 'name'=>'item',
                 'id'=>'item',
-                'class'=>'form-control',
+                'class'=>'form-control input-sm',
             ));?>
         </div>
     </div>
 
     <table id="item_kit_items">
         <tr>
-            <th><?php echo $this->lang->line('common_delete');?></th>
-            <th><?php echo $this->lang->line('item_kits_item');?></th>
-            <th><?php echo $this->lang->line('item_kits_quantity');?></th>
+            <th><?php echo $this->lang->line('common_delete'); ?></th>
+            <th><?php echo $this->lang->line('item_kits_item'); ?></th>
+            <th><?php echo $this->lang->line('item_kits_quantity'); ?></th>
         </tr>
 
-        <?php foreach ($this->Item_kit_items->get_info($item_kit_info->item_kit_id) as $item_kit_item) {?>
+        <?php
+		foreach ($this->Item_kit_items->get_info($item_kit_info->item_kit_id) as $item_kit_item)
+		{
+		?>
             <tr>
-                <?php
-                $item_info = $this->Item->get_info($item_kit_item['item_id']);
-                ?>
-                <td><a href="#" onclick='return deleteItemKitRow(this);'>X</a></td>
+                <?php $item_info = $this->Item->get_info($item_kit_item['item_id']); ?>
+                <td><a href='#' onclick='return deleteItemKitRow(this);'><span class='glyphicon glyphicon-remove'></span></a></td>
                 <td><?php echo $item_info->name; ?></td>
-                <td><input class='quantity' id='item_kit_item_<?php echo $item_kit_item['item_id'] ?>' type='text' class='form-control' name=item_kit_item[<?php echo $item_kit_item['item_id'] ?>] value='<?php echo $item_kit_item['quantity'] ?>'/></td>
+                <td><input class='quantity form-control input-sm' id='item_kit_item_<?php echo $item_kit_item['item_id'] ?>' name=item_kit_item[<?php echo $item_kit_item['item_id'] ?>] value='<?php echo $item_kit_item['quantity'] ?>'/></td>
             </tr>
-        <?php } ?>
+        <?php
+		}
+		?>
     </table>
 </fieldset>
 <?php echo form_close(); ?>
@@ -86,7 +88,7 @@ $("#item").result(function(event, data, formatted)
 	}
 	else
 	{
-		$("#item_kit_items").append("<tr><td><a href='#' onclick='return deleteItemKitRow(this);'><span class='glyphicon glyphicon-remove'></span></a></td><td>"+data[1]+"</td><td><input class='quantity form-control' id='item_kit_item_"+data[0]+"' type='text' name=item_kit_item["+data[0]+"] value='1'/></td></tr>");
+		$("#item_kit_items").append("<tr><td><a href='#' onclick='return deleteItemKitRow(this);'><span class='glyphicon glyphicon-remove'></span></a></td><td>"+data[1]+"</td><td><input class='quantity form-control input-sm' id='item_kit_item_"+data[0]+"' type='text' name=item_kit_item["+data[0]+"] value='1'/></td></tr>");
 	}
 });
 
diff --git a/application/views/item_kits/manage.php b/application/views/item_kits/manage.php
index 9a21f977c..03223458f 100644
--- a/application/views/item_kits/manage.php
+++ b/application/views/item_kits/manage.php
@@ -79,11 +79,11 @@ function post_item_kit_form_submit(response)
 
 <div id="pagination"><?= $links ?></div>
 
-<?php echo form_open("$controller_name/search",array('id'=>'search_form')); ?>
+<?php echo form_open("$controller_name/search", array('id'=>'search_form')); ?>
 	<div id="table_action_header">
 		<ul>
-			<li class="float_left"><span><?php echo anchor("$controller_name/delete",$this->lang->line("common_delete"),array('id'=>'delete')); ?></span></li>
-			<li class="float_left"><span><?php echo anchor("$controller_name/generate_barcodes",$this->lang->line("items_generate_barcodes"),array('id'=>'generate_barcodes', 'target' =>'_blank','title'=>$this->lang->line('items_generate_barcodes'))); ?></span></li>
+			<li class="float_left"><span><?php echo anchor("$controller_name/delete",$this->lang->line("common_delete"), array('id'=>'delete')); ?></span></li>
+			<li class="float_left"><span><?php echo anchor("$controller_name/generate_barcodes",$this->lang->line("items_generate_barcodes"), array('id'=>'generate_barcodes', 'target' =>'_blank','title'=>$this->lang->line('items_generate_barcodes'))); ?></span></li>
 			<li class="float_right">
 				<img src='<?php echo base_url()?>images/spinner_small.gif' alt='spinner' id='spinner' />
 				<input type="text" name ='search' id='search'/>
diff --git a/application/views/items/count_details.php b/application/views/items/count_details.php
index 939f1f0f0..d6b978b2c 100644
--- a/application/views/items/count_details.php
+++ b/application/views/items/count_details.php
@@ -1,10 +1,10 @@
-<?php echo form_open('items/save_inventory/'.$item_info->item_id,array('id'=>'item_form')); ?>
+<?php echo form_open('items/save_inventory/'.$item_info->item_id, array('id'=>'item_form')); ?>
 	<fieldset id="inv_item_basic_info">
 		<table border="0" bgcolor="#CCCCCC">
-			<div class="form-group">
+			<div class="form-group form-group-sm">
 			<tr>
 			<td>
-				<?php echo form_label($this->lang->line('items_item_number').':', 'name',array('class'=>'wide')); ?>
+				<?php echo form_label($this->lang->line('items_item_number').':', 'name', array('class'=>'wide')); ?>
 			</td>
 			<td>
 				<?php $inumber = array (
@@ -21,7 +21,7 @@
 			</tr>
 			<tr>
 			<td>
-				<?php echo form_label($this->lang->line('items_name').':', 'name',array('class'=>'wide')); ?>
+				<?php echo form_label($this->lang->line('items_name').':', 'name', array('class'=>'wide')); ?>
 			</td>
 			<td>
 				<?php $iname = array (
@@ -37,7 +37,7 @@
 			</tr>
 			<tr>
 			<td>
-				<?php echo form_label($this->lang->line('items_category').':', 'category',array('class'=>'wide')); ?>
+				<?php echo form_label($this->lang->line('items_category').':', 'category', array('class'=>'wide')); ?>
 			</td>
 			<td>
 				<?php $cat = array (
@@ -55,7 +55,7 @@
 			</tr>
 			<tr>
 			<td>
-				<?php echo form_label($this->lang->line('items_stock_location').':', 'stock_location',array('class'=>'wide')); ?>
+				<?php echo form_label($this->lang->line('items_stock_location').':', 'stock_location', array('class'=>'wide')); ?>
 			</td>
 			<td>
 				<?php 
@@ -65,7 +65,7 @@
 			</tr>
 			<tr>
 			<td>
-				<?php echo form_label($this->lang->line('items_current_quantity').':', 'quantity',array('class'=>'wide')); ?>
+				<?php echo form_label($this->lang->line('items_current_quantity').':', 'quantity', array('class'=>'wide')); ?>
 			</td>
 			<td>
 				<?php $qty = array (
diff --git a/application/views/items/excel_import.php b/application/views/items/excel_import.php
index 8a5b0e6d9..2dd35e528 100644
--- a/application/views/items/excel_import.php
+++ b/application/views/items/excel_import.php
@@ -1,18 +1,18 @@
-<?php echo form_open_multipart('items/do_excel_import/',array('id'=>'item_form', 'class' => 'form-horizontal')); ?>
+<?php echo form_open_multipart('items/do_excel_import/', array('id'=>'item_form', 'class' => 'form-horizontal')); ?>
 	<div id="required_fields_message"><?php echo $this->lang->line('items_import_items_excel'); ?></div>
 	<ul id="error_message_box" class="error_message_box"></ul>
 
 <fieldset id="item_basic_info">
 	<legend><?php echo $this->lang->line('common_import'); ?></legend>
 
-	<div class="form-group">
+	<div class="form-group form-group-sm">
 		<div class="col-xs-6">
 			<a href="<?php echo site_url('items/excel'); ?>"><?php echo $this->lang->line('common_download_import_template'); ?></a>
 		</div>
 	</div>
 
-	<div class="form-group">
-	<?php echo form_label($this->lang->line('common_import_file_path'), 'name',array('class'=>'control-label col-xs-3')); ?>
+	<div class="form-group form-group-sm">
+	<?php echo form_label($this->lang->line('common_import_file_path'), 'name', array('class'=>'control-label col-xs-3')); ?>
 		<div class='col-xs-6'>
 			<label class="file">
 				<input type="file" id="item_image" name="file_path">
diff --git a/application/views/items/form.php b/application/views/items/form.php
index 0231c9c45..ba42ef18b 100644
--- a/application/views/items/form.php
+++ b/application/views/items/form.php
@@ -1,259 +1,259 @@
 <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', 'class' => 'form-horizontal')); ?>
-<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', 'class' => 'form-horizontal')); ?>
+	<fieldset id="item_basic_info">
+		<legend><?php echo $this->lang->line("items_basic_information"); ?></legend>
 
-	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('items_item_number'), 'item_number',array('class'=>'control-label col-xs-3')); ?>
-		<div class='col-xs-6'>
-			<?php echo form_input(array(
-					'name'=>'item_number',
-					'class'=>'item_number',
-					'id'=>'item_number',
-					'class'=>'form-control',
-					'value'=>$item_info->item_number)
-			);?>
-		</div>
-	</div>
-
-	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('items_name'), 'name',array('class'=>'required control-label col-xs-3')); ?>
-		<div class='col-xs-6'>
-			<?php echo form_input(array(
-					'name'=>'name',
-					'id'=>'name',
-					'class'=>'form-control',
-					'value'=>$item_info->name)
-			);?>
-		</div>
-	</div>
-
-	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('items_category'), 'category',array('class'=>'required control-label col-xs-3')); ?>
-		<div class='col-xs-6'>
-			<?php echo form_input(array(
-					'name'=>'category',
-					'id'=>'category',
-					'class'=>'form-control',
-					'value'=>$item_info->category)
-			);?>
-		</div>
-	</div>
-
-	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('items_supplier'), 'supplier',array('class'=>'required control-label col-xs-3')); ?>
-		<div class='col-xs-6'>
-			<?php echo form_dropdown('supplier_id', $suppliers, $selected_supplier, 'class="form-control"');?>
-		</div>
-	</div>
-
-	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('items_cost_price'), 'cost_price',array('class'=>'required control-label col-xs-3')); ?>
-		<div class="col-xs-3">
-
-		<div class="input-group input-group-sm">
-			<span class="input-group-addon"><?php echo $this->config->item('currency_symbol'); ?></span>
-			<?php echo form_input(array(
-					'name'=>'cost_price',
-					'id'=>'cost_price',
-					'class'=>'form-control',
-					'value'=>$item_info->cost_price)
-			);?>
-		</div>
-		</div>
-	</div>
-
-	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('items_unit_price'), 'unit_price',array('class'=>'required control-label col-xs-3')); ?>
-		<div class='col-xs-3'>
-			<div class="input-group input-group-sm">
-				<span class="input-group-addon"><?php echo $this->config->item('currency_symbol'); ?></span>
+		<div class="form-group form-group-sm">
+			<?php echo form_label($this->lang->line('items_item_number'), 'item_number', array('class'=>'control-label col-xs-3')); ?>
+			<div class='col-xs-6'>
 				<?php echo form_input(array(
-					'name'=>'unit_price',
-					'id'=>'unit_price',
-					'class'=>'form-control',
-					'value'=>$item_info->unit_price)
-			);?>
+						'name'=>'item_number',
+						'class'=>'item_number',
+						'id'=>'item_number',
+						'class'=>'form-control input-sm',
+						'value'=>$item_info->item_number)
+				);?>
 			</div>
 		</div>
-	</div>
 
-	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('items_tax_1'), 'tax_percent_1',array('class'=>'control-label col-xs-3')); ?>
-		<div class='col-sm-3'>
-			<?php echo form_input(array(
+		<div class="form-group form-group-sm">
+			<?php echo form_label($this->lang->line('items_name'), 'name', array('class'=>'required control-label col-xs-3')); ?>
+			<div class='col-xs-6'>
+				<?php echo form_input(array(
+						'name'=>'name',
+						'id'=>'name',
+						'class'=>'form-control input-sm',
+						'value'=>$item_info->name)
+				);?>
+			</div>
+		</div>
+
+		<div class="form-group form-group-sm">
+			<?php echo form_label($this->lang->line('items_category'), 'category', array('class'=>'required control-label col-xs-3')); ?>
+			<div class='col-xs-6'>
+				<?php echo form_input(array(
+						'name'=>'category',
+						'id'=>'category',
+						'class'=>'form-control input-sm',
+						'value'=>$item_info->category)
+				);?>
+			</div>
+		</div>
+
+		<div class="form-group form-group-sm">
+			<?php echo form_label($this->lang->line('items_supplier'), 'supplier', array('class'=>'required control-label col-xs-3')); ?>
+			<div class='col-xs-6'>
+				<?php echo form_dropdown('supplier_id', $suppliers, $selected_supplier, array('class'=>'form-control'));?>
+			</div>
+		</div>
+
+		<div class="form-group form-group-sm">
+			<?php echo form_label($this->lang->line('items_cost_price'), 'cost_price', array('class'=>'required control-label col-xs-3')); ?>
+			<div class="col-xs-4">
+				<div class="input-group input-group-sm">
+					<span class="input-group-addon input-sm"><?php echo $this->config->item('currency_symbol'); ?></span>
+					<?php echo form_input(array(
+							'name'=>'cost_price',
+							'id'=>'cost_price',
+							'class'=>'form-control input-sm',
+							'value'=>$item_info->cost_price)
+					);?>
+				</div>
+			</div>
+		</div>
+
+		<div class="form-group form-group-sm">
+			<?php echo form_label($this->lang->line('items_unit_price'), 'unit_price', array('class'=>'required control-label col-xs-3')); ?>
+			<div class='col-xs-4'>
+				<div class="input-group input-group-sm">
+					<span class="input-group-addon input-sm"><?php echo $this->config->item('currency_symbol'); ?></span>
+					<?php echo form_input(array(
+						'name'=>'unit_price',
+						'id'=>'unit_price',
+						'class'=>'form-control input-sm',
+						'value'=>$item_info->unit_price)
+					);?>
+				</div>
+			</div>
+		</div>
+
+		<div class="form-group form-group-sm">
+			<?php echo form_label($this->lang->line('items_tax_1'), 'tax_percent_1', array('class'=>'control-label col-xs-3')); ?>
+			<div class='col-sm-3'>
+				<?php echo form_input(array(
 					'name'=>'tax_names[]',
 					'id'=>'tax_name_1',
-					'class'=>'form-control',
+					'class'=>'form-control input-sm',
 					'value'=> isset($item_tax_info[0]['name']) ? $item_tax_info[0]['name'] : $this->config->item('default_tax_1_name'))
-			);?>
+				);?>
 			</div>
 			<div class="col-sm-3">
 				<div class="input-group input-group-sm">
 					<?php echo form_input(array(
 							'name'=>'tax_percents[]',
 							'id'=>'tax_percent_name_1',
-							'class'=>'form-control',
+							'class'=>'form-control input-sm',
 							'value'=> isset($item_tax_info[0]['percent']) ? $item_tax_info[0]['percent'] : $default_tax_1_rate)
 					);?>
-					<span class="input-group-addon">%</span>
+					<span class="input-group-addon input-sm">%</span>
 				</div>
 			</div>
 		</div>
-	</div>
 
-	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('items_tax_2'), 'tax_percent_2',array('class'=>'control-label col-xs-3')); ?>
-		<div class='col-sm-3'>
-			<?php echo form_input(array(
+		<div class="form-group form-group-sm">
+			<?php echo form_label($this->lang->line('items_tax_2'), 'tax_percent_2', array('class'=>'control-label col-xs-3')); ?>
+			<div class='col-sm-3'>
+				<?php echo form_input(array(
 					'name'=>'tax_names[]',
 					'id'=>'tax_name_2',
-					'class'=>'form-control',
+					'class'=>'form-control input-sm',
 					'value'=> isset($item_tax_info[1]['name']) ? $item_tax_info[1]['name'] : $this->config->item('default_tax_2_name'))
-			);?>
-		</div>
-		<div class="col-sm-3">
-			<div class="input-group input-group-sm">
-				<?php echo form_input(array(
-						'name'=>'tax_percents[]',
-						'class'=>'form-control',
-						'id'=>'tax_percent_name_2',
-						'value'=> isset($item_tax_info[1]['percent']) ? $item_tax_info[1]['percent'] : $default_tax_2_rate)
-				);?>
-				<span class="input-group-addon">%</span>
-			</div>
-		</div>
-	</div>
-
-	<?php
-	foreach($stock_locations as $key=>$location_detail)
-	{
-		?>
-		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_quantity').' '.$location_detail['location_name'] ,
-				$key.'_quantity',
-				array('class'=>'required control-label col-xs-3')); ?>
-			<div class='col-xs-2'>
-				<?php echo form_input(array(
-						'name'=>$key.'_quantity',
-						'id'=>$key.'_quantity',
-						'class'=>'quantity form-control',
-						'value'=>isset($item_info->item_id)?$location_detail['quantity']:0)
 				);?>
 			</div>
-		</div>
-		<?php
-	}
-	?>
-
-	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('items_receiving_quantity'), 'receiving_quantity',array('class'=>'control-label col-xs-3')); ?>
-		<div class='col-xs-2'>
-			<?php echo form_input(array(
-					'name'=>'receiving_quantity',
-					'id'=>'receiving_quantity',
-					'class'=>'form-control',
-					'value'=>$item_info->receiving_quantity)
-			);?>
-		</div>
-	</div>
-
-	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('items_reorder_level'), 'reorder_level',array('class'=>'required control-label col-xs-3')); ?>
-		<div class='col-xs-2'>
-			<?php echo form_input(array(
-					'name'=>'reorder_level',
-					'id'=>'reorder_level',
-					'class'=>'form-control',
-					'value'=>!isset($item_info->item_id)?0:$item_info->reorder_level)
-			);?>
-		</div>
-	</div>
-
-	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('items_description'), 'description',array('class'=>'control-label col-xs-3')); ?>
-		<div class='col-xs-6'>
-			<?php echo form_textarea(array(
-					'name'=>'description',
-					'id'=>'description',
-					'class'=>'form-control',
-					'value'=>$item_info->description)
-			);?>
-		</div>
-	</div>
-
-	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('items_image'), 'item_image',array('class'=>'control-label col-xs-3')); ?>
-		<div class='col-xs-6'>
-			<label class="file">
-				<input type="file" id="item_image">
-				<span class="file-custom"></span>
-			</label>
-		</div>
-	</div>
-
-	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('items_allow_alt_description'), 'allow_alt_description',array('class'=>'control-label col-xs-3')); ?>
-		<div class='col-xs-1'>
-			<?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="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('items_is_serialized'), 'is_serialized',array('class'=>'control-label col-xs-3')); ?>
-		<div class='col-xs-1'>
-			<?php echo form_checkbox(array(
-					'name'=>'is_serialized',
-					'id'=>'is_serialized',
-					'value'=>1,
-					'checked'=>($item_info->is_serialized)? 1 : 0)
-			);?>
-		</div>
-	</div>
-
-	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('items_is_deleted'), 'is_deleted',array('class'=>'control-label col-xs-3')); ?>
-		<div class='col-xs-1'>
-			<?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="form-group form-group-sm">
-				<?php echo form_label($this->config->item('custom'.$i.'_name'), 'custom'.$i,array('class'=>'control-label col-xs-3')); ?>
-				<div class='col-xs-6'>
+			<div class="col-sm-3">
+				<div class="input-group input-group-sm">
 					<?php echo form_input(array(
-							'name'=>'custom'.$i,
-							'id'=>'custom'.$i,
-							'class'=>'form-control',
-							'value'=>$item_arr['custom'.$i])
+							'name'=>'tax_percents[]',
+							'class'=>'form-control input-sm',
+							'id'=>'tax_percent_name_2',
+							'value'=> isset($item_tax_info[1]['percent']) ? $item_tax_info[1]['percent'] : $default_tax_2_rate)
+					);?>
+					<span class="input-group-addon input-sm">%</span>
+				</div>
+			</div>
+		</div>
+
+		<?php
+		foreach($stock_locations as $key=>$location_detail)
+		{
+		?>
+			<div class="form-group form-group-sm">
+				<?php echo form_label($this->lang->line('items_quantity').' '.$location_detail['location_name'] ,
+					$key.'_quantity',
+					array('class'=>'required control-label col-xs-3')); ?>
+				<div class='col-xs-2'>
+					<?php echo form_input(array(
+							'name'=>$key.'_quantity',
+							'id'=>$key.'_quantity',
+							'class'=>'quantity form-control',
+							'value'=>isset($item_info->item_id)?$location_detail['quantity']:0)
 					);?>
 				</div>
 			</div>
-			<?php
+		<?php
 		}
-	}
-	?>
-</fieldset>
+		?>
+
+		<div class="form-group form-group-sm">
+			<?php echo form_label($this->lang->line('items_receiving_quantity'), 'receiving_quantity', array('class'=>'control-label col-xs-3')); ?>
+			<div class='col-xs-2'>
+				<?php echo form_input(array(
+						'name'=>'receiving_quantity',
+						'id'=>'receiving_quantity',
+						'class'=>'form-control input-sm',
+						'value'=>$item_info->receiving_quantity)
+				);?>
+			</div>
+		</div>
+
+		<div class="form-group form-group-sm">
+			<?php echo form_label($this->lang->line('items_reorder_level'), 'reorder_level', array('class'=>'required control-label col-xs-3')); ?>
+			<div class='col-xs-2'>
+				<?php echo form_input(array(
+						'name'=>'reorder_level',
+						'id'=>'reorder_level',
+						'class'=>'form-control input-sm',
+						'value'=>!isset($item_info->item_id)?0:$item_info->reorder_level)
+				);?>
+			</div>
+		</div>
+
+		<div class="form-group form-group-sm">
+			<?php echo form_label($this->lang->line('items_description'), 'description', array('class'=>'control-label col-xs-3')); ?>
+			<div class='col-xs-6'>
+				<?php echo form_textarea(array(
+						'name'=>'description',
+						'id'=>'description',
+						'class'=>'form-control input-sm',
+						'value'=>$item_info->description)
+				);?>
+			</div>
+		</div>
+
+		<div class="form-group form-group-sm">
+			<?php echo form_label($this->lang->line('items_image'), 'item_image', array('class'=>'control-label col-xs-3')); ?>
+			<div class='col-xs-6'>
+				<label class="file">
+					<input type="file" id="item_image">
+					<span class="file-custom"></span>
+				</label>
+			</div>
+		</div>
+
+		<div class="form-group form-group-sm">
+			<?php echo form_label($this->lang->line('items_allow_alt_description'), 'allow_alt_description', array('class'=>'control-label col-xs-3')); ?>
+			<div class='col-xs-1'>
+				<?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="form-group form-group-sm">
+			<?php echo form_label($this->lang->line('items_is_serialized'), 'is_serialized', array('class'=>'control-label col-xs-3')); ?>
+			<div class='col-xs-1'>
+				<?php echo form_checkbox(array(
+						'name'=>'is_serialized',
+						'id'=>'is_serialized',
+						'value'=>1,
+						'checked'=>($item_info->is_serialized)? 1 : 0)
+				);?>
+			</div>
+		</div>
+
+		<div class="form-group form-group-sm">
+			<?php echo form_label($this->lang->line('items_is_deleted'), 'is_deleted', array('class'=>'control-label col-xs-3')); ?>
+			<div class='col-xs-1'>
+				<?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="form-group form-group-sm">
+					<?php echo form_label($this->config->item('custom'.$i.'_name'), 'custom'.$i, array('class'=>'control-label col-xs-3')); ?>
+					<div class='col-xs-6'>
+						<?php echo form_input(array(
+								'name'=>'custom'.$i,
+								'id'=>'custom'.$i,
+								'class'=>'form-control input-sm',
+								'value'=>$item_arr['custom'.$i])
+						);?>
+					</div>
+				</div>
+		<?php
+			}
+		}
+		?>
+	</fieldset>
 <?php echo form_close(); ?>
 
 <script type='text/javascript'>
@@ -276,7 +276,7 @@
 		<?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();
+			$("#custom"+<?php echo $i; ?>).autocomplete("<?php echo site_url('items/suggest_custom'.$i);?>",{max:100,minChars:0,delay:10}).result(no_op).search();
 		<?php
 		}
 		?>
@@ -343,7 +343,6 @@
 					required:true,
 					number:true
 				},
-
 				unit_price:
 				{
 					required:true,
@@ -385,10 +384,8 @@
 					required:"<?php echo $this->lang->line('items_reorder_level_required'); ?>",
 					number:"<?php echo $this->lang->line('items_reorder_level_number'); ?>"
 				}
-
 			}
 		});
-
 	});
 </script>
 
diff --git a/application/views/items/form_bulk.php b/application/views/items/form_bulk.php
index e47d284fb..adb0ced86 100644
--- a/application/views/items/form_bulk.php
+++ b/application/views/items/form_bulk.php
@@ -1,74 +1,74 @@
 <div id="required_fields_message"><?php echo $this->lang->line('items_edit_fields_you_want_to_update'); ?></div>
 <ul id="error_message_box" class="error_message_box"></ul>
 
-<?php echo form_open('items/bulk_update/',array('id'=>'item_form', 'class'=>'form-horizontal')); ?>
+<?php echo form_open('items/bulk_update/', array('id'=>'item_form', 'class'=>'form-horizontal')); ?>
 	<fieldset id="item_basic_info">
 		<legend><?php echo $this->lang->line("items_basic_information"); ?></legend>
 
 		<div class="form-group form-group-sm">	
-			<?php echo form_label($this->lang->line('items_name'), 'name',array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label($this->lang->line('items_name'), 'name', array('class'=>'control-label col-xs-3')); ?>
 			<div class='col-xs-6'>
 				<?php echo form_input(array(
 					'name'=>'name',
 					'id'=>'name',
-					'class'=>'form-control')
+					'class'=>'form-control input-sm')
 				);?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">	
-			<?php echo form_label($this->lang->line('items_category'), 'category',array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label($this->lang->line('items_category'), 'category', array('class'=>'control-label col-xs-3')); ?>
 			<div class='col-xs-6'>
 				<?php echo form_input(array(
 					'name'=>'category',
 					'id'=>'category',
-					'class'=>'form-control')
+					'class'=>'form-control input-sm')
 				);?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">	
-			<?php echo form_label($this->lang->line('items_supplier'), 'supplier',array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label($this->lang->line('items_supplier'), 'supplier', array('class'=>'control-label col-xs-3')); ?>
 			<div class='col-xs-6'>
-				<?php echo form_dropdown('supplier_id', $suppliers, '', 'class="form-control"');?>
+				<?php echo form_dropdown('supplier_id', $suppliers, '', array('class'=>'form-control'));?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_cost_price'), 'cost_price',array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label($this->lang->line('items_cost_price'), 'cost_price', array('class'=>'control-label col-xs-3')); ?>
 			<div class='col-xs-3'>
 				<div class="input-group input-group-sm">
 					<span class="input-group input-group-addon"><?php echo $this->config->item('currency_symbol'); ?></span>
 					<?php echo form_input(array(
 							'name'=>'cost_price',
 							'id'=>'cost_price',
-							'class'=>'form-control')
+							'class'=>'form-control input-sm')
 					);?>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group">
-			<?php echo form_label($this->lang->line('items_unit_price'), 'unit_price',array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label($this->lang->line('items_unit_price'), 'unit_price', array('class'=>'control-label col-xs-3')); ?>
 			<div class='col-xs-3'>
 				<div class="input-group input-group-sm">
 					<span class="input-group input-group-addon"><?php echo $this->config->item('currency_symbol'); ?></span>
 					<?php echo form_input(array(
 							'name'=>'unit_price',
 							'id'=>'unit_price',
-							'class'=>'form-control')
+							'class'=>'form-control input-sm')
 					);?>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_tax_1'), 'tax_percent_1',array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label($this->lang->line('items_tax_1'), 'tax_percent_1', array('class'=>'control-label col-xs-3')); ?>
 			<div class='col-sm-3'>
 				<?php echo form_input(array(
 						'name'=>'tax_names[]',
 						'id'=>'tax_name_1',
-						'class'=>'form-control',
+						'class'=>'form-control input-sm',
 						'value'=> isset($item_tax_info[0]['name']) ? $item_tax_info[0]['name'] : $this->config->item('items_sales_tax_1'))
 				);?>
 			</div>
@@ -77,7 +77,7 @@
 					<?php echo form_input(array(
 							'name'=>'tax_percents[]',
 							'id'=>'tax_percent_name_1',
-							'class'=>'form-control',
+							'class'=>'form-control input-sm',
 							'value'=> isset($item_tax_info[0]['percent']) ? $item_tax_info[0]['percent'] : '')
 					);?>
 					<span class="input-group input-group-addon">%</span>
@@ -86,12 +86,12 @@
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_tax_2'), 'tax_percent_2',array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label($this->lang->line('items_tax_2'), 'tax_percent_2', array('class'=>'control-label col-xs-3')); ?>
 			<div class='col-sm-3'>
 				<?php echo form_input(array(
 						'name'=>'tax_names[]',
 						'id'=>'tax_name_2',
-						'class'=>'form-control',
+						'class'=>'form-control input-sm',
 						'value'=> isset($item_tax_info[1]['name']) ? $item_tax_info[1]['name'] : $this->config->item('items_sales_tax_2'))
 				);?>
 			</div>
@@ -99,7 +99,7 @@
 				<div class="input-group input-group-sm">
 					<?php echo form_input(array(
 							'name'=>'tax_percents[]',
-							'class'=>'form-control',
+							'class'=>'form-control input-sm',
 							'id'=>'tax_percent_name_2',
 							'value'=> isset($item_tax_info[1]['percent']) ? $item_tax_info[1]['percent'] : '')
 					);?>
@@ -109,38 +109,38 @@
 		</div>
 
 		<div class="form-group form-group-sm">	
-			<?php echo form_label($this->lang->line('items_reorder_level'), 'reorder_level',array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label($this->lang->line('items_reorder_level'), 'reorder_level', array('class'=>'control-label col-xs-3')); ?>
 			<div class='col-xs-3'>
 				<?php echo form_input(array(
 						'name'=>'reorder_level',
 						'id'=>'reorder_level',
-						'class'=>'form-control')
+						'class'=>'form-control input-sm')
 				);?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">	
-			<?php echo form_label($this->lang->line('items_description'), 'description',array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label($this->lang->line('items_description'), 'description', array('class'=>'control-label col-xs-3')); ?>
 			<div class='col-xs-5'>
 				<?php echo form_textarea(array(
 						'name'=>'description',
 						'id'=>'description',
-						'class'=>'form-control')
+						'class'=>'form-control input-sm')
 				);?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_allow_alt_description'), 'allow_alt_description',array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label($this->lang->line('items_allow_alt_description'), 'allow_alt_description', array('class'=>'control-label col-xs-3')); ?>
 			<div class='col-xs-5'>
-				<?php echo form_dropdown('allow_alt_description', $allow_alt_description_choices, '', 'class="form-control"');?>
+				<?php echo form_dropdown('allow_alt_description', $allow_alt_description_choices, '', array('class'=>'form-control'));?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_is_serialized'), 'is_serialized',array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label($this->lang->line('items_is_serialized'), 'is_serialized', array('class'=>'control-label col-xs-3')); ?>
 			<div class='col-xs-5'>
-				<?php echo form_dropdown('is_serialized', $serialization_choices, '', 'class="form-control"');?>
+				<?php echo form_dropdown('is_serialized', $serialization_choices, '', array('class'=>'form-control'));?>
 			</div>
 		</div>
 	</fieldset>
diff --git a/application/views/items/inventory.php b/application/views/items/inventory.php
index ff2dbe73e..2993219b7 100644
--- a/application/views/items/inventory.php
+++ b/application/views/items/inventory.php
@@ -1,11 +1,11 @@
 <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_inventory/'.$item_info->item_id,array('id'=>'item_form')); ?>
+<?php echo form_open('items/save_inventory/'.$item_info->item_id, array('id'=>'item_form')); ?>
 	<fieldset id="item_basic_info">
 
 		<div class="field_row clearfix">
-		<?php echo form_label($this->lang->line('items_item_number').':', 'name',array('class'=>'wide')); ?>
+		<?php echo form_label($this->lang->line('items_item_number').':', 'name', array('class'=>'wide')); ?>
 			<div class="form_field">
 			<?php $inumber = array (
 				'name'=>'item_number',
@@ -20,7 +20,7 @@
 		</div>
 
 		<div class="field_row clearfix">
-			<?php echo form_label($this->lang->line('items_name').':', 'name',array('class'=>'wide')); ?>
+			<?php echo form_label($this->lang->line('items_name').':', 'name', array('class'=>'wide')); ?>
 			<div class='form_field'>
 			<?php $iname = array (
 				'name'=>'name',
@@ -35,7 +35,7 @@
 		</div>
 
 		<div class="field_row clearfix">
-			<?php echo form_label($this->lang->line('items_category').':', 'category',array('class'=>'wide')); ?>
+			<?php echo form_label($this->lang->line('items_category').':', 'category', array('class'=>'wide')); ?>
 			<div class='form_field'>
 			<?php $cat = array (
 				'name'=>'category',
@@ -50,7 +50,7 @@
 		</div>
 
 		<div class="field_row clearfix">
-		<?php echo form_label($this->lang->line('items_stock_location').':', 'stock_location',array('class'=>'wide')); ?>
+		<?php echo form_label($this->lang->line('items_stock_location').':', 'stock_location', array('class'=>'wide')); ?>
 			<div class='form_field'>
 			<?php
 					echo form_dropdown('stock_location',$stock_locations,current($stock_locations),'onchange="fill_quantity(this.value)"');
@@ -59,7 +59,7 @@
 		</div>
 
 		<div class="field_row clearfix">
-		<?php echo form_label($this->lang->line('items_current_quantity').':', 'quantity',array('class'=>'wide')); ?>
+		<?php echo form_label($this->lang->line('items_current_quantity').':', 'quantity', array('class'=>'wide')); ?>
 			<div class='form_field'>
 			<?php $qty = array (
 
@@ -76,7 +76,7 @@
 		</div>
 
 		<div class="field_row clearfix">
-		<?php echo form_label($this->lang->line('items_add_minus').':', 'quantity',array('class'=>'required wide')); ?>
+		<?php echo form_label($this->lang->line('items_add_minus').':', 'quantity', array('class'=>'required wide')); ?>
 			<div class='form_field'>
 			<?php echo form_input(array(
 				'name'=>'newquantity',
@@ -87,7 +87,7 @@
 		</div>
 
 		<div class="field_row clearfix">
-		<?php echo form_label($this->lang->line('items_inventory_comments').':', 'description',array('class'=>'wide')); ?>
+		<?php echo form_label($this->lang->line('items_inventory_comments').':', 'description', array('class'=>'wide')); ?>
 			<div class='form_field'>
 			<?php echo form_textarea(array(
 				'name'=>'trans_comment',
diff --git a/application/views/items/manage.php b/application/views/items/manage.php
index 55f3c935f..cf2b744f5 100644
--- a/application/views/items/manage.php
+++ b/application/views/items/manage.php
@@ -199,9 +199,9 @@ function post_bulk_form_submit(response)
 
 	<div id="table_action_header">
 		<ul>
-			<li class="float_left"><span><?php echo anchor("$controller_name/delete",$this->lang->line("common_delete"),array('id'=>'delete')); ?></span></li>
-			<li class="float_left"><span><?php echo anchor("$controller_name/bulk_edit",$this->lang->line("items_bulk_edit"),array('id'=>'bulk_edit','class'=>'modal-dlg modal-btn-submit','title'=>$this->lang->line('items_edit_multiple_items'))); ?></span></li>
-			<li class="float_left"><span><?php echo anchor("$controller_name/generate_barcodes",$this->lang->line("items_generate_barcodes"),array('id'=>'generate_barcodes', 'target' =>'_blank','title'=>$this->lang->line('items_generate_barcodes'))); ?></span></li>
+			<li class="float_left"><span><?php echo anchor("$controller_name/delete",$this->lang->line("common_delete"), array('id'=>'delete')); ?></span></li>
+			<li class="float_left"><span><?php echo anchor("$controller_name/bulk_edit",$this->lang->line("items_bulk_edit"), array('id'=>'bulk_edit','class'=>'modal-dlg modal-btn-submit','title'=>$this->lang->line('items_edit_multiple_items'))); ?></span></li>
+			<li class="float_left"><span><?php echo anchor("$controller_name/generate_barcodes",$this->lang->line("items_generate_barcodes"), array('id'=>'generate_barcodes', 'target' =>'_blank','title'=>$this->lang->line('items_generate_barcodes'))); ?></span></li>
 			<?php
 			if (count($stock_locations) > 1)
 			{
diff --git a/application/views/people/form_basic_info.php b/application/views/people/form_basic_info.php
index b9f7d617d..5ad7a9abc 100644
--- a/application/views/people/form_basic_info.php
+++ b/application/views/people/form_basic_info.php
@@ -1,27 +1,27 @@
-<div class="form-group">	
-<?php echo form_label($this->lang->line('common_first_name'), 'first_name',array('class' => 'control-label col-xs-3')); ?>
+<div class="form-group form-group-sm">	
+<?php echo form_label($this->lang->line('common_first_name'), 'first_name', array('class' => 'control-label col-xs-3')); ?>
 	<div class='col-xs-6'>
 	<?php echo form_input(array(
 		'name'=>'first_name',
 		'id'=>'first_name',
-		'class'=>'form-control',
+		'class'=>'form-control input-sm',
 		'value'=>$person_info->first_name)
 	);?>
 	</div>
 </div>
-<div class="form-group">	
-<?php echo form_label($this->lang->line('common_last_name'), 'last_name',array('class'=>'required control-label required col-xs-3')); ?>
+<div class="form-group form-group-sm">	
+<?php echo form_label($this->lang->line('common_last_name'), 'last_name', array('class'=>'required control-label required col-xs-3')); ?>
 	<div class='col-xs-6'>
 	<?php echo form_input(array(
 		'name'=>'last_name',
 		'id'=>'last_name',
-		'class'=>'form-control',
+		'class'=>'form-control input-sm',
 		'value'=>$person_info->last_name)
 	);?>
 	</div>
 </div>
 
-<div class="form-group">	
+<div class="form-group form-group-sm">	
 <?php echo form_label($this->lang->line('common_gender'), 'gender',
 !empty($basic_version) ? array('class'=>'control-label required col-xs-3') : array('class' => 'control-label col-xs-3')); ?>
 	<div class="col-xs-4">
@@ -48,102 +48,102 @@
 	</div>
 </div>
 
-<div class="form-group">	
+<div class="form-group form-group-sm">	
 <?php echo form_label($this->lang->line('common_email'), 'email', array('class' => 'control-label col-xs-3')); ?>
 	<div class='col-xs-6'>
 	<?php echo form_input(array(
 		'name'=>'email',
 		'id'=>'email',
-		'class'=>'form-control',
+		'class'=>'form-control input-sm',
 		'value'=>$person_info->email)
 	);?>
 	</div>
 </div>
 
-<div class="form-group">	
+<div class="form-group form-group-sm">	
 <?php echo form_label($this->lang->line('common_phone_number'), 'phone_number', array('class' => 'control-label col-xs-3')); ?>
 	<div class='col-xs-6'>
 	<?php echo form_input(array(
 		'name'=>'phone_number',
 		'id'=>'phone_number',
-		'class'=>'form-control',
+		'class'=>'form-control input-sm',
 		'value'=>$person_info->phone_number));?>
 	</div>
 </div>
 
-<div class="form-group">	
+<div class="form-group form-group-sm">	
 <?php echo form_label($this->lang->line('common_address_1'), 'address_1', array('class' => 'control-label col-xs-3')); ?>
 	<div class='col-xs-6'>
 	<?php echo form_input(array(
 		'name'=>'address_1',
 		'id'=>'address_1',
-		'class'=>'form-control',
+		'class'=>'form-control input-sm',
 		'value'=>$person_info->address_1));?>
 	</div>
 </div>
 
-<div class="form-group">	
+<div class="form-group form-group-sm">	
 <?php echo form_label($this->lang->line('common_address_2'), 'address_2', array('class' => 'control-label col-xs-3')); ?>
 	<div class='col-xs-6'>
 	<?php echo form_input(array(
 		'name'=>'address_2',
 		'id'=>'address_2',
-		'class'=>'form-control',
+		'class'=>'form-control input-sm',
 		'value'=>$person_info->address_2));?>
 	</div>
 </div>
 
-<div class="form-group">	
+<div class="form-group form-group-sm">	
 <?php echo form_label($this->lang->line('common_city'), 'city', array('class' => 'control-label col-xs-3')); ?>
 	<div class='col-xs-6'>
 	<?php echo form_input(array(
 		'name'=>'city',
 		'id'=>'city',
-		'class'=>'form-control',
+		'class'=>'form-control input-sm',
 		'value'=>$person_info->city));?>
 	</div>
 </div>
 
-<div class="form-group">	
+<div class="form-group form-group-sm">	
 <?php echo form_label($this->lang->line('common_state'), 'state', array('class' => 'control-label col-xs-3')); ?>
 	<div class='col-xs-6'>
 	<?php echo form_input(array(
 		'name'=>'state',
 		'id'=>'state',
-		'class'=>'form-control',
+		'class'=>'form-control input-sm',
 		'value'=>$person_info->state));?>
 	</div>
 </div>
 
-<div class="form-group">	
+<div class="form-group form-group-sm">	
 <?php echo form_label($this->lang->line('common_zip'), 'zip', array('class' => 'control-label col-xs-3')); ?>
 	<div class='col-xs-6'>
 	<?php echo form_input(array(
 		'name'=>'zip',
 		'id'=>'postcode',
-		'class'=>'form-control',
+		'class'=>'form-control input-sm',
 		'value'=>$person_info->zip));?>
 	</div>
 </div>
 
-<div class="form-group">	
+<div class="form-group form-group-sm">	
 <?php echo form_label($this->lang->line('common_country'), 'country', array('class' => 'control-label col-xs-3')); ?>
 	<div class='col-xs-6'>
 	<?php echo form_input(array(
 		'name'=>'country',
 		'id'=>'country',
-		'class'=>'form-control',
+		'class'=>'form-control input-sm',
 		'value'=>$person_info->country));?>
 	</div>
 </div>
 
-<div class="form-group">	
+<div class="form-group form-group-sm">	
 <?php echo form_label($this->lang->line('common_comments'), 'comments', array('class' => 'control-label col-xs-3')); ?>
 	<div class='col-xs-6'>
 	<?php echo form_textarea(array(
 		'name'=>'comments',
 		'id'=>'comments',
-		'class'=>'form-control',
+		'class'=>'form-control input-sm',
 		'value'=>$person_info->comments
 		));?>
 	</div>
diff --git a/application/views/people/manage.php b/application/views/people/manage.php
index aeb5f5741..41705fa74 100644
--- a/application/views/people/manage.php
+++ b/application/views/people/manage.php
@@ -80,11 +80,11 @@ function post_person_form_submit(response)
 
 <div id="table_action_header">
 	<ul>
-		<li class="float_left"><span><?php echo anchor("$controller_name/delete",$this->lang->line("common_delete"),array('id'=>'delete')); ?></span></li>
+		<li class="float_left"><span><?php echo anchor("$controller_name/delete",$this->lang->line("common_delete"), array('id'=>'delete')); ?></span></li>
 		<li class="float_left"><span><a href="#" id="email"><?php echo $this->lang->line("common_email");?></a></span></li>
 		<li class="float_right">
 			<img src='<?php echo base_url()?>images/spinner_small.gif' alt='spinner' id='spinner' />
-			<?php echo form_open("$controller_name/search",array('id'=>'search_form')); ?>
+			<?php echo form_open("$controller_name/search", array('id'=>'search_form')); ?>
 				<input type="text" name ='search' id='search'/>
 				<input type="hidden" name ='limit_from' id='limit_from'/>
 			<?php echo form_close(); ?>
diff --git a/application/views/receivings/form.php b/application/views/receivings/form.php
index 2a149ae57..cac22b8f0 100755
--- a/application/views/receivings/form.php
+++ b/application/views/receivings/form.php
@@ -3,7 +3,7 @@
 	<ul id="error_message_box" class="error_message_box"></ul>
 	
 	<fieldset id="receiving_basic_info">
-		<?php echo form_open("receivings/save/".$receiving_info['receiving_id'],array('id'=>'recvs_edit_form', 'class' => 'form-horizontal')); ?>
+		<?php echo form_open("receivings/save/".$receiving_info['receiving_id'], array('id'=>'recvs_edit_form', 'class' => 'form-horizontal')); ?>
 			<legend><?php echo $this->lang->line("recvs_basic_information"); ?></legend>
 			
 			<div class="form-group form-group-sm">
@@ -16,21 +16,21 @@
 			<div class="form-group form-group-sm">
 				<?php echo form_label($this->lang->line('recvs_date'), 'date', array('class' => 'control-label col-xs-3')); ?>
 				<div class='col-xs-6'>
-					<?php echo form_input(array('name'=>'date','value'=>date($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), strtotime($receiving_info['receiving_time'])), 'id'=>'datetime', 'class' => 'form-control', 'readonly'=>'true'));?>
+					<?php echo form_input(array('name'=>'date','value'=>date($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), strtotime($receiving_info['receiving_time'])), 'id'=>'datetime', 'class' => 'form-control input-sm', 'readonly'=>'true'));?>
 				</div>
 			</div>
 			
 			<div class="form-group form-group-sm">
 				<?php echo form_label($this->lang->line('recvs_supplier'), 'supplier', array('class' => 'control-label col-xs-3')); ?>
 				<div class='col-xs-6'>
-					<?php echo form_input(array('name' => 'supplier_id', 'value' => $selected_supplier, 'id' => 'supplier_id', 'class'=>'form-control'));?>
+					<?php echo form_input(array('name' => 'supplier_id', 'value' => $selected_supplier, 'id' => 'supplier_id', 'class'=>'form-control input-sm'));?>
 				</div>
 			</div>
 			
 			<div class="form-group form-group-sm">
 				<?php echo form_label($this->lang->line('recvs_invoice_number'), 'invoice_number', array('class' => 'control-label col-xs-3')); ?>
 				<div class='col-xs-6'>
-					<?php echo form_input(array('name' => 'invoice_number', 'value' => $receiving_info['invoice_number'], 'id' => 'invoice_number', 'class' => 'form-control'));?>
+					<?php echo form_input(array('name' => 'invoice_number', 'value' => $receiving_info['invoice_number'], 'id' => 'invoice_number', 'class' => 'form-control input-sm'));?>
 				</div>
 			</div>
 			
@@ -44,13 +44,13 @@
 			<div class="form-group form-group-sm">
 				<?php echo form_label($this->lang->line('recvs_comments'), 'comment', array('class' => 'control-label col-xs-3')); ?>
 				<div class='col-xs-6'>
-					<?php echo form_textarea(array('name'=>'comment','value'=>$receiving_info['comment'], 'id'=>'comment', 'class' => 'form-control'));?>
+					<?php echo form_textarea(array('name'=>'comment','value'=>$receiving_info['comment'], 'id'=>'comment', 'class' => 'form-control input-sm'));?>
 				</div>
 			</div>
 
 		<?php echo form_close(); ?>
 		
-		<?php echo form_open("receivings/delete/".$receiving_info['receiving_id'],array('id'=>'recvs_delete_form')); ?>
+		<?php echo form_open("receivings/delete/".$receiving_info['receiving_id'], array('id'=>'recvs_delete_form')); ?>
 			<?php echo form_hidden('receiving_id', $receiving_info['receiving_id']);?>
 			<?php echo form_submit(array(
 				'name'=>'submit',
@@ -83,9 +83,33 @@ $(document).ready(function()
         }).responseText).success;
     }, '<?php echo $this->lang->line("recvs_invoice_number_duplicate"); ?>');
 	
+	<?php $this->load->view('partial/datepicker_locale'); ?>
+	
 	$('#datetime').datetimepicker({
-		dateFormat: '<?php echo dateformat_jquery($this->config->item("dateformat"));?>',
-		timeFormat: '<?php echo dateformat_jquery($this->config->item("timeformat"));?>'
+		format: "<?php echo dateformat_bootstrap($this->config->item("dateformat")) . ' ' . dateformat_bootstrap($this->config->item("timeformat"));?>",
+		startDate: "<?php echo date($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), mktime(0, 0, 0, 1, 1, 2010));?>",
+		<?php
+		$t = $this->config->item('timeformat');
+		$m = $t[strlen($t)-1];
+		if( strpos($this->config->item('timeformat'), 'a') !== false || strpos($this->config->item('timeformat'), 'A') !== false )
+		{ 
+		?>
+			showMeridian: true,
+		<?php 
+		}
+		else
+		{
+		?>
+			showMeridian: false,
+		<?php 
+		}
+		?>
+		minuteStep: 1,
+		autoclose: true,
+		todayBtn: true,
+		todayHighlight: true,
+		bootcssVer: 3,
+		language: "<?php echo $this->config->item('language'); ?>"
 	});
 	
 	var format_item = function(row)
diff --git a/application/views/receivings/receiving.php b/application/views/receivings/receiving.php
index f2f6b0ef7..7e3ec145b 100644
--- a/application/views/receivings/receiving.php
+++ b/application/views/receivings/receiving.php
@@ -206,7 +206,7 @@ if (isset($error))
 	}
 	else
 	{
-		echo form_open("receivings/select_supplier",array('id'=>'select_supplier_form'));
+		echo form_open("receivings/select_supplier", array('id'=>'select_supplier_form'));
 	?>
 			<label id="supplier_label" for="supplier"><?php echo $this->lang->line('recvs_select_supplier'); ?></label>
 			<?php echo form_input(array('name'=>'supplier','id'=>'supplier','size'=>'30','value'=>$this->lang->line('recvs_start_typing_supplier_name')));?>
@@ -246,7 +246,7 @@ if (isset($error))
 	?>
 		    <div style='border-top:2px solid #000;' />
 		    <div id="finish_sale">
-		        <?php echo form_open("receivings/requisition_complete",array('id'=>'finish_receiving_form')); ?>
+		        <?php echo form_open("receivings/requisition_complete", array('id'=>'finish_receiving_form')); ?>
 					<br />
 					<label id="comment_label" for="comment"><?php echo $this->lang->line('common_comments'); ?>:</label>
 					<?php echo form_textarea(array('name'=>'comment','id'=>'comment','value'=>$comment,'rows'=>'4','cols'=>'23'));?>
@@ -257,7 +257,7 @@ if (isset($error))
 					</div>
 				<?php echo form_close(); ?> 
 				
-				<?php echo form_open("receivings/cancel_receiving",array('id'=>'cancel_receiving_form')); ?>
+				<?php echo form_open("receivings/cancel_receiving", array('id'=>'cancel_receiving_form')); ?>
 					<div class="btn btn-sm btn-danger pull-left" id='cancel_receiving_button' style='margin-top:5px;'>
 						<?php echo $this->lang->line('recvs_cancel_receiving')?>
 					</div>
@@ -269,7 +269,7 @@ if (isset($error))
 		{
 	?>
 		<div id="finish_sale">
-			<?php echo form_open("receivings/complete",array('id'=>'finish_receiving_form')); ?>
+			<?php echo form_open("receivings/complete", array('id'=>'finish_receiving_form')); ?>
 				<br />
 				<label id="comment_label" for="comment"><?php echo $this->lang->line('common_comments'); ?>:</label>
 				<?php echo form_textarea(array('name'=>'comment','id'=>'comment','value'=>$comment,'rows'=>'4','cols'=>'23'));?>
@@ -353,7 +353,7 @@ if (isset($error))
 				</div>
 			<?php echo form_close(); ?>
 
-			<?php echo form_open("receivings/cancel_receiving",array('id'=>'cancel_receiving_form')); ?>
+			<?php echo form_open("receivings/cancel_receiving", array('id'=>'cancel_receiving_form')); ?>
 					<div class='btn btn-sm btn-danger pull-left' id='cancel_receiving_button' style='margin-top:5px;'>
 						<?php echo $this->lang->line('recvs_cancel_receiving')?>
 					</div>
diff --git a/application/views/reports/date_input.php b/application/views/reports/date_input.php
index cce2e7e89..dfa49af13 100644
--- a/application/views/reports/date_input.php
+++ b/application/views/reports/date_input.php
@@ -46,7 +46,7 @@ if(isset($error))
     ?>
     	<?php echo form_label($this->lang->line('reports_sale_type'), 'reports_sale_type_label', array('class'=>'required')); ?>
     	<div id='report_sale_type'>
-    		<?php echo form_dropdown('sale_type',array('all' => $this->lang->line('reports_all'), 
+    		<?php echo form_dropdown('sale_type', array('all' => $this->lang->line('reports_all'), 
     		'sales' => $this->lang->line('reports_sales'), 
     		'returns' => $this->lang->line('reports_returns')), 'all', 'id="input_type"'); ?>
     	</div>
@@ -57,7 +57,7 @@ if(isset($error))
     ?>
         <?php echo form_label($this->lang->line('reports_receiving_type'), 'reports_receiving_type_label', array('class'=>'required')); ?>
         <div id='report_receiving_type'>
-     	   <?php echo form_dropdown('receiving_type',array('all' => $this->lang->line('reports_all'),
+     	   <?php echo form_dropdown('receiving_type', array('all' => $this->lang->line('reports_all'),
         'receiving' => $this->lang->line('reports_receivings'), 
         'returns' => $this->lang->line('reports_returns'),
         'requisitions' => $this->lang->line('reports_requisitions')), 'all', 'id="input_type"'); ?>
diff --git a/application/views/reports/date_input_excel_export.php b/application/views/reports/date_input_excel_export.php
index 2fa88d7ce..551bbefca 100644
--- a/application/views/reports/date_input_excel_export.php
+++ b/application/views/reports/date_input_excel_export.php
@@ -25,7 +25,7 @@ if(isset($error))
 	
 	<?php echo form_label($this->lang->line('reports_sale_type'), 'reports_sale_type_label', array('class'=>'required')); ?>
 	<div id='report_sale_type'>
-		<?php echo form_dropdown('sale_type',array('all' => $this->lang->line('reports_all'), 
+		<?php echo form_dropdown('sale_type', array('all' => $this->lang->line('reports_all'), 
 		'sales' => $this->lang->line('reports_sales'), 	
 		'returns' => $this->lang->line('reports_returns')), 'all', 'id="sale_type"'); ?>
 	</div>
diff --git a/application/views/reports/specific_input.php b/application/views/reports/specific_input.php
index ad373e9a2..a526e9418 100644
--- a/application/views/reports/specific_input.php
+++ b/application/views/reports/specific_input.php
@@ -31,7 +31,7 @@ if(isset($error))
 	
 	<?php echo form_label($this->lang->line('reports_sale_type'), 'reports_sale_type_label', array('class'=>'required')); ?>
 	<div id='report_sale_type'>
-		<?php echo form_dropdown('sale_type',array('all' => $this->lang->line('reports_all'), 
+		<?php echo form_dropdown('sale_type', array('all' => $this->lang->line('reports_all'), 
 		  'sales' => $this->lang->line('reports_sales'), 	  
 		  'returns' => $this->lang->line('reports_returns')) , 'all', 'id="sale_type"'); ?>
 	</div>
diff --git a/application/views/sales/form.php b/application/views/sales/form.php
index 8c37a7e69..93e3086f1 100755
--- a/application/views/sales/form.php
+++ b/application/views/sales/form.php
@@ -16,7 +16,7 @@
 			<div class="form-group form-group-sm">
 				<?php echo form_label($this->lang->line('sales_date'), 'date', array('class' => 'control-label col-xs-3')); ?>
 				<div class='col-xs-6'>
-					<?php echo form_input(array('name'=>'date','value'=>date($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), strtotime($sale_info['sale_time'])), 'id'=>'datetime', 'class' => 'form-control', 'readonly'=>'true'));?>
+					<?php echo form_input(array('name'=>'date','value'=>date($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), strtotime($sale_info['sale_time'])), 'id'=>'datetime', 'class'=>'form-control input-sm', 'readonly'=>'true'));?>
 				</div>
 			</div>
 			
@@ -25,10 +25,10 @@
 				<div class='col-xs-6'>
 					<?php if (isset($sale_info["invoice_number"]) && !empty($sale_info["invoice_number"]) && 
 						isset($sale_info['customer_id']) && isset($sale_info['email']) && !empty($sale_info['email'])): ?>
-						<?php echo form_input(array('name'=>'invoice_number', 'size'=>10, 'value'=>$sale_info['invoice_number'], 'id'=>'invoice_number', 'class' => 'form-control'));?>
+						<?php echo form_input(array('name'=>'invoice_number', 'size'=>10, 'value'=>$sale_info['invoice_number'], 'id'=>'invoice_number', 'class' => 'form-control input-sm'));?>
 						<a id="send_invoice" href="javascript:void(0);"><?=$this->lang->line('sales_send_invoice')?></a>
 					<?php else: ?>
-						<?php echo form_input(array('name'=>'invoice_number', 'value'=>$sale_info['invoice_number'], 'id'=>'invoice_number', 'class' => 'form-control'));?>
+						<?php echo form_input(array('name'=>'invoice_number', 'value'=>$sale_info['invoice_number'], 'id'=>'invoice_number', 'class' => 'form-control input-sm'));?>
 					<?php endif; ?>
 				</div>
 			</div>
@@ -36,7 +36,7 @@
 			<div class="form-group form-group-sm">
 				<?php echo form_label($this->lang->line('sales_customer'), 'customer', array('class' => 'control-label col-xs-3')); ?>
 				<div class='col-xs-6'>
-					<?php echo form_input(array('name' => 'customer_id', 'value' => $selected_customer, 'id' => 'customer_id', 'class' => 'form-control'));?>
+					<?php echo form_input(array('name' => 'customer_id', 'value' => $selected_customer, 'id' => 'customer_id', 'class' => 'form-control input-sm'));?>
 				</div>
 			</div>
 			
@@ -48,12 +48,11 @@
 			</div>
 			
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('sales_comment'), 'comment',array('class' => 'control-label col-xs-3')); ?>
+				<?php echo form_label($this->lang->line('sales_comment'), 'comment', array('class' => 'control-label col-xs-3')); ?>
 				<div class='col-xs-6'>
-					<?php echo form_textarea(array('name'=>'comment', 'value'=>$sale_info['comment'], 'id'=>'comment', 'class' => 'form-control'));?>
+					<?php echo form_textarea(array('name'=>'comment', 'value'=>$sale_info['comment'], 'id'=>'comment', 'class' => 'form-control input-sm'));?>
 				</div>
 			</div>
-			
 		<?php echo form_close(); ?>
 		
 		<?php echo form_open("sales/delete/".$sale_info['sale_id'], array('id'=>'sales_delete_form')); ?>
@@ -63,8 +62,7 @@
 				'value'=>$this->lang->line('sales_delete_entire_sale'),
 				'class'=>'btn btn-danger btn-sm pull-right',
 				'style'=>'margin-right: 10px;')
-			);
-			?>
+			); ?>
 		<?php echo form_close(); ?>
 	</fieldset>
 </div>
@@ -102,6 +100,33 @@ $(document).ready(function()
     }, '<?php echo $this->lang->line("sales_invoice_number_duplicate"); ?>');
 
 	<?php $this->load->view('partial/datepicker_locale'); ?>
+	
+	$('#datetime').datetimepicker({
+		format: "<?php echo dateformat_bootstrap($this->config->item("dateformat")) . ' ' . dateformat_bootstrap($this->config->item("timeformat"));?>",
+		startDate: "<?php echo date($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), mktime(0, 0, 0, 1, 1, 2010));?>",
+		<?php
+		$t = $this->config->item('timeformat');
+		$m = $t[strlen($t)-1];
+		if( strpos($this->config->item('timeformat'), 'a') !== false || strpos($this->config->item('timeformat'), 'A') !== false )
+		{ 
+		?>
+			showMeridian: true,
+		<?php 
+		}
+		else
+		{
+		?>
+			showMeridian: false,
+		<?php 
+		}
+		?>
+		minuteStep: 1,
+		autoclose: true,
+		todayBtn: true,
+		todayHighlight: true,
+		bootcssVer: 3,
+		language: "<?php echo $this->config->item('language'); ?>"
+	});
 
 	var format_item = function(row)
 	{
diff --git a/application/views/sales/manage.php b/application/views/sales/manage.php
index 9d647230a..e88c0d8a7 100755
--- a/application/views/sales/manage.php
+++ b/application/views/sales/manage.php
@@ -223,8 +223,8 @@ function init_table_sorting()
 
 	<div id="table_action_header">
 		<ul>
-			<li class="float_left"><span><?php echo anchor($controller_name . "/delete",$this->lang->line("common_delete"),array('id'=>'delete')); ?></span></li>
-			<!-- li class="float_left"><span><?php echo anchor($controller_name . "/update_invoice_numbers", $this->lang->line('sales_invoice_update'),array('id'=>'update_invoice_numbers')); ?></span></li -->
+			<li class="float_left"><span><?php echo anchor($controller_name . "/delete",$this->lang->line("common_delete"), array('id'=>'delete')); ?></span></li>
+			<!-- li class="float_left"><span><?php echo anchor($controller_name . "/update_invoice_numbers", $this->lang->line('sales_invoice_update'), array('id'=>'update_invoice_numbers')); ?></span></li -->
 			<li class="float_right">
 				<img src='<?php echo base_url(); ?>images/spinner_small.gif' alt='spinner' id='spinner' />
 				<input type="text" name ='search' id='search'/>
diff --git a/application/views/sales/register.php b/application/views/sales/register.php
index b0a10dd2c..9e56c35fd 100644
--- a/application/views/sales/register.php
+++ b/application/views/sales/register.php
@@ -217,7 +217,7 @@ if (isset($success))
 	}
 	else
 	{
-		echo form_open("sales/select_customer",array('id'=>'select_customer_form'));
+		echo form_open("sales/select_customer", array('id'=>'select_customer_form'));
 	?>
 			<label id="customer_label" for="customer"><?php echo $this->lang->line('sales_select_customer'); ?></label>
 			<?php echo form_input(array('name'=>'customer','id'=>'customer','size'=>'30','value'=>$this->lang->line('sales_start_typing_customer_name')));?>
@@ -318,7 +318,7 @@ if (isset($success))
 
 		<div id="payment_details">
 			<div>
-				<?php echo form_open("sales/add_payment",array('id'=>'add_payment_form')); ?>
+				<?php echo form_open("sales/add_payment", array('id'=>'add_payment_form')); ?>
 					<table width="100%">
 						<tr>
 							<td>
@@ -410,7 +410,7 @@ if (isset($success))
 						<?php
 						foreach($payments as $payment_id=>$payment)
 						{
-							echo form_open("sales/edit_payment/$payment_id",array('id'=>'edit_payment_form'.$payment_id));
+							echo form_open("sales/edit_payment/$payment_id", array('id'=>'edit_payment_form'.$payment_id));
 							?>
 								<tr>
 									<td><?php echo anchor( "sales/delete_payment/$payment_id", '['.$this->lang->line('common_delete').']' ); ?></td>
diff --git a/application/views/suppliers/form.php b/application/views/suppliers/form.php
index 416bca8c6..1ed47437f 100644
--- a/application/views/suppliers/form.php
+++ b/application/views/suppliers/form.php
@@ -1,41 +1,41 @@
-<?php echo form_open('suppliers/save/'.$person_info->person_id,array('id'=>'supplier_form', 'class' => 'form-horizontal')); ?>
+<?php echo form_open('suppliers/save/'.$person_info->person_id, array('id'=>'supplier_form', 'class' => 'form-horizontal')); ?>
 	<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>
 	<fieldset id="supplier_basic_info">
 	<legend><?php echo $this->lang->line("suppliers_basic_information"); ?></legend>
 
-	<div class="form-group">
+	<div class="form-group form-group-sm">
 	<?php echo form_label($this->lang->line('suppliers_company_name'), 'company_name', array('class'=>'required control-label col-xs-3')); ?>
 		<div class='col-xs-6'>
 		<?php echo form_input(array(
 			'name'=>'company_name',
 			'id'=>'company_name_input',
-			'class'=>'form-control',
+			'class'=>'form-control input-sm',
 			'value'=>$person_info->company_name)
 		);?>
 		</div>
 	</div>
 
-	<div class="form-group">	
+	<div class="form-group form-group-sm">	
 	<?php echo form_label($this->lang->line('suppliers_agency_name'), 'agency_name', array('class'=>'control-label col-xs-3')); ?>
 		<div class='col-xs-6'>
 		<?php echo form_input(array(
 			'name'=>'agency_name',
 			'id'=>'agency_name_input',
-			'class'=>'form-control',
+			'class'=>'form-control input-sm',
 			'value'=>$person_info->agency_name)
 		);?>
 		</div>
 	</div>
 
 	<?php $this->load->view("people/form_basic_info"); ?>
-	<div class="form-group">	
+	<div class="form-group form-group-sm">	
 	<?php echo form_label($this->lang->line('suppliers_account_number'), 'account_number', array('class'=>'control-label col-xs-3')); ?>
 		<div class='col-xs-6'>
 		<?php echo form_input(array(
 			'name'=>'account_number',
 			'id'=>'account_number',
-			'class'=>'form-control',
+			'class'=>'form-control input-sm',
 			'value'=>$person_info->account_number)
 		);?>
 		</div>
diff --git a/application/views/suppliers/manage.php b/application/views/suppliers/manage.php
index 29d2d87c2..58ef9f512 100644
--- a/application/views/suppliers/manage.php
+++ b/application/views/suppliers/manage.php
@@ -69,12 +69,12 @@ function post_person_form_submit(response)
 
 <div id="table_action_header">
 	<ul>
-		<li class="float_left"><span><?php echo anchor("$controller_name/delete",$this->lang->line("common_delete"),array('id'=>'delete')); ?></span></li>
+		<li class="float_left"><span><?php echo anchor("$controller_name/delete",$this->lang->line("common_delete"), array('id'=>'delete')); ?></span></li>
 		<li class="float_left"><span><a href="#" id="email"><?php echo $this->lang->line("common_email");?></a></span></li>
 		<li class="float_right">
 			<img src='<?php echo base_url()?>images/spinner_small.gif' alt='spinner' id='spinner' />
 
-			<?php echo form_open("$controller_name/search",array('id'=>'search_form')); ?>
+			<?php echo form_open("$controller_name/search", array('id'=>'search_form')); ?>
 				<input type="text" name ='search' id='search'/>
 				<input type="hidden" name ='limit_from' id='limit_from'/>
 			<?php echo form_close(); ?>