From 8d6a23d0e72136305b175a4ba2a6da36a6c2a6c1 Mon Sep 17 00:00:00 2001
From: jekkos <jeroen.peelaerts@gmail.com>
Date: Thu, 30 Jan 2020 08:56:39 +0100
Subject: [PATCH] Check if grant for module exists (#2702)

---
 application/libraries/Receiving_lib.php | 4 ++--
 application/libraries/Sale_lib.php      | 2 +-
 application/models/Stock_location.php   | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/application/libraries/Receiving_lib.php b/application/libraries/Receiving_lib.php
index d908fc06a..28bc96200 100644
--- a/application/libraries/Receiving_lib.php
+++ b/application/libraries/Receiving_lib.php
@@ -79,7 +79,7 @@ class Receiving_lib
 	{
 		if(!$this->CI->session->userdata('recv_stock_source'))
 		{
-			$this->set_stock_source($this->CI->Stock_location->get_default_location_id());
+			$this->set_stock_source($this->CI->Stock_location->get_default_location_id('receivings'));
 		}
 
 		return $this->CI->session->userdata('recv_stock_source');
@@ -143,7 +143,7 @@ class Receiving_lib
 	{
 		if(!$this->CI->session->userdata('recv_stock_destination'))
 		{
-			$this->set_stock_destination($this->CI->Stock_location->get_default_location_id());
+			$this->set_stock_destination($this->CI->Stock_location->get_default_location_id('receivings'));
 		}
 
 		return $this->CI->session->userdata('recv_stock_destination');
diff --git a/application/libraries/Sale_lib.php b/application/libraries/Sale_lib.php
index 0fa6cffc5..4f6fe6115 100644
--- a/application/libraries/Sale_lib.php
+++ b/application/libraries/Sale_lib.php
@@ -653,7 +653,7 @@ class Sale_lib
 	{
 		if(!$this->CI->session->userdata('sales_location'))
 		{
-			$this->set_sale_location($this->CI->Stock_location->get_default_location_id());
+			$this->set_sale_location($this->CI->Stock_location->get_default_location_id('sales'));
 		}
 
 		return $this->CI->session->userdata('sales_location');
diff --git a/application/models/Stock_location.php b/application/models/Stock_location.php
index 806dd95f4..dcef4618c 100644
--- a/application/models/Stock_location.php
+++ b/application/models/Stock_location.php
@@ -71,12 +71,13 @@ class Stock_location extends CI_Model
 		return ($this->db->get()->num_rows() == 1);
 	}
 
-	public function get_default_location_id()
+	public function get_default_location_id($module_id = 'items')
 	{
 		$this->db->from('stock_locations');
 		$this->db->join('permissions AS permissions', 'permissions.location_id = stock_locations.location_id');
 		$this->db->join('grants AS grants', 'grants.permission_id = permissions.permission_id');
 		$this->db->where('person_id', $this->session->userdata('person_id'));
+		$this->db->like('permissions.permission_id', $module_id, 'after');
 		$this->db->where('deleted', 0);
 		$this->db->limit(1);