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

Merge pull request #49387 from frappe/mergify/bp/version-15-hotfix/pr-49386

Browse Source 
fix: Issue with Barcode Scanning in Stock Entry (backport #49386)
This commit is contained in:
rohitwaghchaure
2025-08-30 13:59:53 +05:30
committed by GitHub
parent dcb3e01df1 45cdb39edd
commit 6317db19e1
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -459,12 +459,8 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
const item_scanned = row.has_item_scanned; const item_scanned = row.has_item_scanned;
let warehouse_match = true; let warehouse_match = true;
if (has_warehouse_field) { if (has_warehouse_field && warehouse && row[warehouse_field]) {
if (warehouse) { warehouse_match = row[warehouse_field] === warehouse;
warehouse_match = row[warehouse_field] === warehouse;
} else {
warehouse_match = !row[warehouse_field];
}
} }
return ( return (

2
erpnext/stock/doctype/stock_entry/stock_entry.js
View File

@@ -1006,7 +1006,7 @@ erpnext.stock.StockEntry = class StockEntry extends erpnext.stock.StockControlle
this.barcode_scanner = new erpnext.utils.BarcodeScanner({ this.barcode_scanner = new erpnext.utils.BarcodeScanner({
frm: this.frm, frm: this.frm,
warehouse_field: (doc) => { warehouse_field: (doc) => {
return doc.purpose === "Material Transfer" ? "t_warehouse" : "s_warehouse"; return doc.purpose === "Material Receipt" ? "t_warehouse" : "s_warehouse";
}, },
}); });