From b9d7f61c837ad5b33015531dba319bd2cf29d0d9 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Thu, 26 Mar 2026 13:05:54 +0530 Subject: [PATCH] fix: keep from and to time blank until added explicitly (#53798) (cherry picked from commit afa66e478598bd3c4320dd2ffdf6839c0b7884ec) # Conflicts: # erpnext/manufacturing/doctype/job_card/job_card.js --- .../doctype/job_card/job_card.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/erpnext/manufacturing/doctype/job_card/job_card.js b/erpnext/manufacturing/doctype/job_card/job_card.js index d911456f602..1b2fe5f66f1 100644 --- a/erpnext/manufacturing/doctype/job_card/job_card.js +++ b/erpnext/manufacturing/doctype/job_card/job_card.js @@ -565,12 +565,31 @@ frappe.ui.form.on("Job Card Time Log", { completed_qty: function (frm) { frm.events.set_total_completed_qty(frm); }, +<<<<<<< HEAD to_time: function (frm) { frm.set_value("started_time", ""); }, +======= +>>>>>>> afa66e4785 (fix: keep from and to time blank until added explicitly (#53798)) }); function get_seconds_diff(d1, d2) { return moment(d1).diff(d2, "seconds"); } +<<<<<<< HEAD +======= + +function get_last_completed_row(time_logs) { + let completed_rows = time_logs.filter((d) => d.to_time); + + if (completed_rows?.length) { + let last_completed_row = completed_rows[completed_rows.length - 1]; + return last_completed_row; + } +} + +function get_last_row(time_logs) { + return time_logs[time_logs.length - 1] || {}; +} +>>>>>>> afa66e4785 (fix: keep from and to time blank until added explicitly (#53798))