Merge pull request #6141 from frappe/revert-6140-timesheet_patch_fix

Revert "Ignore validating mandatory fields on converting timelogs to timesheets"

erpnext/patches/v7_0/convert_timelog_to_timesheet.py

@@ -16,6 +16,7 @@ def execute():
 		time_sheet = make_timesheet(data.production_order)
 		args = get_timelog_data(data)
 		add_timesheet_detail(time_sheet, args)
+		time_sheet.docstatus = data.docstatus
 		time_sheet.note = data.note
 		time_sheet.company = company
 		
@@ -25,15 +26,6 @@ def execute():
 		time_sheet.flags.ignore_validate = True
 		time_sheet.save(ignore_permissions=True)
 
-		# To ignore validate_mandatory_fields function
-		if data.docstatus == 1:
-			time_sheet.db_set("docstatus", 1)
-			for d in time_sheet.get("time_logs"):
-				d.db_set("docstatus", 1)
-			time_sheet.update_production_order(time_sheet.name)
-			time_sheet.update_task_and_project()
-			
-
 def get_timelog_data(data):
 	return {
 		'billable': data.billable,

erpnext/patches/v7_0/migrate_schools_to_erpnext.py

@@ -9,8 +9,7 @@ def execute():
 	frappe.reload_doc('website', 'doctype', 'portal_menu_item')
 	frappe.reload_doc('buying', 'doctype', 'request_for_quotation')
 
-	if frappe.db.exists("Module Def", "Academics") \
-			and frappe.db.get_value("Module Def", "Academics", "app_name") == "schools":
+	if 'schools' in frappe.get_installed_apps():
 		frappe.db.sql("""delete from `tabDesktop Icon`""")
 		
 		if not frappe.db.exists('Module Def', 'Schools') and frappe.db.exists('Module Def', 'Academics'):