Merge pull request #4508 from saurabh6790/domain_fixes

[fix] do not translate domain records

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:

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()