Merge branch 'hotfix'

frappe/__init__.py

@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '9.1.0'
+__version__ = '9.1.1'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/core/doctype/doctype/doctype.py

@@ -637,6 +637,7 @@ def validate_fields(meta):
 	check_timeline_field(meta)
 	check_is_published_field(meta)
 	check_sort_field(meta)
+	check_image_field(meta)
 
 def validate_permissions_for_doctype(doctype, for_remove=False):
 	"""Validates if permissions are set correctly."""

frappe/utils/pdf.py

@@ -64,9 +64,7 @@ def prepare_options(html, options):
 
 		# defaults
 		'margin-right': '15mm',
-		'margin-left': '15mm',
-		'margin-top': '15mm',
-		'margin-bottom': '15mm',
+		'margin-left': '15mm'
 	})
 
 	html, html_options = read_options_from_html(html)
@@ -135,6 +133,11 @@ def prepare_header_footer(soup):
 
 			# {"header-html": "/tmp/frappe-pdf-random.html"}
 			options[html_id] = fname
+		else:
+			if html_id == "header-html":
+				options["margin-top"] = "15mm"
+			elif html_id == "footer-html":
+				options["margin-bottom"] = "15mm"
 
 	return options