From 43e3400468ff1a6ef2318b753287fbf12b3fdfae Mon Sep 17 00:00:00 2001 From: jekkos Date: Fri, 28 Sep 2018 20:26:52 +0200 Subject: [PATCH] Fix item row refresh (#68) --- application/models/Item.php | 2 +- application/views/attributes/item.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/application/models/Item.php b/application/models/Item.php index f1eab15b8..f3953026b 100644 --- a/application/models/Item.php +++ b/application/models/Item.php @@ -383,7 +383,7 @@ class Item extends CI_Model $this->db->from('items'); $this->db->join('suppliers', 'suppliers.person_id = items.supplier_id', 'left'); $this->db->join('item_quantities', 'item_quantities.item_id = items.item_id', 'left'); - $this->db->join('attribute_links', 'attribute_links.item_id = items.item_id', 'left'); + $this->db->join('attribute_links', 'attribute_links.item_id = items.item_id AND sale_id IS NULL AND receiving_id IS NULL', 'left'); $this->db->join('attribute_values', 'attribute_links.attribute_id = attribute_values.attribute_id', 'left'); $this->db->where('location_id', $location_id); $this->db->where_in('items.item_id', $item_ids); diff --git a/application/views/attributes/item.php b/application/views/attributes/item.php index 7c580207a..fdc3bad3d 100644 --- a/application/views/attributes/item.php +++ b/application/views/attributes/item.php @@ -58,7 +58,6 @@ foreach($definition_values as $definition_id => $definition_value) var enable_delete = function() { $('.remove_attribute_btn').click(function() { $(this).parents('.form-group').remove(); - refresh(); }); };