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

:erge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Anand Doshi 2013-02-19 16:55:42 +05:30
commit c25cf3f413
5 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
patches/patch_list.py
View File

@ -175,4 +175,11 @@ patch_list = [
"patches.february_2013.p05_leave_application", "patches.february_2013.p05_leave_application",
"patches.february_2013.gle_floating_point_issue_revisited", "patches.february_2013.gle_floating_point_issue_revisited",
"patches.february_2013.fix_outstanding", "patches.february_2013.fix_outstanding",
'execute:webnotes.reload_doc("selling", "Print Format", "Quotation Classic") # 2013-02-19',
'execute:webnotes.reload_doc("selling", "Print Format", "Quotation Modern") # 2013-02-19',
'execute:webnotes.reload_doc("selling", "Print Format", "Quotation Spartan") # 2013-02-19',
"execute:webnotes.delete_doc('DocType', 'Service Order')",
"execute:webnotes.delete_doc('DocType', 'Service Quotation')",
"execute:webnotes.delete_doc('DocType', 'Service Order Detail')",
"execute:webnotes.delete_doc('DocType', 'Service Quotation Detail')",
] ]

4
selling/Print Format/Quotation Classic/Quotation Classic.txt
View File

File diff suppressed because one or more lines are too long

4
selling/Print Format/Quotation Modern/Quotation Modern.txt
View File

File diff suppressed because one or more lines are too long

4
selling/Print Format/Quotation Spartan/Quotation Spartan.txt
View File

File diff suppressed because one or more lines are too long

10
setup/doctype/naming_series/naming_series.py
View File

@ -101,15 +101,19 @@ class DocType:
from core.doctype.doctype.doctype import DocType from core.doctype.doctype.doctype import DocType
dt = DocType() dt = DocType()
parent = sql("select parent from `tabDocField` where fieldname='naming_series' and parent != %s", self.doc.select_doc_for_series) parent = sql("""select dt.name from `tabDocField` df, `tabDocType` dt
sr = ([webnotes.model.doctype.get_property(p[0], 'options', 'naming_series'), p[0]] for p in parent) where dt.name = df.parent and df.fieldname='naming_series' and dt.name != %s""",
self.doc.select_doc_for_series)
sr = ([webnotes.model.doctype.get_property(p[0], 'options', 'naming_series'), p[0]]
for p in parent)
options = self.scrub_options_list(self.doc.set_options.split("\n")) options = self.scrub_options_list(self.doc.set_options.split("\n"))
for series in options: for series in options:
dt.validate_series(series, self.doc.select_doc_for_series) dt.validate_series(series, self.doc.select_doc_for_series)
for i in sr: for i in sr:
if i[0]: if i[0]:
if series in i[0].split("\n"): if series in i[0].split("\n"):
msgprint("Oops! Series name %s is already in use in %s. Please select a new one" % (series, i[1]), raise_exception=1) msgprint("Oops! Series name %s is already in use in %s. \
Please select a new one" % (series, i[1]), raise_exception=1)
def validate_series_name(self, n): def validate_series_name(self, n):
import re import re