Merge branch 'hotfix'

This commit is contained in:
Saurabh 2017-08-21 15:48:55 +05:30
commit 0f63f8a889
3 changed files with 3 additions and 3 deletions

View file

@ -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()

View file

@ -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"""

View file

@ -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):