Merge branch 'develop' into merge_translated_doctypes

frappe/client.py

@@ -78,7 +78,13 @@ def get(doctype, name=None, filters=None, parent=None):
 	if frappe.is_table(doctype):
 		check_parent_permission(parent, doctype)
 
-	doc = frappe.get_doc(doctype, name or frappe.parse_json(filters))
+	if name:
+		doc = frappe.get_doc(doctype, name)
+	elif filters or filters == {}:
+		doc = frappe.get_doc(doctype, frappe.parse_json(filters))
+	else:
+		doc = frappe.get_doc(doctype)  # single
+
 	doc.check_permission()
 	return doc.as_dict()
 

frappe/custom/doctype/custom_field/custom_field.py

@@ -186,10 +186,13 @@ def create_custom_fields(custom_fields, ignore_validate=False, update=True):
 				field = frappe.db.get_value("Custom Field", {"dt": doctype, "fieldname": df["fieldname"]})
 				if not field:
 					try:
+						df = df.copy()
 						df["owner"] = "Administrator"
 						create_custom_field(doctype, df, ignore_validate=ignore_validate)
+
 					except frappe.exceptions.DuplicateEntryError:
 						pass
+
 				elif update:
 					custom_field = frappe.get_doc("Custom Field", field)
 					custom_field.flags.ignore_validate = ignore_validate

frappe/tests/test_client.py

@@ -139,7 +139,8 @@ class TestClient(unittest.TestCase):
 
 		self.assertEqual(get("ToDo", filters=filters).description, "test")
 		self.assertEqual(get("ToDo", filters=filters_json).description, "test")
-
+		self.assertEqual(get("System Settings", "", "").doctype, "System Settings")
+		self.assertEqual(get("ToDo", filters={}), get("ToDo", filters="{}"))
 		todo.delete()
 
 	def test_client_insert(self):