From 40bdc767dc6717574c58b82ebff081e007e9fac3 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Sat, 19 Aug 2017 15:15:58 +0530 Subject: [PATCH 1/3] [minor] Bypass template validation for js print format --- frappe/printing/doctype/print_format/print_format.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/printing/doctype/print_format/print_format.py b/frappe/printing/doctype/print_format/print_format.py index 7c9afe9844..ea66665572 100644 --- a/frappe/printing/doctype/print_format/print_format.py +++ b/frappe/printing/doctype/print_format/print_format.py @@ -27,7 +27,7 @@ class PrintFormat(Document): if not self.module: self.module = frappe.db.get_value('DocType', self.doc_type, 'module') - if self.html: + if self.html and self.print_format_type != 'Js': validate_template(self.html) def extract_images(self): From 087dd23e3bd7aa88df52d8fabe04c3aa6d166cf3 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 21 Aug 2017 15:32:02 +0530 Subject: [PATCH 2/3] [hot][fix] add daily_emails key in clear-limits check --- frappe/commands/site.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index 05c3ff4dc5..d5944ad023 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -470,7 +470,7 @@ def _set_limits(context, site, limits): @click.command('clear-limits') @click.option('--site', help='site name') @click.argument('limits', nargs=-1, type=click.Choice(['emails', 'space', 'users', 'email_group', - 'expiry', 'support_email', 'support_chat', 'upgrade_url'])) + 'expiry', 'support_email', 'support_chat', 'upgrade_url', 'daily_emails'])) @pass_context def clear_limits(context, site, limits): """Clears given limit from the site config, and removes limit from site config if its empty""" From 69085c75e33ccdcb67481c1df38a23addc6b216b Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 21 Aug 2017 16:18:54 +0600 Subject: [PATCH 3/3] bumped to version 8.7.10 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 2a83741212..c92e8b4a89 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__ = '8.7.9' +__version__ = '8.7.10' __title__ = "Frappe Framework" local = Local()