From 8dd14aa6c1b2ca4f8c8fc8dedad9587067c9d06a Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Wed, 4 Jun 2014 20:50:26 +0530
Subject: [PATCH] Fixed enable scheduler patch, control.js disp_area fix

---
 .../enable_scheduler_in_system_settings.py    |  1 +
 frappe/public/js/frappe/form/control.js       | 21 ++++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/frappe/patches/v4_0/enable_scheduler_in_system_settings.py b/frappe/patches/v4_0/enable_scheduler_in_system_settings.py
index 8cb4e510fb..274cc7eb98 100644
--- a/frappe/patches/v4_0/enable_scheduler_in_system_settings.py
+++ b/frappe/patches/v4_0/enable_scheduler_in_system_settings.py
@@ -6,6 +6,7 @@ import frappe
 from frappe.utils.scheduler import disable_scheduler, enable_scheduler
 
 def execute():
+	frappe.reload_doc("core", "doctype", "system_settings")
 	if frappe.db.get_global("disable_scheduler"):
 		disable_scheduler()
 	else:
diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js
index 34939d351b..88e87f3bb8 100644
--- a/frappe/public/js/frappe/form/control.js
+++ b/frappe/public/js/frappe/form/control.js
@@ -193,12 +193,10 @@ frappe.ui.form.ControlInput = frappe.ui.form.Control.extend({
 				} else {
 					$(me.input_area).toggle(false);
 					$(me.input_area).find("input").prop("disabled", true);
-					me.disp_area && $(me.disp_area)
-						.toggle(true)
-						.html(
-							frappe.format(me.value, me.df,
-								{no_icon:true}, me.name ? locals[me.doctype][me.name] : null)
-						);
+					if (me.disp_area) {
+						me.set_disp_area();
+						$(me.disp_area).toggle(true);
+					}
 				}
 
 				me.set_description();
@@ -208,6 +206,15 @@ frappe.ui.form.ControlInput = frappe.ui.form.Control.extend({
 			return false;
 		});
 	},
+
+	set_disp_area: function() {
+		this.disp_area && $(this.disp_area)
+			.html(
+				frappe.format(this.value, this.df,
+					{no_icon:true}, this.name ? locals[this.doctype][this.name] : null)
+			);
+	},
+
 	bind_change_event: function() {
 		var me = this;
 		this.$input && this.$input.on("change", this.change || function(e) {
@@ -289,7 +296,7 @@ frappe.ui.form.ControlData = frappe.ui.form.ControlInput.extend({
 	},
 	set_input: function(val) {
 		this.$input && this.$input.val(this.format_for_input(val));
-		this.disp_area && $(this.disp_area).html(this.format_for_input(val));
+		this.set_disp_area();
 		this.last_value = val;
 		this.set_mandatory && this.set_mandatory(val);
 	},