Merge lp:~vauxoo/openerp-venezuela-localization/miguel-fiscal-requirements-imp into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

[Miguel Delgado (Vauxoo)]

[lp:~vauxoo/openerp-venezuela-localization/miguel-fiscal-requirements-imp]

619. By Miguel Delgado (Vauxoo) on 2012-02-16

[FIX] placing the wizard to consult the rif of the partners in the right place for ergonomic use

=== modified file 'l10n_ve_fiscal_requirements/installer.py'
--- l10n_ve_fiscal_requirements/installer.py	2012-01-19 02:07:57 +0000
+++ l10n_ve_fiscal_requirements/installer.py	2012-02-16 19:56:39 +0000
@@ -38,7 +38,7 @@
         context = {'exec_wizard': True, 'vat': vat}
         
         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')}
+        v = {'name': partner_info.get('name'), 'vat_subjected': partner_info.get('vat_subjected')}
         return {'value': v}
 
     def execute(self, cr, uid, ids, context=None):
@@ -63,13 +63,13 @@
                     'street':wiz_data.add,
                     'country_id':self.pool.get("res.country").search(cr,uid,[('code','=','VE')])[0]})
         #Data on res.partner
-        data = {'name': wiz_data.name, 'vat': "VE%s" % wiz_data.vat.upper(), 'vat_apply': wiz_data.vat_apply,}
+        data = {'name': wiz_data.name, 'vat': "VE%s" % wiz_data.vat.upper(), 'vat_subjected': wiz_data.vat_subjected,}
         self.pool.get('res.partner').write(cr, uid, [partner.id], data)
 
     _columns = {
         'vat': fields.char('VAT', 16, required=True, help='Partner\'s VAT to update the other fields'),
         'name': fields.char('Name', 64, help="The commercial name of the company"),
         'add':fields.char('Invoice Address',64,help='Put Here the address declared on your VAT information on SENIAT',required=True),
-        'vat_apply': fields.boolean("Apply VAT?"),
+        'vat_subjected': fields.boolean("Apply VAT?"),
     }
 fiscal_requirements_config()
 
=== modified file 'l10n_ve_fiscal_requirements/installer_view.xml'
--- l10n_ve_fiscal_requirements/installer_view.xml	2011-10-25 20:33:16 +0000
+++ l10n_ve_fiscal_requirements/installer_view.xml	2012-02-16 19:56:39 +0000
@@ -31,7 +31,7 @@
               <newline/>
               <field name="name" groups="base.group_extended"/>
               <newline/>
-              <field name="vat_apply" groups="base.group_extended" />
+              <field name="vat_subjected" groups="base.group_extended" />
               <newline/>
               <field name="add" groups="base.group_extended" widget="text"/>
             </group>
 
=== modified file 'l10n_ve_fiscal_requirements/partner.py'
--- l10n_ve_fiscal_requirements/partner.py	2012-01-27 15:30:52 +0000
+++ l10n_ve_fiscal_requirements/partner.py	2012-02-16 19:56:39 +0000
@@ -63,7 +63,6 @@
     _inherit = 'res.partner'
    
     _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"),
     }
 
@@ -150,72 +149,11 @@
             return False
         return True
     
-#    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_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 {'name': name,'vat_apply': vat_apply}
-
-    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 _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):
-        self.write(cr, uid, id, {'seniat_updated': True})
-
-    def update_rif(self, cr, uid, ids, context={}):
+    def update_rif(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         su_obj = self.pool.get('seniat.url')
-        ctx = context.copy()
-        su_obj.connect_seniat(cr, uid, ids, context=ctx)
-        return True
+        return su_obj.update_rif(cr, uid, ids, context=context)
 
 res_partner()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'l10n_ve_fiscal_requirements/seniat_url.py'
--- l10n_ve_fiscal_requirements/seniat_url.py	2012-02-14 14:33:22 +0000
+++ l10n_ve_fiscal_requirements/seniat_url.py	2012-02-16 19:56:39 +0000
@@ -78,13 +78,12 @@
     
     def _parse_dom(self,dom,rif,url_seniat):
         name = dom.childNodes[0].childNodes[0].firstChild.data 
-        wh_iva_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
+        vat_subjected = 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,'wh_iva_agent': wh_iva_agent,'wh_iva_rate':self._buscar_porcentaje(rif,url_seniat)}  
+        res= {'name': name,'vat_subjected': vat_subjected,}  
         return res
 
     def _print_error(self, error, msg):
 
=== modified file 'l10n_ve_fiscal_requirements/view/partner_view.xml'
--- l10n_ve_fiscal_requirements/view/partner_view.xml	2012-01-19 01:37:26 +0000
+++ l10n_ve_fiscal_requirements/view/partner_view.xml	2012-02-16 19:56:39 +0000
@@ -8,7 +8,6 @@
       <field name="inherit_id" ref="base_vat.view_partner_form"/>
       <field name="arch" type="xml">
         <field name="vat" position="replace">
-        <field name="vat_apply"/>
         </field>
       </field>
     </record>
 
=== modified file 'l10n_ve_fiscal_requirements/wizard/search_info_partner_seniat.py'
--- l10n_ve_fiscal_requirements/wizard/search_info_partner_seniat.py	2012-02-13 21:02:05 +0000
+++ l10n_ve_fiscal_requirements/wizard/search_info_partner_seniat.py	2012-02-16 19:56:39 +0000
@@ -31,24 +31,11 @@
     _columns = {
         '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'),
+        'wh_iva_agent':fields.boolean('Agente de Retencion', help='Es Agente de Retencion'),
         'wh_iva_rate':fields.float('Porcentaje de Retencion', help='Porcentaje de Retencion Aplicable'),
-        'vat_apply':fields.boolean('Contribuyente Formal', help='Es Contribuyente'),
+        'vat_subjected':fields.boolean('Contribuyente Formal', help='Es Contribuyente'),
     }
-    
-    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 search_partner_seniat(self, cr, uid, vat, context=None):
         if context is None:
             context={}
@@ -61,7 +48,7 @@
         if var_vat:
             aux = var_vat[0]['vat']
         res = su_obj._dom_giver(url1, url2, context, aux)
-        res.update({'wh_iva_rate':self._buscar_porcentaje(aux,url2)})
+        res.update({'wh_iva_rate':su_obj._buscar_porcentaje(aux,url2)})
         self.write(cr,uid,vat,res)
         
         return False
 
=== modified file 'l10n_ve_fiscal_requirements/wizard/search_info_partner_seniat.xml'
--- l10n_ve_fiscal_requirements/wizard/search_info_partner_seniat.xml	2012-02-13 21:02:05 +0000
+++ l10n_ve_fiscal_requirements/wizard/search_info_partner_seniat.xml	2012-02-16 19:56:39 +0000
@@ -16,7 +16,7 @@
                     <field name="name" readonly='True'/>
                     <field name="wh_iva_agent" readonly='True'/>
                     <field name="wh_iva_rate" readonly='True'/>
-                    <field name="vat_apply" readonly='True'/>
+                    <field name="vat_subjected" readonly='True'/>
                     </group>
                 </form>
             </field>
@@ -31,8 +31,13 @@
             <field name="target">new</field>
         </record>
         
+        
         <menuitem name="Search RIF" id="wizard_vat_search_action_menu" 
-            parent="l10n_ve_fiscal_requirements.menu_finance_partner_fiscal_information" action="wizard_vat_search_action"
+            parent="account.menu_finance_receivables" action="wizard_vat_search_action"
+            sequence="400"/>
+            
+        <menuitem name="Search RIF" id="wizard_vat_search_action_pay_menu" 
+            parent="account.menu_finance_payables" action="wizard_vat_search_action"
             sequence="400"/>
 
   </data>
 
=== modified file 'l10n_ve_withholding_islr/partner.py'
--- l10n_ve_withholding_islr/partner.py	2011-11-28 15:07:46 +0000
+++ l10n_ve_withholding_islr/partner.py	2012-02-16 19:56:39 +0000
@@ -40,10 +40,6 @@
         'islr_withholding_agent': fields.boolean('Withholding Income Agent?',help="Check if the partner is an agent for withholding income"),
     }
     
-    _defaults = {
-        'islr_withholding_agent': 1,
-    }
-    
 res_partner()
 
 
 
=== modified file 'l10n_ve_withholding_iva/model/partner.py'
--- l10n_ve_withholding_iva/model/partner.py	2012-01-25 16:56:12 +0000
+++ l10n_ve_withholding_iva/model/partner.py	2012-02-16 19:56:39 +0000
@@ -39,28 +39,26 @@
     _defaults = {
         'wh_iva_rate': lambda *a: 0,
     }
-
-
-    def _buscar_porcentaje(self,rif,url):
-        context={}
-        html_data = self._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:
-            pos += len(search_str)
-            pct = html_data[pos:pos+4].replace('%','').replace(' ','')
-            return float(pct)
-        else:
-            return 0.0
-
+    
+    def update_rif(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        su_obj = self.pool.get('seniat.url')
+        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):
+        su_obj = self.pool.get('seniat.url')
         wh_agent = dom.childNodes[0].childNodes[1].firstChild.data.upper()=='SI' and True or False
-        wh_rate = self._buscar_porcentaje(rif,url_seniat)
+        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(res_partner,self)._parse_dom(dom,rif,url_seniat).items())
+        return dict(data.items() + super(seniat_url,self)._parse_dom(dom,rif,url_seniat).items())
     
-res_partner()
+seniat_url()