Merge branch 'develop'
diff --git a/buying/doctype/supplier_quotation/supplier_quotation.txt b/buying/doctype/supplier_quotation/supplier_quotation.txt
index cf62a9f..e532aa6 100644
--- a/buying/doctype/supplier_quotation/supplier_quotation.txt
+++ b/buying/doctype/supplier_quotation/supplier_quotation.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:45",
"docstatus": 0,
- "modified": "2013-11-22 17:16:16",
+ "modified": "2013-12-14 17:27:47",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -632,6 +632,7 @@
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
+ "match": "supplier",
"role": "Supplier",
"submit": 0,
"write": 0
diff --git a/config.json b/config.json
index 28d1a3d..bb88d76 100644
--- a/config.json
+++ b/config.json
@@ -1,6 +1,6 @@
{
"app_name": "ERPNext",
- "app_version": "3.2.2",
+ "app_version": "3.2.3",
"base_template": "app/portal/templates/base.html",
"modules": {
"Accounts": {
diff --git a/selling/doctype/quotation/quotation.txt b/selling/doctype/quotation/quotation.txt
index dc34272..93346d3 100644
--- a/selling/doctype/quotation/quotation.txt
+++ b/selling/doctype/quotation/quotation.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:08",
"docstatus": 0,
- "modified": "2013-11-27 17:57:19",
+ "modified": "2013-12-14 17:25:46",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -863,6 +863,7 @@
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
+ "match": "customer",
"role": "Customer",
"submit": 0,
"write": 0
diff --git a/setup/doctype/naming_series/naming_series.py b/setup/doctype/naming_series/naming_series.py
index 234a689..3a14d41 100644
--- a/setup/doctype/naming_series/naming_series.py
+++ b/setup/doctype/naming_series/naming_series.py
@@ -22,7 +22,7 @@
where fieldname='naming_series'""")
)))),
"prefixes": "\n".join([''] + [i[0] for i in
- webnotes.conn.sql("""select name from tabSeries""")])
+ webnotes.conn.sql("""select name from tabSeries order by name""")])
}
def scrub_options_list(self, ol):
@@ -38,7 +38,7 @@
self.set_series_for(self.doc.select_doc_for_series, series_list)
# create series
- map(self.insert_series, series_list)
+ map(self.insert_series, [d.split('.')[0] for d in series_list])
msgprint('Series Updated')
@@ -103,7 +103,8 @@
dt.validate_series(series, self.doc.select_doc_for_series)
for i in sr:
if i[0]:
- if series in i[0].split("\n"):
+ existing_series = [d.split('.')[0] for d in i[0].split("\n")]
+ if series.split(".")[0] in existing_series:
msgprint("Oops! Series name %s is already in use in %s. \
Please select a new one" % (series, i[1]), raise_exception=1)
@@ -120,17 +121,21 @@
def get_current(self, arg=None):
"""get series current"""
- self.doc.current_value = webnotes.conn.get_value("Series", self.doc.prefix, "current")
+ self.doc.current_value = webnotes.conn.get_value("Series",
+ self.doc.prefix.split('.')[0], "current")
def insert_series(self, series):
"""insert series if missing"""
if not webnotes.conn.exists('Series', series):
- webnotes.conn.sql("insert into tabSeries (name, current) values (%s,0)", (series))
+ webnotes.conn.sql("insert into tabSeries (name, current) values (%s, 0)",
+ (series))
def update_series_start(self):
if self.doc.prefix:
- self.insert_series(self.doc.prefix)
- webnotes.conn.sql("update `tabSeries` set current = '%s' where name = '%s'" % (self.doc.current_value,self.doc.prefix))
+ prefix = self.doc.prefix.split('.')[0]
+ self.insert_series(prefix)
+ webnotes.conn.sql("update `tabSeries` set current = %s where name = %s",
+ (self.doc.current_value, prefix))
msgprint("Series Updated Successfully")
else:
msgprint("Please select prefix first")
diff --git a/stock/doctype/delivery_note/delivery_note.txt b/stock/doctype/delivery_note/delivery_note.txt
index 1dc3cd3..480d45d 100644
--- a/stock/doctype/delivery_note/delivery_note.txt
+++ b/stock/doctype/delivery_note/delivery_note.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:09",
"docstatus": 0,
- "modified": "2013-12-09 16:24:08",
+ "modified": "2013-12-14 17:26:12",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -1058,7 +1058,7 @@
},
{
"doctype": "DocPerm",
- "match": "customer_name",
+ "match": "customer",
"role": "Customer"
}
]
\ No newline at end of file
diff --git a/support/doctype/support_ticket/support_ticket.txt b/support/doctype/support_ticket/support_ticket.txt
index 684c809..4fa4874 100644
--- a/support/doctype/support_ticket/support_ticket.txt
+++ b/support/doctype/support_ticket/support_ticket.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-01 10:36:25",
"docstatus": 0,
- "modified": "2013-11-02 14:06:26",
+ "modified": "2013-12-14 17:27:02",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -278,6 +278,7 @@
{
"cancel": 0,
"doctype": "DocPerm",
+ "match": "customer",
"role": "Customer"
},
{