Merge lp:~vauxoo/openerp-venezuela-localization/miguel-Bug917888 into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

[Miguel Delgado (Vauxoo)]

fix Bug 917888

[Gabriela Quilarque (gabrielaquilarque97)]

Migue debes corregir el conflicto que se presenta en las líneas 51,59 y 60.

review: Needs Fixing

[lp:~vauxoo/openerp-venezuela-localization/miguel-Bug917888]

544. By Miguel Delgado (Vauxoo) on 2012-01-26

[FIX] solve conflicts in merge

Unmerged revisions

=== modified file 'l10n_ve_fiscal_requirements/installer.py'
--- l10n_ve_fiscal_requirements/installer.py	2012-01-05 19:15:59 +0000
+++ l10n_ve_fiscal_requirements/installer.py	2012-01-24 14:29:45 +0000
@@ -36,7 +36,8 @@
 
     def onchange_update_rif(self, cr, uid, ids, vat):
         context = {'exec_wizard': True, 'vat': vat}
-        partner_info = self.pool.get('res.partner').update_rif(cr, uid, ids, context)
+        
+        partner_info = self.pool.get('seniat.url').update_rif(cr, uid, ids, context)
         v = {'name': partner_info.get('name'), 'vat_apply': partner_info.get('vat_apply')}
         return {'value': v}
 

=== modified file 'l10n_ve_fiscal_requirements/partner.py'
--- l10n_ve_fiscal_requirements/partner.py	2012-01-19 14:04:28 +0000
+++ l10n_ve_fiscal_requirements/partner.py	2012-01-24 14:29:45 +0000
@@ -32,9 +32,6 @@
 
 from osv import fields, osv
 from tools.translate import _
-import urllib
-from xml.dom.minidom import parseString
-import netsvc
 
 class res_partner_address(osv.osv):
     _inherit='res.partner.address'
@@ -64,8 +61,7 @@
 
 class res_partner(osv.osv):
     _inherit = 'res.partner'
-    logger = netsvc.Logger()
-    
+   
     _columns = {
         'vat_apply': fields.boolean('Vat Apply', help="This field indicate if partner is subject to vat apply "),
         'seniat_updated': fields.boolean('Seniat Updated', help="This field indicates if partner was updated using SENIAT button"),
@@ -111,6 +107,8 @@
             return True
 
         current_vat = current_partner['vat']
+        if current_vat.strip()=='':
+            return True
         duplicates = partner_obj.read(cr, uid, partner_obj.search(cr, uid, [('vat', '=', current_vat)]), ['vat'])
 
         return not current_vat in [p['vat'] for p in duplicates if p['id'] != current_partner['id']]
@@ -149,6 +147,7 @@
             return False
         return True
     
+<<<<<<< TREE
 #    Update Partner Information 
 
     def _load_url(self,retries,url):
@@ -210,48 +209,12 @@
     def _update_partner(self, cr, uid, id, context=None):
         self.write(cr, uid, id, {'seniat_updated': True})
 
+=======
+>>>>>>> MERGE-SOURCE
     def update_rif(self, cr, uid, ids, context={}):
-        pool = self.pool.get('seniat.url')
-        url_obj = pool.browse(cr, uid, pool.search(cr, uid, []))[0]
-        url1 = url_obj.name + '%s'
-        url2 = url_obj.url_seniat + '%s'
-        if context.get('exec_wizard'):
-            res = self._dom_giver(url1, url2, context, context['vat'])
-            if res:
-                self._update_partner(cr, uid, ids, context)
-                return res
-            else:
-                return False
-        for partner in self.browse(cr,uid,ids):
-            if partner.vat:
-                vat_country, vat_number = self._split_vat(partner.vat)
-                if vat_country.upper() == 'VE':
-                    xml_data = self._load_url(3,url1 %partner.vat[2:])
-                    if not self._eval_seniat_data(xml_data,context):
-                        dom = parseString(xml_data)
-                        res = self.write(cr,uid,partner.id,self._parse_dom(dom,partner.vat[2:],url2))
-                        if res:
-                          self._update_partner(cr, uid, partner.id, context)  
-                    else:
-                        return False
-            else:
-                if partner.address:
-                    invoices_addr_country = [i.country_id and i.country_id.code or False  for i in partner.address if i.type == 'invoice']
-                    if invoices_addr_country:
-                        country = [j for j in invoices_addr_country if j]
-                        if country and 'VE' in country and not context.get('all_rif',False):
-                                self._print_error(_('Vat Error !'),_('The field vat is empty'))
-                else:
-                    
-                    pass
-                
-        return True
-
-    def connect_seniat(self, cr, uid, ids, context={}, all_rif=False):
+        su_obj = self.pool.get('seniat.url')
         ctx = context.copy()
-        if all_rif:
-            ctx.update({'all_rif': True})
-        self.update_rif(cr, uid, ids, context=ctx)
+        su_obj.connect_seniat(cr, uid, ids, context=ctx)
         return True
 
 res_partner()

=== modified file 'l10n_ve_fiscal_requirements/seniat_url.py'
--- l10n_ve_fiscal_requirements/seniat_url.py	2011-10-25 20:33:16 +0000
+++ l10n_ve_fiscal_requirements/seniat_url.py	2012-01-24 14:29:45 +0000
@@ -27,16 +27,135 @@
 import tools
 from tools.translate import _
 from tools import config
+import urllib
+from xml.dom.minidom import parseString
+import netsvc
 
 class seniat_url(osv.osv):
     """
     OpenERP Model : seniat_url
     """
-    
+    logger = netsvc.Logger()
     _name = 'seniat.url'
     _description = __doc__
     _columns = {
-         'name':fields.char('URL Seniat for Partner Information',size=64, required=True, readonly=False,help='In this field enter the URL from Seniat for search the fiscal information from partner'),
+        'name':fields.char('URL Seniat for Partner Information',size=64, required=True, readonly=False,help='In this field enter the URL from Seniat for search the fiscal information from partner'),
         'url_seniat':fields.char('URL Seniat for Retention Rate',size=64, required=True, readonly=False,help='In this field enter the URL from Seniat for search the retention rate from partner'),
     }
+    
+    #    Update Partner Information 
+
+    def _load_url(self,retries,url):
+        str_error= '404 Not Found'
+        while retries > 0:
+            try:
+                s = urllib.urlopen(url)
+                r = s.read()
+                ok = not('404 Not Found' in r)
+                if ok:
+                    self.logger.notifyChannel("info", netsvc.LOG_INFO,
+            "Url Loaded correctly %s" % url)
+                    return r
+            except:
+                self.logger.notifyChannel("warning", netsvc.LOG_WARNING,
+            "Url could not be loaded %s" % str_error)
+                pass
+            retries -= 1
+        return str_error
+    
+    def _parse_dom(self,dom,rif,url_seniat):
+        name = dom.childNodes[0].childNodes[0].firstChild.data 
+        vat_subjected = dom.childNodes[0].childNodes[1].firstChild.data.upper()=='SI' and True or False
+        vat_apply = dom.childNodes[0].childNodes[2].firstChild.data.upper()=='SI' and True or False
+        self.logger.notifyChannel("info", netsvc.LOG_INFO,
+            "RIF: %s Found" % rif)
+        if name.count('(') > 0:
+            name = name[:name.index('(')].rstrip()
+        res= {'name': name,'vat_apply': vat_apply,'vat_subjected': vat_subjected }  
+        return res
+
+    def _print_error(self, error, msg):
+        raise osv.except_osv(error,msg)
+
+    def _eval_seniat_data(self,xml_data,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:
+                self._print_error(_('No Connection !'),_("Could not connect! Check the URL "))
+                return True
+        else:
+            return True
+
+    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):
+            dom = parseString(xml_data)
+            return self._parse_dom(dom, vat, url2)
+        else:
+            return False
+
+    def _update_partner(self, cr, uid, id, context=None):
+        rp_obj = self.pool.get('res.partner')
+        rp_obj.write(cr, uid, id, {'seniat_updated': True})
+
+    def update_rif(self, cr, uid, ids, context={}):
+        aux=0
+        rp_obj = self.pool.get('res.partner')
+        url_obj = self.browse(cr, uid, self.search(cr, uid, []))[0]
+        url1 = url_obj.name + '%s'
+        url2 = url_obj.url_seniat + '%s'
+        if context.get('exec_wizard'):
+            res = self._dom_giver(url1, url2, context, context['vat'])
+            if res:
+                self._update_partner(cr, uid, ids, context)
+                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):
+                            dom = parseString(xml_data)
+                            res = rp_obj.write(cr,uid,partner.id,self._parse_dom(dom,partner.vat[2:],url2))
+                            if res:
+                                self._update_partner(cr, uid, partner.id, context)  
+                        else:
+                            if not context.get('all_rif'):
+                                return False
+                    else:
+                        return False
+            else:
+                if partner.address:
+                    invoices_addr_country = [i.country_id and i.country_id.code or False  for i in partner.address if i.type == 'invoice']
+                    if invoices_addr_country:
+                        country = [j for j in invoices_addr_country if j]
+                        if country and 'VE' in country and not context.get('all_rif',False):
+                                self._print_error(_('Vat Error !'),_('The field vat is empty'))
+        return True
+
+    def connect_seniat(self, cr, uid, ids, context={}, all_rif=False):
+        ctx = context.copy()
+        if all_rif:
+            ctx.update({'all_rif': True})
+        self.update_rif(cr, uid, ids, context=ctx)
+        return True
+
 seniat_url()

=== modified file 'l10n_ve_fiscal_requirements/view/partner_view.xml'
--- l10n_ve_fiscal_requirements/view/partner_view.xml	2011-11-03 19:16:11 +0000
+++ l10n_ve_fiscal_requirements/view/partner_view.xml	2012-01-24 14:29:45 +0000
@@ -37,6 +37,5 @@
         </field>
       </field>
     </record>
-
   </data>
 </openerp>

=== modified file 'l10n_ve_fiscal_requirements/wizard/search_info_partner_seniat.py'
--- l10n_ve_fiscal_requirements/wizard/search_info_partner_seniat.py	2012-01-18 15:34:02 +0000
+++ l10n_ve_fiscal_requirements/wizard/search_info_partner_seniat.py	2012-01-24 14:29:45 +0000
@@ -24,77 +24,22 @@
 import pooler
 from osv import osv, fields
 from tools.translate import _
-import urllib
-from xml.dom.minidom import parseString
-import netsvc
 
 class search_info_partner_seniat(osv.osv_memory):
     
     _name = "search.info.partner.seniat"
     _columns = {
-        'name':fields.char('Numero de RIF', size=64, help='El RIF debe poseer el formato J1234567890',required=True),
-        'vat_name':fields.char('Empresa / Persona', size=256, help='Nombre de la Empresa'),
-        'vat_agent':fields.boolean('Agente de Retencion', help='Es Agente de Retencion'),
+        'vat':fields.char('Numero de RIF', size=64, help='El RIF debe poseer el formato J1234567890',required=True),
+        'name':fields.char('Empresa / Persona', size=256, help='Nombre de la Empresa'),
+        'vat_subjected':fields.boolean('Agente de Retencion', help='Es Agente de Retencion'),
         'percent':fields.float('Porcentaje de Retencion', help='Porcentaje de Retencion Aplicable'),
         'vat_apply':fields.boolean('Contribuyente Formal', help='Es Contribuyente'),
     }
     
-    logger = netsvc.Logger()
-    
-    def _load_url(self,retries,url):
-        str_error= '404 Not Found'
-        while retries > 0:
-            try:
-                s = urllib.urlopen(url)
-                r = s.read()
-                ok = not('404 Not Found' in r)
-                if ok:
-                    self.logger.notifyChannel("info", netsvc.LOG_INFO,
-            "Url Loaded correctly %s" % url)
-                    return r
-            except:
-                self.logger.notifyChannel("warning", netsvc.LOG_WARNING,
-            "Url could not be loaded %s" % str_error)
-                pass
-            retries -= 1
-        return str_error
-        
-    def _print_error(self, error, msg):
-        raise osv.except_osv(error,msg)
-        
-    def _eval_seniat_data(self,xml_data,context={}):
-
-        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:
-            self._print_error(_('No Connection !'),_("Could not connect! Check the URL "))
-            return True
-
-    def _parse_dom(self,dom,rif,url_seniat):
-        name = dom.childNodes[0].childNodes[0].firstChild.data
-        vat_agent = dom.childNodes[0].childNodes[1].firstChild.data.upper()=='SI' and True or False
-        vat_apply = dom.childNodes[0].childNodes[2].firstChild.data.upper()=='SI' and True or False
-        self.logger.notifyChannel("info", netsvc.LOG_INFO,
-            "RIF: %s Found" % rif)
-        if name.count('(') > 0:
-            name = name[:name.index('(')].rstrip()
-        return {'vat_name': name,'vat_apply': vat_apply, 'vat_agent':vat_agent}
-    
     def _buscar_porcentaje(self,rif,url):
         context={}
-        html_data = self._load_url(3,url %rif)
+        html_data = self.pool.get('seniat.url')._load_url(3,url %rif)
         html_data = unicode(html_data, 'ISO-8859-1').encode('utf-8')
-        self._eval_seniat_data(html_data,context)
         search_str='La condición de este contribuyente requiere la retención del '
         pos = html_data.find(search_str)
         if pos > 0:
@@ -103,47 +48,22 @@
             return float(pct)
         else:
             return 0.0
-    
-    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):
-            dom = parseString(xml_data)
-            return self._parse_dom(dom, vat, url2)
-        else:
-            return False
         
     def search_partner_seniat(self, cr, uid, vat, context=None):
-        pool = self.pool.get('seniat.url')
-        var_vat = self.read(cr,uid,vat,['name'])
-        context.update({'vat':var_vat and var_vat[0] and var_vat[0]['name'] or []})
-        if not context['vat']:
-            self._print_error(_('Vat Error !'),_('The field vat is empty'))
-        else:
-            url_obj = pool.browse(cr, uid, pool.search(cr, uid, []))[0]
-            url1 = url_obj.name + '%s'
-            url2 = url_obj.url_seniat + '%s'
-            res = self._dom_giver(url1, url2, context, context['vat'])
-            if res:
-                percent = self._buscar_porcentaje(context['vat'],url2)
-                res.update({'percent':percent, 'name':var_vat[0]['name']})
-                context.update(res)
-                self.write(cr,uid,vat,res)
-            else:
-                return False
-        res_id = self.pool.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_vat_return')])
-        resource_id = self.pool.get('ir.model.data').read(cr, uid, res_id, fields=['res_id'])[0]['res_id']
+        if context is None:
+            context={}
+        su_obj = self.pool.get('seniat.url')
+        rp_obj = self.pool.get('res.partner')
+        url_obj = su_obj.browse(cr, uid, su_obj.search(cr, uid, []))[0]
+        url1 = url_obj.name + '%s'
+        url2 = url_obj.url_seniat + '%s'
+        var_vat = self.read(cr,uid,vat,['vat'])
+        if var_vat:
+            aux = var_vat[0]['vat']
+        res = su_obj._dom_giver(url1, url2, context, aux)
+        res.update({'percent':self._buscar_porcentaje(aux,url2)})
+        self.write(cr,uid,vat,res)
         
-        return {
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'search.info.partner.seniat',
-            'views': [(resource_id,'form')], #Comentar en caso de que no funcione
-            'type': 'ir.actions.act_window',
-            'nodestroy': True,
-            'target': 'new',
-            'context': context,
-            #~ 'ref': 'search_info_partner_seniat.view_vat_return', 
-            'res_id': vat and vat[0] or [],
-        }
+        return False
         
 search_info_partner_seniat()

=== modified file 'l10n_ve_fiscal_requirements/wizard/search_info_partner_seniat.xml'
--- l10n_ve_fiscal_requirements/wizard/search_info_partner_seniat.xml	2012-01-16 14:51:55 +0000
+++ l10n_ve_fiscal_requirements/wizard/search_info_partner_seniat.xml	2012-01-24 14:29:45 +0000
@@ -7,41 +7,21 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Asistente de Busqueda del RIF">
-                    <field name="name" />
-                    <button name="search_partner_seniat" string="Buscar RIF" type="object" icon="terp-check" />
-                </form>
-            </field>
-        </record>
-        
-        <record model="ir.ui.view" id="view_vat_return">
-            <field name="name">search.info.partner.seniat.form.return</field>
-            <field name="model">search.info.partner.seniat</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Asistente de Busqueda del RIF">
                     <group colspan="4">
-                    <field name="name" />
+                    <field name="vat" />
                     <button name="search_partner_seniat" string="Buscar RIF" type="object" icon="terp-check" />
                     </group>
                     <separator string="Datos del RIF Consultado" />
-                    <field name="vat_name" />
-                    <field name="vat_agent" />
-                    <field name="percent" />
-                    <field name="vat_apply" />
+                    <group colspan="4" >
+                    <field name="name" readonly='True'/>
+                    <field name="vat_subjected" readonly='True'/>
+                    <field name="percent" readonly='True'/>
+                    <field name="vat_apply" readonly='True'/>
+                    </group>
                 </form>
             </field>
         </record>
         
-        <record id="wizard_vat_return_action" model="ir.actions.act_window">
-            <field name="name">Wizard Search VAT</field>
-            <field name="res_model">search.info.partner.seniat</field>
-            <field name="src_model">search.info.partner.seniat</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_vat_return"/>
-            <field name="target">new</field>
-        </record>
-        
         <record id="wizard_vat_search_action" model="ir.actions.act_window">
             <field name="name">Wizard Search VAT</field>
             <field name="res_model">search.info.partner.seniat</field>

=== modified file 'l10n_ve_fiscal_requirements/wizard/update_info_partner.py'
--- l10n_ve_fiscal_requirements/wizard/update_info_partner.py	2011-10-25 20:33:16 +0000
+++ l10n_ve_fiscal_requirements/wizard/update_info_partner.py	2012-01-24 14:29:45 +0000
@@ -32,8 +32,9 @@
     
     def update_info(self, cr, uid, ids, context={}):
         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, [])
-        res_part_obj.connect_seniat(cr, uid, es_partner_ids, context,True)
+        seniat_url_obj.connect_seniat(cr, uid, es_partner_ids, context,True)
         return{}