mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-07-20 11:52:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix Reports and few other minor things

Browse Source
This commit is contained in:
FrancescoUK
2017-12-12 20:58:36 +00:00
parent 323738210b
commit c96c2a69a6
15 changed files with 269 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/models/Item.php
View File

@@ -484,7 +484,7 @@ class Item extends CI_Model
{
$suggestions = array();
$this->db->select($this->get_search_suggestion_format('item_id,name'));
$this->db->select($this->get_search_suggestion_format('item_id, name'));
$this->db->from('items');
$this->db->where('deleted', $filters['is_deleted']);
$this->db->where("item_type = " . ITEM); // standard, exclude kit items since kits will be picked up later
@@ -495,7 +495,7 @@ class Item extends CI_Model
$suggestions[] = array('value' => $row->item_id, 'label' => $this->get_search_suggestion_label($row));
}
$this->db->select($this->get_search_suggestion_format('item_id,item_number'));
$this->db->select($this->get_search_suggestion_format('item_id, item_number'));
$this->db->from('items');
$this->db->where('deleted', $filters['is_deleted']);
$this->db->where("item_type = " . ITEM); // standard, exclude kit items since kits will be picked up later
@@ -576,7 +576,6 @@ class Item extends CI_Model
}
}
//only return $limit suggestions
if(count($suggestions > $limit))
{
@@ -687,7 +686,6 @@ class Item extends CI_Model
}
}
//only return $limit suggestions
if(count($suggestions > $limit))
{