From bb0989f6bddd1856943b495eb16673e6a75ef57a Mon Sep 17 00:00:00 2001
From: FrancescoUK <francesco.lodolo.uk@gmail.com>
Date: Mon, 18 Apr 2016 18:31:40 +0100
Subject: [PATCH] Adjust form fields size to give more space and fit better
 dialog form, fixed few details

---
 application/views/customers/form.php          |   6 +-
 application/views/employees/form.php          |  10 +-
 application/views/giftcards/form.php          |  10 +-
 application/views/item_kits/form.php          |  10 +-
 application/views/items/form.php              |  26 +--
 application/views/items/form_bulk.php         |  24 +--
 .../views/items/form_count_details.php        |  12 +-
 application/views/items/form_inventory.php    |  16 +-
 application/views/partial/stock_locations.php |   3 +-
 application/views/people/form_basic_info.php  |  26 +--
 application/views/receivings/form.php         |  94 +++++-----
 application/views/sales/form.php              | 170 +++++++++---------
 application/views/suppliers/form.php          |   6 +-
 13 files changed, 204 insertions(+), 209 deletions(-)

diff --git a/application/views/customers/form.php b/application/views/customers/form.php
index 870213bdb..463ae7815 100644
--- a/application/views/customers/form.php
+++ b/application/views/customers/form.php
@@ -8,7 +8,7 @@
 
 		<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'>
+			<div class='col-xs-8'>
 				<?php echo form_input(array(
 						'name'=>'company_name',
 						'class'=>'form-control input-sm',
@@ -19,7 +19,7 @@
 
 		<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'>
+			<div class='col-xs-4'>
 				<?php echo form_input(array(
 						'name'=>'account_number',
 						'id'=>'account_number',
@@ -31,7 +31,7 @@
 		
 		<div class="form-group form-group-sm">
 			<?php echo form_label($this->lang->line('customers_total'), 'total', array('class' => 'control-label col-xs-3')); ?>
-			<div class="col-xs-6">
+			<div class="col-xs-4">
 				<div class="input-group input-group-sm">
 					<?php if (!$this->config->item('currency_side')): ?>
 						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
diff --git a/application/views/employees/form.php b/application/views/employees/form.php
index 3529b56b4..2e7eba723 100644
--- a/application/views/employees/form.php
+++ b/application/views/employees/form.php
@@ -26,7 +26,7 @@
 			<fieldset>
 				<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-6'>
+					<div class='col-xs-8'>
 						<div class="input-group">
 							<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-user"></span></span>
 							<?php echo form_input(array(
@@ -42,8 +42,8 @@
 				<?php $password_label_attributes = $person_info->person_id == "" ? array('class'=>'required') : array(); ?>
 
 				<div class="form-group form-group-sm">	
-					<?php echo form_label($this->lang->line('employees_password'), 'password', array_merge($password_label_attributes, array('class'=>'col-xs-3 control-label'))); ?>
-					<div class='col-xs-6'>
+					<?php echo form_label($this->lang->line('employees_password'), 'password', array_merge($password_label_attributes, array('class'=>'control-label col-xs-3'))); ?>
+					<div class='col-xs-8'>
 						<div class="input-group">
 							<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-asterisk"></span></span>
 							<?php echo form_password(array(
@@ -56,8 +56,8 @@
 				</div>
 
 				<div class="form-group form-group-sm">	
-				<?php echo form_label($this->lang->line('employees_repeat_password'), 'repeat_password', array_merge($password_label_attributes, array('class'=>'col-xs-3 control-label'))); ?>
-					<div class='col-xs-6'>
+				<?php echo form_label($this->lang->line('employees_repeat_password'), 'repeat_password', array_merge($password_label_attributes, array('class'=>'control-label col-xs-3'))); ?>
+					<div class='col-xs-8'>
 						<div class="input-group">
 							<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-asterisk"></span></span>
 							<?php echo form_password(array(
diff --git a/application/views/giftcards/form.php b/application/views/giftcards/form.php
index 16266d79b..3d408ad87 100644
--- a/application/views/giftcards/form.php
+++ b/application/views/giftcards/form.php
@@ -6,7 +6,7 @@
 	<fieldset id="giftcard_basic_info">
 		<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'>
+			<div class='col-xs-8'>
 				<?php echo form_input(array(
 						'name'=>'person_name',
 						'id'=>'person_name',
@@ -19,7 +19,7 @@
 
 		<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'>
+			<div class='col-xs-4'>
 				<?php echo form_input(array(
 						'name'=>'giftcard_number',
 						'id'=>'giftcard_number',
@@ -31,10 +31,10 @@
 
 		<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'>
+			<div class='col-xs-4'>
 				<div class="input-group input-group-sm">
 					<?php if (!$this->config->item('currency_side')): ?>
-					<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
 					<?php endif; ?>
 					<?php echo form_input(array(
 							'name'=>'value',
@@ -43,7 +43,7 @@
 							'value'=>to_currency_no_money($giftcard_info->value))
 							);?>
 					<?php if ($this->config->item('currency_side')): ?>
-					<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
 					<?php endif; ?>
 				</div>
 			</div>
diff --git a/application/views/item_kits/form.php b/application/views/item_kits/form.php
index 7b210e51a..5fcb3a43d 100644
--- a/application/views/item_kits/form.php
+++ b/application/views/item_kits/form.php
@@ -3,10 +3,10 @@
 <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')); ?>
-	<fieldset id="item_kit_info">
+	<fieldset id="item_kit_basic_info">
 		<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_label($this->lang->line('item_kits_name'), 'name', array('class'=>'required control-label col-xs-3')); ?>
+			<div class='col-xs-8'>
 				<?php echo form_input(array(
 						'name'=>'name',
 						'id'=>'name',
@@ -18,7 +18,7 @@
 
 		<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'>
+			<div class='col-xs-8'>
 				<?php echo form_textarea(array(
 						'name'=>'description',
 						'id'=>'description',
@@ -30,7 +30,7 @@
 
 		<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'>
+			<div class='col-xs-8'>
 				<?php echo form_input(array(
 						'name'=>'item',
 						'id'=>'item',
diff --git a/application/views/items/form.php b/application/views/items/form.php
index bb46e1889..9d7db0ef9 100644
--- a/application/views/items/form.php
+++ b/application/views/items/form.php
@@ -6,7 +6,7 @@
 	<fieldset id="item_basic_info">
 		<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'>
+			<div class='col-xs-8'>
 				<div class="input-group">
 					<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-barcode"></span></span>
 					<?php echo form_input(array(
@@ -21,7 +21,7 @@
 
 		<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'>
+			<div class='col-xs-8'>
 				<?php echo form_input(array(
 						'name'=>'name',
 						'id'=>'name',
@@ -33,7 +33,7 @@
 
 		<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'>
+			<div class='col-xs-8'>
 				<div class="input-group">
 					<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-tag"></span></span>
 					<?php echo form_input(array(
@@ -48,7 +48,7 @@
 
 		<div class="form-group form-group-sm">
 			<?php echo form_label($this->lang->line('items_supplier'), 'supplier', array('class'=>'control-label col-xs-3')); ?>
-			<div class='col-xs-6'>
+			<div class='col-xs-8'>
 				<?php echo form_dropdown('supplier_id', $suppliers, $selected_supplier, array('class'=>'form-control')); ?>
 			</div>
 		</div>
@@ -95,7 +95,7 @@
 
 		<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-xs-3'>
+			<div class='col-xs-4'>
 				<?php echo form_input(array(
 						'name'=>'tax_names[]',
 						'id'=>'tax_name_1',
@@ -103,7 +103,7 @@
 						'value'=>isset($item_tax_info[0]['name']) ? $item_tax_info[0]['name'] : $this->config->item('default_tax_1_name'))
 						);?>
 			</div>
-			<div class="col-xs-3">
+			<div class="col-xs-4">
 				<div class="input-group input-group-sm">
 					<?php echo form_input(array(
 							'name'=>'tax_percents[]',
@@ -118,7 +118,7 @@
 
 		<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-xs-3'>
+			<div class='col-xs-4'>
 				<?php echo form_input(array(
 						'name'=>'tax_names[]',
 						'id'=>'tax_name_2',
@@ -126,7 +126,7 @@
 						'value'=>isset($item_tax_info[1]['name']) ? $item_tax_info[1]['name'] : $this->config->item('default_tax_2_name'))
 						);?>
 			</div>
-			<div class="col-xs-3">
+			<div class="col-xs-4">
 				<div class="input-group input-group-sm">
 					<?php echo form_input(array(
 							'name'=>'tax_percents[]',
@@ -145,7 +145,7 @@
 		?>
 			<div class="form-group form-group-sm">
 				<?php echo form_label($this->lang->line('items_quantity').' '.$location_detail['location_name'], 'quantity_' . $key, array('class'=>'required control-label col-xs-3')); ?>
-				<div class='col-xs-3'>
+				<div class='col-xs-4'>
 					<?php echo form_input(array(
 							'name'=>'quantity_' . $key,
 							'id'=>'quantity_' . $key,
@@ -160,7 +160,7 @@
 
 		<div class="form-group form-group-sm">
 			<?php echo form_label($this->lang->line('items_receiving_quantity'), 'receiving_quantity', array('class'=>'required control-label col-xs-3')); ?>
-			<div class='col-xs-3'>
+			<div class='col-xs-4'>
 				<?php echo form_input(array(
 						'name'=>'receiving_quantity',
 						'id'=>'receiving_quantity',
@@ -172,7 +172,7 @@
 
 		<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-3'>
+			<div class='col-xs-4'>
 				<?php echo form_input(array(
 						'name'=>'reorder_level',
 						'id'=>'reorder_level',
@@ -184,7 +184,7 @@
 
 		<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'>
+			<div class='col-xs-8'>
 				<?php echo form_textarea(array(
 						'name'=>'description',
 						'id'=>'description',
@@ -263,7 +263,7 @@
 			?>
 				<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-xs-8'>
 						<?php echo form_input(array(
 								'name'=>'custom'.$i,
 								'id'=>'custom'.$i,
diff --git a/application/views/items/form_bulk.php b/application/views/items/form_bulk.php
index ab6e3c177..ba97abe9a 100644
--- a/application/views/items/form_bulk.php
+++ b/application/views/items/form_bulk.php
@@ -3,10 +3,10 @@
 <ul id="error_message_box" class="error_message_box"></ul>
 
 <?php echo form_open('items/bulk_update/', array('id'=>'item_form', 'class'=>'form-horizontal')); ?>
-	<fieldset id="item_basic_info">
+	<fieldset id="bulk_item_basic_info">
 		<div class="form-group form-group-sm">	
 			<?php echo form_label($this->lang->line('items_name'), 'name', array('class'=>'control-label col-xs-3')); ?>
-			<div class='col-xs-6'>
+			<div class='col-xs-8'>
 				<?php echo form_input(array(
 						'name'=>'name',
 						'id'=>'name',
@@ -17,7 +17,7 @@
 
 		<div class="form-group form-group-sm">	
 			<?php echo form_label($this->lang->line('items_category'), 'category', array('class'=>'control-label col-xs-3')); ?>
-			<div class='col-xs-6'>
+			<div class='col-xs-8'>
 				<div class="input-group">
 					<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-tag"></span></span>
 					<?php echo form_input(array(
@@ -31,7 +31,7 @@
 
 		<div class="form-group form-group-sm">	
 			<?php echo form_label($this->lang->line('items_supplier'), 'supplier', array('class'=>'control-label col-xs-3')); ?>
-			<div class='col-xs-6'>
+			<div class='col-xs-8'>
 				<?php echo form_dropdown('supplier_id', $suppliers, '', array('class'=>'form-control'));?>
 			</div>
 		</div>
@@ -76,7 +76,7 @@
 
 		<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'>
+			<div class='col-xs-4'>
 				<?php echo form_input(array(
 						'name'=>'tax_names[]',
 						'id'=>'tax_name_1',
@@ -84,7 +84,7 @@
 						'value'=>$this->config->item('default_tax_1_name'))
 						);?>
 			</div>
-			<div class="col-sm-3">
+			<div class="col-xs-4">
 				<div class="input-group input-group-sm">
 					<?php echo form_input(array(
 							'name'=>'tax_percents[]',
@@ -99,7 +99,7 @@
 
 		<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'>
+			<div class='col-xs-4'>
 				<?php echo form_input(array(
 						'name'=>'tax_names[]',
 						'id'=>'tax_name_2',
@@ -107,7 +107,7 @@
 						'value'=>$this->config->item('default_tax_2_name'))
 						);?>
 			</div>
-			<div class="col-sm-3">
+			<div class="col-xs-4">
 				<div class="input-group input-group-sm">
 					<?php echo form_input(array(
 							'name'=>'tax_percents[]',
@@ -122,7 +122,7 @@
 
 		<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')); ?>
-			<div class='col-xs-3'>
+			<div class='col-xs-4'>
 				<?php echo form_input(array(
 						'name'=>'reorder_level',
 						'id'=>'reorder_level',
@@ -133,7 +133,7 @@
 
 		<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-5'>
+			<div class='col-xs-8'>
 				<?php echo form_textarea(array(
 						'name'=>'description',
 						'id'=>'description',
@@ -144,14 +144,14 @@
 
 		<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-5'>
+			<div class='col-xs-8'>
 				<?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')); ?>
-			<div class='col-xs-5'>
+			<div class='col-xs-8'>
 				<?php echo form_dropdown('is_serialized', $serialization_choices, '', array('class'=>'form-control'));?>
 			</div>
 		</div>
diff --git a/application/views/items/form_count_details.php b/application/views/items/form_count_details.php
index a81c7e26a..197c75c02 100644
--- a/application/views/items/form_count_details.php
+++ b/application/views/items/form_count_details.php
@@ -1,8 +1,8 @@
 <?php echo form_open('items/save_inventory/'.$item_info->item_id, array('id'=>'item_form', 'class'=>'form-horizontal')); ?>
-	<fieldset id="inv_item_basic_info">
+	<fieldset id="count_item_basic_info">
 		<div class="form-group form-group-sm">
 			<?php echo form_label($this->lang->line('items_item_number'), 'name', array('class'=>'control-label col-xs-3')); ?>
-			<div class="col-xs-6">
+			<div class="col-xs-8">
 				<div class="input-group">
 					<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-barcode"></span></span>
 					<?php echo form_input(array(
@@ -18,7 +18,7 @@
 
 		<div class="form-group form-group-sm">
 			<?php echo form_label($this->lang->line('items_name'), 'name', array('class'=>'control-label col-xs-3')); ?>
-			<div class='col-xs-6'>
+			<div class='col-xs-8'>
 				<?php echo form_input(array(
 						'name'=>'name',
 						'id'=>'name',
@@ -31,7 +31,7 @@
 
 		<div class="form-group form-group-sm">
 			<?php echo form_label($this->lang->line('items_category'), 'category', array('class'=>'control-label col-xs-3')); ?>
-			<div class='col-xs-6'>
+			<div class='col-xs-8'>
 				<div class="input-group">
 					<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-tag"></span></span>
 					<?php echo form_input(array(
@@ -47,14 +47,14 @@
 
 		<div class="form-group form-group-sm">
 			<?php echo form_label($this->lang->line('items_stock_location'), 'stock_location', array('class'=>'control-label col-xs-3')); ?>
-			<div class='col-xs-6'>
+			<div class='col-xs-8'>
 				<?php echo form_dropdown('stock_location', $stock_locations, current($stock_locations), array('onchange'=>'display_stock(this.value);', 'class'=>'form-control'));	?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
 			<?php echo form_label($this->lang->line('items_current_quantity'), 'quantity', array('class'=>'control-label col-xs-3')); ?>
-			<div class='col-xs-3'>
+			<div class='col-xs-4'>
 				<?php echo form_input(array(
 						'name'=>'quantity',
 						'id'=>'quantity',
diff --git a/application/views/items/form_inventory.php b/application/views/items/form_inventory.php
index 908676f3b..91074367e 100644
--- a/application/views/items/form_inventory.php
+++ b/application/views/items/form_inventory.php
@@ -3,10 +3,10 @@
 <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', 'class'=>'form-horizontal')); ?>
-	<fieldset id="item_basic_info">
+	<fieldset id="inv_item_basic_info">
 		<div class="form-group form-group-sm">
 			<?php echo form_label($this->lang->line('items_item_number'), 'name', array('class'=>'control-label col-xs-3')); ?>
-			<div class="col-xs-6">
+			<div class="col-xs-8">
 				<div class="input-group">
 					<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-barcode"></span></span>
 					<?php echo form_input(array(
@@ -22,7 +22,7 @@
 
 		<div class="form-group form-group-sm">
 			<?php echo form_label($this->lang->line('items_name'), 'name', array('class'=>'control-label col-xs-3')); ?>
-			<div class='col-xs-6'>
+			<div class='col-xs-8'>
 				<?php echo form_input(array(
 						'name'=>'name',
 						'id'=>'name',
@@ -35,7 +35,7 @@
 
 		<div class="form-group form-group-sm">
 			<?php echo form_label($this->lang->line('items_category'), 'category', array('class'=>'control-label col-xs-3')); ?>
-			<div class='col-xs-6'>
+			<div class='col-xs-8'>
 				<div class="input-group">
 					<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-tag"></span></span>
 					<?php echo form_input(array(
@@ -51,14 +51,14 @@
 
 		<div class="form-group form-group-sm">
 			<?php echo form_label($this->lang->line('items_stock_location'), 'stock_location', array('class'=>'control-label col-xs-3')); ?>
-			<div class='col-xs-6'>
+			<div class='col-xs-8'>
 				<?php echo form_dropdown('stock_location', $stock_locations, current($stock_locations), array('onchange'=>'fill_quantity(this.value)', 'class'=>'form-control'));	?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
 			<?php echo form_label($this->lang->line('items_current_quantity'), 'quantity', array('class'=>'control-label col-xs-3')); ?>
-			<div class='col-xs-3'>
+			<div class='col-xs-4'>
 				<?php echo form_input(array(
 						'name'=>'quantity',
 						'id'=>'quantity',
@@ -71,7 +71,7 @@
 
 		<div class="form-group form-group-sm">
 			<?php echo form_label($this->lang->line('items_add_minus'), 'quantity', array('class'=>'required control-label col-xs-3')); ?>
-			<div class='col-xs-3'>
+			<div class='col-xs-4'>
 				<?php echo form_input(array(
 						'name'=>'newquantity',
 						'id'=>'newquantity',
@@ -82,7 +82,7 @@
 
 		<div class="form-group form-group-sm">
 			<?php echo form_label($this->lang->line('items_inventory_comments'), 'description', array('class'=>'control-label col-xs-3')); ?>
-			<div class='col-xs-6'>
+			<div class='col-xs-8'>
 				<?php echo form_textarea(array(
 						'name'=>'trans_comment',
 						'id'=>'trans_comment',
diff --git a/application/views/partial/stock_locations.php b/application/views/partial/stock_locations.php
index 1a561eeea..3e5042375 100644
--- a/application/views/partial/stock_locations.php
+++ b/application/views/partial/stock_locations.php
@@ -5,9 +5,10 @@ foreach($stock_locations as $location=>$location_data)
 {
 	$location_id = $location_data['location_id'];
 	$location_name = $location_data['location_name'];
+	$i++;
 ?>
 	<div class="form-group form-group-sm" style="<?php echo $location_data['deleted'] ? 'display:none;' : 'display:block;' ?>">
-		<?php echo form_label($this->lang->line('config_stock_location') . ' ' . ++$i, 'stock_location_' . $i, array('class'=>'control-label col-xs-2 required')); ?>
+		<?php echo form_label($this->lang->line('config_stock_location') . ' ' . $i, 'stock_location_' . $i, array('class'=>'required control-label col-xs-2')); ?>
 		<div class='col-xs-2'>
 			<?php $form_data = array(
 					'name'=>'stock_location_' . $location_id,
diff --git a/application/views/people/form_basic_info.php b/application/views/people/form_basic_info.php
index 622e080c3..1bbef2162 100644
--- a/application/views/people/form_basic_info.php
+++ b/application/views/people/form_basic_info.php
@@ -1,6 +1,6 @@
 <div class="form-group form-group-sm">	
 	<?php echo form_label($this->lang->line('common_first_name'), 'first_name', array('class'=>'required control-label col-xs-3')); ?>
-	<div class='col-xs-6'>
+	<div class='col-xs-8'>
 		<?php echo form_input(array(
 				'name'=>'first_name',
 				'id'=>'first_name',
@@ -11,8 +11,8 @@
 </div>
 
 <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_label($this->lang->line('common_last_name'), 'last_name', array('class'=>'required control-label col-xs-3')); ?>
+	<div class='col-xs-8'>
 		<?php echo form_input(array(
 				'name'=>'last_name',
 				'id'=>'last_name',
@@ -23,7 +23,7 @@
 </div>
 
 <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')); ?>
+	<?php echo form_label($this->lang->line('common_gender'), 'gender', !empty($basic_version) ? array('class'=>'required control-label col-xs-3') : array('class'=>'control-label col-xs-3')); ?>
 	<div class="col-xs-4">
 		<label class="radio-inline">
 			<?php echo form_radio(array(
@@ -49,7 +49,7 @@
 
 <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'>
+	<div class='col-xs-8'>
 		<div class="input-group">
 			<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-envelope"></span></span>
 			<?php echo form_input(array(
@@ -64,7 +64,7 @@
 
 <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'>
+	<div class='col-xs-8'>
 		<div class="input-group">
 			<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-phone-alt"></span></span>
 			<?php echo form_input(array(
@@ -79,7 +79,7 @@
 
 <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'>
+	<div class='col-xs-8'>
 		<?php echo form_input(array(
 				'name'=>'address_1',
 				'id'=>'address_1',
@@ -91,7 +91,7 @@
 
 <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'>
+	<div class='col-xs-8'>
 		<?php echo form_input(array(
 				'name'=>'address_2',
 				'id'=>'address_2',
@@ -103,7 +103,7 @@
 
 <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'>
+	<div class='col-xs-8'>
 		<?php echo form_input(array(
 				'name'=>'city',
 				'id'=>'city',
@@ -115,7 +115,7 @@
 
 <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'>
+	<div class='col-xs-8'>
 		<?php echo form_input(array(
 				'name'=>'state',
 				'id'=>'state',
@@ -127,7 +127,7 @@
 
 <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'>
+	<div class='col-xs-8'>
 		<?php echo form_input(array(
 				'name'=>'zip',
 				'id'=>'postcode',
@@ -139,7 +139,7 @@
 
 <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'>
+	<div class='col-xs-8'>
 		<?php echo form_input(array(
 				'name'=>'country',
 				'id'=>'country',
@@ -151,7 +151,7 @@
 
 <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'>
+	<div class='col-xs-8'>
 		<?php echo form_textarea(array(
 				'name'=>'comments',
 				'id'=>'comments',
diff --git a/application/views/receivings/form.php b/application/views/receivings/form.php
index ac8ce3f17..9e0c5fb4e 100755
--- a/application/views/receivings/form.php
+++ b/application/views/receivings/form.php
@@ -2,58 +2,54 @@
 
 <ul id="error_message_box" class="error_message_box"></ul>
 
-<div id="edit_sale_wrapper">
+<?php echo form_open("receivings/save/".$receiving_info['receiving_id'], array('id'=>'recvs_edit_form', 'class'=>'form-horizontal')); ?>
 	<fieldset id="receiving_basic_info">
-		<?php echo form_open("receivings/save/".$receiving_info['receiving_id'], array('id'=>'recvs_edit_form', 'class'=>'form-horizontal')); ?>		
-			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('recvs_receipt_number'), 'supplier', array('class'=>'control-label col-xs-3')); ?>
-				<div class='col-xs-6'>
-					<?php echo anchor('receivings/receipt/'.$receiving_info['receiving_id'], $this->lang->line('recvs_receipt_number') .$receiving_info['receiving_id'], array('target' => '_blank'));?>
-				</div>
-			</div>
-			
-			<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 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_name, 'id' => 'supplier_id', 'class'=>'form-control input-sm'));?>
-					<?php echo form_hidden('supplier_id', $selected_supplier_id);?>
-				</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 input-sm'));?>
-				</div>
-			</div>
-			
-			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('recvs_employee'), 'employee', array('class'=>'control-label col-xs-3')); ?>
-				<div class='col-xs-6'>
-					<?php echo form_dropdown('employee_id', $employees, $receiving_info['employee_id'], 'id="employee_id" class="form-control"');?>
-				</div>
-			</div>
-			
-			<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 input-sm'));?>
-				</div>
-			</div>
-		<?php echo form_close(); ?>
+		<div class="form-group form-group-sm">
+			<?php echo form_label($this->lang->line('recvs_receipt_number'), 'supplier', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo anchor('receivings/receipt/'.$receiving_info['receiving_id'], 'RECV ' . $receiving_info['receiving_id'], array('target'=>'_blank', 'class'=>'control-label col-xs-8', "style"=>"text-align:left"));?>
+		</div>
 		
-		<?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_close(); ?>
+		<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-8'>
+				<?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-8'>
+				<?php echo form_input(array('name' => 'supplier_id', 'value' => $selected_supplier_name, 'id' => 'supplier_id', 'class'=>'form-control input-sm'));?>
+				<?php echo form_hidden('supplier_id', $selected_supplier_id);?>
+			</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-8'>
+				<?php echo form_input(array('name' => 'invoice_number', 'value' => $receiving_info['invoice_number'], 'id' => 'invoice_number', 'class'=>'form-control input-sm'));?>
+			</div>
+		</div>
+		
+		<div class="form-group form-group-sm">
+			<?php echo form_label($this->lang->line('recvs_employee'), 'employee', array('class'=>'control-label col-xs-3')); ?>
+			<div class='col-xs-8'>
+				<?php echo form_dropdown('employee_id', $employees, $receiving_info['employee_id'], 'id="employee_id" class="form-control"');?>
+			</div>
+		</div>
+		
+		<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-8'>
+				<?php echo form_textarea(array('name'=>'comment','value'=>$receiving_info['comment'], 'id'=>'comment', 'class'=>'form-control input-sm'));?>
+			</div>
+		</div>
 	</fieldset>
-</div>
+<?php echo form_close(); ?>
+		
+<?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_close(); ?>
 
 <script type="text/javascript" language="javascript">
 $(document).ready(function()
diff --git a/application/views/sales/form.php b/application/views/sales/form.php
index 8e90f8cb9..0a9406024 100755
--- a/application/views/sales/form.php
+++ b/application/views/sales/form.php
@@ -2,95 +2,93 @@
 
 <ul id="error_message_box" class="error_message_box"></ul>
 
-<div id="edit_sale_wrapper">
+<?php echo form_open("sales/save/".$sale_info['sale_id'], array('id'=>'sales_edit_form', 'class'=>'form-horizontal')); ?>
 	<fieldset id="sale_basic_info">
-		<?php echo form_open("sales/save/".$sale_info['sale_id'], array('id'=>'sales_edit_form', 'class'=>'form-horizontal')); ?>	
-			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('sales_receipt_number'), 'receipt_number', array('class'=>'control-label col-xs-3')); ?>
-				<?php echo anchor('sales/receipt/'.$sale_info['sale_id'], 'POS ' . $sale_info['sale_id'], array('target'=>'_blank', 'class'=>'control-label col-xs-6', "style"=>"text-align:left"));?>
-			</div>
-			
-			<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 input-sm', 'readonly'=>'true'));?>
-				</div>
-			</div>
-			
-			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('sales_invoice_number'), 'invoice_number', array('class'=>'control-label col-xs-3')); ?>
-				<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 input-sm'));?>
-						<a id="send_invoice" href="javascript:void(0);"><?php echo $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 input-sm'));?>
-					<?php endif; ?>
-				</div>
-			</div>
-
-			<?php 
-			$i = 0;
-			foreach($payments->result() as $row)
-			{
-			?>
-				<div class="form-group form-group-sm">
-					<?php echo form_label($this->lang->line('sales_payment'), 'payment_'.$i, array('class'=>'control-label col-xs-3')); ?>
-					<div class='col-xs-3'>
-							<?php // no editing of Gift Card payments as it's a complex change ?>
-							<?php if( !empty(strstr($row->payment_type, $this->lang->line('sales_giftcard'))) ): ?>
-								<?php echo form_input(array('name'=>'payment_type_'.$i, 'value'=>$row->payment_type, 'id'=>'payment_type_'.$i, 'class'=>'form-control input-sm', 'readonly'=>'true'));?>
-							<?php else: ?>
-								<?php echo form_dropdown('payment_type_'.$i, $payment_options, $row->payment_type, array('id'=>'payment_types_'.$i, 'class'=>'form-control')); ?>
-							<?php endif; ?>
-					</div>
-					<div class='col-xs-3'>
-						<div class="input-group input-group-sm">
-							<?php if(!$this->config->item('currency_side')): ?>
-								<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
-							<?php endif; ?>
-							<?php echo form_input(array('name'=>'payment_amount_'.$i, 'value'=>$row->payment_amount, 'id'=>'payment_amount_'.$i, 'class'=>'form-control input-sm', 'readonly'=>'true'));?>
-							<?php if ($this->config->item('currency_side')): ?>
-								<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
-							<?php endif; ?>
-						</div>
-					</div>
-				</div>
-			<?php 
-			$i++;
-			}
-			echo form_hidden('number_of_payments', $i);			
-			?>
-			
-			<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_name', 'value'=>$selected_customer_name, 'id'=>'customer_name', 'class'=>'form-control input-sm'));?>
-					<?php echo form_hidden('customer_id', $selected_customer_id);?>
-				</div>
-			</div>
-			
-			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('sales_employee'), 'employee', array('class'=>'control-label col-xs-3')); ?>
-				<div class='col-xs-6'>
-					<?php echo form_dropdown('employee_id', $employees, $sale_info['employee_id'], 'id="employee_id" class="form-control"');?>
-				</div>
-			</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')); ?>
-				<div class='col-xs-6'>
-					<?php echo form_textarea(array('name'=>'comment', 'value'=>$sale_info['comment'], 'id'=>'comment', 'class'=>'form-control input-sm'));?>
-				</div>
-			</div>
-		<?php echo form_close(); ?>
+		<div class="form-group form-group-sm">
+			<?php echo form_label($this->lang->line('sales_receipt_number'), 'receipt_number', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo anchor('sales/receipt/'.$sale_info['sale_id'], 'POS ' . $sale_info['sale_id'], array('target'=>'_blank', 'class'=>'control-label col-xs-8', "style"=>"text-align:left"));?>
+		</div>
 		
-		<?php echo form_open("sales/delete/".$sale_info['sale_id'], array('id'=>'sales_delete_form')); ?>
-			<?php echo form_hidden('sale_id', $sale_info['sale_id']);?>
-		<?php echo form_close(); ?>
+		<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-8'>
+				<?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>
+		
+		<div class="form-group form-group-sm">
+			<?php echo form_label($this->lang->line('sales_invoice_number'), 'invoice_number', array('class'=>'control-label col-xs-3')); ?>
+			<div class='col-xs-8'>
+				<?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 input-sm'));?>
+					<a id="send_invoice" href="javascript:void(0);"><?php echo $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 input-sm'));?>
+				<?php endif; ?>
+			</div>
+		</div>
+
+		<?php 
+		$i = 0;
+		foreach($payments->result() as $row)
+		{
+		?>
+			<div class="form-group form-group-sm">
+				<?php echo form_label($this->lang->line('sales_payment'), 'payment_'.$i, array('class'=>'control-label col-xs-3')); ?>
+				<div class='col-xs-4'>
+						<?php // no editing of Gift Card payments as it's a complex change ?>
+						<?php if( !empty(strstr($row->payment_type, $this->lang->line('sales_giftcard'))) ): ?>
+							<?php echo form_input(array('name'=>'payment_type_'.$i, 'value'=>$row->payment_type, 'id'=>'payment_type_'.$i, 'class'=>'form-control input-sm', 'readonly'=>'true'));?>
+						<?php else: ?>
+							<?php echo form_dropdown('payment_type_'.$i, $payment_options, $row->payment_type, array('id'=>'payment_types_'.$i, 'class'=>'form-control')); ?>
+						<?php endif; ?>
+				</div>
+				<div class='col-xs-4'>
+					<div class="input-group input-group-sm">
+						<?php if(!$this->config->item('currency_side')): ?>
+							<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<?php endif; ?>
+						<?php echo form_input(array('name'=>'payment_amount_'.$i, 'value'=>$row->payment_amount, 'id'=>'payment_amount_'.$i, 'class'=>'form-control input-sm', 'readonly'=>'true'));?>
+						<?php if ($this->config->item('currency_side')): ?>
+							<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<?php endif; ?>
+					</div>
+				</div>
+			</div>
+		<?php 
+		$i++;
+		}
+		echo form_hidden('number_of_payments', $i);			
+		?>
+		
+		<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-8'>
+				<?php echo form_input(array('name'=>'customer_name', 'value'=>$selected_customer_name, 'id'=>'customer_name', 'class'=>'form-control input-sm'));?>
+				<?php echo form_hidden('customer_id', $selected_customer_id);?>
+			</div>
+		</div>
+		
+		<div class="form-group form-group-sm">
+			<?php echo form_label($this->lang->line('sales_employee'), 'employee', array('class'=>'control-label col-xs-3')); ?>
+			<div class='col-xs-8'>
+				<?php echo form_dropdown('employee_id', $employees, $sale_info['employee_id'], 'id="employee_id" class="form-control"');?>
+			</div>
+		</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')); ?>
+			<div class='col-xs-8'>
+				<?php echo form_textarea(array('name'=>'comment', 'value'=>$sale_info['comment'], 'id'=>'comment', 'class'=>'form-control input-sm'));?>
+			</div>
+		</div>
 	</fieldset>
-</div>
+<?php echo form_close(); ?>
+		
+<?php echo form_open("sales/delete/".$sale_info['sale_id'], array('id'=>'sales_delete_form')); ?>
+	<?php echo form_hidden('sale_id', $sale_info['sale_id']);?>
+<?php echo form_close(); ?>
 
 <script type="text/javascript" language="javascript">
 $(document).ready(function()
diff --git a/application/views/suppliers/form.php b/application/views/suppliers/form.php
index 922aabaf0..6e808e1d5 100644
--- a/application/views/suppliers/form.php
+++ b/application/views/suppliers/form.php
@@ -6,7 +6,7 @@
 	<fieldset id="supplier_basic_info">
 		<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'>
+			<div class='col-xs-8'>
 				<?php echo form_input(array(
 					'name'=>'company_name',
 					'id'=>'company_name_input',
@@ -18,7 +18,7 @@
 
 		<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'>
+			<div class='col-xs-8'>
 				<?php echo form_input(array(
 					'name'=>'agency_name',
 					'id'=>'agency_name_input',
@@ -32,7 +32,7 @@
 
 		<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'>
+			<div class='col-xs-8'>
 				<?php echo form_input(array(
 					'name'=>'account_number',
 					'id'=>'account_number',