CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-21 03:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2025-11-10 12:43:05 +05:30
parent 635fe427fe
commit df6ca3af57
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,11 +87,7 @@ class Task(NestedSet):
self.update_depends_on()
self.validate_dependencies_for_template_task()
self.validate_completed_on()
<<<<<<< HEAD
=======
self.set_default_end_date_if_missing()
self.validate_parent_is_group()
>>>>>>> ed1a1099cb (fix: validate is_group for parent task)
def validate_dates(self):
self.validate_from_to_dates("exp_start_date", "exp_end_date")

5
erpnext/projects/doctype/task/test_task.py
View File

@@ -6,12 +6,7 @@ import unittest
import frappe
from frappe.utils import add_days, getdate, nowdate
<<<<<<< HEAD
from erpnext.projects.doctype.task.task import CircularReferenceError
=======
from erpnext.projects.doctype.task.task import CircularReferenceError, ParentIsGroupError
from erpnext.tests.utils import ERPNextTestSuite
>>>>>>> 291f0c7161 (test: add test for parent task is_group validation)
class TestTask(unittest.TestCase):