schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #19852 from rohitwaghchaure/fixed_timesheet_overlap_issue_v11_hotfix

Browse Source 
fix: timesheet overlap error
This commit is contained in:
rohitwaghchaure
2019-12-07 14:10:35 +05:30
committed by GitHub
parent 3483426fe7 ab4aa53f52
commit 3b37a109c5
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -191,6 +191,9 @@ class Timesheet(Document):
}, as_dict=True)
# check internal overlap
for time_log in self.time_logs:
if not (time_log.from_time and time_log.to_time
and args.from_time and args.to_time): continue
if (fieldname != 'workstation' or args.get(fieldname) == time_log.get(fieldname)) and \
args.idx != time_log.idx and ((args.from_time > time_log.from_time and args.from_time < time_log.to_time) or
(args.to_time > time_log.from_time and args.to_time < time_log.to_time) or