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

fix: barcode field on line item not working (backport #40381) (#40383)

Browse Source 
fix: barcode field on line item not working (#40381)

(cherry picked from commit 0da19a40a7)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
This commit is contained in:
mergify[bot]
2024-03-12 13:49:08 +05:30
committed by GitHub
parent ffd04b3960
commit 80df6094e3
3 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/public/js/controllers/stock_controller.js
View File

@@ -11,6 +11,18 @@ erpnext.stock.StockController = class StockController extends frappe.ui.form.Con
}
}
barcode(doc, cdt, cdn) {
let row = locals[cdt][cdn];
if (row.barcode) {
erpnext.stock.utils.set_item_details_using_barcode(this.frm, row, (r) => {
frappe.model.set_value(cdt, cdn, {
"item_code": r.message.item_code,
"qty": 1,
});
});
}
}
setup_warehouse_query() {
var me = this;
erpnext.queries.setup_queries(this.frm, "Warehouse", function() {

13
erpnext/public/js/controllers/transaction.js
View File

@@ -354,6 +354,19 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
barcode_scanner.process_scan();
}
barcode(doc, cdt, cdn) {
let row = locals[cdt][cdn];
if (row.barcode) {
erpnext.stock.utils.set_item_details_using_barcode(this.frm, row, (r) => {
debugger
frappe.model.set_value(cdt, cdn, {
"item_code": r.message.item_code,
"qty": 1,
});
});
}
}
validate_has_items () {
let table = this.frm.doc.items;
this.frm.has_items = (table && table.length

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

@@ -2,6 +2,7 @@
// License: GNU General Public License v3. See license.txt
frappe.provide("erpnext");
frappe.provide("erpnext.utils");
frappe.provide("erpnext.stock.utils");
$.extend(erpnext, {
get_currency: function (company) {
@@ -1084,3 +1085,10 @@ function attach_selector_button(inner_text, append_loction, context, grid_row) {
context.show_serial_batch_selector(grid_row.frm, grid_row.doc, "", "", true);
});
}
$.extend(erpnext.stock.utils, {
set_item_details_using_barcode(frm, child_row, callback) {
const barcode_scanner = new erpnext.utils.BarcodeScanner({ frm: frm });
barcode_scanner.scan_api_call(child_row.barcode, callback);
},
});