Merge lp:~team-cluster/openerp-venezuela-localization/ovl70-fiscal-requirements-eochoa-vat into lp:openerp-venezuela-localization

[Eduardo Ochoa - Cluster Brands]

Reengineering l10nve_fiscal_requirements module to improve the response time on requests to SENIAT

[hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha)]

Hello Eduardo, I am reviewing your merge proposal,

Changing Method
def _get_valid_digit(self, cr, uid, ids, vat, context=None):

by
def _complete_vat(self,vat):

gives same result.

In Section

        elif re.search(r'^([VE][0-9]{1,8})$', vat):
            '''Checked vat is an ID'''
            vat = vat[0] + vat[1:].rjust(8,'0')
            vat = vat+self._complete_vat(vat)
            return self._get_rif(cr, uid, vat, url1, url2, context=context)

Changing

vat = vat+self._complete_vat(vat)

by

vat = self._validate_rif(cr, uid, ids, vat, context=context)

would render same result.

BTW, _validate_rif method has gotten replaced with _complete_vat method of yours

Though I do _not_ agree with this concept of _always_ given to a vat of 8 chars
the ninth char, the validating digit, thus we are agreeing that all 8 chars people are Tax Payers, and there are chance that 8 chars people are non-tax payers,

In the event that we are validating this with SENIAT portal, we would be falling
into a loop which would lead to not allowing non-tax payers to be recorded within Partners.

Regarding to added method:

    def vies_vat_check(self, cr, uid, country_code, vat_number, context=None):

        if country_code != "ve":

The country_code should be upper-cased, to avoid mistakes when code be [VE,vE,Ve]
and the method should have a minimum docstring (Copy & Paste from base_vat :D )

You have renamed method

def button_check_vat(self, cr, uid, ids, context=None):

to def check_vat(self, cr, uid, ids, context=None):

And it could look good to me, but

you have forgotten to change the name attribute of button used in the view in res.partner
which uses that same method name

<button name="button_check_vat" string="Check Validity" type="object" icon="gtk-execute" class="oe_inline"/>

Thanks in advance for your contribution

Hbto

review: Needs Fixing

[lp:~team-cluster/openerp-venezuela-localization/ovl70-fiscal-requirements-eochoa-vat]

888. By Eduardo Ochoa - Cluster Brands on 2013-06-20

[REF]
-upper-cased country-code param in the method check_vies
-changed check_vat method from button_check_vat method

889. By Eduardo Ochoa - Cluster Brands on 2013-06-20

[REF]
-added docstring to check_vies method

890. By Eduardo Ochoa - Cluster Brands on 2013-06-27

[IMP]
-Added check_rif method to seniat.url class to query a vat
without creating an object

891. By Eduardo Ochoa - Cluster Brands on 2013-07-08

[REF]
      -Restored the methods _get_valid_digit and _validate_rif
      -Refactored _dom_giver method to remove redundant validations
      that are already on the function _validate_rif

892. By Eduardo Ochoa - Cluster Brands on 2013-07-10

[REF]
-Fixed slice for vat country code
-Raised exception when the validator digit don't match

Unmerged revisions

=== modified file 'l10n_ve_fiscal_requirements/model/partner.py'
--- l10n_ve_fiscal_requirements/model/partner.py	2013-06-04 03:15:49 +0000
+++ l10n_ve_fiscal_requirements/model/partner.py	2013-06-27 13:10:36 +0000
@@ -205,7 +205,7 @@
     def _validate(self, cr, uid, ids, context=None):
         """ Validates the fields
         """
-            
+        
         #In the original orm.py openerp does not allow using
         #context within the constraint because we have to yield 
         # the same result always,
@@ -279,6 +279,15 @@
             return True
         return False
         
+    def vies_vat_check(self, cr, uid, country_code, vat_number, context=None):
+        """
+        Validate against  VAT Information Exchange System (VIES)
+        """
+        if country_code.upper() != "VE":
+            return super(res_partner, self).vies_vat_check(cr, uid, country_code, vat_number,context=context)
+        else:
+            return super(res_partner, self).simple_vat_check(cr, uid, country_code, vat_number, context=context)
+        
     def update_rif(self, cr, uid, ids, context=None):
         """ Load the rif and name of the partner from the database seniat
         """
@@ -293,11 +302,11 @@
         """
         if context is None: context = {}
         context.update({'update_fiscal_information':True})
-        super(res_partner, self).button_check_vat(cr, uid, ids, context=context)
+        super(res_partner, self).check_vat(cr, uid, ids, context=context)
         user_company = self.pool.get('res.users').browse(cr, uid, uid).company_id
         if user_company.vat_check_vies:
             # force full VIES online check
             self.update_rif(cr, uid, ids, context=context)
-        return True 
+        return True
 res_partner()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'l10n_ve_fiscal_requirements/model/seniat_url.py'
--- l10n_ve_fiscal_requirements/model/seniat_url.py	2013-06-03 21:24:15 +0000
+++ l10n_ve_fiscal_requirements/model/seniat_url.py	2013-06-27 13:10:36 +0000
@@ -54,56 +54,18 @@
     }
 
     #    Update Partner Information
-
-    def _get_valid_digit(self, cr, uid, ids, vat, context=None):
+    
+    def _complete_vat(self,vat):
         '''
         @param vat: string
         returns validating digit
         '''
-        divisor = 11
-        vat_type = {'V':1, 'E':2, 'J':3, 'P':4, 'G':5} 
-        mapper = {1:3, 2:2, 3:7, 4:6, 5:5, 6:4, 7:3, 8:2}
-        valid_digit = None
-
-        vat_type = vat_type.get(vat[0].upper())
-        if vat_type:
-            sum = vat_type * 4
-            for i in range(8):
-                sum += int(vat[i+1]) * mapper[i+1]
-
-            valid_digit = divisor - sum%divisor
-            if valid_digit >= 10:
-                valid_digit = 0
-        return valid_digit 
-
-    def _validate_rif(self, cr, uid, ids, vat, context=None):
-        '''validates if the VE VAT NUMBER is right         
-        @param vat: string: Vat number to Check
-        returns vat when right otherwise returns False 
-
-        '''
-        if not vat:
-            return False
-
-        if 'VE' in vat:
-            vat = vat[:2]
-
-        if re.search(r'^[VJEGP][0-9]{9}$', vat):
-            valid_digit = self._get_valid_digit(cr, uid, ids, vat,
-                    context=context)
-            if valid_digit is None:
-                return False
-            if int(vat[9])==valid_digit:
-                return vat
-            else:
-                return False
-        elif re.search(r'^([VE][0-9]{1,8})$', vat):
-            vat = vat[0] + vat[1:].rjust(8, '0')
-            valid_digit = self._get_valid_digit(cr, uid, ids, vat,
-                    context=context)
-            vat += str(valid_digit)
-            return vat
-        return False
+        diff = {'V':1,'E':2,'J':3,'P':4,'G':5}
+        sum = int(vat[1])*3+int(vat[2])*2+int(vat[3])*7+int(vat[4])*6 + \
+              int(vat[5])*5+int(vat[6])*4+int(vat[7])*3+int(vat[8])*2 + \
+              diff[vat[0]]*4
+        ret = 11-sum % 11;
+        return (ret >= 10) and "0" or str(ret)
 
     def _load_url(self, retries, url):
         """ Check that the seniat url is loaded correctly
@@ -179,6 +141,10 @@
         if not self._eval_seniat_data(xml_data, vat, context=context):
             dom = parseString(xml_data)
             return self._parse_dom(cr, uid, dom, vat, url2, context=context)
+            
+    def check_rif(self, cr, uid, vat, context=None):
+        context = context or {}
+        return self._dom_giver(cr, uid, vat, context=context)
 
     def _dom_giver(self, cr, uid, vat, context=None):
         """ Check and validates that the vat is a passport,
@@ -204,14 +170,9 @@
 
         elif re.search(r'^([VE][0-9]{1,8})$', vat):
             '''Checked vat is an ID'''
-            xml_data = self._load_url(3, url3 % str(int(vat[1:])))
-            vat = vat[1:].rjust(8, '0')
-            match2 = re.search(r'[VE]' + vat + '[0-9]{1}', xml_data)
-            if re.search(r'No existe el contribuyente solicitado', xml_data):
-                return False
-            elif match2:
-                vat = match2.group(0)
-                return self._get_rif(cr, uid, vat, url1, url2, context=context)
+            vat = vat[0] + vat[1:].rjust(8,'0')
+            vat = vat+self._complete_vat(vat)
+            return self._get_rif(cr, uid, vat, url1, url2, context=context)
 
     def _update_partner(self, cr, uid, id, context=None):
         """ Indicates that the partner was updated with information provided by seniat