Merge branch 'v4.x.x'

frappe/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = "4.13.4"
+__version__ = "4.13.5"

frappe/core/doctype/print_format/print_format.py

@@ -19,7 +19,7 @@ class PrintFormat(Document):
 
 		jenv = frappe.get_jenv()
 		try:
-			jenv.from_string(self.html)
+			jenv.from_string(self.html or "")
 		except TemplateSyntaxError, e:
 			frappe.msgprint('Line {}: {}'.format(e.lineno, e.message))
 			frappe.throw(frappe._("Syntax error in Jinja template"))

frappe/hooks.py

@@ -4,7 +4,7 @@ app_title = "Frappe Framework"
 app_publisher = "Web Notes Technologies Pvt. Ltd."
 app_description = "Full Stack Web Application Framework in Python"
 app_icon = "assets/frappe/images/frappe.svg"
-app_version = "4.13.4"
+app_version = "4.13.5"
 app_color = "#3498db"
 app_email = "support@frappe.io"
 

frappe/website/website_generator.py

@@ -83,8 +83,11 @@ class WebsiteGenerator(Document):
 			field = self.meta.get_field(self.parent_website_route_field)
 			parent = self.get(self.parent_website_route_field)
 			if parent:
-				self.parent_website_route = frappe.get_doc(field.options,
-					parent).get_route()
+				parent_doc = frappe.get_doc(field.options, parent)
+				if parent_doc.website_published():
+					self.parent_website_route = parent_doc.get_route()
+				else:
+					self.parent_website_route = None
 
 	def update_routes_of_descendants(self, old_route = None):
 		if not self.is_new() and self.meta.get_field("parent_website_route"):

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = "4.13.4"
+version = "4.13.5"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()