mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-24 16:28:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix subtle error with Stock location SQL query

Browse Source
This commit is contained in:
FrancescoUK
2018-04-29 10:38:38 +01:00
parent 1fe94c3626
commit 3e9e144075
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
application/models/Stock_location.php
View File

@@ -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);
}