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

fix: multiple button in job card showing in a single row

Browse Source 
(cherry picked from commit 74df63a28a)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.js
This commit is contained in:
Mihir Kandoi
2025-07-01 11:44:03 +05:30
committed by Mergify
parent 58c6031c1f
commit c231583d81
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/manufacturing/doctype/job_card/job_card.js
View File

@@ -50,20 +50,42 @@ frappe.ui.form.on("Job Card", {
let to_request = frm.doc.for_quantity > frm.doc.transferred_qty; let to_request = frm.doc.for_quantity > frm.doc.transferred_qty;
let excess_transfer_allowed = frm.doc.__onload.job_card_excess_transfer; let excess_transfer_allowed = frm.doc.__onload.job_card_excess_transfer;
<<<<<<< HEAD
if (to_request || excess_transfer_allowed) { if (to_request || excess_transfer_allowed) {
frm.add_custom_button(__("Material Request"), () => { frm.add_custom_button(__("Material Request"), () => {
frm.trigger("make_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 // check if any row has untransferred materials
// in case of multiple items in JC // in case of multiple items in JC
let to_transfer = frm.doc.items.some((row) => row.transferred_qty < row.required_qty); let to_transfer = frm.doc.items.some((row) => row.transferred_qty < row.required_qty);
<<<<<<< HEAD
if (to_transfer || excess_transfer_allowed) { if (to_transfer || excess_transfer_allowed) {
frm.add_custom_button(__("Material Transfer"), () => { frm.add_custom_button(__("Material Transfer"), () => {
frm.trigger("make_stock_entry"); frm.trigger("make_stock_entry");
}).addClass("btn-primary"); }).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)
} }
} }