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

Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations

Browse Source
This commit is contained in:
Suraj Shetty
2020-01-29 15:06:50 +05:30
parent 48e9bc3fc9 d64135b2d2
commit 2f67647f7b
125 changed files with 18290 additions and 14829 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,8 +56,8 @@ class Task(NestedSet):
def validate_status(self):
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") != "Completed":
frappe.throw(_("Cannot close task {0} as its dependant task {1} is not closed.").format(frappe.bold(self.name), frappe.bold(d.task)))
if frappe.db.get_value("Task", d.task, "status") not in ("Completed", "Cancelled"):
frappe.throw(_("Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.").format(frappe.bold(self.name), frappe.bold(d.task)))
close_all_assignments(self.doctype, self.name)