Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #39932 from frappe/mergify/bp/version-15/pr-39931

Browse Source 
fix: use serial batch fields not enabled for new stock entry (backport #39930) (backport #39931)
This commit is contained in:
rohitwaghchaure 2024-02-16 15:58:17 +05:30 committed by GitHub
commit 7af62fb6c8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,7 +234,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
}
set_fields_onload_for_line_item() {
if (this.frm.is_new && this.frm.doc?.items) {
if (this.frm.is_new() && this.frm.doc?.items) {
this.frm.doc.items.forEach(item => {
if (item.docstatus === 0
&& frappe.meta.has_field(item.doctype, "use_serial_batch_fields")

34
erpnext/stock/doctype/stock_entry/stock_entry.js
View File

@ -936,6 +936,7 @@ erpnext.stock.StockEntry = class StockEntry extends erpnext.stock.StockControlle
this.toggle_related_fields(this.frm.doc);
this.toggle_enable_bom();
this.show_stock_ledger();
this.set_fields_onload_for_line_item();
erpnext.utils.view_serial_batch_nos(this.frm);
if (this.frm.doc.docstatus===1 && erpnext.is_perpetual_inventory_enabled(this.frm.doc.company)) {
this.show_general_ledger();
@ -944,6 +945,35 @@ erpnext.stock.StockEntry = class StockEntry extends erpnext.stock.StockControlle
erpnext.utils.add_item(this.frm);
}
serial_no(doc, cdt, cdn) {
var item = frappe.get_doc(cdt, cdn);
if (item?.serial_no) {
// Replace all occurences of comma with line feed
item.serial_no = item.serial_no.replace(/,/g, '\n');
item.conversion_factor = item.conversion_factor || 1;
let valid_serial_nos = [];
let serialnos = item.serial_no.split("\n");
for (var i = 0; i < serialnos.length; i++) {
if (serialnos[i] != "") {
valid_serial_nos.push(serialnos[i]);
}
}
frappe.model.set_value(item.doctype, item.name,
"qty", valid_serial_nos.length / item.conversion_factor);
}
}
set_fields_onload_for_line_item() {
if (this.frm.is_new() && this.frm.doc?.items
&& cint(frappe.user_defaults?.use_serial_batch_fields) === 1) {
this.frm.doc.items.forEach(item => {
frappe.model.set_value(item.doctype, item.name, "use_serial_batch_fields", 1);
})
}
}
scan_barcode() {
frappe.flags.dialog_set = false;
const barcode_scanner = new erpnext.utils.BarcodeScanner({frm:this.frm});
@ -1074,6 +1104,10 @@ erpnext.stock.StockEntry = class StockEntry extends erpnext.stock.StockControlle
if(!row.s_warehouse) row.s_warehouse = this.frm.doc.from_warehouse;
if(!row.t_warehouse) row.t_warehouse = this.frm.doc.to_warehouse;
if (cint(frappe.user_defaults?.use_serial_batch_fields)) {
frappe.model.set_value(row.doctype, row.name, "use_serial_batch_fields", 1);
}
}
from_warehouse(doc) {