Merge branch 'hotfix'

erpnext/__init__.py

@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
 
-__version__ = '7.0.35'
+__version__ = '7.0.36'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/patches/v7_0/update_missing_employee_in_timesheet.py

@@ -2,6 +2,7 @@ from __future__ import unicode_literals
 import frappe
 
 def execute():
+	if frappe.db.table_exists("Time Log"):
 		timesheet = frappe.db.sql("""select tl.employee as employee, ts.name as name,
 				tl.modified as modified, tl.modified_by as modified_by, tl.creation as creation, tl.owner as owner
 			from