diff --git a/application/language/en/config_lang.php b/application/language/en/config_lang.php
index 601ff242c..c342a5c01 100644
--- a/application/language/en/config_lang.php
+++ b/application/language/en/config_lang.php
@@ -114,7 +114,7 @@ $lang["config_show_total_discount"] = "Show total discount";
 $lang["config_stock_location"] = "Stock location";
 $lang["config_stock_location_duplicate"] = "Please use an unique location name";
 $lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'";
-$lang["config_stock_location_required"] = "Stock location number is a required field";
+$lang["config_stock_location_required"] = "Stock location is a required field";
 $lang["config_tax_included"] = "Tax Included";
 $lang["config_thousands_separator"] = "Thousands Separator";
 $lang["config_timezone"] = "Timezone";
diff --git a/application/views/configs/stock_config.php b/application/views/configs/stock_config.php
index 286a6ed6f..df8833686 100644
--- a/application/views/configs/stock_config.php
+++ b/application/views/configs/stock_config.php
@@ -109,17 +109,35 @@ $(document).ready(function()
 
 		rules: 
 		{
-    		stock_location:
+			<?php
+			$i = 0;
+
+			foreach($stock_locations as $location=>$location_data)
 			{
-        		required: true,
-				stock_location: true,
-				valid_chars: true
-    		}
+			?>
+				<?php echo 'stock_location_' . ++$i ?>:
+				{
+					required: true,
+					stock_location: true,
+					valid_chars: true
+				},
+			<?php
+			}
+			?>
    		},
 
 		messages: 
 		{
-     		stock_location:"<?php echo $this->lang->line('config_stock_location_required'); ?>"
+			<?php
+			$i = 0;
+
+			foreach($stock_locations as $location=>$location_data)
+			{
+			?>
+				<?php echo 'stock_location_' . ++$i ?>: "<?php echo $this->lang->line('config_stock_location_required'); ?>",
+			<?php
+			}
+			?>
 		}
 	});
 });
diff --git a/application/views/items/form.php b/application/views/items/form.php
index ffa3ed66e..226c9a2a8 100644
--- a/application/views/items/form.php
+++ b/application/views/items/form.php
@@ -342,6 +342,7 @@
 					dataType: 'json'
 				});
 			},
+
 			rules:
 			{
 				name:"required",
@@ -388,6 +389,7 @@
 					number:true
 				}
 			},
+
 			messages:
 			{
 				name:"<?php echo $this->lang->line('items_name_required'); ?>",
diff --git a/application/views/partial/stock_locations.php b/application/views/partial/stock_locations.php
index 60c183599..4f339dd5c 100644
--- a/application/views/partial/stock_locations.php
+++ b/application/views/partial/stock_locations.php
@@ -1,13 +1,13 @@
 <?php
 $i = 0;
 
-foreach($stock_locations as $location => $location_data)
+foreach($stock_locations as $location=>$location_data)
 {
 	$location_id = $location_data['location_id'];
 	$location_name = $location_data['location_name'];
 ?>
 	<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'=>'control-label col-xs-2 required')); ?>
 			<div class='col-xs-2'>
 				<?php $form_data = array(
 						'name'=>'stock_location_' . $location_id,
diff --git a/translations/config_lang.csv b/translations/config_lang.csv
index 0d501afbe..abe2e6bca 100644
--- a/translations/config_lang.csv
+++ b/translations/config_lang.csv
@@ -113,7 +113,7 @@ config_show_total_discount,Zeige Gesamtrabatt,Toon Totale Korting,Mostrar Descue
 config_stock_location,Lagerort,Stock locatie,Ubicación de Inventario,Stock location,Stock location,Stock location,Stock location,สถานที่เก็บ,Mağaza Yeri,Lokasi Stock
 config_stock_location_duplicate,Bitte verwenden Sie einen eindeutigen Lagerort,Vul een unieke naam in,Por favor use un nombre de inventario único,Please use an unique location name,Please use an unique location name,Please use an unique location name,Please use an unique location name,,Please use an unique location name,Please use an unique location name
 config_stock_location_invalid_chars,Der Lagerort kann keine Unterstriche enthalten,De bedrijfsnaam moet ingevuld worden,Nombre de la Ubicación de Inventario no debe contener '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_'
-config_stock_location_required,Lagerort Nummer ist erforderlich,Naam van de stock locatie is een verplicht veld,Número de Ubicación de Inventario es requerido,Stock location number is a required field,Stock location number is a required field,Stock location number is a required field,Stock location number is a required field,จำเป็นต้องระบุสถานที่เก็บ,Mağaza Yeri numarası zorunlu alandır,Stock location number is a required field
+config_stock_location_required,Lagerort Nummer ist erforderlich,Naam van de stock locatie is een verplicht veld,Número de Ubicación de Inventario es requerido,Stock location is a required field,Stock location number is a required field,Stock location number is a required field,Stock location number is a required field,จำเป็นต้องระบุสถานที่เก็บ,Mağaza Yeri numarası zorunlu alandır,Stock location number is a required field
 config_tax_included,MWSt inbegriffen,VAT Inbegrepen,Impuestos incluidos,Tax Included,Tax Included,Tax Included,Tax Included,รวมภาษีแล้ว,Tax Included,Dikenakan Pajak
 config_thousands_separator,Tausendertrennzeichen,Thousands Separator,Separador de miles,Thousands Separator,Thousands Separator,Thousands Separator,Thousands Separator,ตัวคั่นหลักพัน,Thousands Separator,Pemisah Ribuan
 config_timezone,Zeitzone,Tijdzone,Zona Horaria,Timezone,Fuseau Horaire,時區,Часовой пояс,โซนเวลา,Saat Dilimi,Zona Waktu