fix: Batch scans get overwritten on the same row (#27668)
* fix: Batch scans get overwritten on the same row * fix: Increment batch qty if pre-existing batch is scanned * fix: Delete accidental __init__.py file * fix: Add patch to patches.txt for https://github.com/frappe/erpnext/pull/27554 * fix: reload doc in patch
This commit is contained in:
commit
273f3fbe0f
@ -312,3 +312,4 @@ erpnext.patches.v13_0.create_accounting_dimensions_in_pos_doctypes
|
|||||||
erpnext.patches.v13_0.create_custom_field_for_finance_book
|
erpnext.patches.v13_0.create_custom_field_for_finance_book
|
||||||
erpnext.patches.v13_0.modify_invalid_gain_loss_gl_entries
|
erpnext.patches.v13_0.modify_invalid_gain_loss_gl_entries
|
||||||
erpnext.patches.v13_0.fix_additional_cost_in_mfg_stock_entry
|
erpnext.patches.v13_0.fix_additional_cost_in_mfg_stock_entry
|
||||||
|
erpnext.patches.v13_0.set_status_in_maintenance_schedule_table
|
||||||
|
@ -2,6 +2,7 @@ import frappe
|
|||||||
|
|
||||||
|
|
||||||
def execute():
|
def execute():
|
||||||
|
frappe.reload_doc("maintenance", "doctype", "Maintenance Schedule Detail")
|
||||||
frappe.db.sql("""
|
frappe.db.sql("""
|
||||||
UPDATE `tabMaintenance Schedule Detail`
|
UPDATE `tabMaintenance Schedule Detail`
|
||||||
SET completion_status = 'Pending'
|
SET completion_status = 'Pending'
|
||||||
|
@ -345,26 +345,14 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
|
|||||||
}
|
}
|
||||||
|
|
||||||
scan_barcode() {
|
scan_barcode() {
|
||||||
let scan_barcode_field = this.frm.fields_dict["scan_barcode"];
|
let me = this;
|
||||||
|
|
||||||
let show_description = function(idx, exist = null) {
|
|
||||||
if (exist) {
|
|
||||||
frappe.show_alert({
|
|
||||||
message: __('Row #{0}: Qty increased by 1', [idx]),
|
|
||||||
indicator: 'green'
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
frappe.show_alert({
|
|
||||||
message: __('Row #{0}: Item added', [idx]),
|
|
||||||
indicator: 'green'
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(this.frm.doc.scan_barcode) {
|
if(this.frm.doc.scan_barcode) {
|
||||||
frappe.call({
|
frappe.call({
|
||||||
method: "erpnext.selling.page.point_of_sale.point_of_sale.search_for_serial_or_batch_or_barcode_number",
|
method: "erpnext.selling.page.point_of_sale.point_of_sale.search_for_serial_or_batch_or_barcode_number",
|
||||||
args: { search_value: this.frm.doc.scan_barcode }
|
args: {
|
||||||
|
search_value: this.frm.doc.scan_barcode
|
||||||
|
}
|
||||||
}).then(r => {
|
}).then(r => {
|
||||||
const data = r && r.message;
|
const data = r && r.message;
|
||||||
if (!data || Object.keys(data).length === 0) {
|
if (!data || Object.keys(data).length === 0) {
|
||||||
@ -375,49 +363,96 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
let cur_grid = this.frm.fields_dict.items.grid;
|
me.modify_table_after_scan(data);
|
||||||
|
|
||||||
let row_to_modify = null;
|
|
||||||
const existing_item_row = this.frm.doc.items.find(d => d.item_code === data.item_code);
|
|
||||||
const blank_item_row = this.frm.doc.items.find(d => !d.item_code);
|
|
||||||
|
|
||||||
if (existing_item_row) {
|
|
||||||
row_to_modify = existing_item_row;
|
|
||||||
} else if (blank_item_row) {
|
|
||||||
row_to_modify = blank_item_row;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!row_to_modify) {
|
|
||||||
// add new row
|
|
||||||
row_to_modify = frappe.model.add_child(this.frm.doc, cur_grid.doctype, 'items');
|
|
||||||
}
|
|
||||||
|
|
||||||
show_description(row_to_modify.idx, row_to_modify.item_code);
|
|
||||||
|
|
||||||
this.frm.from_barcode = this.frm.from_barcode ? this.frm.from_barcode + 1 : 1;
|
|
||||||
frappe.model.set_value(row_to_modify.doctype, row_to_modify.name, {
|
|
||||||
item_code: data.item_code,
|
|
||||||
qty: (row_to_modify.qty || 0) + 1
|
|
||||||
});
|
|
||||||
|
|
||||||
['serial_no', 'batch_no', 'barcode'].forEach(field => {
|
|
||||||
if (data[field] && frappe.meta.has_field(row_to_modify.doctype, field)) {
|
|
||||||
|
|
||||||
let value = (row_to_modify[field] && field === "serial_no")
|
|
||||||
? row_to_modify[field] + '\n' + data[field] : data[field];
|
|
||||||
|
|
||||||
frappe.model.set_value(row_to_modify.doctype,
|
|
||||||
row_to_modify.name, field, value);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
scan_barcode_field.set_value('');
|
|
||||||
refresh_field("items");
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
modify_table_after_scan(data) {
|
||||||
|
let scan_barcode_field = this.frm.fields_dict["scan_barcode"];
|
||||||
|
let cur_grid = this.frm.fields_dict.items.grid;
|
||||||
|
let row_to_modify = null;
|
||||||
|
|
||||||
|
// Check if batch is scanned and table has batch no field
|
||||||
|
let batch_no_scan = Boolean(data.batch_no) && frappe.meta.has_field(cur_grid.doctype, "batch_no");
|
||||||
|
|
||||||
|
if (batch_no_scan) {
|
||||||
|
row_to_modify = this.get_batch_row_to_modify(data.batch_no);
|
||||||
|
} else {
|
||||||
|
// serial or barcode scan
|
||||||
|
row_to_modify = this.get_row_to_modify_on_scan(row_to_modify, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!row_to_modify) {
|
||||||
|
// add new row if new item/batch is scanned
|
||||||
|
row_to_modify = frappe.model.add_child(this.frm.doc, cur_grid.doctype, 'items');
|
||||||
|
}
|
||||||
|
|
||||||
|
this.show_scan_message(row_to_modify.idx, row_to_modify.item_code);
|
||||||
|
this.set_scanned_values(row_to_modify, data, scan_barcode_field);
|
||||||
|
}
|
||||||
|
|
||||||
|
set_scanned_values(row_to_modify, data, scan_barcode_field) {
|
||||||
|
// increase qty and set scanned value and item in row
|
||||||
|
this.frm.from_barcode = this.frm.from_barcode ? this.frm.from_barcode + 1 : 1;
|
||||||
|
frappe.model.set_value(row_to_modify.doctype, row_to_modify.name, {
|
||||||
|
item_code: data.item_code,
|
||||||
|
qty: (row_to_modify.qty || 0) + 1
|
||||||
|
});
|
||||||
|
|
||||||
|
['serial_no', 'batch_no', 'barcode'].forEach(field => {
|
||||||
|
if (data[field] && frappe.meta.has_field(row_to_modify.doctype, field)) {
|
||||||
|
let is_serial_no = row_to_modify[field] && field === "serial_no";
|
||||||
|
let value = data[field];
|
||||||
|
|
||||||
|
if (is_serial_no) {
|
||||||
|
value = row_to_modify[field] + '\n' + data[field];
|
||||||
|
}
|
||||||
|
|
||||||
|
frappe.model.set_value(row_to_modify.doctype, row_to_modify.name, field, value);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
scan_barcode_field.set_value('');
|
||||||
|
refresh_field("items");
|
||||||
|
}
|
||||||
|
|
||||||
|
get_row_to_modify_on_scan(row_to_modify, data) {
|
||||||
|
// get an existing item row to increment or blank row to modify
|
||||||
|
const existing_item_row = this.frm.doc.items.find(d => d.item_code === data.item_code);
|
||||||
|
const blank_item_row = this.frm.doc.items.find(d => !d.item_code);
|
||||||
|
|
||||||
|
if (existing_item_row) {
|
||||||
|
row_to_modify = existing_item_row;
|
||||||
|
} else if (blank_item_row) {
|
||||||
|
row_to_modify = blank_item_row;
|
||||||
|
}
|
||||||
|
|
||||||
|
return row_to_modify;
|
||||||
|
}
|
||||||
|
|
||||||
|
get_batch_row_to_modify(batch_no) {
|
||||||
|
// get row if batch already exists in table
|
||||||
|
const existing_batch_row = this.frm.doc.items.find(d => d.batch_no === batch_no);
|
||||||
|
return existing_batch_row || null;
|
||||||
|
}
|
||||||
|
|
||||||
|
show_scan_message (idx, exist = null) {
|
||||||
|
// show new row or qty increase toast
|
||||||
|
if (exist) {
|
||||||
|
frappe.show_alert({
|
||||||
|
message: __('Row #{0}: Qty increased by 1', [idx]),
|
||||||
|
indicator: 'green'
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
frappe.show_alert({
|
||||||
|
message: __('Row #{0}: Item added', [idx]),
|
||||||
|
indicator: 'green'
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
apply_default_taxes() {
|
apply_default_taxes() {
|
||||||
var me = this;
|
var me = this;
|
||||||
var taxes_and_charges_field = frappe.meta.get_docfield(me.frm.doc.doctype, "taxes_and_charges",
|
var taxes_and_charges_field = frappe.meta.get_docfield(me.frm.doc.doctype, "taxes_and_charges",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user