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

fix: job card timer issue

Browse Source
This commit is contained in:
Rohit Waghchaure
2020-04-17 00:54:20 +05:30
parent 61fc2d3263
commit da83af1213
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,7 +86,9 @@ frappe.ui.form.on('Job Card', {
frm.set_value('current_time' , 0); frm.set_value('current_time' , 0);
} }
frm.save(); frm.save("Save", () => {}, "", () => {
frm.doc.time_logs.pop(-1);
});
}, },
complete_job: function(frm, completed_time, completed_qty) { complete_job: function(frm, completed_time, completed_qty) {
@@ -111,12 +113,22 @@ frappe.ui.form.on('Job Card', {
validate: function(frm) { validate: function(frm) {
if ((!frm.doc.time_logs || !frm.doc.time_logs.length) && frm.doc.started_time) { if ((!frm.doc.time_logs || !frm.doc.time_logs.length) && frm.doc.started_time) {
frm.set_value('started_time' , ''); frm.trigger("reset_timer");
frm.set_value('job_started', 0);
frm.set_value('current_time' , 0);
} }
}, },
employee: function(frm) {
if (frm.doc.job_started && !frm.doc.current_time) {
frm.trigger("reset_timer");
}
},
reset_timer: function(frm) {
frm.set_value('started_time' , '');
frm.set_value('job_started', 0);
frm.set_value('current_time' , 0);
},
make_dashboard: function(frm) { make_dashboard: function(frm) {
if(frm.doc.__islocal) if(frm.doc.__islocal)
return; return;