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

typo

Browse Source
This commit is contained in:
Anurag Mishra
2019-01-04 11:00:07 +05:30
parent f2b29a0488
commit 68aedfd176
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@ from frappe.utils.nestedset import NestedSet
class CircularReferenceError(frappe.ValidationError): pass class CircularReferenceError(frappe.ValidationError): pass
class EndDateCannotGreaterThanProjecteEndDateError(frappe.ValidationError): pass class EndDateCannotBeGreaterThanProjectEndDateError(frappe.ValidationError): pass
class Task(NestedSet): class Task(NestedSet):
nsm_parent_field = 'parent_task' nsm_parent_field = 'parent_task'
@@ -48,8 +48,7 @@ class Task(NestedSet):
if frappe.db.exists("Project", self.project): if frappe.db.exists("Project", self.project):
doc = frappe.get_doc("Project", self.project) doc = frappe.get_doc("Project", self.project)
if self.exp_end_date and doc.expected_end_date and getdate(self.exp_end_date) > getdate(doc.expected_end_date) : if self.exp_end_date and doc.expected_end_date and getdate(self.exp_end_date) > getdate(doc.expected_end_date) :
frappe.msgprint(_("Expected end date cannot be after Project: <b>'{0}'</b> Expected end date").format(doc.name)) frappe.throw(_("Expected end date cannot be after Project: <b>'{0}'</b> Expected end date").format(doc.name), EndDateCannotBeGreaterThanProjectEndDateError)
raise EndDateCannotGreaterThanProjecteEndDateError
def validate_status(self): def validate_status(self):
if self.status!=self.get_db_value("status") and self.status == "Closed": if self.status!=self.get_db_value("status") and self.status == "Closed":

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

@@ -5,7 +5,7 @@ import frappe
import unittest import unittest
from frappe.utils import getdate, nowdate, add_days from frappe.utils import getdate, nowdate, add_days
from erpnext.projects.doctype.task.task import CircularReferenceError, EndDateCannotGreaterThanProjecteEndDateError from erpnext.projects.doctype.task.task import CircularReferenceError, EndDateCannotBeGreaterThanProjectEndDateError
class TestTask(unittest.TestCase): class TestTask(unittest.TestCase):
def test_circular_reference(self): def test_circular_reference(self):
@@ -102,7 +102,7 @@ class TestTask(unittest.TestCase):
pro = frappe.get_doc("Project", task_end.project) pro = frappe.get_doc("Project", task_end.project)
pro.expected_end_date = add_days(nowdate(), 40) pro.expected_end_date = add_days(nowdate(), 40)
pro.save() pro.save()
self.assertRaises(EndDateCannotGreaterThanProjecteEndDateError, task_end.save) self.assertRaises(EndDateCannotBeGreaterThanProjectEndDateError, task_end.save)