commit a1aa85712bd85aba472876544f5e35cac811b084
author Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Mon Aug 26 10:01:45 2019 +0530
committer GitHub <noreply@github.com> Mon Aug 26 10:01:45 2019 +0530
tree 5d4f1ad0ff363ab66919b467f6db3ae39ce0a9d5
parent 4affe4b939b6276004e55c371197cedb2974fdd0
parent d8c262fd5c9611c65a33bafac57c2084f3dc8bbb

Merge branch 'develop' into fix-timesheet-creation

erpnext/projects/doctype/timesheet/timesheet.py

diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py
index df9a6ba..3c71922 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.py
+++ b/erpnext/projects/doctype/timesheet/timesheet.py
@@ -96,7 +96,7 @@
 
 		for time in self.time_logs:
 			if time.from_time and time.to_time:
-				if flt(std_working_hours) > 0:
+				if flt(std_working_hours) and date_diff(time.to_time, time.from_time):
 					time.hours = flt(std_working_hours) * date_diff(time.to_time, time.from_time)
 				else:
 					if not time.hours: