From bd9abc15b5cedbfe01e9b24aa78bd8aca271f551 Mon Sep 17 00:00:00 2001
From: Rohan <Alchez@users.noreply.github.com>
Date: Wed, 5 Jun 2019 14:17:29 +0530
Subject: [PATCH] fix(projects): Remove hardcode of expected end date for new
 Tasks (#17717)

---
 erpnext/projects/doctype/task/task.js | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/erpnext/projects/doctype/task/task.js b/erpnext/projects/doctype/task/task.js
index 1f609d7910..298efbf236 100644
--- a/erpnext/projects/doctype/task/task.js
+++ b/erpnext/projects/doctype/task/task.js
@@ -26,23 +26,17 @@ frappe.ui.form.on("Task", {
 				}
 			}
 		}
-		if(!frm.is_group){
-			var doc = frm.doc;
-			if(doc.__islocal) {
-				if(!frm.doc.exp_end_date) {
-					frm.set_value("exp_end_date", frappe.datetime.add_days(new Date(), 7));
-				}
-			}
 
-			if(!doc.__islocal) {
-				if(frm.perm[0].write) {
-					if(frm.doc.status!=="Completed" && frm.doc.status!=="Cancelled") {
-						frm.add_custom_button(__("Completed"), function() {
-							frm.set_value("status", "Completed");
+		if(!frm.doc.is_group){
+			if (!frm.is_new()) {
+				if (frm.perm[0].write) {
+					if (!["Closed", "Cancelled"].includes(frm.doc.status)) {
+						frm.add_custom_button(__("Close"), () => {
+							frm.set_value("status", "Closed");
 							frm.save();
 						});
 					} else {
-						frm.add_custom_button(__("Reopen"), function() {
+						frm.add_custom_button(__("Reopen"), () => {
 							frm.set_value("status", "Open");
 							frm.save();
 						});