diff --git a/frappe/model/create_new.py b/frappe/model/create_new.py index aa4f4983ee..2b92a99b38 100644 --- a/frappe/model/create_new.py +++ b/frappe/model/create_new.py @@ -89,5 +89,5 @@ def get_default_value(df, defaults, user_permissions, parent_doc): elif df.fieldtype == "Time": return nowtime() - elif (df.fieldtype == "Select" and df.options and df.options != "[Select]"): + elif (df.fieldtype == "Select" and df.options and df.options not in ("[Select]", "Loading...")): return df.options.split("\n")[0] diff --git a/frappe/model/document.py b/frappe/model/document.py index 8449afe181..0097d392d6 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -84,6 +84,7 @@ class Document(BaseDocument): if not single_doc: single_doc = frappe.new_doc(self.doctype).as_dict() single_doc["name"] = self.doctype + del single_doc["__islocal"] self.update(single_doc) self.init_valid_columns() diff --git a/frappe/public/js/frappe/model/create_new.js b/frappe/public/js/frappe/model/create_new.js index 19fe0487de..5a63ca3dfa 100644 --- a/frappe/public/js/frappe/model/create_new.js +++ b/frappe/public/js/frappe/model/create_new.js @@ -66,7 +66,7 @@ $.extend(frappe.model, { doc[f.fieldname] = v; updated.push(f.fieldname); } else if(f.fieldtype == "Select" && f.options - && f.options!="[Select]") { + && !in_list(["[Select]", "Loading..."], f.options)) { doc[f.fieldname] = f.options.split("\n")[0]; } }