Merge lp:~vauxoo/openerp-venezuela-localization/ovl60-bug-1187089 into lp:openerp-venezuela-localization/6.0

[Katherine Zaoral (Vauxoo)]

[FIX] bug 1187089

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

review: Approve

=== modified file 'l10n_ve_fiscal_requirements/partner.py'
--- l10n_ve_fiscal_requirements/partner.py	2012-07-16 18:55:40 +0000
+++ l10n_ve_fiscal_requirements/partner.py	2013-06-04 18:10:38 +0000
@@ -32,6 +32,7 @@
 
 from osv import fields, osv
 from tools.translate import _
+import decimal_precision as dp
 import re
 
 class res_partner_address(osv.osv):
@@ -65,6 +66,11 @@
    
     _columns = {
         'seniat_updated': fields.boolean('Seniat Updated', help="This field indicates if partner was updated using SENIAT button"),
+        'wh_iva_agent': fields.boolean('Wh. Agent', help="Indicate if the partner is a withholding vat agent"),
+        'wh_iva_rate': fields.float(
+            string='Rate',
+            digits_compute=dp.get_precision('Withhold'),
+            help="Withholding vat rate"),
     }
 
     _default = {

=== modified file 'l10n_ve_fiscal_requirements/seniat_url.py'
--- l10n_ve_fiscal_requirements/seniat_url.py	2012-07-16 18:55:40 +0000
+++ l10n_ve_fiscal_requirements/seniat_url.py	2013-06-04 18:10:38 +0000
@@ -64,31 +64,23 @@
                 pass
             retries -= 1
         return str_error
-    
-    def _buscar_porcentaje(self,rif,url):
-        context={}
-        html_data = self.pool.get('seniat.url')._load_url(3,url %rif)
-        html_data = unicode(html_data, 'ISO-8859-1').encode('utf-8')
-        search_str='La condición de este contribuyente requiere la retención del '
-        pos = html_data.find(search_str)
-        if pos > 0:
-            pos += len(search_str)
-            pct = html_data[pos:pos+4].replace('%','').replace(' ','')
-            return float(pct)
-        else:
-            return 0.0
 
     def _parse_dom(self,dom,rif,url_seniat,context={}):
         rif_aux = dom.childNodes[0].getAttribute('rif:numeroRif')
         name = dom.childNodes[0].childNodes[0].firstChild.data
         wh_agent = dom.childNodes[0].childNodes[1].firstChild.data.upper()=='SI' and True or False
         vat_subjected = dom.childNodes[0].childNodes[2].firstChild.data.upper()=='SI' and True or False
+        wh_rate = dom.childNodes[0].childNodes[3].firstChild.data
         self.logger.notifyChannel("info", netsvc.LOG_INFO,
             "RIF: %s Found" % rif)
         if name.count('(') > 0:
             name = name[:name.index('(')].rstrip()
         if context.get('spf_info'):
-            res= {'name': name,'vat_subjected': vat_subjected,'vat':'VE'+rif_aux,'wh_iva_agent':wh_agent}  
+            res= {'name': name,
+                  'vat_subjected': vat_subjected,
+                  'vat': 'VE'+rif_aux,
+                  'wh_iva_rate': wh_rate,
+                  'wh_iva_agent': wh_agent}
         else:
             res= {'name': name,'vat_subjected': vat_subjected,'vat':'VE'+rif_aux}  
         return res

=== modified file 'l10n_ve_fiscal_requirements/wizard/search_info_partner_seniat.py'
--- l10n_ve_fiscal_requirements/wizard/search_info_partner_seniat.py	2012-07-16 18:55:40 +0000
+++ l10n_ve_fiscal_requirements/wizard/search_info_partner_seniat.py	2013-06-04 18:10:38 +0000
@@ -52,9 +52,7 @@
         if rp_obj.check_vat_ve(aux,context):
             context.update({'spf_info':True})
             res = su_obj._dom_giver(url1,url2,url3, aux,context)
-            if res:
-                res.update({'wh_iva_rate':su_obj._buscar_porcentaje(aux,url2)})
-            else:
+            if not res:
                 raise osv.except_osv(_('Error'),_("Does not exist the contributor requested"))
             self.write(cr,uid,vat,res)
         

=== modified file 'l10n_ve_withholding_iva/model/partner.py'
--- l10n_ve_withholding_iva/model/partner.py	2012-07-25 19:19:14 +0000
+++ l10n_ve_withholding_iva/model/partner.py	2013-06-04 18:10:38 +0000
@@ -23,19 +23,11 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 from osv import fields, osv
-import decimal_precision as dp
-from tools.translate import _
-import urllib
-from xml.dom.minidom import parseString
 import netsvc
 
 class res_partner(osv.osv):
     _inherit = 'res.partner'
     logger = netsvc.Logger()
-    _columns = {
-        'wh_iva_agent': fields.boolean('Wh. Agent', help="Indicate if the partner is a withholding vat agent"),
-        'wh_iva_rate': fields.float(string='Rate', digits_compute= dp.get_precision('Withhold'), help="Withholding vat rate"),
-    }
     _defaults = {
         'wh_iva_rate': lambda *a: 0,
     }
@@ -47,18 +39,3 @@
         return su_obj.update_rif(cr, uid, ids, context=context)
 
 res_partner()
-
-class seniat_url(osv.osv):
-
-    _inherit = 'seniat.url'
-    
-    def _parse_dom(self,dom,rif,url_seniat,context=None):
-        su_obj = self.pool.get('seniat.url')
-        wh_agent = dom.childNodes[0].childNodes[1].firstChild.data.upper()=='SI' and True or False
-        wh_rate = su_obj._buscar_porcentaje(rif,url_seniat)
-        self.logger.notifyChannel("info", netsvc.LOG_INFO,
-            "RIF: %s Found" % rif)
-        data = {'wh_iva_agent':wh_agent,'wh_iva_rate':wh_rate}
-        return dict(data.items() + super(seniat_url,self)._parse_dom(dom,rif,url_seniat,context=context).items())
-    
-seniat_url()