nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-17 02:26:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into new_invoice_fix

Browse Source
This commit is contained in:
Deepesh Garg
2019-12-07 19:54:21 +05:30
committed by GitHub
parent 175d604f5f ddc6e42b08
commit 3139fa2866
25 changed files with 188 additions and 61 deletions
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)
# check internal overlap
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 \
args.idx != time_log.idx and ((args.from_time > time_log.from_time and args.from_time < time_log.to_time) or