Fixed merge conflict
diff --git a/erpnext/patches/v7_0/update_missing_employee_in_timesheet.py b/erpnext/patches/v7_0/update_missing_employee_in_timesheet.py
index c74a40a..57f5189 100644
--- a/erpnext/patches/v7_0/update_missing_employee_in_timesheet.py
+++ b/erpnext/patches/v7_0/update_missing_employee_in_timesheet.py
@@ -2,18 +2,19 @@
import frappe
def execute():
- 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
- `tabTimesheet` ts, `tabTimesheet Detail` tsd, `tabTime Log` tl
- where
- tsd.parent = ts.name and tl.from_time = tsd.from_time and tl.to_time = tsd.to_time
- and tl.hours = tsd.hours and tl.billing_rate = tsd.billing_rate and tsd.idx=1
- and tl.docstatus < 2 and (ts.employee = '' or ts.employee is null)""", as_dict=1)
+ 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
+ `tabTimesheet` ts, `tabTimesheet Detail` tsd, `tabTime Log` tl
+ where
+ tsd.parent = ts.name and tl.from_time = tsd.from_time and tl.to_time = tsd.to_time
+ and tl.hours = tsd.hours and tl.billing_rate = tsd.billing_rate and tsd.idx=1
+ and tl.docstatus < 2 and (ts.employee = '' or ts.employee is null)""", as_dict=1)
- for data in timesheet:
- ts_doc = frappe.get_doc('Timesheet', data.name)
- if len(ts_doc.time_logs) == 1:
- frappe.db.sql(""" update `tabTimesheet` set creation = %(creation)s,
- owner = %(owner)s, modified = %(modified)s, modified_by = %(modified_by)s,
- employee = %(employee)s where name = %(name)s""", data)
+ for data in timesheet:
+ ts_doc = frappe.get_doc('Timesheet', data.name)
+ if len(ts_doc.time_logs) == 1:
+ frappe.db.sql(""" update `tabTimesheet` set creation = %(creation)s,
+ owner = %(owner)s, modified = %(modified)s, modified_by = %(modified_by)s,
+ employee = %(employee)s where name = %(name)s""", data)