Merge branch 'master' into develop

frappe/__init__.py

@@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template
 
-__version__ = '7.1.15'
+__version__ = '7.1.16'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/model/rename_doc.py

@@ -85,8 +85,17 @@ def rename_parent_and_child(doctype, old, new, meta):
 	# rename the doc
 	frappe.db.sql("update `tab%s` set name=%s where name=%s" % (frappe.db.escape(doctype), '%s', '%s'),
 		(new, old))
+	update_autoname_field(doctype, new, meta)
 	update_child_docs(old, new, meta)
 
+def update_autoname_field(doctype, new, meta):
+	# update the value of the autoname field on rename of the docname
+	if meta.get('autoname'):
+		field = meta.get('autoname').split(':')
+		if field and field[0] == "field":
+			frappe.db.sql("update `tab%s` set %s=%s where name=%s" % (frappe.db.escape(doctype), field[1], '%s', '%s'),
+				(new, new))
+
 def validate_rename(doctype, new, meta, merge, force, ignore_permissions):
 	# using for update so that it gets locked and someone else cannot edit it while this rename is going on!
 	exists = frappe.db.sql("select name from `tab{doctype}` where name=%s for update".format(doctype=frappe.db.escape(doctype)), new)

frappe/patches.txt

@@ -1,7 +1,7 @@
 execute:frappe.db.sql("""update `tabPatch Log` set patch=replace(patch, '.4_0.', '.v4_0.')""") #2014-05-12
-frappe.patches.v7_1.rename_scheduler_log_to_error_log
 frappe.patches.v5_0.convert_to_barracuda_and_utf8mb4
 frappe.patches.v7_0.update_auth
+frappe.patches.v7_1.rename_scheduler_log_to_error_log
 frappe.patches.v6_1.rename_file_data
 frappe.patches.v7_0.re_route #2016-06-27
 execute:frappe.reload_doc('core', 'doctype', 'doctype', force=True) #2016-10-17