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

fix(stock): deduplicate scans after serial reselection

Browse Source
This commit is contained in:
Mihir Kandoi
2026-09-09 10:01:46 +05:30
parent 445a30ba60
commit acbefcd603
1 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
erpnext/public/js/utils/serial_batch_inline_editor.js
View File

@@ -707,28 +707,37 @@ erpnext.stock.SerialBatchInlineEditor = class SerialBatchInlineEditor {
dialog.show(); dialog.show();
} }
get_entry_number(entry, field) {
let update = this.pending.updates[entry.name] || {};
let name = update[field] || entry[field];
let is_serial = field === "serial_no";
return (
(!update[field] && entry[is_serial ? "serial_number" : "batch_number"]) ||
frappe.utils.get_link_title(is_serial ? "Serial No" : "Batch", name) ||
name ||
""
);
}
get_active_server_row(field, value) { get_active_server_row(field, value) {
let p = this.pending; let p = this.pending;
if (p.delete_all) return null; if (p.delete_all) return null;
return this.last_entries.find( return this.last_entries.find(
(d) => (d) => this.get_entry_number(d, field) === value && !p.deleted.some((x) => x.name === d.name)
(d[field === "batch_no" ? "batch_number" : "serial_number"] || d[field]) === value &&
!p.deleted.some((x) => x.name === d.name)
); );
} }
get_known_identifiers() { get_known_identifiers() {
let p = this.pending; let p = this.pending;
let known = new Set( let field = cint(this.item.has_serial_no) ? "serial_no" : "batch_no";
p.new_entries.map((d) => d.serial_number || d.serial_no || d.batch_number || d.batch_no) let known = new Set(p.new_entries.map((d) => this.get_entry_number(d, field)));
);
if (!p.delete_all) { if (!p.delete_all) {
let deleted = new Set(p.deleted.map((d) => d.name)); let deleted = new Set(p.deleted.map((d) => d.name));
for (const d of this.last_entries) { for (const d of this.last_entries) {
if (!deleted.has(d.name)) { if (!deleted.has(d.name)) {
known.add(d.serial_number || d.serial_no || d.batch_number || d.batch_no); known.add(this.get_entry_number(d, field));
} }
} }
} }
@@ -750,7 +759,7 @@ erpnext.stock.SerialBatchInlineEditor = class SerialBatchInlineEditor {
p.new_entries.push({ serial_number: value, qty: 1 }); p.new_entries.push({ serial_number: value, qty: 1 });
} else { } else {
let existing = p.new_entries.find((d) => (d.batch_number || d.batch_no) === value); let existing = p.new_entries.find((d) => this.get_entry_number(d, "batch_no") === value);
let server_row = this.get_active_server_row("batch_no", value); let server_row = this.get_active_server_row("batch_no", value);
if (existing) { if (existing) {
existing.qty = flt(existing.qty) + 1; existing.qty = flt(existing.qty) + 1;
@@ -956,16 +965,8 @@ erpnext.stock.SerialBatchInlineEditor = class SerialBatchInlineEditor {
.map((d, i) => { .map((d, i) => {
let update = p.updates[d.name] || {}; let update = p.updates[d.name] || {};
let qty = update.qty != null ? flt(update.qty) : Math.abs(flt(d.qty)); let qty = update.qty != null ? flt(update.qty) : Math.abs(flt(d.qty));
let batch_no = this.esc( let batch_no = this.esc(this.get_entry_number(d, "batch_no"));
update.batch_no let serial_no = this.esc(this.get_entry_number(d, "serial_no"));
? frappe.utils.get_link_title("Batch", update.batch_no) || update.batch_no
: d.batch_number || d.batch_no || ""
);
let serial_no = this.esc(
update.serial_no
? frappe.utils.get_link_title("Serial No", update.serial_no) || update.serial_no
: d.serial_number || d.serial_no || ""
);
let name = this.esc(d.name); let name = this.esc(d.name);
return `<tr data-name="${name}"> return `<tr data-name="${name}">
@@ -1013,10 +1014,7 @@ erpnext.stock.SerialBatchInlineEditor = class SerialBatchInlineEditor {
? `<td class="sbie-serial-cell" data-pending-index="${index}" title="${__( ? `<td class="sbie-serial-cell" data-pending-index="${index}" title="${__(
"Click to change Serial No" "Click to change Serial No"
)}" style="cursor: pointer;">${this.esc( )}" style="cursor: pointer;">${this.esc(
d.serial_number || this.get_entry_number(d, "serial_no")
frappe.utils.get_link_title("Serial No", d.serial_no) ||
d.serial_no ||
""
)}</td>` )}</td>`
: "" : ""
} }
@@ -1024,12 +1022,7 @@ erpnext.stock.SerialBatchInlineEditor = class SerialBatchInlineEditor {
show_batch show_batch
? `<td class="sbie-batch-cell" data-pending-index="${index}" title="${__( ? `<td class="sbie-batch-cell" data-pending-index="${index}" title="${__(
"Click to change Batch No" "Click to change Batch No"
)}" style="cursor: pointer;">${this.esc( )}" style="cursor: pointer;">${this.esc(this.get_entry_number(d, "batch_no"))}</td>`
d.batch_number ||
frappe.utils.get_link_title("Batch", d.batch_no) ||
d.batch_no ||
""
)}</td>`
: "" : ""
} }
<td class="${ <td class="${