From 895f6605e90f998324c5d253fff48a48a591efb7 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Fri, 1 Dec 2017 12:06:01 +0530 Subject: [PATCH 1/3] [hotfix] doc.get (#4564) --- frappe/model/base_document.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index 5b2512a856..c266f419ee 100644 --- a/frappe/model/base_document.py +++ b/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: From 4078a543c4d7d7c94b0aab41e92f740ffb344fb2 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Fri, 1 Dec 2017 16:06:08 +0530 Subject: [PATCH 2/3] [fix] frm.can_create when language is different (#4567) --- frappe/public/js/legacy/clientscriptAPI.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/legacy/clientscriptAPI.js b/frappe/public/js/legacy/clientscriptAPI.js index dc715defe8..c4032760c7 100644 --- a/frappe/public/js/legacy/clientscriptAPI.js +++ b/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]) { From 42ac72a995fb3e5d04ac9d0878a3faa30a88539f Mon Sep 17 00:00:00 2001 From: Saurabh Date: Fri, 1 Dec 2017 16:49:16 +0600 Subject: [PATCH 3/3] bumped to version 9.2.20 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 7894d3a24b..97d576d433 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.2.19' +__version__ = '9.2.20' __title__ = "Frappe Framework" local = Local()