浏览代码

Merge branch 'hotfix'

version-14
Saurabh 8 年前
父节点
当前提交
0f63f8a889
共有 3 个文件被更改,包括 3 次插入3 次删除
  1. +1
    -1
      frappe/__init__.py
  2. +1
    -1
      frappe/commands/site.py
  3. +1
    -1
      frappe/printing/doctype/print_format/print_format.py

+ 1
- 1
frappe/__init__.py 查看文件

@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
from .exceptions import * from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template 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" __title__ = "Frappe Framework"


local = Local() local = Local()


+ 1
- 1
frappe/commands/site.py 查看文件

@@ -470,7 +470,7 @@ def _set_limits(context, site, limits):
@click.command('clear-limits') @click.command('clear-limits')
@click.option('--site', help='site name') @click.option('--site', help='site name')
@click.argument('limits', nargs=-1, type=click.Choice(['emails', 'space', 'users', 'email_group', @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 @pass_context
def clear_limits(context, site, limits): def clear_limits(context, site, limits):
"""Clears given limit from the site config, and removes limit from site config if its empty""" """Clears given limit from the site config, and removes limit from site config if its empty"""


+ 1
- 1
frappe/printing/doctype/print_format/print_format.py 查看文件

@@ -27,7 +27,7 @@ class PrintFormat(Document):
if not self.module: if not self.module:
self.module = frappe.db.get_value('DocType', self.doc_type, '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) validate_template(self.html)


def extract_images(self): def extract_images(self):


正在加载...
取消
保存