From d61b92dc1f69ab24fa4d6ceb7a93a7b2fb02c047 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Fri, 17 Nov 2017 12:26:59 +0530 Subject: [PATCH] [fix] do not translate domain records --- frappe/core/doctype/domain/domain.py | 12 +++++++----- .../core/doctype/domain_settings/domain_settings.py | 1 - 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/frappe/core/doctype/domain/domain.py b/frappe/core/doctype/domain/domain.py index d897d6ee30..1f9ff60f66 100644 --- a/frappe/core/doctype/domain/domain.py +++ b/frappe/core/doctype/domain/domain.py @@ -34,11 +34,13 @@ class Domain(Document): def remove_domain(self): '''Unset domain settings''' self.setup_data() - for role_name in self.data.restricted_roles: - if frappe.db.exists('Role', role_name): - role = frappe.get_doc('Role', role_name) - role.disabled = 1 - role.save() + + if self.data.restricted_roles: + for role_name in self.data.restricted_roles: + if frappe.db.exists('Role', role_name): + role = frappe.get_doc('Role', role_name) + role.disabled = 1 + role.save() if self.data.custom_fields: for doctype in self.data.custom_fields: diff --git a/frappe/core/doctype/domain_settings/domain_settings.py b/frappe/core/doctype/domain_settings/domain_settings.py index a6bfaa0957..ab3cfc38df 100644 --- a/frappe/core/doctype/domain_settings/domain_settings.py +++ b/frappe/core/doctype/domain_settings/domain_settings.py @@ -32,7 +32,6 @@ 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()