From c231583d810e03bbeea460bea94dab28a53c437d Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 1 Jul 2025 11:44:03 +0530 Subject: [PATCH] fix: multiple button in job card showing in a single row (cherry picked from commit 74df63a28a416de54784c9fc51d9bf9f35509977) # Conflicts: # erpnext/manufacturing/doctype/job_card/job_card.js --- .../doctype/job_card/job_card.js | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/erpnext/manufacturing/doctype/job_card/job_card.js b/erpnext/manufacturing/doctype/job_card/job_card.js index 690d7945beb..cd5b48e8af0 100644 --- a/erpnext/manufacturing/doctype/job_card/job_card.js +++ b/erpnext/manufacturing/doctype/job_card/job_card.js @@ -50,20 +50,42 @@ frappe.ui.form.on("Job Card", { let to_request = frm.doc.for_quantity > frm.doc.transferred_qty; let excess_transfer_allowed = frm.doc.__onload.job_card_excess_transfer; +<<<<<<< HEAD if (to_request || excess_transfer_allowed) { frm.add_custom_button(__("Material Request"), () => { frm.trigger("make_material_request"); }); +======= + if (has_items && (to_request || excess_transfer_allowed)) { + frm.add_custom_button( + __("Material Request"), + () => { + frm.trigger("make_material_request"); + }, + __("Create") + ); +>>>>>>> 74df63a28a (fix: multiple button in job card showing in a single row) } // check if any row has untransferred materials // in case of multiple items in JC let to_transfer = frm.doc.items.some((row) => row.transferred_qty < row.required_qty); +<<<<<<< HEAD if (to_transfer || excess_transfer_allowed) { frm.add_custom_button(__("Material Transfer"), () => { frm.trigger("make_stock_entry"); }).addClass("btn-primary"); +======= + if (has_items && (to_transfer || excess_transfer_allowed)) { + frm.add_custom_button( + __("Material Transfer"), + () => { + frm.trigger("make_stock_entry"); + }, + __("Create") + ); +>>>>>>> 74df63a28a (fix: multiple button in job card showing in a single row) } }