RobbyV2/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2025-12-03 18:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: show only active employees when starting job card

Browse Source 
(cherry picked from commit 21ec4ed911)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.js
This commit is contained in:
Mihir Kandoi
2025-12-02 11:16:01 +05:30
committed by Mergify
parent 441a2bcf38
commit 6ab1490252
1 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,6 +114,7 @@ frappe.ui.form.on("Job Card", {
(frm.doc.for_quantity > frm.doc.total_completed_qty || !frm.doc.for_quantity) && (frm.doc.for_quantity > frm.doc.total_completed_qty || !frm.doc.for_quantity) &&
(frm.doc.items || !frm.doc.items.length || frm.doc.for_quantity == frm.doc.transferred_qty) (frm.doc.items || !frm.doc.items.length || frm.doc.for_quantity == frm.doc.transferred_qty)
) { ) {
<<<<<<< HEAD
// if Job Card is link to Work Order, the job card must not be able to start if Work Order not "Started" // if Job Card is link to Work Order, the job card must not be able to start if Work Order not "Started"
// and if stock mvt for WIP is required // and if stock mvt for WIP is required
if (frm.doc.work_order) { if (frm.doc.work_order) {
@@ -130,6 +131,37 @@ frappe.ui.form.on("Job Card", {
) { ) {
frm.trigger("prepare_timer_buttons"); frm.trigger("prepare_timer_buttons");
} }
=======
let last_row = {};
if (frm.doc.sub_operations?.length && frm.doc.time_logs?.length) {
last_row = get_last_row(frm.doc.time_logs);
}
if (
(!frm.doc.time_logs?.length || (frm.doc.sub_operations?.length && last_row?.to_time)) &&
!frm.doc.is_paused
) {
frm.add_custom_button(__("Start Job"), () => {
let from_time = frappe.datetime.now_datetime();
if ((frm.doc.employee && !frm.doc.employee.length) || !frm.doc.employee) {
frappe.prompt(
{
fieldtype: "Table MultiSelect",
label: __("Select Employees"),
options: "Job Card Time Log",
fieldname: "employees",
filters: {
status: "Active",
},
},
(d) => {
frm.events.start_timer(frm, from_time, d.employees);
},
__("Assign Job to Employee")
);
} else {
frm.events.start_timer(frm, from_time, frm.doc.employee);
>>>>>>> 21ec4ed911 (fix: show only active employees when starting job card)
} }
); );
} else { } else {