nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-05 13:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2018-02-12 15:59:55 +05:30
parent c89782502c 04338cfb4b
commit e21e59614f
15 changed files with 443 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -301,6 +301,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
this.customers = r.message.customers;
this.serial_no_data = r.message.serial_no_data;
this.batch_no_data = r.message.batch_no_data;
this.barcode_data = r.message.barcode_data;
this.tax_data = r.message.tax_data;
this.contacts = r.message.contacts;
this.address = r.message.address || {};
@@ -415,7 +416,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
});
this.serach_item.make_input();
this.serach_item.$input.on("keypress", function (event) {
clearTimeout(me.last_search_timeout);
@@ -423,7 +424,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
if((me.serach_item.$input.val() != "") || (event.which == 13)) {
me.items = me.get_items();
me.make_item_list();
}
}
}, 400);
});
@@ -1110,9 +1111,9 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
search_status = false;
me.item_serial_no[item.item_code] = [me.serach_item.$input.val(), me.serial_no_data[item.item_code][me.serach_item.$input.val()]]
return true
} else if (item.barcode == me.serach_item.$input.val()) {
} else if (in_list(me.barcode_data[item.item_code], me.serach_item.$input.val())) {
search_status = false;
return item.barcode == me.serach_item.$input.val();
return true;
} else if (reg.test(item.item_code.toLowerCase()) || (item.description && reg.test(item.description.toLowerCase())) ||
reg.test(item.item_name.toLowerCase()) || reg.test(item.item_group.toLowerCase())) {
return true
@@ -1526,8 +1527,8 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
me.print_document(html)
})
}
if (this.frm.doc.docstatus == 1) {
if (this.frm.doc.docstatus == 1) {
this.page.add_menu_item(__("Email"), function () {
me.email_prompt()
})