nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 00:44:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: sider issues fixed

Browse Source
This commit is contained in:
pateljannat
2020-12-09 17:09:22 +05:30
parent 811629a961
commit f936e8a334
3 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
erpnext/projects/doctype/project/test_project.py
View File

@@ -27,8 +27,8 @@ class TestProject(unittest.TestCase):
project = get_project("Test Project with Templ - no parent and dependend tasks", template) project = get_project("Test Project with Templ - no parent and dependend tasks", template)
tasks = frappe.get_all('Task', '*', dict(project=project.name), order_by='creation asc') tasks = frappe.get_all('Task', '*', dict(project=project.name), order_by='creation asc')
self.assertEqual(task[0].subject, 'Test Temp Task with no parent and dependency') self.assertEqual(tasks[0].subject, 'Test Temp Task with no parent and dependency')
self.assertEqual(getdate(task[0].exp_end_date), add_days(nowdate() + 0 + 3)) self.assertEqual(getdate(tasks[0].exp_end_date), add_days(nowdate() + 0 + 3))
self.assertEqual(len(tasks), 1) self.assertEqual(len(tasks), 1)
def test_project_template_having_parent_child_tasks(self): def test_project_template_having_parent_child_tasks(self):
@@ -48,18 +48,17 @@ class TestProject(unittest.TestCase):
template = make_project_template("Test Project Template - tasks with parent-child", [task1, task2, task3]) template = make_project_template("Test Project Template - tasks with parent-child", [task1, task2, task3])
project = get_project("Test Project with Templ - tasks with parent-child", template) project = get_project("Test Project with Templ - tasks with parent-child", template)
tasks = frappe.get_all('Task', '*', dict(project=project.name), order_by='creation asc') tasks = frappe.get_all('Task', '*', dict(project=project.name), order_by='creation asc')
print(tasks, type(tasks), len(tasks))
self.assertEqual(tasks[0].subject, 'Test Temp Task parent')
self.assertEqual(getdate(tasks[0].exp_end_date), add_days(nowdate()+ 1 + 1))
self.assertEqual(task[0].subject, 'Test Temp Task parent') self.assertEqual(tasks[1].subject, 'Test Temp Task child 1')
self.assertEqual(getdate(task[0].exp_end_date), add_days(nowdate()+ 1 + 1)) self.assertEqual(getdate(tasks[1].exp_end_date), add_days(nowdate()+ 1 + 3))
print(task[0].depends_on) self.assertEqual(tasks[1].parent_task, tasks[0].name)
self.assertEqual(task[1].subject, 'Test Temp Task child 1') self.assertEqual(tasks[2].subject, 'Test Temp Task child 2')
self.assertEqual(getdate(task[1].exp_end_date), add_days(nowdate()+ 1 + 3)) self.assertEqual(getdate(tasks[2].exp_end_date), add_days(nowdate()+ 2 + 3))
self.assertEqual(task[1].parent_task, task[0].name) self.assertEqual(tasks[2].parent_task, tasks[0].name)
self.assertEqual(task[2].subject, 'Test Temp Task child 2')
self.assertEqual(getdate(task[2].exp_end_date), add_days(nowdate()+ 2 + 3))
self.assertEqual(task[2].parent_task, task[0].name)
self.assertEqual(len(tasks), 3) self.assertEqual(len(tasks), 3)
@@ -78,12 +77,12 @@ class TestProject(unittest.TestCase):
project = get_project("Test Project with Templ - tasks with parent-child", template) project = get_project("Test Project with Templ - tasks with parent-child", template)
tasks = frappe.get_all('Task', '*', dict(project=project.name), order_by='creation asc') tasks = frappe.get_all('Task', '*', dict(project=project.name), order_by='creation asc')
self.assertEqual(task[0].subject, 'Test Temp Task for dependency') self.assertEqual(tasks[0].subject, 'Test Temp Task for dependency')
self.assertEqual(getdate(task[0].exp_end_date), add_days(nowdate()+ 3 + 1)) self.assertEqual(getdate(tasks[0].exp_end_date), add_days(nowdate()+ 3 + 1))
self.assertEqual(task[1].subject, 'Test Temp Task with dependency') self.assertEqual(tasks[1].subject, 'Test Temp Task with dependency')
self.assertEqual(getdate(task[1].exp_end_date), add_days(nowdate()+ 2 + 2)) self.assertEqual(getdate(tasks[1].exp_end_date), add_days(nowdate()+ 2 + 2))
self.assertEqual(task[1].depends_on, task[0].name) self.assertEqual(tasks[1].depends_on, tasks[0].name)
self.assertEqual(len(tasks), 2) self.assertEqual(len(tasks), 2)

4
erpnext/projects/doctype/project_template/project_template.js
View File

@@ -6,12 +6,12 @@ frappe.ui.form.on('Project Template', {
// } // }
setup: function (frm) { setup: function (frm) {
me.frm.set_query("task", "tasks", function (doc, cdt, cdn) { frm.set_query("task", "tasks", function () {
return { return {
filters: { filters: {
"is_template": 1 "is_template": 1
} }
} };
}); });
} }
}); });

6
erpnext/projects/doctype/project_template/test_project_template.py
View File

@@ -27,15 +27,13 @@ def get_project_template(project_template_name="Test Project Template", project_
def make_project_template(project_template_name, project_tasks=[]): def make_project_template(project_template_name, project_tasks=[]):
if not frappe.db.exists('Project Template', project_template_name): if not frappe.db.exists('Project Template', project_template_name):
doc = frappe.get_doc(dict( frappe.get_doc(dict(
doctype = 'Project Template', doctype = 'Project Template',
name = project_template_name, name = project_template_name,
tasks = project_tasks or [ tasks = project_tasks or [
create_task(subject="_Test Template Task 1", is_template=1, begin=0, duration=3), create_task(subject="_Test Template Task 1", is_template=1, begin=0, duration=3),
create_task(subject="_Test Template Task 2", is_template=1, begin=0, duration=2), create_task(subject="_Test Template Task 2", is_template=1, begin=0, duration=2),
] ]
)) )).insert()
print("doc",doc.tasks)
doc.insert()
return frappe.get_doc('Project Template', project_template_name) return frappe.get_doc('Project Template', project_template_name)