[naming series] [fix] added Date in make autoname
diff --git a/setup/doctype/naming_series/naming_series.py b/setup/doctype/naming_series/naming_series.py
index 3a6b36d..eb293f2 100644
--- a/setup/doctype/naming_series/naming_series.py
+++ b/setup/doctype/naming_series/naming_series.py
@@ -123,16 +123,9 @@
def validate_series_name(self, n):
import re
- if "." in n:
- parts = n.split(".")
- if len(parts) > 2:
- msgprint("Only one dot (.) allowed in " + n, raise_exception=1)
- if not re.match("#+$", parts[-1]):
- msgprint("Numbering series must be in hashes (e.g. ####)", raise_exception=1)
- n = n[0]
- if not re.match("^[a-zA-Z0-9-/]*$", n):
- msgprint('Special Characters except "-" and "/" not allowed in naming series')
- raise Exception
+ if not re.match("^[a-zA-Z0-9-/.#]*$", n):
+ msgprint('Special Characters except "-" and "/" not allowed in naming series',
+ raise_exception=True)
def get_options(self, arg=''):
sr = webnotes.model.doctype.get_property(self.doc.select_doc_for_series,
diff --git a/setup/page/setup/setup.js b/setup/page/setup/setup.js
index 1ebd730..788021a 100644
--- a/setup/page/setup/setup.js
+++ b/setup/page/setup/setup.js
@@ -73,7 +73,7 @@
{
"route":"Form/Naming Series/Naming Series",
doctype: "Naming Series",
- label: wn._("Manage numbering series"),
+ label: wn._("Manage Numbering Series"),
"description":wn._("Set multiple numbering series for transactions")
},
{