From 7f2d08b03f66a7c15b86eddf8c8426e7d8eb6c42 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 24 Apr 2014 13:51:35 +0530 Subject: [PATCH] Fixed Naming Series page loading fails #1524 --- erpnext/setup/doctype/naming_series/naming_series.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/erpnext/setup/doctype/naming_series/naming_series.py b/erpnext/setup/doctype/naming_series/naming_series.py index 186bde319d..1dcf218a5e 100644 --- a/erpnext/setup/doctype/naming_series/naming_series.py +++ b/erpnext/setup/doctype/naming_series/naming_series.py @@ -82,9 +82,6 @@ class NamingSeries(Document): frappe.clear_cache(doctype=doctype) def check_duplicate(self): - from frappe.core.doctype.doctype.doctype import DocType - dt = DocType() - parent = list(set( frappe.db.sql_list("""select dt.name from `tabDocField` df, `tabDocType` dt @@ -97,9 +94,11 @@ class NamingSeries(Document): )) sr = [[frappe.get_meta(p).get_field("naming_series").options, p] for p in parent] + + dt = frappe.get_doc("DocType", self.select_doc_for_series) options = self.scrub_options_list(self.set_options.split("\n")) for series in options: - dt.validate_series(series, self.select_doc_for_series) + dt.validate_series(series) for i in sr: if i[0]: existing_series = [d.split('.')[0] for d in i[0].split("\n")]