Fixed merge conflict

This commit is contained in:
Nabin Hait
2018-04-13 14:38:57 +05:30
15 changed files with 124 additions and 91 deletions

View File

@@ -10,7 +10,7 @@ def validate_gstin_for_india(doc, method):
if doc.gstin:
doc.gstin = doc.gstin.upper()
if doc.gstin != "NA":
if doc.gstin not in ["NA", "na"]:
p = re.compile("[0-9]{2}[a-zA-Z]{5}[0-9]{4}[a-zA-Z]{1}[1-9A-Za-z]{1}[Z]{1}[0-9a-zA-Z]{1}")
if not p.match(doc.gstin):
frappe.throw(_("Invalid GSTIN or Enter NA for Unregistered"))