diff --git a/patches/patch_list.py b/patches/patch_list.py
index d42360ef067..ab9130ebe62 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -175,4 +175,11 @@ patch_list = [
"patches.february_2013.p05_leave_application",
"patches.february_2013.gle_floating_point_issue_revisited",
"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')",
]
\ No newline at end of file
diff --git a/selling/Print Format/Quotation Classic/Quotation Classic.txt b/selling/Print Format/Quotation Classic/Quotation Classic.txt
index 885570ecf27..ca950a21ad6 100644
--- a/selling/Print Format/Quotation Classic/Quotation Classic.txt
+++ b/selling/Print Format/Quotation Classic/Quotation Classic.txt
@@ -2,14 +2,14 @@
{
"creation": "2012-04-17 11:29:12",
"docstatus": 0,
- "modified": "2013-01-25 17:11:54",
+ "modified": "2013-02-19 15:44:56",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"doc_type": "Quotation",
"doctype": "Print Format",
- "html": "\n\n\n\n\n\n\n\n\n\n\n
\n\n\t\n\t\n
\n\n",
+ "html": "\n\n\n\n\n\n\n\n\n\n\n\n\n\t\n\t\n
\n\n",
"module": "Selling",
"name": "__common__",
"standard": "Yes"
diff --git a/selling/Print Format/Quotation Modern/Quotation Modern.txt b/selling/Print Format/Quotation Modern/Quotation Modern.txt
index 707d5ead931..a323fbf8292 100644
--- a/selling/Print Format/Quotation Modern/Quotation Modern.txt
+++ b/selling/Print Format/Quotation Modern/Quotation Modern.txt
@@ -2,14 +2,14 @@
{
"creation": "2012-04-17 11:29:12",
"docstatus": 0,
- "modified": "2013-01-25 17:15:42",
+ "modified": "2013-02-19 15:44:22",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"doc_type": "Quotation",
"doctype": "Print Format",
- "html": "\n\n\n\n\n\n\n\n\n\n\n\n\n\t\n\t\n
\n\n",
+ "html": "\n\n\n\n\n\n\n\n\n\n\n\n\n\t\n\t\n
\n\n",
"module": "Selling",
"name": "__common__",
"standard": "Yes"
diff --git a/selling/Print Format/Quotation Spartan/Quotation Spartan.txt b/selling/Print Format/Quotation Spartan/Quotation Spartan.txt
index f49e4c99208..d2e04dda8d6 100644
--- a/selling/Print Format/Quotation Spartan/Quotation Spartan.txt
+++ b/selling/Print Format/Quotation Spartan/Quotation Spartan.txt
@@ -2,14 +2,14 @@
{
"creation": "2012-04-17 11:29:12",
"docstatus": 0,
- "modified": "2013-01-25 17:09:04",
+ "modified": "2013-02-19 15:45:22",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"doc_type": "Quotation",
"doctype": "Print Format",
- "html": "\n\n\n\n\n\n\n\n\n\n\n\n\n\t\n\t\n
\n\n",
+ "html": "\n\n\n\n\n\n\n\n\n\n\n\n\n\t\n\t\n
\n\n",
"module": "Selling",
"name": "__common__",
"standard": "Yes"
diff --git a/setup/doctype/naming_series/naming_series.py b/setup/doctype/naming_series/naming_series.py
index dbbc298c4c8..599118152d5 100644
--- a/setup/doctype/naming_series/naming_series.py
+++ b/setup/doctype/naming_series/naming_series.py
@@ -101,15 +101,19 @@ class DocType:
from core.doctype.doctype.doctype import DocType
dt = DocType()
- parent = sql("select parent from `tabDocField` where fieldname='naming_series' and parent != %s", self.doc.select_doc_for_series)
- sr = ([webnotes.model.doctype.get_property(p[0], 'options', 'naming_series'), p[0]] for p in parent)
+ parent = sql("""select dt.name from `tabDocField` df, `tabDocType` dt
+ 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"))
for series in options:
dt.validate_series(series, self.doc.select_doc_for_series)
for i in sr:
if i[0]:
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):
import re