From a1eb735d96d63ded8785021716c6db55e5ef109d Mon Sep 17 00:00:00 2001 From: jekkos-t520 Date: Tue, 7 Oct 2014 08:27:31 +0200 Subject: [PATCH] Remove empty check for item_id and quantity_id when saving item_quantities Add configuration key to database script --- application/models/item_quantities.php | 2 +- application/models/stock_locations.php | 2 +- database/database.sql | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/application/models/item_quantities.php b/application/models/item_quantities.php index 48059e535..1ec21a184 100644 --- a/application/models/item_quantities.php +++ b/application/models/item_quantities.php @@ -13,7 +13,7 @@ class Item_quantities extends CI_Model function save($location_detail, $item_id, $location_id) { - if (!($item_id && $location_id) or !$this->exists($item_id,$location_id)) + if (!$this->exists($item_id,$location_id)) { if($this->db->insert('item_quantities',$location_detail)) { diff --git a/application/models/stock_locations.php b/application/models/stock_locations.php index 15d9ad273..5ef5ca6ca 100644 --- a/application/models/stock_locations.php +++ b/application/models/stock_locations.php @@ -112,7 +112,7 @@ class Stock_locations extends CI_Model $this->db->update('stock_locations',array('location_name'=>$db['location_name'],'deleted'=>0)); // remmove module (and permissions) for stock location - //$this->db->delete('modules', array('module_id' => 'items_stock'.$db['location_id'])); + $this->db->delete('permissions', array('module_id' => 'items_'.$db['location_name'])); } $to_create = false; break; diff --git a/database/database.sql b/database/database.sql index 28452abb6..f4b333e9d 100644 --- a/database/database.sql +++ b/database/database.sql @@ -37,7 +37,9 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES ('return_policy', 'Test'), ('timezone', 'America/New_York'), ('website', ''), -('tax_included', '0'); +('tax_included', '0'), +('recv_invoice_format', ''); + -- --------------------------------------------------------