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

fix: use empty row when batch is scanned (#30638)

Browse Source
This commit is contained in:
Ankush Menat
2022-04-07 21:38:18 +05:30
committed by GitHub
parent 8fbfba4f2f
commit 225deb949b
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,7 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
row = this.get_batch_row_to_modify(batch_no); row = this.get_batch_row_to_modify(batch_no);
} else { } else {
// serial or barcode scan // serial or barcode scan
row = this.get_row_to_modify_on_scan(row, item_code); row = this.get_row_to_modify_on_scan(item_code);
} }
if (!row) { if (!row) {
@@ -177,21 +177,17 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
get_batch_row_to_modify(batch_no) { get_batch_row_to_modify(batch_no) {
// get row if batch already exists in table // get row if batch already exists in table
const existing_batch_row = this.items_table.find((d) => d.batch_no === batch_no); const existing_batch_row = this.items_table.find((d) => d.batch_no === batch_no);
return existing_batch_row || null; return existing_batch_row || this.get_existing_blank_row();
} }
get_row_to_modify_on_scan(row_to_modify, item_code) { get_row_to_modify_on_scan(item_code) {
// get an existing item row to increment or blank row to modify // get an existing item row to increment or blank row to modify
const existing_item_row = this.items_table.find((d) => d.item_code === item_code); const existing_item_row = this.items_table.find((d) => d.item_code === item_code);
const blank_item_row = this.items_table.find((d) => !d.item_code); return existing_item_row || this.get_existing_blank_row();
}
if (existing_item_row) { get_existing_blank_row() {
row_to_modify = existing_item_row; return this.items_table.find((d) => !d.item_code);
} else if (blank_item_row) {
row_to_modify = blank_item_row;
}
return row_to_modify;
} }
clean_up() { clean_up() {