From 3e9e1440751270add97a0e28b0e1e1d21c8cb823 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Sun, 29 Apr 2018 10:38:38 +0100 Subject: [PATCH] Fix subtle error with Stock location SQL query --- application/models/Stock_location.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/application/models/Stock_location.php b/application/models/Stock_location.php index e5ea65ede..b35b4647a 100644 --- a/application/models/Stock_location.php +++ b/application/models/Stock_location.php @@ -25,8 +25,8 @@ class Stock_location extends CI_Model public function get_undeleted_all($module_id = 'items') { $this->db->from('stock_locations'); - $this->db->join('permissions', 'permissions.location_id = stock_locations.location_id'); - $this->db->join('grants', 'grants.permission_id = permissions.permission_id'); + $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); @@ -61,12 +61,12 @@ class Stock_location extends CI_Model public function is_allowed_location($location_id, $module_id = 'items') { $this->db->from('stock_locations'); - $this->db->join('permissions', 'permissions.location_id = stock_locations.location_id'); - $this->db->join('grants', 'grants.permission_id = permissions.permission_id'); + $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->where('stock_locations.location_id', $location_id); + $this->db->where('deleted', 0); return ($this->db->get()->num_rows() == 1); } @@ -74,8 +74,8 @@ class Stock_location extends CI_Model public function get_default_location_id() { $this->db->from('stock_locations'); - $this->db->join('permissions', 'permissions.location_id = stock_locations.location_id'); - $this->db->join('grants', 'grants.permission_id = permissions.permission_id'); + $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->where('deleted', 0); $this->db->limit(1); @@ -139,10 +139,10 @@ class Stock_location extends CI_Model $this->_insert_new_permission('items', $location_id, $location_name); $this->_insert_new_permission('sales', $location_id, $location_name); $this->_insert_new_permission('receivings', $location_id, $location_name); - } $this->db->where('location_id', $location_id); + return $this->db->update('stock_locations', $location_data_to_save); }