nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: PR 49320

Browse Source 
(cherry picked from commit 991413608b)
This commit is contained in:
Mihir Kandoi
2025-09-03 13:07:08 +05:30
committed by Mergify
parent b8a07a437b
commit 43e9ab9cd1
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
erpnext/manufacturing/doctype/work_order/work_order.js
View File

@@ -116,20 +116,6 @@ frappe.ui.form.on("Work Order", {
frm.set_indicator_formatter("operation", function (doc) { frm.set_indicator_formatter("operation", function (doc) {
return frm.doc.qty == doc.completed_qty ? "green" : "orange"; return frm.doc.qty == doc.completed_qty ? "green" : "orange";
}); });
if (frm.doc.docstatus == 0 && frm.doc.bom_no) {
frappe.call({
method: "erpnext.manufacturing.doctype.work_order.work_order.check_if_scrap_warehouse_mandatory",
args: {
bom_no: frm.doc.bom_no,
},
callback: function (r) {
if (r.message["set_scrap_wh_mandatory"]) {
frm.toggle_reqd("scrap_warehouse", true);
}
},
});
}
}, },
onload: function (frm) { onload: function (frm) {
@@ -144,6 +130,20 @@ frappe.ui.form.on("Work Order", {
}); });
erpnext.work_order.set_default_warehouse(frm); erpnext.work_order.set_default_warehouse(frm);
} }
if (frm.doc.docstatus == 0 && frm.doc.bom_no) {
frappe.call({
method: "erpnext.manufacturing.doctype.work_order.work_order.check_if_scrap_warehouse_mandatory",
args: {
bom_no: frm.doc.bom_no,
},
callback: function (r) {
if (r.message["set_scrap_wh_mandatory"]) {
frm.toggle_reqd("scrap_warehouse", true);
}
},
});
}
}, },
source_warehouse: function (frm) { source_warehouse: function (frm) {

6
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@@ -2123,14 +2123,16 @@ class StockEntry(StockController):
"Work Order", self.work_order, "allow_alternative_item" "Work Order", self.work_order, "allow_alternative_item"
) )
skip_transfer, from_wip_warehouse = frappe.get_value(
"Work Order", self.work_order, ["skip_transfer", "from_wip_warehouse"]
)
item.from_warehouse = ( item.from_warehouse = (
frappe.get_value( frappe.get_value(
"Work Order Item", "Work Order Item",
{"parent": self.work_order, "item_code": item.item_code}, {"parent": self.work_order, "item_code": item.item_code},
"source_warehouse", "source_warehouse",
) )
if frappe.get_value("Work Order", self.work_order, "skip_transfer") if skip_transfer and not from_wip_warehouse
and not frappe.get_value("Work Order", self.work_order, "from_wip_warehouse")
else self.from_warehouse or item.source_warehouse or item.default_warehouse else self.from_warehouse or item.source_warehouse or item.default_warehouse
) )
if item.item_code in used_alternative_items: if item.item_code in used_alternative_items: