浏览代码

Merge branch 'hotfix'

version-14
Saurabh 7 年前
父节点
当前提交
08b80bafde
共有 3 个文件被更改,包括 7 次插入2 次删除
  1. +1
    -1
      frappe/__init__.py
  2. +3
    -0
      frappe/model/base_document.py
  3. +3
    -1
      frappe/public/js/legacy/clientscriptAPI.js

+ 1
- 1
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.2.19'
__version__ = '9.2.20'
__title__ = "Frappe Framework"

local = Local()


+ 3
- 0
frappe/model/base_document.py 查看文件

@@ -791,6 +791,9 @@ def _filter(data, filters, limit=None):

out, _filters = [], {}

if not data:
return out

# setup filters as tuples
if filters:
for f in filters:


+ 3
- 1
frappe/public/js/legacy/clientscriptAPI.js 查看文件

@@ -457,8 +457,10 @@ _f.Frm.prototype.can_create = function(doctype) {
}

if(this.custom_make_buttons && this.custom_make_buttons[doctype]) {
// custom buttons are translated and so are the keys
const key = __(this.custom_make_buttons[doctype]);
// if the button is present, then show make
return !!this.custom_buttons[this.custom_make_buttons[doctype]];
return !!this.custom_buttons[key];
}

if(this.can_make_methods && this.can_make_methods[doctype]) {


正在加载...
取消
保存