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

Merge pull request #51455 from nishkagosalia/gh-51383

Browse Source
This commit is contained in:
Mihir Kandoi
2026-01-02 17:05:58 +05:30
committed by GitHub
parent 4632ddc497 f622996c48
commit d4702ac232
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
erpnext/projects/doctype/timesheet/test_timesheet.py
View File

@@ -172,6 +172,21 @@ class TestTimesheet(ERPNextTestSuite):
settings.ignore_employee_time_overlap = 1 settings.ignore_employee_time_overlap = 1
settings.save() settings.save()
timesheet.save() # should not throw an error timesheet.save() # should not throw an error
timesheet.submit() # should not throw an error
settings.ignore_employee_time_overlap = 0
settings.save()
timesheet.append(
"time_logs",
{
"billable": 1,
"activity_type": "_Test Activity Type",
"from_time": now_datetime(),
"to_time": now_datetime() + datetime.timedelta(hours=3),
"company": "_Test Company",
},
)
self.assertRaises(frappe.ValidationError, timesheet.submit)
settings.ignore_employee_time_overlap = initial_setting settings.ignore_employee_time_overlap = initial_setting
settings.save() settings.save()

1
erpnext/projects/doctype/timesheet/timesheet.py
View File

@@ -79,6 +79,7 @@ class Timesheet(Document):
def on_update_after_submit(self): def on_update_after_submit(self):
self.validate_mandatory_fields() self.validate_mandatory_fields()
self.update_task_and_project() self.update_task_and_project()
self.validate_time_logs()
def calculate_hours(self): def calculate_hours(self):
for row in self.time_logs: for row in self.time_logs: