diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js index 746f316bb0..ffcc1eafc1 100755 --- a/frappe/public/js/frappe/form/control.js +++ b/frappe/public/js/frappe/form/control.js @@ -1537,7 +1537,7 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({ // validate the value just entered var me = this; - if(this.df.options=="[Select]") { + if(this.df.options=="[Select]" || this.df.ignore_link_validation) { callback(value); return; } diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 2d7a1e7a3e..789923d752 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -306,6 +306,7 @@ frappe.views.QueryReport = Class.extend({ var f = me.page.add_field(df); $(f.wrapper).addClass("filters pull-left"); me.filters.push(f); + if(df["default"]) { f.set_input(df["default"]); } @@ -327,6 +328,7 @@ frappe.views.QueryReport = Class.extend({ } f.set_mandatory && f.set_mandatory(f.$input.val()); } + df.ignore_link_validation = true; } });