From 71f203dbc565d170c993668f6f0f92de2303194a Mon Sep 17 00:00:00 2001
From: pateljannat <jannatpatel@MacBook-Air.local>
Date: Mon, 28 Dec 2020 12:35:19 +0530
Subject: [PATCH] fix: template task status, subject in project template task

---
 .../patches/v13_0/update_project_template_tasks.py    |  2 ++
 .../doctype/project_template/project_template.js      | 10 ++++++++++
 .../project_template_task/project_template_task.json  | 11 +++++++++--
 erpnext/projects/doctype/task/task.json               |  4 ++--
 erpnext/projects/doctype/task/task.py                 |  2 ++
 5 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/erpnext/patches/v13_0/update_project_template_tasks.py b/erpnext/patches/v13_0/update_project_template_tasks.py
index 26c42592816..f24a2c62f1f 100644
--- a/erpnext/patches/v13_0/update_project_template_tasks.py
+++ b/erpnext/patches/v13_0/update_project_template_tasks.py
@@ -5,6 +5,8 @@ from __future__ import unicode_literals
 import frappe
 
 def execute():
+    frappe.reload_doc("projects", "doctype", "project_template")
+    frappe.reload_doc("projects", "doctype", "project_template_task")
     frappe.reload_doc("projects", "doctype", "project_template")
     for template_name in frappe.db.sql(""" 
         select 
diff --git a/erpnext/projects/doctype/project_template/project_template.js b/erpnext/projects/doctype/project_template/project_template.js
index 7668df3e139..04153dc5704 100644
--- a/erpnext/projects/doctype/project_template/project_template.js
+++ b/erpnext/projects/doctype/project_template/project_template.js
@@ -15,3 +15,13 @@ frappe.ui.form.on('Project Template', {
 		});
 	}
 });
+
+frappe.ui.form.on('Project Template Task', {
+	task: function (frm, cdt, cdn) {
+		var row = locals[cdt][cdn];
+		frappe.db.get_value("Task", row.task, "subject", (value) => {
+				row.subject = value.subject;
+				refresh_field("tasks");
+			});
+	}
+})
diff --git a/erpnext/projects/doctype/project_template_task/project_template_task.json b/erpnext/projects/doctype/project_template_task/project_template_task.json
index 80c510db1b0..7a552945bd5 100644
--- a/erpnext/projects/doctype/project_template_task/project_template_task.json
+++ b/erpnext/projects/doctype/project_template_task/project_template_task.json
@@ -5,7 +5,8 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "task"
+  "task",
+  "subject"
  ],
  "fields": [
   {
@@ -15,11 +16,17 @@
    "label": "Task",
    "options": "Task",
    "reqd": 1
+  },
+  {
+   "fieldname": "subject",
+   "fieldtype": "Read Only",
+   "in_list_view": 1,
+   "label": "Subject"
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-12-07 13:28:40.961810",
+ "modified": "2020-12-28 12:10:26.321913",
  "modified_by": "Administrator",
  "module": "Projects",
  "name": "Project Template Task",
diff --git a/erpnext/projects/doctype/task/task.json b/erpnext/projects/doctype/task/task.json
index bb55256f7d9..160cc5812f7 100644
--- a/erpnext/projects/doctype/task/task.json
+++ b/erpnext/projects/doctype/task/task.json
@@ -115,7 +115,7 @@
    "no_copy": 1,
    "oldfieldname": "status",
    "oldfieldtype": "Select",
-   "options": "Open\nWorking\nPending Review\nOverdue\nCompleted\nCancelled"
+   "options": "Open\nWorking\nPending Review\nOverdue\nTemplate\nCompleted\nCancelled"
   },
   {
    "fieldname": "priority",
@@ -388,7 +388,7 @@
  "is_tree": 1,
  "links": [],
  "max_attachments": 5,
- "modified": "2020-12-21 11:59:24.196834",
+ "modified": "2020-12-28 11:32:58.714991",
  "modified_by": "Administrator",
  "module": "Projects",
  "name": "Task",
diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
index 80b764ba4f0..a2095c95d51 100755
--- a/erpnext/projects/doctype/task/task.py
+++ b/erpnext/projects/doctype/task/task.py
@@ -56,6 +56,8 @@ class Task(NestedSet):
             validate_project_dates(getdate(expected_end_date), self, "act_start_date", "act_end_date", "Actual")
 
     def validate_status(self):
+        if self.is_template and self.status != "Template":
+            self.status = "Template"
         if self.status!=self.get_db_value("status") and self.status == "Completed":
             for d in self.depends_on:
                 if frappe.db.get_value("Task", d.task, "status") not in ("Completed", "Cancelled"):