Fix VAT numbers validators

Author: nip24pl

nip24/__init__.py

@@ -40,4 +40,4 @@
 from nip24.iban import *
 from nip24.nip24client import *
 
-__version__ = '1.3.8'
+__version__ = '1.3.9'

nip24/euvat.py

@@ -31,80 +31,78 @@ class EUVAT:
     """
 
     @staticmethod
-    def normalize(nip):
+    def normalize(number):
         """
         Normalizes form of the VAT number
-
-        :param nip: input string
-        :type nip: str
+        :param number: input string
+        :type number: str
         :returns: normalized string or False
         :rtype: str or False
         """
 
-        if not nip:
+        if not number:
             return False
 
-        nip = re.sub('[ -]', '', nip).upper()
+        number = re.sub('[ -]', '', number).upper()
 
-        if not re.match('[A-Z]{2}[A-Z0-9]{2,12}', nip):
+        if not re.match('[A-Z]{2}[A-Z0-9+*]{2,12}', number):
             return False
 
-        return nip
+        return number
 
     @staticmethod
-    def isValid(nip):
+    def isValid(number):
         """
         Checks if specified NIP is valid
-
-        :param nip: input string
-        :type nip: str
+        :param number: input string
+        :type number: str
         :returns: True if NIP is valid
         :rtype: bool
         """
 
-        nip = EUVAT.normalize(nip)
+        number = EUVAT.normalize(number)
 
-        if not nip:
+        if not number:
             return False
 
         map = {
             'AT': 'ATU\\d{8}',
-            'BE': 'BE0\\d{9}',
+            'BE': 'BE[0-1]{1}\\d{9}',
             'BG': 'BG\\d{9,10}',
             'CY': 'CY\\d{8}[A-Z]{1}',
             'CZ': 'CZ\\d{8,10}',
             'DE': 'DE\\d{9}',
             'DK': 'DK\\d{8}',
             'EE': 'EE\\d{9}',
             'EL': 'EL\\d{9}',
-            'ES': 'ES[A-Z0-9]{9}',
+            'ES': 'ES[A-Z0-9]{1}\\d{7}[A-Z0-9]{1}',
             'FI': 'FI\\d{8}',
             'FR': 'FR[A-Z0-9]{2}\\d{9}',
-            'GB': 'GB[A-Z0-9]{5,12}',
             'HR': 'HR\\d{11}',
             'HU': 'HU\\d{8}',
-            'IE': 'IE[A-Z0-9]{8,9}',
+            'IE': 'IE[A-Z0-9+*]{8,9}',
             'IT': 'IT\\d{11}',
             'LT': 'LT\\d{9,12}',
             'LU': 'LU\\d{8}',
             'LV': 'LV\\d{11}',
             'MT': 'MT\\d{8}',
-            'NL': 'NL\\d{9}B\\d{2}',
+            'NL': 'NL[A-Z0-9+*]{12}',
             'PL': 'PL\\d{10}',
             'PT': 'PT\\d{9}',
             'RO': 'RO\\d{2,10}',
             'SE': 'SE\\d{12}',
             'SI': 'SI\\d{8}',
-            'SK': 'SK\\d{10}'
+            'SK': 'SK\\d{10}',
+            'XI': 'XI[A-Z0-9]{5,12}'
         }
 
-        cc = nip[0:2].upper()
-        num = nip[2:].upper()
+        cc = number[0:2].upper()
+        num = number[2:].upper()
 
         if cc not in map:
             return False
 
-        if not re.match(map[cc], nip):
+        if not re.match(map[cc], number):
             return False
 
         if cc == 'PL':

nip24/nip24client.py

@@ -41,7 +41,7 @@ class NIP24Client:
     NIP24 service client
     """
 
-    VERSION = '1.3.8'
+    VERSION = '1.3.9'
 
     PRODUCTION_URL = 'https://www.nip24.pl/api'
     TEST_URL = 'https://www.nip24.pl/api-test'

setup.py

@@ -23,7 +23,7 @@
 from setuptools import setup
 
 setup(name='nip24',
-      version='1.3.8',
+      version='1.3.9',
       description='NIP24 Service Client',
       url='https://www.nip24.pl',
       author='nip24.pl',