nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 18:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/version-15-hotfix' into mergify/bp/version-15-hotfix/pr-40050

Browse Source
This commit is contained in:
barredterra
2025-04-08 19:59:34 +02:00
parent db647a4e42 d319d89988
commit 98b75aaa38
70 changed files with 1295 additions and 924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,6 +150,19 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
});
}
if (this.frm.fields_dict["items"].grid.get_field("uom")) {
this.frm.set_query("uom", "items", function(doc, cdt, cdn) {
let row = locals[cdt][cdn];
return {
query: "erpnext.controllers.queries.get_item_uom_query",
filters: {
"item_code": row.item_code
}
};
});
}
if(
this.frm.docstatus < 2
&& this.frm.fields_dict["payment_terms_template"]
@@ -238,6 +251,15 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
}
}
use_serial_batch_fields(frm, cdt, cdn) {
const item = locals[cdt][cdn];
if (!item.use_serial_batch_fields) {
frappe.model.set_value(cdt, cdn, "serial_no", "");
frappe.model.set_value(cdt, cdn, "batch_no", "");
frappe.model.set_value(cdt, cdn, "rejected_serial_no", "");
}
}
set_fields_onload_for_line_item() {
if (this.frm.is_new() && this.frm.doc?.items) {
this.frm.doc.items.forEach(item => {