Merge pull request #619 from nabinhait/v4-hotfix

Multiple fixes

frappe/model/__init__.py

@@ -113,7 +113,7 @@ def rename_field(doctype, old_fieldname, new_fieldname):
 		where doc_type=%s and field_name=%s""", (new_fieldname, doctype, old_fieldname))
 
 	update_reports(doctype, old_fieldname, new_fieldname)
-	update_users_report_view_settings(doctype, old_fieldname)
+	update_users_report_view_settings(doctype, old_fieldname, new_fieldname)
 
 def update_reports(doctype, old_fieldname, new_fieldname):
 	def _get_new_sort_by(report_dict, report, key):
@@ -175,7 +175,7 @@ def update_reports(doctype, old_fieldname, new_fieldname):
 
 			frappe.db.sql("""update `tabReport` set `json`=%s where name=%s""", (new_val, r.name))
 
-def update_users_report_view_settings(doctype, ref_fieldname):
+def update_users_report_view_settings(doctype, ref_fieldname, new_fieldname):
 	user_report_cols = frappe.db.sql("""select defkey, defvalue from `tabDefaultValue` where
 		defkey like '_list_settings:%'""")
 	for key, value in user_report_cols:
@@ -183,8 +183,11 @@ def update_users_report_view_settings(doctype, ref_fieldname):
 		columns_modified = False
 		for field, field_doctype in json.loads(value):
 			if field == ref_fieldname and field_doctype == doctype:
-				new_columns.append([field, field_doctype])
+				new_columns.append([new_fieldname, field_doctype])
 				columns_modified=True
+			else:
+				new_columns.append([field, field_doctype])
+
 		if columns_modified:
 			frappe.db.sql("""update `tabDefaultValue` set defvalue=%s
 				where defkey=%s""" % ('%s', '%s'), (json.dumps(new_columns), key))

frappe/model/document.py

@@ -399,7 +399,6 @@ class Document(BaseDocument):
 		elif self._action=="cancel":
 			self.run_method("before_cancel")
 		elif self._action=="update_after_submit":
-			self.run_method("validate")
 			self.run_method("before_update_after_submit")
 
 	def run_post_save_methods(self):

frappe/public/js/frappe/model/model.js

@@ -212,9 +212,8 @@ $.extend(frappe.model, {
 	},
 
 	get_value: function(doctype, filters, fieldname) {
-		if(typeof filters==="string") {
-			return locals[doctype] && locals[doctype][filters]
-				&& locals[doctype][filters][fieldname];
+		if(typeof filters==="string" && locals[doctype] && locals[doctype][filters]) {
+			return locals[doctype][filters][fieldname];
 		} else {
 			var l = frappe.get_list(doctype, filters);
 			return (l.length && l[0]) ? l[0][fieldname] : null;

frappe/public/js/legacy/form.js

@@ -619,13 +619,16 @@ _f.Frm.prototype._save = function(save_action, callback, btn, on_error) {
 	if((!this.meta.in_dialog || this.in_form) && !this.meta.istable)
 		scroll(0, 0);
 
-	// validate
-	validated = true;
-	this.script_manager.trigger("validate");
-	if(!validated) {
-		if(on_error)
-			on_error();
-		return;
+	if(save_action != "Update") {
+		// validate
+		validated = true;
+		this.script_manager.trigger("validate");
+
+		if(!validated) {
+			if(on_error)
+				on_error();
+			return;
+		}
 	}
 
 	var after_save = function(r) {