From c79055c40f21f0cf44db3def44c3098a9a01965e Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 21 Mar 2017 17:44:22 +0100
Subject: [PATCH] [minor] refactor naming.py

---
 frappe/model/naming.py                  | 10 +++++-----
 frappe/public/js/frappe/form/toolbar.js |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/frappe/model/naming.py b/frappe/model/naming.py
index 5f65a8b3f3..ce0ecb2a6b 100644
--- a/frappe/model/naming.py
+++ b/frappe/model/naming.py
@@ -187,20 +187,20 @@ def _set_amended_name(doc):
 	doc.name = am_prefix + '-' + str(am_id)
 	return doc.name
 
-def append_number_if_name_exists(doc):
-	if frappe.db.exists(doc.doctype, doc.name):
+def append_number_if_name_exists(doctype, name):
+	if frappe.db.exists(doctype, name):
 		last = frappe.db.sql("""select name from `tab{}`
 			where name regexp '^{}-[[:digit:]]+'
-			order by length(name) desc, name desc limit 1""".format(doc.doctype, doc.name))
+			order by length(name) desc, name desc limit 1""".format(doctype, name))
 
 		if last:
 			count = str(cint(last[0][0].rsplit("-", 1)[1]) + 1)
 		else:
 			count = "1"
 
-		doc.name = "{0}-{1}".format(doc.name, count)
+		name = "{0}-{1}".format(name, count)
 
-	return doc
+	return name
 
 def de_duplicate(doctype, name):
 	original_name = name
diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js
index 35074a8a84..734475e1df 100644
--- a/frappe/public/js/frappe/form/toolbar.js
+++ b/frappe/public/js/frappe/form/toolbar.js
@@ -91,7 +91,7 @@ frappe.ui.form.Toolbar = Class.extend({
 	set_indicator: function() {
 		if(this.frm.save_disabled)
 			return;
-		
+
 		var indicator = frappe.get_indicator(this.frm.doc);
 		if(indicator) {
 			this.page.set_indicator(indicator[0], indicator[1]);
@@ -173,13 +173,13 @@ frappe.ui.form.Toolbar = Class.extend({
 				}, true);
 			}
 		}
-		
+
 		// feedback
 		if(!this.frm.doc.__unsaved) {
 			if(is_submittable && docstatus != 1)
 				return
 
-			this.page.add_menu_item(__("Ask a Feedback"), function() {
+			this.page.add_menu_item(__("Request Feedback"), function() {
 				feedback = new frappe.utils.Feedback();
 				feedback.manual_feedback_request(me.frm.doc);
 			}, true)