From 5e8367681bda5f3abcc592a89a0350852727b7cc Mon Sep 17 00:00:00 2001
From: jekkos-t520 <jeroen.peelaerts@gmail.com>
Date: Sat, 4 Oct 2014 13:38:52 +0200
Subject: [PATCH] Fix default location in items, sales and receivings

---
 application/controllers/items.php       | 2 +-
 application/libraries/Item_lib.php      | 2 +-
 application/libraries/Receiving_lib.php | 7 +++----
 application/libraries/Sale_lib.php      | 2 +-
 application/models/stock_locations.php  | 4 ++--
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/application/controllers/items.php b/application/controllers/items.php
index 6b1a71a63..23e747b8c 100644
--- a/application/controllers/items.php
+++ b/application/controllers/items.php
@@ -19,7 +19,7 @@ class Items extends Secure_area implements iData_controller
 		
 		$stock_location=$this->item_lib->get_item_location();
 		$stock_locations=$this->Stock_locations->get_allowed_locations();
-		$data['stock_location']=$this->item_lib->get_item_location();
+		$data['stock_location']=$stock_location;
 		$data['stock_locations']=$stock_locations;
 		
 		$data['controller_name']=strtolower(get_class());
diff --git a/application/libraries/Item_lib.php b/application/libraries/Item_lib.php
index 64f3c9853..9517000f9 100644
--- a/application/libraries/Item_lib.php
+++ b/application/libraries/Item_lib.php
@@ -13,7 +13,7 @@ class Item_lib
     {
         if(!$this->CI->session->userdata('item_location'))
         {
-        	 $location_name = $this->Stock_locations->get_default_location();
+        	 $location_name = $this->CI->Stock_locations->get_default_location_id();
              $this->set_item_location($location_name);
         }
         return $this->CI->session->userdata('item_location');
diff --git a/application/libraries/Receiving_lib.php b/application/libraries/Receiving_lib.php
index 24c603af1..f19f4042b 100644
--- a/application/libraries/Receiving_lib.php
+++ b/application/libraries/Receiving_lib.php
@@ -52,7 +52,7 @@ class Receiving_lib
     {
         if(!$this->CI->session->userdata('recv_stock_source'))
         {
-             $location_name = $this->Stock_locations->get_default_location();
+             $location_name = $this->CI->Stock_locations->get_default_location_id();
              $this->set_stock_source($location_name);
         }
         return $this->CI->session->userdata('recv_stock_source');
@@ -87,9 +87,8 @@ class Receiving_lib
     {
         if(!$this->CI->session->userdata('recv_stock_destination'))
         {
-             $stock_locations = $this->CI->Stock_locations->get_undeleted_all()->result_array();
-             $location_name = $stock_locations[0]['location_id'];
-             $this->set_stock_destination($location_name);
+        	$location_name = $this->CI->Stock_locations->get_default_location_id();
+        	$this->set_stock_destination($location_name);
         }
         return $this->CI->session->userdata('recv_stock_destination');
     }
diff --git a/application/libraries/Sale_lib.php b/application/libraries/Sale_lib.php
index 139f9eb18..174f6aa4b 100644
--- a/application/libraries/Sale_lib.php
+++ b/application/libraries/Sale_lib.php
@@ -172,7 +172,7 @@ class Sale_lib
     {
         if(!$this->CI->session->userdata('sale_location'))
         {
-             $location_name = $this->Stock_locations->get_default_location();
+             $location_name = $this->CI->Stock_locations->get_default_location_id();
              $this->set_sale_location($location_name);
         }
         return $this->CI->session->userdata('sale_location');
diff --git a/application/models/stock_locations.php b/application/models/stock_locations.php
index 41bd24ce6..f50adfa88 100644
--- a/application/models/stock_locations.php
+++ b/application/models/stock_locations.php
@@ -61,7 +61,7 @@ class Stock_locations extends CI_Model
     	return $stock_locations;
     }
     
-    function get_default_location_name()
+    function get_default_location_id()
     {
     	$this->db->from('stock_locations');
     	// TODO replace with extra join on ospos_grants
@@ -70,7 +70,7 @@ class Stock_locations extends CI_Model
     	$this->db->where('person_id', $this->session->userdata('person_id'));
     	$this->db->where('deleted',0);
     	$this->db->limit(1);
-    	return $this->db->get()->row()->location_name;
+    	return $this->db->get()->row()->location_id;
     }
     
     function get_location_name($location_id)