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

Merge pull request #19936 from benknowles/patch-3

Browse Source 
fix: task validation error when adding tasks to projects
This commit is contained in:
rohitwaghchaure
2019-12-16 14:01:20 +05:30
committed by GitHub
parent e0e7dcd2f6 9097c7e11c
commit 0df3c93737
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,11 +47,11 @@ class Task(NestedSet):
if not self.project or frappe.flags.in_test:
return
expected_end_date = getdate(frappe.db.get_value("Project", self.project, "expected_end_date"))
expected_end_date = frappe.db.get_value("Project", self.project, "expected_end_date")
if expected_end_date:
validate_project_dates(expected_end_date, self, "exp_start_date", "exp_end_date", "Expected")
validate_project_dates(expected_end_date, self, "act_start_date", "act_end_date", "Actual")
validate_project_dates(getdate(expected_end_date), self, "exp_start_date", "exp_end_date", "Expected")
validate_project_dates(getdate(expected_end_date), self, "act_start_date", "act_end_date", "Actual")
def validate_status(self):
if self.status!=self.get_db_value("status") and self.status == "Completed":
@@ -278,4 +278,4 @@ def validate_project_dates(project_end_date, task, task_start, task_end, actual_
frappe.throw(_("Task's {0} Start Date cannot be after Project's End Date.").format(actual_or_expected_date))
if task.get(task_end) and date_diff(project_end_date, getdate(task.get(task_end))) < 0:
frappe.throw(_("Task's {0} End Date cannot be after Project's End Date.").format(actual_or_expected_date))
frappe.throw(_("Task's {0} End Date cannot be after Project's End Date.").format(actual_or_expected_date))