fix: include TDS regex in GSTIN regex

(cherry picked from commit acd292f)
resilient-tech · Mar 19, 2024 · b7bac89 · b7bac89
1 parent cecdd2d
commit b7bac89
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/india_compliance/gst_india/client_scripts/party.js b/india_compliance/gst_india/client_scripts/party.js
@@ -58,12 +58,16 @@ function validate_gstin(doctype) {
                 frappe.throw(__("GSTIN/UIN should be 15 characters long"));
             }
 
-            gstin = india_compliance.validate_gstin(gstin);
-
             if (TCS_REGEX.test(gstin)) {
-                frappe.throw(__("e-Commerce Operator (TCS) GSTIN is not allowed to be set in Party/Address"));
+                frappe.throw(
+                    __(
+                        "e-Commerce Operator (TCS) GSTIN is not allowed to be set in Party/Address"
+                    )
+                );
             }
 
+            gstin = india_compliance.validate_gstin(gstin);
+
             frm.doc.gstin = gstin;
             frm.refresh_field("gstin");
 

diff --git a/india_compliance/public/js/regex_constants.js b/india_compliance/public/js/regex_constants.js
@@ -12,9 +12,8 @@ export const OVERSEAS_REGEX = new RegExp([NRI_ID, OIDAR].join("|"));
 export const UNBODY_REGEX = new RegExp(UNBODY);
 export const TDS_REGEX = new RegExp(TDS);
 
-// TDS is covered in Normal, hence not included separately
 export const GSTIN_REGEX = new RegExp(
-    [NORMAL, GOVT_DEPTID, NRI_ID, OIDAR, UNBODY].join("|")
+    [NORMAL, GOVT_DEPTID, NRI_ID, OIDAR, UNBODY, TDS].join("|")
 );
 
 export const GST_INVOICE_NUMBER_FORMAT = new RegExp("^[^\\W_][A-Za-z\\d\\-/]{0,15}$");