Space allowed in naming series

Conflicts:
	setup/doctype/naming_series/naming_series.py
diff --git a/erpnext/setup/doctype/naming_series/naming_series.py b/erpnext/setup/doctype/naming_series/naming_series.py
index d44cd4b..186bde3 100644
--- a/erpnext/setup/doctype/naming_series/naming_series.py
+++ b/erpnext/setup/doctype/naming_series/naming_series.py
@@ -108,7 +108,7 @@
 
 	def validate_series_name(self, n):
 		import re
-		if not re.match("^[a-zA-Z0-9-/.#]*$", n):
+		if not re.match("^[a-zA-Z0-9- /.#]*$", n):
 			throw(_('Special Characters except "-" and "/" not allowed in naming series'))
 
 	def get_options(self, arg=''):