mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-12 11:25:09 +00:00
(cherry picked from commit 5880f1d5c6)
# Conflicts:
# erpnext/projects/doctype/timesheet/test_timesheet.py
(cherry picked from commit 5880f1d5c6)
# Conflicts:
# erpnext/projects/doctype/timesheet/test_timesheet.py