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

fix: ignore circular dependencies on barcode scan

Browse Source
This commit is contained in:
Ankush Menat 2022-03-27 22:15:38 +05:30 committed by Ankush Menat
parent 806f420ddd
commit 98468fab18
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/public/js/controllers/transaction.js
View File

@ -404,11 +404,13 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
} }
barcode(doc, cdt, cdn) { barcode(doc, cdt, cdn) {
var d = locals[cdt][cdn]; const d = locals[cdt][cdn];
if(d.barcode=="" || d.barcode==null) { if (!d.barcode) {
// barcode cleared, remove item // barcode cleared, remove item
d.item_code = ""; d.item_code = "";
} }
// flag required for circular triggers
d._triggerd_from_barcode = true;
this.item_code(doc, cdt, cdn); this.item_code(doc, cdt, cdn);
} }
@ -429,7 +431,9 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
this.frm.doc.doctype === 'Delivery Note') { this.frm.doc.doctype === 'Delivery Note') {
show_batch_dialog = 1; show_batch_dialog = 1;
} }
item.barcode = null; if (!item._triggerd_from_barcode) {
item.barcode = null;
}
if(item.item_code || item.barcode || item.serial_no) { if(item.item_code || item.barcode || item.serial_no) {