Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19849 from rohitwaghchaure/fixed_timsheet_overlap_issue

Browse Source 
fix: timesheet overlap error
This commit is contained in:
rohitwaghchaure 2019-12-07 14:13:14 +05:30 committed by GitHub
commit c229a1b1d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,7 +188,8 @@ class Timesheet(Document):
}, as_dict=True) }, as_dict=True)
# check internal overlap # check internal overlap
for time_log in self.time_logs: for time_log in self.time_logs:
if not (time_log.from_time or time_log.to_time): continue 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 \ 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.idx != time_log.idx and ((args.from_time > time_log.from_time and args.from_time < time_log.to_time) or