Merge lp:~vauxoo/openerp-venezuela-localization/miguel-update-partner-info-seniat-bug into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

[Miguel Delgado (Vauxoo)]

[FIX] bug when we try to update fiscal partner information
when partner vat contain string "450" the wizard dont work

[Gabriela Quilarque (gabrielaquilarque97)]

Migue por favor elimina los prints.

review: Needs Fixing

[lp:~vauxoo/openerp-venezuela-localization/miguel-update-partner-info-seniat-bug]

613. By Miguel Delgado (Vauxoo) on 2012-02-14

[IMP] drop prints in this files seniat_url.py and update_info_partner.py

[Gabriela Quilarque (gabrielaquilarque97)]

Listo. Merge Ejecutado.

review: Approve

=== modified file 'l10n_ve_fiscal_requirements/seniat_url.py'
--- l10n_ve_fiscal_requirements/seniat_url.py	2012-02-13 21:02:05 +0000
+++ l10n_ve_fiscal_requirements/seniat_url.py	2012-02-14 14:26:29 +0000
@@ -90,31 +90,30 @@
     def _print_error(self, error, msg):
         raise osv.except_osv(error,msg)
 
-    def _eval_seniat_data(self,xml_data,context={}):
+    def _eval_seniat_data(self,xml_data,vat,context={}):
         if context is None:
             context={}
         if not context.get('all_rif'):
-            if xml_data.find('450')>=0:
-                if not 'all_rif' in context:
-                    self._print_error(_('Vat Error !'),_('Invalid VAT!'))
-                else:
-                    return True
-
-            if xml_data.find('452')>=0:
-                if not 'all_rif' in context:
-                    self._print_error(_('Vat Error !'),_('Unregistered VAT!'))
-                else:
-                    return True
-
-            if xml_data.find("404")>=0:
+            if xml_data.find('450')>=0 and not vat.find('450'):
+                self._print_error(_('Vat Error !'),_('Invalid VAT!'))
+
+            elif xml_data.find('452')>=0 and not vat.find('452'):
+                self._print_error(_('Vat Error !'),_('Unregistered VAT!'))
+                
+            elif xml_data.find("404")>=0 and not vat.find('404'):
                 self._print_error(_('No Connection !'),_("Could not connect! Check the URL "))
+        
+            else:
+                return False
+        else:
+            if xml_data.find('450')>=0 or xml_data.find('452')>=0 or xml_data.find("404")>=0:
                 return True
-        else:
-            return True
+            else:
+                return False
 
     def _dom_giver(self, url1, url2, context, vat):
         xml_data = self._load_url(3,url1 % vat)
-        if not self._eval_seniat_data(xml_data,context):
+        if not self._eval_seniat_data(xml_data,vat,context):
             dom = parseString(xml_data)
             return self._parse_dom(dom, vat, url2)
         else:
@@ -125,7 +124,7 @@
         rp_obj.write(cr, uid, id, {'seniat_updated': True})
 
     def update_rif(self, cr, uid, ids, context={}):
-        aux=0
+        aux=[]
         rp_obj = self.pool.get('res.partner')
         url_obj = self.browse(cr, uid, self.search(cr, uid, []))[0]
         url1 = url_obj.name + '%s'
@@ -137,15 +136,14 @@
                 return res
             else:
                 return False
+        
         for partner in rp_obj.browse(cr,uid,ids):
-            aux+=1
             if partner.vat:
                 vat_country, vat_number = rp_obj._split_vat(partner.vat)
                 if vat_country.upper() == 'VE':
-                    print 'partner.vat[2:]',partner.vat[2:]
                     if len(partner.vat[2:])==10:
                         xml_data = self._load_url(3,url1 %partner.vat[2:])
-                        if not self._eval_seniat_data(xml_data,context):
+                        if not self._eval_seniat_data(xml_data,partner.vat[2:],context):
                             dom = parseString(xml_data)
                             res = rp_obj.write(cr,uid,partner.id,self._parse_dom(dom,partner.vat[2:],url2))
                             if res:
 
=== modified file 'l10n_ve_fiscal_requirements/wizard/update_info_partner.py'
--- l10n_ve_fiscal_requirements/wizard/update_info_partner.py	2012-01-19 01:37:26 +0000
+++ l10n_ve_fiscal_requirements/wizard/update_info_partner.py	2012-02-14 14:26:29 +0000
@@ -31,9 +31,15 @@
     _name = 'update.info.partner'
     
     def update_info(self, cr, uid, ids, context={}):
+        aux=[]
         res_part_obj = self.pool.get('res.partner')
         seniat_url_obj = self.pool.get('seniat.url')
-        es_partner_ids= res_part_obj.search(cr, uid, [])
+        sql= '''SELECT vat FROM res_partner GROUP BY vat HAVING count(vat) > 1 ;'''
+        cr.execute(sql)
+        record = cr.dictfetchall()
+        for r in record:
+            aux.append(r.values()[0])
+        es_partner_ids= res_part_obj.search(cr, uid, [('vat','not in',aux)])
         seniat_url_obj.connect_seniat(cr, uid, es_partner_ids, context,True)
         return{}
 
 
=== modified file 'l10n_ve_topology/module/sector.py'
--- l10n_ve_topology/module/sector.py	2012-01-31 16:19:58 +0000
+++ l10n_ve_topology/module/sector.py	2012-02-14 14:26:29 +0000
@@ -64,7 +64,7 @@
         'parish_id':fields.many2one('res.parish','Parish',help="In this field you enter the parish to which the sector is associated",domain= "[('municipalities_id','=',municipality_id)]" ),
         'zipcode_id':fields.many2one('res.zipcode',string='Zip Code',help="in this field is selected Zip Code associated with this sector"),
         'sector_id':fields.many2one('res.sector',string='Sector',required=False,help="in this field select the Sector associated with this Municipality"),
-        'city_id':fields.many2one('res.city',string='City',help="in this field select the city associated with this State"),
+        'city_id':fields.many2one('res.city',string='City',domain= "[('state_id','=',state_id)]",help="in this field select the city associated with this State"),
         'city':fields.function(_get_city_name, method=True, type='char', string='City', size=256, domain= "[('state_id','=',state_id)]",store=True),
     }