From 0aa97b7aaac4d78e60e6125a39212904c1a144b8 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 16 May 2017 12:46:58 +0530 Subject: [PATCH] Made seprate method to parse the naming series (#3293) --- frappe/model/naming.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/frappe/model/naming.py b/frappe/model/naming.py index f6a947cf4b..dbe236f09e 100644 --- a/frappe/model/naming.py +++ b/frappe/model/naming.py @@ -94,12 +94,15 @@ def make_autoname(key='', doctype='', doc=''): elif not "." in key: frappe.throw(_("Invalid naming series (. missing)") + (_(" for {0}").format(doctype) if doctype else "")) + parts = key.split('.') + n = parse_naming_series(parts, doctype, doc) + return n + +def parse_naming_series(parts, doctype= '', doc = ''): n = '' - l = key.split('.') series_set = False today = now_datetime() - - for e in l: + for e in parts: part = '' if e.startswith('#'): if not series_set: @@ -120,6 +123,7 @@ def make_autoname(key='', doctype='', doc=''): if isinstance(part, basestring): n+=part + return n def getseries(key, digits, doctype=''):