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

fix(Project): get correct holiday list when calculating dates; test fixes (#24901)

Browse Source
This commit is contained in:
Sagar Vora
2021-03-17 10:00:35 +05:30
committed by GitHub
parent 8fbb043190
commit 65d7f2c798
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/projects/doctype/project/project.py
View File

@@ -81,12 +81,18 @@ class Project(Document):
def calculate_start_date(self, task_details): def calculate_start_date(self, task_details):
self.start_date = add_days(self.expected_start_date, task_details.start) self.start_date = add_days(self.expected_start_date, task_details.start)
self.start_date = update_if_holiday(self.holiday_list, self.start_date) self.start_date = self.update_if_holiday(self.start_date)
return self.start_date return self.start_date
def calculate_end_date(self, task_details): def calculate_end_date(self, task_details):
self.end_date = add_days(self.start_date, task_details.duration) self.end_date = add_days(self.start_date, task_details.duration)
return update_if_holiday(self.holiday_list, self.end_date) return self.update_if_holiday(self.end_date)
def update_if_holiday(self, date):
holiday_list = self.holiday_list or get_holiday_list(self.company)
while is_holiday(holiday_list, date):
date = add_days(date, 1)
return date
def dependency_mapping(self, template_tasks, project_tasks): def dependency_mapping(self, template_tasks, project_tasks):
for template_task in template_tasks: for template_task in template_tasks:
@@ -541,9 +547,3 @@ def set_project_status(project, status):
project.status = status project.status = status
project.save() project.save()
def update_if_holiday(holiday_list, date):
holiday_list = holiday_list or get_holiday_list()
while is_holiday(holiday_list, date):
date = add_days(date, 1)
return date

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

@@ -8,7 +8,6 @@ test_records = frappe.get_test_records('Project')
test_ignore = ["Sales Order"] test_ignore = ["Sales Order"]
from erpnext.projects.doctype.project_template.test_project_template import make_project_template from erpnext.projects.doctype.project_template.test_project_template import make_project_template
from erpnext.projects.doctype.project.project import update_if_holiday
from erpnext.projects.doctype.task.test_task import create_task from erpnext.projects.doctype.task.test_task import create_task
from frappe.utils import getdate, nowdate, add_days from frappe.utils import getdate, nowdate, add_days
@@ -97,7 +96,8 @@ def get_project(name, template):
project_name = name, project_name = name,
status = 'Open', status = 'Open',
project_template = template.name, project_template = template.name,
expected_start_date = nowdate() expected_start_date = nowdate(),
company="_Test Company"
)).insert() )).insert()
return project return project
@@ -131,7 +131,7 @@ def task_exists(subject):
def calculate_end_date(project, start, duration): def calculate_end_date(project, start, duration):
start = add_days(project.expected_start_date, start) start = add_days(project.expected_start_date, start)
start = update_if_holiday(project.holiday_list, start) start = project.update_if_holiday(start)
end = add_days(start, duration) end = add_days(start, duration)
end = update_if_holiday(project.holiday_list, end) end = project.update_if_holiday(end)
return getdate(end) return getdate(end)