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

fix: incorrect job card timer issue

Browse Source
This commit is contained in:
Rohit Waghchaure
2020-09-01 14:02:34 +05:30
parent ab6f761753
commit ee4e725b37
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@ frappe.ui.form.on('Job Card', {
frm.trigger("toggle_operation_number"); frm.trigger("toggle_operation_number");
if (frm.doc.docstatus == 0 && (frm.doc.for_quantity > frm.doc.total_completed_qty || !frm.doc.for_quantity) if (frm.doc.docstatus == 0 && (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)) {
frm.trigger("prepare_timer_buttons"); frm.trigger("prepare_timer_buttons");
} }
}, },
@@ -98,9 +98,9 @@ frappe.ui.form.on('Job Card', {
fieldname: 'employee'}, d => { fieldname: 'employee'}, d => {
if (d.employee) { if (d.employee) {
frm.set_value("employee", d.employee); frm.set_value("employee", d.employee);
} else {
frm.events.start_job(frm);
} }
frm.events.start_job(frm);
}, __("Enter Value"), __("Start")); }, __("Enter Value"), __("Start"));
} else { } else {
frm.events.start_job(frm); frm.events.start_job(frm);
@@ -145,9 +145,7 @@ frappe.ui.form.on('Job Card', {
frm.set_value('current_time' , 0); frm.set_value('current_time' , 0);
} }
frm.save("Save", () => {}, "", () => { frm.save();
frm.doc.time_logs.pop(-1);
});
}, },
complete_job: function(frm, completed_time, completed_qty) { complete_job: function(frm, completed_time, completed_qty) {
@@ -179,6 +177,8 @@ frappe.ui.form.on('Job Card', {
employee: function(frm) { employee: function(frm) {
if (frm.doc.job_started && !frm.doc.current_time) { if (frm.doc.job_started && !frm.doc.current_time) {
frm.trigger("reset_timer"); frm.trigger("reset_timer");
} else {
frm.events.start_job(frm);
} }
}, },