fixed version conflict
diff --git a/erpnext/patches/v7_0/set_party_name_in_payment_entry.py b/erpnext/patches/v7_0/set_party_name_in_payment_entry.py
index c3085ce..bbdcf5c 100644
--- a/erpnext/patches/v7_0/set_party_name_in_payment_entry.py
+++ b/erpnext/patches/v7_0/set_party_name_in_payment_entry.py
@@ -9,10 +9,12 @@
customers = frappe._dict(frappe.db.sql("select name, customer_name from tabCustomer"))
suppliers = frappe._dict(frappe.db.sql("select name, supplier_name from tabSupplier"))
+ frappe.reload_doc('accounts', 'doctype', 'payment_entry')
+
pe_list = frappe.db.sql("""select name, party_type, party from `tabPayment Entry`
where party is not null and party != ''""", as_dict=1)
for pe in pe_list:
party_name = customers.get(pe.party) if pe.party_type=="Customer" else suppliers.get(pe.party)
frappe.db.set_value("Payment Entry", pe.name, "party_name", party_name, update_modified=False)
-
\ No newline at end of file
+
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 57f5189..54d492b 100644
--- a/erpnext/patches/v7_0/update_missing_employee_in_timesheet.py
+++ b/erpnext/patches/v7_0/update_missing_employee_in_timesheet.py
@@ -2,7 +2,7 @@
import frappe
def execute():
- if frappe.db.table_exists("Time Log"):
+ if frappe.db.table_exists("Time Log") and "employee" in frappe.db.get_table_columns("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