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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-06-10 14:35:23 +05:30
committed by GitHub
parent 795108c1dd
commit 781b66e252
1 changed files with 0 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
erpnext/manufacturing/doctype/production_plan/production_plan.js
View File

@@ -195,8 +195,6 @@ frappe.ui.form.on("Production Plan", {
set_field_options("projected_qty_formula", projected_qty_formula); set_field_options("projected_qty_formula", projected_qty_formula);
}, },
<<<<<<< HEAD
=======
get_items_for_work_order(frm) { get_items_for_work_order(frm) {
let items = frm.doc.po_items; let items = frm.doc.po_items;
if (frm.doc.sub_assembly_items?.length) { if (frm.doc.sub_assembly_items?.length) {
@@ -215,73 +213,6 @@ frappe.ui.form.on("Production Plan", {
return has_items; return has_items;
}, },
has_unreserved_stock(frm, table, qty_field = "required_qty") {
let has_unreserved_stock = frm.doc[table].some(
(item) => flt(item[qty_field]) > flt(item.stock_reserved_qty)
);
return has_unreserved_stock;
},
has_reserved_stock(frm, table) {
let has_reserved_stock = frm.doc[table].some((item) => flt(item.stock_reserved_qty) > 0);
return has_reserved_stock;
},
setup_stock_reservation_for_sub_assembly(frm) {
if (frm.doc.docstatus === 1 && frm.doc.reserve_stock) {
if (frm.events.has_unreserved_stock(frm, "sub_assembly_items")) {
frm.add_custom_button(
__("Reserve for Sub-assembly"),
() => erpnext.stock_reservation.make_entries(frm, "sub_assembly_items"),
__("Stock Reservation")
);
}
if (frm.events.has_reserved_stock(frm, "sub_assembly_items")) {
frm.add_custom_button(
__("Unreserve for Sub-assembly"),
() => erpnext.stock_reservation.unreserve_stock(frm),
__("Stock Reservation")
);
frm.add_custom_button(
__("Reserved Stock for Sub-assembly"),
() => erpnext.stock_reservation.show_reserved_stock(frm, "sub_assembly_items"),
__("Stock Reservation")
);
}
}
},
setup_stock_reservation_for_raw_materials(frm) {
if (frm.doc.docstatus === 1 && frm.doc.reserve_stock) {
if (frm.events.has_unreserved_stock(frm, "mr_items", "required_bom_qty")) {
frm.add_custom_button(
__("Reserve for Raw Materials"),
() => erpnext.stock_reservation.make_entries(frm, "mr_items"),
__("Stock Reservation")
);
}
if (frm.events.has_reserved_stock(frm, "mr_items")) {
frm.add_custom_button(
__("Unreserve for Raw Materials"),
() => erpnext.stock_reservation.unreserve_stock(frm),
__("Stock Reservation")
);
frm.add_custom_button(
__("Reserved Stock for Raw Materials"),
() => erpnext.stock_reservation.show_reserved_stock(frm, "mr_items"),
__("Stock Reservation")
);
}
}
},
>>>>>>> 384f4e120a (fix: do not create repeat work orders)
close_open_production_plan(frm, close = false) { close_open_production_plan(frm, close = false) {
frappe.call({ frappe.call({
method: "set_status", method: "set_status",