From 57128e413c406e0707bb44307ee74f95c3efaeb9 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 28 Feb 2019 12:43:58 +0530 Subject: [PATCH] fix: task.js --- erpnext/projects/doctype/task/task.js | 6 +++--- erpnext/projects/doctype/task/task_list.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/erpnext/projects/doctype/task/task.js b/erpnext/projects/doctype/task/task.js index c1a9c448b4..93423db762 100644 --- a/erpnext/projects/doctype/task/task.js +++ b/erpnext/projects/doctype/task/task.js @@ -49,9 +49,9 @@ frappe.ui.form.on("Task", { } if(frm.perm[0].write) { - if(frm.doc.status!=="Closed" && frm.doc.status!=="Cancelled") { - frm.add_custom_button(__("Close"), function() { - frm.set_value("status", "Closed"); + if(frm.doc.status!=="Completed" && frm.doc.status!=="Cancelled") { + frm.add_custom_button(__("Completed"), function() { + frm.set_value("status", "Completed"); frm.save(); }); } else { diff --git a/erpnext/projects/doctype/task/task_list.js b/erpnext/projects/doctype/task/task_list.js index 887bd4281b..29d2a738f4 100644 --- a/erpnext/projects/doctype/task/task_list.js +++ b/erpnext/projects/doctype/task/task_list.js @@ -10,7 +10,7 @@ frappe.listview_settings['Task'] = { }); listview.page.add_menu_item(__("Set as Closed"), function() { - listview.call_for_selected_items(method, {"status": "Closed"}); + listview.call_for_selected_items(method, {"status": "Completed"}); }); }, get_indicator: function(doc) { @@ -19,7 +19,7 @@ frappe.listview_settings['Task'] = { "Overdue": "red", "Pending Review": "orange", "Working": "orange", - "Closed": "green", + "Completed": "green", "Cancelled": "dark grey" } return [__(doc.status), colors[doc.status], "status,=," + doc.status];