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

revert: "fix: ignore circular dependencies on barcode scan"

Browse Source 
This reverts commit 98468fab18.
This commit is contained in:
Ankush Menat
2022-03-31 14:37:30 +05:30
committed by Ankush Menat
parent 767b827b59
commit 530f767098
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -404,13 +404,11 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
} }
barcode(doc, cdt, cdn) { barcode(doc, cdt, cdn) {
const d = locals[cdt][cdn]; var d = locals[cdt][cdn];
if (!d.barcode) { if(d.barcode=="" || d.barcode==null) {
// 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);
} }
@@ -431,9 +429,7 @@ 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;
} }
if (!item._triggerd_from_barcode) { item.barcode = null;
item.barcode = null;
}
if(item.item_code || item.barcode || item.serial_no) { if(item.item_code || item.barcode || item.serial_no) {