From 9fd552d3f22684132ab48d6af1aa59dbab5b5367 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 14 Nov 2017 14:14:45 +0530 Subject: [PATCH 1/2] [fix] domain.remove_domain --- frappe/core/doctype/domain/domain.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/domain/domain.py b/frappe/core/doctype/domain/domain.py index 890ef87af6..d897d6ee30 100644 --- a/frappe/core/doctype/domain/domain.py +++ b/frappe/core/doctype/domain/domain.py @@ -49,10 +49,10 @@ class Domain(Document): custom_fields = [custom_fields] for custom_field_detail in custom_fields: - custom_field = frappe.get_doc('Custom Field', + custom_field_name = frappe.db.get_value('Custom Field', dict(dt=doctype, fieldname=custom_field_detail.get('fieldname'))) - custom_field.delete() - + if custom_field_name: + frappe.delete_doc('Custom Field', custom_field_name) def setup_roles(self): '''Enable roles that are restricted to this domain''' From 5363b9ab2905c0e7de1daeace1f3b42a3ff603d1 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 14 Nov 2017 14:45:37 +0600 Subject: [PATCH 2/2] bumped to version 9.2.13 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index ee58ac2f83..726472be52 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.12' +__version__ = '9.2.13' __title__ = "Frappe Framework" local = Local()