nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-04 05:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext into responsive

Browse Source 
Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.py
	selling/doctype/sales_common/sales_common.py
This commit is contained in:
Anand Doshi
2013-05-29 12:30:54 +05:30
parent 047442efa2 72edc3d955
commit 200c8f7980
15 changed files with 145 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,16 +123,9 @@ class DocType:
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,

2
setup/page/setup/setup.js
View File

@@ -73,7 +73,7 @@ wn.module_page["Setup"] = [
{
"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")
},
{