diff --git a/erpnext/__init__.py b/erpnext/__init__.py index c6fd27d4f7..97b7c373af 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import frappe -__version__ = '7.0.25' +__version__ = '7.0.26' def get_default_company(user=None): '''Get default company for user''' diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js index 8444dbe91f..64168b2f4b 100644 --- a/erpnext/accounts/page/pos/pos.js +++ b/erpnext/accounts/page/pos/pos.js @@ -421,19 +421,25 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ } key = this.search.$input.val().toLowerCase(); + search_status = true if(key){ return $.grep(window.items, function(item){ - if(in_list(item.batch_nos, me.search.$input.val())){ - return me.item_batch_no[item.item_code] = me.search.$input.val() - } else if((item.item_code.toLowerCase().match(key)) || - (item.item_name.toLowerCase().match(key)) || (item.item_group.toLowerCase().match(key))){ - return true - }else if(item.barcode == me.search.$input.val()){ - return item.barcode == me.search.$input.val(); - } else if (in_list(Object.keys(item.serial_nos), me.search.$input.val())){ - me.item_serial_no[item.item_code] = [me.search.$input.val(), item.serial_nos[me.search.$input.val()]] - return true + if(search_status){ + if(in_list(item.batch_nos, me.search.$input.val())){ + search_status = false; + return me.item_batch_no[item.item_code] = me.search.$input.val() + } else if(in_list(Object.keys(item.serial_nos), me.search.$input.val())) { + search_status = false; + me.item_serial_no[item.item_code] = [me.search.$input.val(), item.serial_nos[me.search.$input.val()]] + return true + } else if(item.barcode == me.search.$input.val()) { + search_status = false; + return item.barcode == me.search.$input.val(); + } else if((item.item_code.toLowerCase().match(key)) || + (item.item_name.toLowerCase().match(key)) || (item.item_group.toLowerCase().match(key))) { + return true + } } }) }else{ diff --git a/erpnext/patches/v7_0/migrate_schools_to_erpnext.py b/erpnext/patches/v7_0/migrate_schools_to_erpnext.py index 695f6ccbcd..80e9eac896 100644 --- a/erpnext/patches/v7_0/migrate_schools_to_erpnext.py +++ b/erpnext/patches/v7_0/migrate_schools_to_erpnext.py @@ -1,5 +1,5 @@ from __future__ import unicode_literals -import frappe +import frappe, os def execute(): reload_doctypes_for_schools_icons() @@ -21,5 +21,7 @@ def execute(): remove_from_installed_apps("schools") def reload_doctypes_for_schools_icons(): - for d in frappe.get_all('DocType', filters={'module': 'Schools'}): - frappe.reload_doc('schools', 'doctype', frappe.scrub(d.name)) + base_path = frappe.get_app_path('erpnext', 'schools', 'doctype') + for doctype in os.listdir(base_path): + if os.path.exists(os.path.join(base_path, doctype, doctype + '.json')): + frappe.reload_doc('schools', 'doctype', doctype)