From e7bc2beea040d213d027af09195e598d16b92b25 Mon Sep 17 00:00:00 2001 From: Himanshu Date: Wed, 6 Feb 2019 15:55:49 +0530 Subject: [PATCH 1/2] Remove illegal character after break --- .../doctype/woocommerce_settings/woocommerce_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py b/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py index bb4f62a0993..1edc1029565 100644 --- a/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +++ b/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py @@ -28,7 +28,7 @@ class WoocommerceSettings(Document): if not frappe.get_value("Custom Field",{"name":i[0]}) or not frappe.get_value("Custom Field",{"name":i[1]}): create_custom_field_id_and_check_status = True - break; + break if create_custom_field_id_and_check_status: From dc34393b8a0bc1265ebf80439641931252bc9ddd Mon Sep 17 00:00:00 2001 From: Himanshu Date: Sun, 14 Apr 2019 00:54:24 +0530 Subject: [PATCH 2/2] fix: allow braces for custom field names --- erpnext/setup/doctype/naming_series/naming_series.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/setup/doctype/naming_series/naming_series.py b/erpnext/setup/doctype/naming_series/naming_series.py index 2167b12e32c..ffcfa2edb37 100644 --- a/erpnext/setup/doctype/naming_series/naming_series.py +++ b/erpnext/setup/doctype/naming_series/naming_series.py @@ -135,7 +135,7 @@ class NamingSeries(Document): def validate_series_name(self, n): import re - if not re.match("^[\w\- /.#]*$", n, re.UNICODE): + if not (re.match("^[\w\- /.#]*$", n, re.UNICODE) or re.match("\{(.*?)\}", n, re.UNICODE)): throw(_('Special Characters except "-", "#", "." and "/" not allowed in naming series')) def get_options(self, arg=None):