Browse Source

Made seprate method to parse the naming series (#3293)

version-14
rohitwaghchaure 8 years ago
committed by Nabin Hait
parent
commit
0aa97b7aaa
1 changed files with 7 additions and 3 deletions
  1. +7
    -3
      frappe/model/naming.py

+ 7
- 3
frappe/model/naming.py View File

@@ -94,12 +94,15 @@ def make_autoname(key='', doctype='', doc=''):
elif not "." in key: elif not "." in key:
frappe.throw(_("Invalid naming series (. missing)") + (_(" for {0}").format(doctype) if doctype else "")) 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 = '' n = ''
l = key.split('.')
series_set = False series_set = False
today = now_datetime() today = now_datetime()

for e in l:
for e in parts:
part = '' part = ''
if e.startswith('#'): if e.startswith('#'):
if not series_set: if not series_set:
@@ -120,6 +123,7 @@ def make_autoname(key='', doctype='', doc=''):


if isinstance(part, basestring): if isinstance(part, basestring):
n+=part n+=part

return n return n


def getseries(key, digits, doctype=''): def getseries(key, digits, doctype=''):


Loading…
Cancel
Save