vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: ignore empty part in naming series (#17508)

Browse source 
on v13 doc.get("") returns entire doc dictionary, this gets strigified
and becomes a problem for naming.
This commit is contained in:
Ankush Menat 2022-07-14 13:14:58 +05:30 • committed by GitHub
parent 2c36874554
commit 95f67b8de8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
frappe/model/naming.py
View file

@ -1,6 +1,7 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: MIT. See LICENSE
import datetime
import re
from typing import TYPE_CHECKING, Callable, Optional
@ -23,6 +24,17 @@ NAMING_SERIES_PATTERN = re.compile(r"^[\w\- \/.#{}]+$", re.UNICODE)
BRACED_PARAMS_PATTERN = re.compile(r"(\{[\w | #]+\})")
# Types that can be using in naming series fields
NAMING_SERIES_PART_TYPES = (
int,
str,
datetime.datetime,
datetime.date,
datetime.time,
datetime.timedelta,
)
class InvalidNamingSeriesError(frappe.ValidationError):
pass
@ -298,6 +310,9 @@ def parse_naming_series(
series_set = False
today = now_datetime()
for e in parts:
if not e:
continue
part = ""
if e.startswith("#"):
if not series_set:
@ -320,14 +335,16 @@ def parse_naming_series(
part = frappe.defaults.get_user_default("fiscal_year")
elif e.startswith("{") and doc:
e = e.replace("{", "").replace("}", "")
part = (cstr(doc.get(e)) or "").strip()
part = doc.get(e)
elif doc and doc.get(e):
part = (cstr(doc.get(e)) or "").strip()
part = doc.get(e)
else:
part = e
if isinstance(part, str):
name += part
elif isinstance(part, NAMING_SERIES_PART_TYPES):
name += cstr(part).strip()
return name

27
frappe/tests/test_naming.py
View file

@ -9,6 +9,7 @@ from frappe.model.naming import (
append_number_if_name_exists,
determine_consecutive_week_number,
getseries,
parse_naming_series,
revert_series_if_last,
)
from frappe.tests.utils import FrappeTestCase
@ -342,6 +343,32 @@ class TestNaming(FrappeTestCase):
name.startswith("KOOH-on_update"), f"incorrect name generated {name}, missing field value"
)
def test_naming_with_empty_part(self):
# check naming with empty part (duplicate dots)
webhook = frappe.new_doc("Webhook")
webhook.webhook_docevent = "on_update"
series = "KOOH-..{webhook_docevent}.-.####"
name = parse_naming_series(series, doc=webhook)
self.assertTrue(
name.startswith("KOOH-on_update"), f"incorrect name generated {name}, missing field value"
)
def test_naming_with_unsupported_part(self):
# check naming with empty part (duplicate dots)
webhook = frappe.new_doc("Webhook")
webhook.webhook_docevent = {"dict": "not supported"}
series = "KOOH-..{webhook_docevent}.-.####"
name = parse_naming_series(series, doc=webhook)
self.assertTrue(
name.startswith("KOOH-"), f"incorrect name generated {name}, missing field value"
)
def make_invalid_todo():
frappe.get_doc({"doctype": "ToDo", "description": "Test"}).insert(set_name="ToDo")