Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: template task status, subject in project template task

Browse Source
This commit is contained in:
pateljannat 2020-12-28 12:35:19 +05:30
parent 8dec1c142f
commit 71f203dbc5
5 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/patches/v13_0/update_project_template_tasks.py
View File

@ -5,6 +5,8 @@ from __future__ import unicode_literals
import frappe import frappe
def execute(): def execute():
frappe.reload_doc("projects", "doctype", "project_template")
frappe.reload_doc("projects", "doctype", "project_template_task")
frappe.reload_doc("projects", "doctype", "project_template") frappe.reload_doc("projects", "doctype", "project_template")
for template_name in frappe.db.sql(""" for template_name in frappe.db.sql("""
select select

10
erpnext/projects/doctype/project_template/project_template.js
View File

@ -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");
});
}
})

11
erpnext/projects/doctype/project_template_task/project_template_task.json
View File

@ -5,7 +5,8 @@
"editable_grid": 1, "editable_grid": 1,
"engine": "InnoDB", "engine": "InnoDB",
"field_order": [ "field_order": [
"task" "task",
"subject"
], ],
"fields": [ "fields": [
{ {
@ -15,11 +16,17 @@
"label": "Task", "label": "Task",
"options": "Task", "options": "Task",
"reqd": 1 "reqd": 1
},
{
"fieldname": "subject",
"fieldtype": "Read Only",
"in_list_view": 1,
"label": "Subject"
} }
], ],
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2020-12-07 13:28:40.961810", "modified": "2020-12-28 12:10:26.321913",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Projects", "module": "Projects",
"name": "Project Template Task", "name": "Project Template Task",

4
erpnext/projects/doctype/task/task.json
View File

@ -115,7 +115,7 @@
"no_copy": 1, "no_copy": 1,
"oldfieldname": "status", "oldfieldname": "status",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "Open\nWorking\nPending Review\nOverdue\nCompleted\nCancelled" "options": "Open\nWorking\nPending Review\nOverdue\nTemplate\nCompleted\nCancelled"
}, },
{ {
"fieldname": "priority", "fieldname": "priority",
@ -388,7 +388,7 @@
"is_tree": 1, "is_tree": 1,
"links": [], "links": [],
"max_attachments": 5, "max_attachments": 5,
"modified": "2020-12-21 11:59:24.196834", "modified": "2020-12-28 11:32:58.714991",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Projects", "module": "Projects",
"name": "Task", "name": "Task",

2
erpnext/projects/doctype/task/task.py
View File

@ -56,6 +56,8 @@ class Task(NestedSet):
validate_project_dates(getdate(expected_end_date), self, "act_start_date", "act_end_date", "Actual") validate_project_dates(getdate(expected_end_date), self, "act_start_date", "act_end_date", "Actual")
def validate_status(self): 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": if self.status!=self.get_db_value("status") and self.status == "Completed":
for d in self.depends_on: for d in self.depends_on:
if frappe.db.get_value("Task", d.task, "status") not in ("Completed", "Cancelled"): if frappe.db.get_value("Task", d.task, "status") not in ("Completed", "Cancelled"):