Merge pull request #1103 from RuleDomain/restrict-inventory-reports-to-stock-items

Restrict inventory reports to stock items
This commit is contained in:
FrancescoUK
2017-01-31 08:05:54 +00:00
committed by GitHub
2 changed files with 2 additions and 1 deletions

View File

@@ -27,7 +27,7 @@ class Inventory_low extends Report
$this->db->join('stock_locations', 'item_quantities.location_id = stock_locations.location_id');
$this->db->where('items.deleted', 0);
$this->db->where('stock_locations.deleted', 0);
$this->db->where('item_quantities.quantity <= items.reorder_level');
$this->db->where('items.stock_type', 0);
$this->db->order_by('items.name');
return $this->db->get()->result_array();

View File

@@ -28,6 +28,7 @@ class Inventory_summary extends Report
$this->db->join('item_quantities AS item_quantities', 'items.item_id = item_quantities.item_id');
$this->db->join('stock_locations AS stock_locations', 'item_quantities.location_id = stock_locations.location_id');
$this->db->where('items.deleted', 0);
$this->db->where('items.stock_type', 0);
$this->db->where('stock_locations.deleted', 0);
// should be corresponding to values Inventory_summary::getItemCountDropdownArray() returns...