nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-21 22:19:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: actually reject process_scan when update_table fails.

Browse Source
This commit is contained in:
Devin Slauenwhite
2022-09-16 17:49:00 -04:00
parent 43ebfa7982
commit 613c8158a8
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/public/js/utils/barcode_scanner.js
View File

@@ -59,14 +59,14 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
} }
me.update_table(data).then(row => { me.update_table(data).then(row => {
row ? resolve(row) : reject(); resolve(row);
}); }).catch(() => reject());
}); });
}); });
} }
update_table(data) { update_table(data) {
return new Promise(resolve => { return new Promise((resolve, reject) => {
let cur_grid = this.frm.fields_dict[this.items_table_name].grid; let cur_grid = this.frm.fields_dict[this.items_table_name].grid;
const {item_code, barcode, batch_no, serial_no, uom} = data; const {item_code, barcode, batch_no, serial_no, uom} = data;
@@ -77,6 +77,7 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
if (this.dont_allow_new_row) { if (this.dont_allow_new_row) {
this.show_alert(__("Maximum quantity scanned for item {0}.", [item_code]), "red"); this.show_alert(__("Maximum quantity scanned for item {0}.", [item_code]), "red");
this.clean_up(); this.clean_up();
reject();
return; return;
} }
@@ -88,6 +89,7 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
if (this.is_duplicate_serial_no(row, serial_no)) { if (this.is_duplicate_serial_no(row, serial_no)) {
this.clean_up(); this.clean_up();
reject();
return; return;
} }