From b0a7c47de7cccc496cf3eef124b4f96cee7c2e1f Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Mon, 30 May 2022 17:50:57 +0530 Subject: [PATCH] fix(UX): dont query options for doctype that dont exist --- .../document_naming_settings.py | 10 +++++++--- .../test_document_naming_settings.py | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/frappe/core/doctype/document_naming_settings/document_naming_settings.py b/frappe/core/doctype/document_naming_settings/document_naming_settings.py index 13e1e4aeba..b3f1ad0e97 100644 --- a/frappe/core/doctype/document_naming_settings/document_naming_settings.py +++ b/frappe/core/doctype/document_naming_settings/document_naming_settings.py @@ -167,9 +167,13 @@ class DocumentNamingSettings(Document): ) @frappe.whitelist() - def get_options(self, arg=None): - if frappe.get_meta(arg or self.transaction_type).get_field("naming_series"): - return frappe.get_meta(arg or self.transaction_type).get_field("naming_series").options + def get_options(self, doctype=None): + doctype = doctype or self.transaction_type + if not doctype: + return + + if frappe.get_meta(doctype or self.transaction_type).get_field("naming_series"): + return frappe.get_meta(doctype or self.transaction_type).get_field("naming_series").options @frappe.whitelist() def get_current(self, arg=None): diff --git a/frappe/core/doctype/document_naming_settings/test_document_naming_settings.py b/frappe/core/doctype/document_naming_settings/test_document_naming_settings.py index 13da12fa19..f57d7b06aa 100644 --- a/frappe/core/doctype/document_naming_settings/test_document_naming_settings.py +++ b/frappe/core/doctype/document_naming_settings/test_document_naming_settings.py @@ -10,7 +10,7 @@ from frappe.tests.utils import FrappeTestCase class TestNamingSeries(FrappeTestCase): def setUp(self): - self.ns: DocumentNamingSettings = frappe.get_doc("Naming Series Settings") + self.ns: DocumentNamingSettings = frappe.get_doc("Document Naming Settings") def tearDown(self): frappe.db.rollback()