Merge branch 'develop' into version-12

Author: sahil28297

frappe/__init__.py

@@ -23,7 +23,7 @@
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '12.0.8'
+__version__ = '12.0.9'
 __title__ = "Frappe Framework"
 
 local = Local()
@@ -1162,7 +1162,7 @@ def respond_as_web_page(title, html, success=None, http_status_code=None,
 	:param context: web template context
 	:param indicator_color: color of indicator in title
 	:param primary_action: route on primary button (default is `/`)
-	:param primary_label: label on primary button (defaut is "Home")
+	:param primary_label: label on primary button (default is "Home")
 	:param fullpage: hide header / footer
 	:param width: Width of message in pixels
 	:param template: Optionally pass view template
@@ -1171,6 +1171,8 @@ def respond_as_web_page(title, html, success=None, http_status_code=None,
 	local.message = html
 	local.response['type'] = 'page'
 	local.response['route'] = template
+	local.no_cache = 1
+
 	if http_status_code:
 		local.response['http_status_code'] = http_status_code
 

frappe/api.py

@@ -113,7 +113,10 @@ def handle():
 							doctype, **frappe.local.form_dict)})
 
 				if frappe.local.request.method=="POST":
-					data = json.loads(frappe.local.form_dict.data)
+					if frappe.local.form_dict.data is None:
+						data = json.loads(frappe.local.request.get_data())
+					else:
+						data = json.loads(frappe.local.form_dict.data)
 					data.update({
 						"doctype": doctype
 					})

frappe/automation/doctype/auto_repeat/auto_repeat.py

@@ -221,7 +221,9 @@ def send_notification(self, new_doc):
 		attachments = [frappe.attach_print(new_doc.doctype, new_doc.name,
 			file_name=new_doc.name, print_format=print_format)]
 
-		make(doctype=new_doc.doctype, name=new_doc.name, recipients=self.recipients,
+		recipients = self.recipients.split('\n')
+
+		make(doctype=new_doc.doctype, name=new_doc.name, recipients=recipients,
 			subject=subject, content=message, attachments=attachments, send_email=1)
 
 	def fetch_linked_contacts(self):
@@ -243,13 +245,14 @@ def disable_auto_repeat(self):
 		frappe.db.set_value('Auto Repeat', self.name, 'disabled', 1)
 
 	def notify_error_to_user(self, error_log):
-		recipients = get_system_managers(only_name=True) + self.owner
+		recipients = list(get_system_managers(only_name=True))
+		recipients.append(self.owner)
 		subject = _("Auto Repeat Document Creation Failed")
 
 		form_link = frappe.utils.get_link_to_form(self.reference_doctype, self.reference_document)
 		auto_repeat_failed_for = _('Auto Repeat failed for {0}').format(form_link)
 
-		error_log_link =frappe.utils.get_link_to_form(error_log.reference_doctype, error_log.reference_document)
+		error_log_link = frappe.utils.get_link_to_form('Error Log', error_log.name)
 		error_log_message = _('Check the Error Log for more information: {0}').format(error_log_link)
 
 		frappe.sendmail(

frappe/client.py

@@ -377,3 +377,14 @@ def check_parent_permission(parent, child_doctype):
 	# Either parent not passed or the user doesn't have permission on parent doctype of child table!
 	raise frappe.PermissionError
 
+@frappe.whitelist()
+def is_document_amended(doctype, docname):
+	if frappe.permissions.has_permission(doctype):
+		try:
+			return frappe.db.exists(doctype, {
+				'amended_from': docname
+			})
+		except frappe.db.InternalError:
+			pass
+
+	return False

frappe/contacts/address_and_contact.py

@@ -10,7 +10,7 @@
 
 def load_address_and_contact(doc, key=None):
 	"""Loads address list and contact list in `__onload`"""
-	from frappe.contacts.doctype.address.address import get_address_display
+	from frappe.contacts.doctype.address.address import get_address_display, get_condensed_address
 
 	filters = [
 		["Dynamic Link", "link_doctype", "=", doc.doctype],
@@ -37,6 +37,23 @@ def load_address_and_contact(doc, key=None):
 	]
 	contact_list = frappe.get_all("Contact", filters=filters, fields=["*"])
 
+	for contact in contact_list:
+		contact["email_ids"] = frappe.get_list("Contact Email", filters={
+				"parenttype": "Contact",
+				"parent": contact.name,
+				"is_primary": 0
+			}, fields=["email_id"])
+
+		contact["phone_nos"] = frappe.get_list("Contact Phone", filters={
+				"parenttype": "Contact",
+				"parent": contact.name,
+				"is_primary": 0
+			}, fields=["phone"])
+
+		if contact.address:
+			address = frappe.get_doc("Address", contact.address)
+			contact["address"] = get_condensed_address(address)
+
 	contact_list = sorted(contact_list,
 		key = functools.cmp_to_key(lambda a, b:
 			(int(a.is_primary_contact - b.is_primary_contact)) or