Merge pull request #33217 from barredterra/validate-project-dates
refactor: validate dates in project and task
diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index d80133c..cbf2493 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -42,6 +42,8 @@
self.send_welcome_email()
self.update_costing()
self.update_percent_complete()
+ self.validate_from_to_dates("expected_start_date", "expected_end_date")
+ self.validate_from_to_dates("actual_start_date", "actual_end_date")
def copy_from_template(self):
"""
diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
index fa50785..79f1b3a 100755
--- a/erpnext/projects/doctype/task/task.py
+++ b/erpnext/projects/doctype/task/task.py
@@ -9,6 +9,7 @@
from frappe.desk.form.assign_to import clear, close_all_assignments
from frappe.model.mapper import get_mapped_doc
from frappe.utils import add_days, cstr, date_diff, flt, get_link_to_form, getdate, today
+from frappe.utils.data import format_date
from frappe.utils.nestedset import NestedSet
@@ -16,10 +17,6 @@
pass
-class EndDateCannotBeGreaterThanProjectEndDateError(frappe.ValidationError):
- pass
-
-
class Task(NestedSet):
nsm_parent_field = "parent_task"
@@ -34,8 +31,6 @@
def validate(self):
self.validate_dates()
- self.validate_parent_expected_end_date()
- self.validate_parent_project_dates()
self.validate_progress()
self.validate_status()
self.update_depends_on()
@@ -43,51 +38,42 @@
self.validate_completed_on()
def validate_dates(self):
- if (
- self.exp_start_date
- and self.exp_end_date
- and getdate(self.exp_start_date) > getdate(self.exp_end_date)
- ):
- frappe.throw(
- _("{0} can not be greater than {1}").format(
- frappe.bold("Expected Start Date"), frappe.bold("Expected End Date")
- )
- )
-
- if (
- self.act_start_date
- and self.act_end_date
- and getdate(self.act_start_date) > getdate(self.act_end_date)
- ):
- frappe.throw(
- _("{0} can not be greater than {1}").format(
- frappe.bold("Actual Start Date"), frappe.bold("Actual End Date")
- )
- )
+ self.validate_from_to_dates("exp_start_date", "exp_end_date")
+ self.validate_from_to_dates("act_start_date", "act_end_date")
+ self.validate_parent_expected_end_date()
+ self.validate_parent_project_dates()
def validate_parent_expected_end_date(self):
- if self.parent_task:
- parent_exp_end_date = frappe.db.get_value("Task", self.parent_task, "exp_end_date")
- if parent_exp_end_date and getdate(self.get("exp_end_date")) > getdate(parent_exp_end_date):
- frappe.throw(
- _(
- "Expected End Date should be less than or equal to parent task's Expected End Date {0}."
- ).format(getdate(parent_exp_end_date))
- )
+ if not self.parent_task or not self.exp_end_date:
+ return
+
+ parent_exp_end_date = frappe.db.get_value("Task", self.parent_task, "exp_end_date")
+ if not parent_exp_end_date:
+ return
+
+ if getdate(self.exp_end_date) > getdate(parent_exp_end_date):
+ frappe.throw(
+ _(
+ "Expected End Date should be less than or equal to parent task's Expected End Date {0}."
+ ).format(format_date(parent_exp_end_date)),
+ frappe.exceptions.InvalidDates,
+ )
def validate_parent_project_dates(self):
if not self.project or frappe.flags.in_test:
return
- expected_end_date = frappe.db.get_value("Project", self.project, "expected_end_date")
-
- if expected_end_date:
- 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"
- )
+ if project_end_date := frappe.db.get_value("Project", self.project, "expected_end_date"):
+ project_end_date = getdate(project_end_date)
+ for fieldname in ("exp_start_date", "exp_end_date", "act_start_date", "act_end_date"):
+ task_date = self.get(fieldname)
+ if task_date and date_diff(project_end_date, getdate(task_date)) < 0:
+ frappe.throw(
+ _("Task's {0} cannot be after Project's Expected End Date.").format(
+ _(self.meta.get_label(fieldname))
+ ),
+ frappe.exceptions.InvalidDates,
+ )
def validate_status(self):
if self.is_template and self.status != "Template":
@@ -398,15 +384,3 @@
def on_doctype_update():
frappe.db.add_index("Task", ["lft", "rgt"])
-
-
-def validate_project_dates(project_end_date, task, task_start, task_end, actual_or_expected_date):
- if task.get(task_start) and date_diff(project_end_date, getdate(task.get(task_start))) < 0:
- 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)
- )