commit b96956f35c43a3f58fd8ac720c501a151e909f1e
author Aditya Hase <aditya@adityahase.com> Thu Jun 20 09:40:23 2019 +0530
committer GitHub <noreply@github.com> Thu Jun 20 09:40:23 2019 +0530
tree f35f3060ce4f825a6537c85fc8259af8d83da111
parent be8a46a92a3cb79861720e0f084f6c4a12b6e78e
parent 12f2096846a7cf6b15102c2d9262be9681b70fcd

Merge branch 'develop' into fix-timesheet-tests

erpnext/projects/doctype/timesheet/test_timesheet.py

diff --git a/erpnext/projects/doctype/timesheet/test_timesheet.py b/erpnext/projects/doctype/timesheet/test_timesheet.py
index f117903..32f0428 100644
--- a/erpnext/projects/doctype/timesheet/test_timesheet.py
+++ b/erpnext/projects/doctype/timesheet/test_timesheet.py
@@ -103,8 +103,8 @@
 			{
 				"billable": 1,
 				"activity_type": "_Test Activity Type",
-				"from_type": now_datetime(),
-				"hours": 3,
+				"from_time": now_datetime(),
+				"to_time": now_datetime() + datetime.timedelta(hours=3),
 				"company": "_Test Company"
 			}
 		)
@@ -113,8 +113,8 @@
 			{
 				"billable": 1,
 				"activity_type": "_Test Activity Type",
-				"from_type": now_datetime(),
-				"hours": 3,
+				"from_time": now_datetime(),
+				"to_time": now_datetime() + datetime.timedelta(hours=3),
 				"company": "_Test Company"
 			}
 		)