From 1b3cbb9a817813293c855c913041b937359da107 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 25 Oct 2017 17:24:09 +0530 Subject: [PATCH 1/3] [fix] if doctype is specified consider doctype in filter (#4381) --- frappe/model/meta.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/model/meta.py b/frappe/model/meta.py index 69182cdeff..81f5708dc8 100644 --- a/frappe/model/meta.py +++ b/frappe/model/meta.py @@ -483,7 +483,7 @@ def trim_tables(doctype=None): if doctype: filters["name"] = doctype - for doctype in frappe.db.get_all("DocType", filters={"issingle": 0}): + for doctype in frappe.db.get_all("DocType", filters=filters): doctype = doctype.name columns = frappe.db.get_table_columns(doctype) fields = frappe.get_meta(doctype).get_fieldnames_with_value() From c1af5db270708858d4077beea1f971e452e81d68 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 26 Oct 2017 09:42:24 +0530 Subject: [PATCH 2/3] [fix] translate domain --- frappe/core/doctype/domain_settings/domain_settings.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/core/doctype/domain_settings/domain_settings.py b/frappe/core/doctype/domain_settings/domain_settings.py index b3e1b133ae..a6bfaa0957 100644 --- a/frappe/core/doctype/domain_settings/domain_settings.py +++ b/frappe/core/doctype/domain_settings/domain_settings.py @@ -5,6 +5,7 @@ from __future__ import unicode_literals import frappe from frappe.model.document import Document +from frappe import _ class DomainSettings(Document): def set_active_domains(self, domains): @@ -31,6 +32,7 @@ class DomainSettings(Document): frappe.set_value('Role', role, 'disabled', 1) for domain in all_domains: + domain = _(domain) data = frappe.get_domain_data(domain) if not frappe.db.get_value('Domain', domain): frappe.get_doc(dict(doctype='Domain', domain=domain)).insert() From c160d3a2ab0f889b9532b6827254d5d35dafcbfb Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 26 Oct 2017 10:24:21 +0600 Subject: [PATCH 3/3] bumped to version 9.2.1 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 0d77a099df..26c77fcc25 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.0' +__version__ = '9.2.1' __title__ = "Frappe Framework" local = Local()