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

fix: revert global flag added for erasing barcode

Browse Source 
This looked like a hack and doesn't even work anyway! how can row level
barcode-item relation be maitnained on entire form?
This commit is contained in:
Ankush Menat 2022-03-27 22:06:45 +05:30 committed by Ankush Menat
parent 17a2ceb5d1
commit 806f420ddd
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -409,8 +409,6 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
// barcode cleared, remove item
d.item_code = "";
}
this.frm.from_barcode = this.frm.from_barcode ? this.frm.from_barcode + 1 : 1;
this.item_code(doc, cdt, cdn);
}
@ -431,11 +429,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
this.frm.doc.doctype === 'Delivery Note') {
show_batch_dialog = 1;
}
// clear barcode if setting item (else barcode will take priority)
if (this.frm.from_barcode == 0) {
item.barcode = null;
}
this.frm.from_barcode = this.frm.from_barcode - 1 >= 0 ? this.frm.from_barcode - 1 : 0;
item.barcode = null;
if(item.item_code || item.barcode || item.serial_no) {

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

@ -118,10 +118,6 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
}
set_barcode(row, barcode) {
// increase qty and set scanned value and item in row
// XXX: tightly coupled global flag on frm object used in transaction.js -_-
this.frm.from_barcode = this.frm.from_barcode ? this.frm.from_barcode + 1 : 1;
if (barcode && frappe.meta.has_field(row.doctype, this.barcode_field)) {
frappe.model.set_value(row.doctype, row.name, this.barcode_field, barcode);
}