Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the problem that naming series would remove trailing '-' from series prefix if ##### was not entered (#15514)

Browse Source
This commit is contained in:
Saif 2018-09-27 15:18:04 +05:00 committed by Nabin Hait
parent 0fc4917d81
commit c2dd9ab778
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/setup/doctype/naming_series/naming_series.py
View File

@ -166,13 +166,12 @@ class NamingSeries(Document):
def parse_naming_series(self): def parse_naming_series(self):
parts = self.prefix.split('.') parts = self.prefix.split('.')
# If series contain date format like INV.YYYY.MM.#####
if len(parts) > 2:
del parts[-1] # Removed ### from the series
prefix = parse_naming_series(parts)
else:
prefix = parts[0]
# Remove ### from the end of series
if parts[-1] == "#" * len(parts[-1]):
del parts[-1]
prefix = parse_naming_series(parts)
return prefix return prefix
def set_by_naming_series(doctype, fieldname, naming_series, hide_name_field=True): def set_by_naming_series(doctype, fieldname, naming_series, hide_name_field=True):