diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py index 178bc427eb..66238dd4b0 100644 --- a/frappe/model/db_query.py +++ b/frappe/model/db_query.py @@ -458,7 +458,7 @@ class DatabaseQuery(object): f.operator = '=' value = "" - fallback = '""' + fallback = "''" can_be_null = True if 'ifnull' not in column_name: diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 68ff55efe5..5313f64b41 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -72,7 +72,7 @@ frappe.Application = Class.extend({ frappe.msgprint(frappe.boot.messages); } - if (frappe.boot.change_log && frappe.boot.change_log.length) { + if (frappe.boot.change_log && frappe.boot.change_log.length && !window.Cypress) { this.show_change_log(); } else { this.show_notes();