From a5bc359b10b16415cf9b14bc5aa5f0088f1e450a Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Thu, 5 Oct 2017 11:21:01 +0530 Subject: [PATCH 1/3] [hotfix] validate the image field on doctype or customize form update (#4244) --- frappe/core/doctype/doctype/doctype.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index fda42d7557..c5b9dc436a 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/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.""" From 192fae169c66c2c6b01053d32a76d75dad5d8f2c Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Thu, 5 Oct 2017 13:01:35 +0530 Subject: [PATCH 2/3] [Fix] Letter head not displaying proper in the pdf (#4251) --- frappe/utils/pdf.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/frappe/utils/pdf.py b/frappe/utils/pdf.py index 6fa7cd7231..6005346270 100644 --- a/frappe/utils/pdf.py +++ b/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 From 5830b523214183c793e543cf4e1790404820a373 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Thu, 5 Oct 2017 14:05:51 +0600 Subject: [PATCH 3/3] bumped to version 9.1.1 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 9e7039acd4..5a2dbd5b3f 100644 --- a/frappe/__init__.py +++ b/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()