nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-13 03:45:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: match warehouse only when last_scanned_warehouse field exists

Browse Source 
(cherry picked from commit 4005e4412d)
This commit is contained in:
Sagar Vora
2025-08-26 00:06:14 +05:30
committed by Mergify
parent 04c2fca4e2
commit fbbd5a3af5
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,12 +113,7 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
frappe.flags.trigger_from_barcode_scanner = true;
const { item_code, barcode, batch_no, serial_no, uom, default_warehouse } = data;
const warehouse = this.has_last_scanned_warehouse
? this.frm.doc.last_scanned_warehouse || default_warehouse
: null;
let row = this.get_row_to_modify_on_scan(item_code, batch_no, uom, barcode, warehouse);
let row = this.get_row_to_modify_on_scan(item_code, batch_no, uom, barcode, default_warehouse);
const is_new_row = !row?.item_code;
if (!row) {
if (this.dont_allow_new_row) {
@@ -151,7 +146,7 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
() => this.set_serial_no(row, serial_no),
() => this.set_batch_no(row, batch_no),
() => this.set_barcode(row, barcode),
() => this.set_warehouse(row, warehouse),
() => this.set_warehouse(row),
() => this.clean_up(),
() => this.revert_selector_flag(),
() => resolve(row),
@@ -412,12 +407,16 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
}
}
async set_warehouse(row, warehouse) {
const warehouse_field = this.get_warehouse_field();
async set_warehouse(row) {
if (!this.has_last_scanned_warehouse) return;
if (warehouse && frappe.meta.has_field(row.doctype, warehouse_field)) {
await frappe.model.set_value(row.doctype, row.name, warehouse_field, warehouse);
}
const last_scanned_warehouse = this.frm.doc.last_scanned_warehouse;
if (!last_scanned_warehouse) return;
const warehouse_field = this.get_warehouse_field();
if (!warehouse_field || !frappe.meta.has_field(row.doctype, warehouse_field)) return;
await frappe.model.set_value(row.doctype, row.name, warehouse_field, last_scanned_warehouse);
}
show_scan_message(idx, is_existing_row = false, qty = 1) {
@@ -438,15 +437,19 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
return is_duplicate;
}
get_row_to_modify_on_scan(item_code, batch_no, uom, barcode, warehouse) {
get_row_to_modify_on_scan(item_code, batch_no, uom, barcode, default_warehouse) {
let cur_grid = this.frm.fields_dict[this.items_table_name].grid;
// Check if batch is scanned and table has batch no field
let is_batch_no_scan = batch_no && frappe.meta.has_field(cur_grid.doctype, this.batch_no_field);
let check_max_qty = this.max_qty_field && frappe.meta.has_field(cur_grid.doctype, this.max_qty_field);
const warehouse_field = this.get_warehouse_field();
let has_warehouse_field = frappe.meta.has_field(cur_grid.doctype, warehouse_field);
const warehouse_field = this.has_last_scanned_warehouse && this.get_warehouse_field();
const has_warehouse_field =
warehouse_field && frappe.meta.has_field(cur_grid.doctype, warehouse_field);
const warehouse = has_warehouse_field
? this.frm.doc.last_scanned_warehouse || default_warehouse
: null;
const matching_row = (row) => {
const item_match = row.item_code == item_code;