From 73df6d2887ffae2d8845ca98a119e9e261e77dcd Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Wed, 10 Jul 2019 11:11:03 +0530
Subject: [PATCH] requested changes implemented

---
 frappe/core/doctype/doctype/doctype.py                 | 2 +-
 frappe/custom/doctype/customize_form/customize_form.py | 2 +-
 frappe/desk/doctype/auto_repeat/auto_repeat.js         | 2 +-
 frappe/public/js/frappe/form/sidebar/form_sidebar.js   | 6 +++---
 frappe/public/js/frappe/form/toolbar.js                | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py
index b158b6e87f..74ed56feb9 100644
--- a/frappe/core/doctype/doctype/doctype.py
+++ b/frappe/core/doctype/doctype/doctype.py
@@ -532,7 +532,7 @@ class DocType(Document):
 	def make_repeatable(self):
 		"""If allow_auto_repeat is set, add auto_repeat custom field."""
 		if self.allow_auto_repeat:
-			if not frappe.db.sql("SELECT `fieldname` FROM `tabCustom Field` WHERE `fieldname`='auto_repeat' and `dt`=%s",self.name):
+			if not frappe.db.exists('Custom Field', {'fieldname': 'auto_repeat', 'dt': self.name}):
 				insert_after = self.fields[len(self.fields) - 1].fieldname
 				df = dict(fieldname='auto_repeat', label='Auto Repeat', fieldtype='Link', options='Auto Repeat', insert_after=insert_after, read_only=1, no_copy=1, print_hide=1)
 				create_custom_field(self.name, df)
diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py
index 4950617e7f..425191c4eb 100644
--- a/frappe/custom/doctype/customize_form/customize_form.py
+++ b/frappe/custom/doctype/customize_form/customize_form.py
@@ -113,7 +113,7 @@ class CustomizeForm(Document):
 
 		#If allow_auto_repeat is set, add auto_repeat custom field.
 		if self.allow_auto_repeat:
-			if not frappe.db.sql("SELECT `fieldname` FROM `tabCustom Field` WHERE `fieldname`='auto_repeat' and `dt`=%s",self.doc_type):
+			if not frappe.db.exists('Custom Field', {'fieldname': 'auto_repeat', 'dt': self.doc_type}):
 				insert_after = self.fields[len(self.fields) - 1].fieldname
 				df = dict(fieldname='auto_repeat', label='Auto Repeat', fieldtype='Link', options='Auto Repeat', insert_after=insert_after, read_only=1, no_copy=1, print_hide=1)
 				create_custom_field(self.doc_type, df)
diff --git a/frappe/desk/doctype/auto_repeat/auto_repeat.js b/frappe/desk/doctype/auto_repeat/auto_repeat.js
index 3f8abc3ae7..51bbbffdc9 100644
--- a/frappe/desk/doctype/auto_repeat/auto_repeat.js
+++ b/frappe/desk/doctype/auto_repeat/auto_repeat.js
@@ -29,7 +29,7 @@ frappe.ui.form.on('Auto Repeat', {
 
 	refresh: function(frm) {
 		//if document is not saved do not show schedule and document link
-		if(!frm.doc.__unsaved) {
+		if (!frm.is_dirty()) {
 			let label = __('View {0}', [__(frm.doc.reference_doctype)]);
 			frm.add_custom_button(__(label),
 				function() {
diff --git a/frappe/public/js/frappe/form/sidebar/form_sidebar.js b/frappe/public/js/frappe/form/sidebar/form_sidebar.js
index 35397e8a27..5798d3361e 100644
--- a/frappe/public/js/frappe/form/sidebar/form_sidebar.js
+++ b/frappe/public/js/frappe/form/sidebar/form_sidebar.js
@@ -89,8 +89,8 @@ frappe.ui.form.Sidebar = Class.extend({
 		}
 	},
 
-	show_auto_repeat_status: function(){
-		if(this.frm.meta.allow_auto_repeat && this.frm.doc.auto_repeat){
+	show_auto_repeat_status: function() {
+		if (this.frm.meta.allow_auto_repeat && this.frm.doc.auto_repeat) {
 			const me = this;
 			frappe.call({
 				method: "frappe.client.get_value",
@@ -101,7 +101,7 @@ frappe.ui.form.Sidebar = Class.extend({
 					},
 					fieldname: ["frequency"]
 				},
-				callback: function(res){
+				callback: function(res) {
 					me.sidebar.find(".auto-repeat-status").html(__("Repeats {0}", [res.message.frequency]));
 					me.sidebar.find(".auto-repeat-status").on("click", function(){
 						frappe.set_route("Form", "Auto Repeat", me.frm.doc.auto_repeat);
diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js
index d0ea7d0428..3eebe2e371 100644
--- a/frappe/public/js/frappe/form/toolbar.js
+++ b/frappe/public/js/frappe/form/toolbar.js
@@ -202,7 +202,7 @@ frappe.ui.form.Toolbar = Class.extend({
 	},
 	can_repeat: function() {
 		return this.frm.meta.allow_auto_repeat
-			&& !this.frm.doc.__islocal
+			&& !this.frm.is_new()
 			&& !this.frm.doc.auto_repeat;
 	},
 	can_save: function() {