nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-26 21:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #57103 from frappe/mergify/bp/version-16-hotfix/pr-57089

Browse Source 
fix: allow barcode scan to add and increment items in pick list (backport #57089)
This commit is contained in:
Mihir Kandoi
2026-07-13 21:27:40 +05:30
committed by GitHub
parent aa1d50a914 00a646ac25
commit 0447a18217
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,11 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
this.warehouse_field = opts.warehouse_field || "warehouse"; this.warehouse_field = opts.warehouse_field || "warehouse";
// field name on row which defines max quantity to be scanned e.g. picklist // field name on row which defines max quantity to be scanned e.g. picklist
this.max_qty_field = opts.max_qty_field; this.max_qty_field = opts.max_qty_field;
// row fields that, if set, mean max_qty_field is a real demand qty (e.g. from a
// linked Sales Order) that scanning must not exceed. Rows with none of these set
// have no real demand qty, so max_qty_field is just an arbitrary default and
// shouldn't cap further scans.
this.demand_ref_fields = opts.demand_ref_fields || [];
// scanner won't add a new row if this flag is set. // scanner won't add a new row if this flag is set.
this.dont_allow_new_row = opts.dont_allow_new_row; this.dont_allow_new_row = opts.dont_allow_new_row;
// scanner will ask user to type the quantity instead of incrementing by 1 // scanner will ask user to type the quantity instead of incrementing by 1
@@ -390,6 +395,9 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
} }
async set_barcode_uom(row, uom) { async set_barcode_uom(row, uom) {
// e.g. Pick List: picked_qty is always tracked in stock UOM, so an incidental
// barcode uom must not overwrite the row's own uom.
if (this.max_qty_field) return;
if (uom && frappe.meta.has_field(row.doctype, this.uom_field)) { if (uom && frappe.meta.has_field(row.doctype, this.uom_field)) {
await frappe.model.set_value(row.doctype, row.name, this.uom_field, uom); await frappe.model.set_value(row.doctype, row.name, this.uom_field, uom);
} }
@@ -454,8 +462,9 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
const matching_row = (row) => { const matching_row = (row) => {
const item_match = row.item_code == item_code; const item_match = row.item_code == item_code;
const batch_match = !row[this.batch_no_field] || row[this.batch_no_field] == batch_no; const batch_match = !row[this.batch_no_field] || row[this.batch_no_field] == batch_no;
const uom_match = !uom || row[this.uom_field] == uom; const uom_match = !uom || this.max_qty_field || row[this.uom_field] == uom;
const qty_in_limit = flt(row[this.qty_field]) < flt(row[this.max_qty_field]); const has_demand_qty = this.demand_ref_fields.some((fieldname) => row[fieldname]);
const qty_in_limit = !has_demand_qty || flt(row[this.qty_field]) < flt(row[this.max_qty_field]);
const item_scanned = row.has_item_scanned; const item_scanned = row.has_item_scanned;
let warehouse_match = true; let warehouse_match = true;

3
erpnext/stock/doctype/pick_list/pick_list.js
View File

@@ -288,7 +288,8 @@ frappe.ui.form.on("Pick List", {
items_table_name: "locations", items_table_name: "locations",
qty_field: "picked_qty", qty_field: "picked_qty",
max_qty_field: "qty", max_qty_field: "qty",
dont_allow_new_row: true, demand_ref_fields: ["sales_order_item", "material_request_item", "product_bundle_item"],
dont_allow_new_row: !frm.doc.pick_manually,
prompt_qty: frm.doc.prompt_qty, prompt_qty: frm.doc.prompt_qty,
serial_no_field: "not_supported", // doesn't make sense for picklist without a separate field. serial_no_field: "not_supported", // doesn't make sense for picklist without a separate field.
}; };