Merge branch 'frappe:develop' into blog-email-notification

frappe/tests/test_printview.py

@@ -0,0 +1,22 @@
+import unittest
+
+import frappe
+from frappe.www.printview import get_html_and_style
+
+
+class PrintViewTest(unittest.TestCase):
+	def test_print_view_without_errors(self):
+
+		user = frappe.get_last_doc("User")
+
+		messages_before = frappe.get_message_log()
+		ret = get_html_and_style(doc=user.as_json(), print_format="Standard", no_letterhead=1)
+		messages_after = frappe.get_message_log()
+
+		if len(messages_after) > len(messages_before):
+			new_messages = messages_after[len(messages_before):]
+			self.fail("Print view showing error/warnings: \n"
+					+ "\n".join(str(msg) for msg in new_messages))
+
+		# html should exist
+		self.assertTrue(bool(ret["html"]))

frappe/www/app.py

@@ -45,7 +45,7 @@ def get_context(context):
 		"lang": frappe.local.lang,
 		"sounds": hooks["sounds"],
 		"boot": boot if context.get("for_mobile") else boot_json,
-		"desk_theme": desk_theme,
+		"desk_theme": desk_theme or "Light",
 		"csrf_token": csrf_token,
 		"google_analytics_id": frappe.conf.get("google_analytics_id"),
 		"google_analytics_anonymize_ip": frappe.conf.get("google_analytics_anonymize_ip"),