Merge pull request #563 from nabinhait/v4-hotfix

Some fixes

frappe/country_info.py

@@ -11,7 +11,7 @@ def get_country_info(country=None):
 	data = frappe._dict(data.get(country, {}))
 	if not 'date_format' in data:
 		data.date_format = "dd-mm-yyyy"
-			
+
 	return data
 
 def get_all():
@@ -19,7 +19,7 @@ def get_all():
 		all_data = json.loads(local_info.read())
 	return all_data
 
-@frappe.whitelist()	
+@frappe.whitelist()
 def get_country_timezone_info():
 	import pytz
 	return {
@@ -30,15 +30,13 @@ def get_country_timezone_info():
 def update():
 	with open(os.path.join(os.path.dirname(__file__), "currency_info.json"), "r") as nformats:
 		nformats = json.loads(nformats.read())
-		
+
 	all_data = get_all()
-	
+
 	for country in all_data:
 		data = all_data[country]
-		data["number_format"] = nformats.get(data.get("currency", "default"), 
+		data["number_format"] = nformats.get(data.get("currency", "default"),
 			nformats.get("default"))["display"]
-	
-	print all_data
-	
+
 	with open(os.path.join(os.path.dirname(__file__), "country_info.json"), "w") as local_info:
 		local_info.write(json.dumps(all_data, indent=1))

frappe/model/document.py

@@ -400,9 +400,15 @@ class Document(BaseDocument):
 			self.run_method("on_submit")
 		elif self._action=="cancel":
 			self.run_method("on_cancel")
+			self.check_no_back_links_exist()
 		elif self._action=="update_after_submit":
 			self.run_method("on_update_after_submit")
 
+	def check_no_back_links_exist(self):
+		from frappe.model.delete_doc import check_if_doc_is_linked
+		if not self.get("ignore_links"):
+			check_if_doc_is_linked(self, method="Cancel")
+
 	@staticmethod
 	def whitelist(f):
 		f.whitelisted = True

frappe/model/rename_doc.py

@@ -23,7 +23,7 @@ def rename_doc(doctype, old, new, force=False, merge=False, ignore_permissions=F
 
 	# call before_rename
 	out = frappe.get_doc(doctype, old).run_method("before_rename", old, new, merge) or {}
-	new = (out.get("new") or new) if isinstance(out, dict) else new
+	new = (out.get("new") or new) if isinstance(out, dict) else (out or new)
 	new = validate_rename(doctype, new, meta, merge, force, ignore_permissions)
 
 	if not merge:

frappe/templates/pages/style_settings.py

@@ -12,8 +12,6 @@ def get_context(context):
 	doc = frappe.get_doc("Style Settings", "Style Settings")
 	prepare(doc)
 
-	print doc.page_header_color
-
 	return { "doc": doc }
 
 def prepare(doc):

frappe/widgets/form/assign_to.py

@@ -68,16 +68,19 @@ def add(args=None):
 @frappe.whitelist()
 def remove(doctype, name, assign_to):
 	"""remove from todo"""
-	todo = frappe.get_doc("ToDo", {"reference_type":doctype, "reference_name":name, "owner":assign_to, "status":"Open"})
-	todo.status = "Closed"
-	todo.save(ignore_permissions=True)
+	try:
+		todo = frappe.get_doc("ToDo", {"reference_type":doctype, "reference_name":name, "owner":assign_to, "status":"Open"})
+		todo.status = "Closed"
+		todo.save(ignore_permissions=True)
+
+		notify_assignment(todo.assigned_by, todo.owner, todo.reference_type, todo.reference_name)
+	except frappe.DoesNotExistError:
+		pass
 
 	# clear assigned_to if field exists
 	if frappe.get_meta(doctype).get_field("assigned_to"):
 		frappe.db.set_value(doctype, name, "assigned_to", None)
 
-	notify_assignment(todo.assigned_by, todo.owner, todo.reference_type, todo.reference_name)
-
 	return get({"doctype": doctype, "name": name})
 
 def clear(doctype, name):