Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Rushabh Mehta 2016-08-10 19:47:24 +05:30
commit 7909a30008
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -2,7 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
__version__ = '7.0.25' __version__ = '7.0.26'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

26
erpnext/accounts/page/pos/pos.js
View File

@ -421,19 +421,25 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
} }
key = this.search.$input.val().toLowerCase(); key = this.search.$input.val().toLowerCase();
search_status = true
if(key){ if(key){
return $.grep(window.items, function(item){ return $.grep(window.items, function(item){
if(in_list(item.batch_nos, me.search.$input.val())){ if(search_status){
return me.item_batch_no[item.item_code] = me.search.$input.val() if(in_list(item.batch_nos, me.search.$input.val())){
} else if((item.item_code.toLowerCase().match(key)) || search_status = false;
(item.item_name.toLowerCase().match(key)) || (item.item_group.toLowerCase().match(key))){ return me.item_batch_no[item.item_code] = me.search.$input.val()
return true } else if(in_list(Object.keys(item.serial_nos), me.search.$input.val())) {
}else if(item.barcode == me.search.$input.val()){ search_status = false;
return item.barcode == me.search.$input.val(); me.item_serial_no[item.item_code] = [me.search.$input.val(), item.serial_nos[me.search.$input.val()]]
} else if (in_list(Object.keys(item.serial_nos), me.search.$input.val())){ return true
me.item_serial_no[item.item_code] = [me.search.$input.val(), item.serial_nos[me.search.$input.val()]] } else if(item.barcode == me.search.$input.val()) {
return true 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{ }else{

8
erpnext/patches/v7_0/migrate_schools_to_erpnext.py
View File

@ -1,5 +1,5 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe, os
def execute(): def execute():
reload_doctypes_for_schools_icons() reload_doctypes_for_schools_icons()
@ -21,5 +21,7 @@ def execute():
remove_from_installed_apps("schools") remove_from_installed_apps("schools")
def reload_doctypes_for_schools_icons(): def reload_doctypes_for_schools_icons():
for d in frappe.get_all('DocType', filters={'module': 'Schools'}): base_path = frappe.get_app_path('erpnext', 'schools', 'doctype')
frappe.reload_doc('schools', 'doctype', frappe.scrub(d.name)) 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)