nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 04:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: keep from and to time blank until added explicitly (#53798)

Browse Source 
(cherry picked from commit afa66e4785)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.js
This commit is contained in:
Mihir Kandoi
2026-03-26 13:05:54 +05:30
committed by Mergify
parent 0a28fb3ae1
commit b9d7f61c83
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -565,12 +565,31 @@ frappe.ui.form.on("Job Card Time Log", {
completed_qty: function (frm) { completed_qty: function (frm) {
frm.events.set_total_completed_qty(frm); frm.events.set_total_completed_qty(frm);
}, },
<<<<<<< HEAD
to_time: function (frm) { to_time: function (frm) {
frm.set_value("started_time", ""); frm.set_value("started_time", "");
}, },
=======
>>>>>>> afa66e4785 (fix: keep from and to time blank until added explicitly (#53798))
}); });
function get_seconds_diff(d1, d2) { function get_seconds_diff(d1, d2) {
return moment(d1).diff(d2, "seconds"); 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))