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

Merge pull request #6050 from rohitwaghchaure/pos_serial_no_search_issue

Browse Source 
[Fix] Serial no search issue, if serial no is similar with item code.
This commit is contained in:
Rushabh Mehta 2016-08-10 18:52:17 +05:30 committed by GitHub
commit a7d92bc8f6
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
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(search_status){
if(in_list(item.batch_nos, me.search.$input.val())){ 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() 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)) || } else if((item.item_code.toLowerCase().match(key)) ||
(item.item_name.toLowerCase().match(key)) || (item.item_group.toLowerCase().match(key))) { (item.item_name.toLowerCase().match(key)) || (item.item_group.toLowerCase().match(key))) {
return true 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
} }
}) })
}else{ }else{