Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed Naming Series page loading fails #1524

Browse Source
This commit is contained in:
Anand Doshi 2014-04-24 13:51:35 +05:30
parent 8c62c40a3d
commit 7f2d08b03f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/setup/doctype/naming_series/naming_series.py
View File

@ -82,9 +82,6 @@ class NamingSeries(Document):
frappe.clear_cache(doctype=doctype) frappe.clear_cache(doctype=doctype)
def check_duplicate(self): def check_duplicate(self):
from frappe.core.doctype.doctype.doctype import DocType
dt = DocType()
parent = list(set( parent = list(set(
frappe.db.sql_list("""select dt.name frappe.db.sql_list("""select dt.name
from `tabDocField` df, `tabDocType` dt from `tabDocField` df, `tabDocType` dt
@ -97,9 +94,11 @@ class NamingSeries(Document):
)) ))
sr = [[frappe.get_meta(p).get_field("naming_series").options, p] sr = [[frappe.get_meta(p).get_field("naming_series").options, p]
for p in parent] for p in parent]
dt = frappe.get_doc("DocType", self.select_doc_for_series)
options = self.scrub_options_list(self.set_options.split("\n")) options = self.scrub_options_list(self.set_options.split("\n"))
for series in options: for series in options:
dt.validate_series(series, self.select_doc_for_series) dt.validate_series(series)
for i in sr: for i in sr:
if i[0]: if i[0]:
existing_series = [d.split('.')[0] for d in i[0].split("\n")] existing_series = [d.split('.')[0] for d in i[0].split("\n")]