From 1bb9acdc379be1e05448810c113eddce9b6dd37e Mon Sep 17 00:00:00 2001
From: jekkos <jeroen.peelaerts@gmail.com>
Date: Fri, 4 Dec 2015 08:33:39 +0100
Subject: [PATCH] Fix for adding/deleting stock locations (#242)

---
 application/models/stock_location.php         | 8 ++++----
 application/views/partial/stock_locations.php | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/models/stock_location.php b/application/models/stock_location.php
index 5d5337e1d..f355ad612 100644
--- a/application/models/stock_location.php
+++ b/application/models/stock_location.php
@@ -1,10 +1,10 @@
 <?php
 class Stock_location extends CI_Model
 {
-    function exists($location_id='')
+    function exists($location_name='')
     {
         $this->db->from('stock_locations');  
-        $this->db->where('location_id',$location_id);
+        $this->db->where('location_name',$location_name);
         $query = $this->db->get();
         
         return ($query->num_rows()>=1);
@@ -84,9 +84,9 @@ class Stock_location extends CI_Model
     
     function save(&$location_data,$location_id) 
     {
-    	if (!$this->exists($location_id))
+		$location_name = $location_data['location_name'];
+    	if (!$this->exists($location_name))
     	{
-    		$location_name = $location_data['location_name'];
     		$this->db->trans_start();
     		$location_data = array('location_name'=>$location_name,'deleted'=>0);
    			$this->db->insert('stock_locations',$location_data);
diff --git a/application/views/partial/stock_locations.php b/application/views/partial/stock_locations.php
index 6530ba4e2..c6de78f9d 100644
--- a/application/views/partial/stock_locations.php
+++ b/application/views/partial/stock_locations.php
@@ -3,7 +3,7 @@
 <?php $location_id = $location_data['location_id']; ?>
 <?php $location_name = $location_data['location_name']; ?>
 <div class="field_row clearfix" 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'=>'required wide')); ?>
+  <?php echo form_label($this->lang->line('config_stock_location').' ' .++$i. ':', 'stock_location_'.$i ,array('class'=>'required wide')); ?>
     <div class='form_field'>
     <?php $form_data = array(
         'name'=>'stock_location_'.$location_id,