diff --git a/frappe/desk/doctype/note/note.js b/frappe/desk/doctype/note/note.js index 2cd64d8f15..ececf61bc7 100644 --- a/frappe/desk/doctype/note/note.js +++ b/frappe/desk/doctype/note/note.js @@ -3,6 +3,10 @@ frappe.ui.form.on("Note", { if(frm.doc.__islocal) { frm.events.set_editable(frm, true); } else { + if(!frm.doc.content) { + frm.doc.content = ""; + } + // toggle edit frm.add_custom_button("Edit", function() { frm.events.set_editable(frm, !frm.is_note_editable); diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index 3dc909f2ea..b0bd13494f 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -306,9 +306,13 @@ class BaseDocument(object): def show_unique_validation_message(self, e): type, value, traceback = sys.exc_info() - fieldname = str(e).split("'")[-2] - label = fieldname if fieldname.startswith("unique_") else self.meta.get_label(fieldname) - frappe.msgprint(_("{0} must be unique".format(label))) + fieldname, label = str(e).split("'")[-2], None + if "unique_" in fieldname: + fieldname = fieldname.split("_", 1)[1] + df = self.meta.get_field(fieldname) + if df: + label = df.label + frappe.msgprint(_("{0} must be unique".format(label or fieldname))) raise frappe.UniqueValidationError, (self.doctype, self.name, e), traceback def db_set(self, fieldname, value, update_modified=True):