schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #39689 from rohitwaghchaure/fixed-flag-for-barcode-scanner

Browse Source 
chore: flag for barcode scanner
This commit is contained in:
rohitwaghchaure
2024-02-02 13:27:43 +05:30
committed by GitHub
parent 76c652c016 f8ca5c5c8b
commit b193d3cc86
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
erpnext.utils.BarcodeScanner = class BarcodeScanner { erpnext.utils.BarcodeScanner = class BarcodeScanner {
constructor(opts) { constructor(opts) {
this.frm = opts.frm; this.frm = opts.frm;
// frappe.flags.trigger_from_barcode_scanner is used for custom scripts
// field from which to capture input of scanned data // field from which to capture input of scanned data
this.scan_field_name = opts.scan_field_name || "scan_barcode"; this.scan_field_name = opts.scan_field_name || "scan_barcode";
@@ -84,6 +85,7 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
update_table(data) { update_table(data) {
return new Promise(resolve => { return new Promise(resolve => {
let cur_grid = this.frm.fields_dict[this.items_table_name].grid; let cur_grid = this.frm.fields_dict[this.items_table_name].grid;
frappe.flags.trigger_from_barcode_scanner = true;
const {item_code, barcode, batch_no, serial_no, uom} = data; const {item_code, barcode, batch_no, serial_no, uom} = data;
@@ -143,12 +145,14 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
revert_selector_flag() { revert_selector_flag() {
frappe.flags.hide_serial_batch_dialog = false; frappe.flags.hide_serial_batch_dialog = false;
frappe.flags.trigger_from_barcode_scanner = false;
} }
set_item(row, item_code, barcode, batch_no, serial_no) { set_item(row, item_code, barcode, batch_no, serial_no) {
return new Promise(resolve => { return new Promise(resolve => {
const increment = async (value = 1) => { const increment = async (value = 1) => {
const item_data = {item_code: item_code}; const item_data = {item_code: item_code};
frappe.flags.trigger_from_barcode_scanner = true;
item_data[this.qty_field] = Number((row[this.qty_field] || 0)) + Number(value); item_data[this.qty_field] = Number((row[this.qty_field] || 0)) + Number(value);
await frappe.model.set_value(row.doctype, row.name, item_data); await frappe.model.set_value(row.doctype, row.name, item_data);
return value; return value;