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

[Miguel Delgado (Vauxoo)]

[ADD] the functionality to update fiscal partner information in the module l10n_ve_fiscal_requirements
for put together all fiscal functionality
[IMP] Change the position of update fiscal information button and vat field to principal view of partner
[ADD] Added a field (vat_apply) in Account page of partner form to know if a partner can be applied VAT

[Nhomar - Vauxoo (nhomar)]

HEllo.

Good job.. I didn't try yet,

But.

One idea that in the backlog wasn't mentioned by me is:

The buton "Update from Seniat" should be as close as possible to VAT field.

If before this merge proposal it can be done, it should be great.

Regards.

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

414. By Miguel Delgado (Vauxoo) on 2011-10-06

[IMP] remove the line asociated to include data demo file in __openerp__.py

[Javier Duran (javieredm)]

Merged en la rama trunk:

revno: 420 [merge]
revision-id: javier@squezee-vir-20111006181340-ljk4dnt5t24ti2uk

review: Approve

=== modified file 'bank_management/__openerp__.py'
--- bank_management/__openerp__.py	2011-10-05 00:08:13 +0000
+++ bank_management/__openerp__.py	2011-10-06 18:14:24 +0000
@@ -80,7 +80,7 @@
         'bank/data/industrial_data.xml',
         'bank/data/mercantil_bank_data.xml',
         'bank/data/venezuela_bank_data.xml',
-        'check/demo/demo.xml',
+#        'check/demo/demo.xml',
     ],
     'demo_xml': [],
     'test': [],

=== modified file 'l10n_ve_fiscal_requirements/partner.py'
--- l10n_ve_fiscal_requirements/partner.py	2011-10-04 03:19:01 +0000
+++ l10n_ve_fiscal_requirements/partner.py	2011-10-06 18:14:24 +0000
@@ -2,7 +2,17 @@
 ##############################################################################
 #
 #    
+#    Programmed by: Alexander Olivares <[e-mail]>
+#                   Juan Márquez <[e-mail]>
+#
+#    This the script to connect with Seniat website 
+#    for consult the rif asociated with a partner was taken from:
 #    
+#    http://siv.cenditel.gob.ve/svn/sigesic/ramas/sigesic-1.1.x/sigesic/apps/comun/seniat.py
+#
+#    This script was modify by:
+#                   Javier Duran <[e-mail]>
+#                   Miguel Delgado <[e-mail]>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -21,6 +31,9 @@
 
 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'
@@ -50,6 +63,10 @@
 
 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 "),
+    }
 
     '''
     Required Invoice Address
@@ -57,7 +74,6 @@
     def _check_partner_invoice_addr(self,cr,uid,ids,context={}):
         partner_obj = self.browse(cr,uid,ids[0])
         if partner_obj.vat and partner_obj.vat[:2].upper() == 'VE':
-            #~ if hasattr(partner_obj, 'address') and partner_obj.address:
             if hasattr(partner_obj, 'address'):
                 res = [addr for addr in partner_obj.address if addr.type == 'invoice']
 
@@ -70,17 +86,13 @@
                 return True
         return True
 
-
     _constraints = [
         (_check_partner_invoice_addr, 'Error ! The partner does not have an invoice address. ', [])
     ]
-    
 
-    
     def vat_change_fiscal_requirements(self, cr, uid, ids, value, context=None):
         warning = {'Tittle':'Vat Error !','Message':'You try to put a VAT already existant !'}
         res = self.pool.get('res.partner').search(cr, uid, [('vat', '=', value)])
-        print "esto es el len",len(res)
         if len(res)>=1:
             raise osv.except_osv(_('Vat Error !'),_('Invalid VAT. This vat is alredy used'))
         else:
@@ -97,6 +109,68 @@
             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)
+        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:
+            if not 'all_rif' in context:
+                self._print_error(_('No Connection !'),_("Could not connect! Check the URL "))
+            else:
+                return True
+
+    def update_rif(self, cr, uid, ids, context={}):
+        for partner in self.browse(cr,uid,ids):
+            url1=partner.company_id.url_seniat1_company+'%s'
+            url2=partner.company_id.url_seniat2_company+'%s'
+            if partner.vat:
+                xml_data = self._load_url(3,url1 %partner.vat[2:])
+                if not self._eval_seniat_data(xml_data,context):
+                    dom = parseString(xml_data)
+                    self.write(cr,uid,partner.id,self._parse_dom(dom,partner.vat[2:],url2))
+                else:
+                    return False
+            else:
+                if not 'all_rif' in context:
+                    self._print_error(_('Vat Error !'),_('The field vat is empty'))
+        return True
+
 res_partner()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'l10n_ve_fiscal_requirements/res_company.py'
--- l10n_ve_fiscal_requirements/res_company.py	2011-10-05 05:53:31 +0000
+++ l10n_ve_fiscal_requirements/res_company.py	2011-10-06 18:14:24 +0000
@@ -36,6 +36,12 @@
     _columns = {
         'jour_id': fields.many2one('account.journal', 'Journal',required=False,help="Default journal for damaged invoices"),
         'acc_id': fields.many2one('account.account', 'Account',required=False,help="Default account used for invoices and lines from damaged invoices"),
+        'url_seniat1_company':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_seniat2_company':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'),
         }
+    _defaults = {
+        'url_seniat1_company':'http://contribuyente.seniat.gob.ve/getContribuyente/getrif?rif=',
+        'url_seniat2_company':'http://contribuyente.seniat.gob.ve/BuscaRif/BuscaRif.jsp?p_rif=',
+    }
 res_company()
 

=== modified file 'l10n_ve_fiscal_requirements/view/partner_view.xml'
--- l10n_ve_fiscal_requirements/view/partner_view.xml	2011-10-04 03:19:01 +0000
+++ l10n_ve_fiscal_requirements/view/partner_view.xml	2011-10-06 18:14:24 +0000
@@ -1,15 +1,30 @@
 <?xml version="1.0"?>
 <openerp>
   <data>
+
     <record id="view_partner_form2" model="ir.ui.view">
       <field name="name">res.partner.vat.inherit2</field>
       <field name="model">res.partner</field>
       <field name="inherit_id" ref="base_vat.view_partner_form"/>
       <field name="arch" type="xml">
         <field name="vat" position="replace">
-              <field name="vat" on_change="vat_change_fiscal_requirements(vat)" colspan="4" />
+        <field name="vat_apply"/>
         </field>
       </field>
     </record>
+
+    <record id="view_partner_form3" model="ir.ui.view">
+        <field name="name">res.partner.vat.inherit3</field>
+        <field name="model">res.partner</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="base.view_partner_form"/>
+        <field name="arch" type="xml">
+          <xpath expr='/form/group/group/field[@name="lang"]' position='after'>
+              <field name="vat" on_change="vat_change_fiscal_requirements(vat)" colspan="2"/>
+              <button name="update_rif" string="Update Fiscal Information" type="object" icon="gtk-execute" colspan="2"/>
+          </xpath>
+        </field>
+    </record>
+
   </data>
 </openerp>

=== modified file 'l10n_ve_fiscal_requirements/view/res_company_view.xml'
--- l10n_ve_fiscal_requirements/view/res_company_view.xml	2011-10-05 05:53:31 +0000
+++ l10n_ve_fiscal_requirements/view/res_company_view.xml	2011-10-06 18:14:24 +0000
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <record id="il_company_invoice_damaged" model="ir.ui.view">
             <field name="name">il_company_invoice_damaged</field>
             <field name="model">res.company</field>
@@ -15,6 +16,21 @@
                 </page>
             </field>
         </record>
+
+        <record model="ir.ui.view" id="view_res_company_wh_iva_form_inherit">
+          <field name="name">res.company.form.inherit</field>
+          <field name="model">res.company</field>
+          <field name="type">form</field>
+          <field name="inherit_id" ref="base.view_company_form"/>
+          <field name="arch" type="xml">
+              <xpath expr="/form/notebook/page[@string='Configuration']" position="inside">
+                  <separator string="Fiscal Information" colspan="4"/>
+                  <field name="url_seniat1_company" />
+                  <field name="url_seniat2_company" />
+              </xpath>
+          </field>
+        </record>
+
     </data>
 </openerp>
 

=== modified file 'l10n_ve_withholding_iva/__init__.py'
--- l10n_ve_withholding_iva/__init__.py	2011-10-04 21:06:55 +0000
+++ l10n_ve_withholding_iva/__init__.py	2011-10-06 18:14:24 +0000
@@ -24,7 +24,6 @@
 import partner
 import generate_txt
 import report
-import res_company
 import installer
 import wizard
 

=== modified file 'l10n_ve_withholding_iva/__openerp__.py'
--- l10n_ve_withholding_iva/__openerp__.py	2011-10-04 21:06:55 +0000
+++ l10n_ve_withholding_iva/__openerp__.py	2011-10-06 18:14:24 +0000
@@ -37,7 +37,6 @@
         'security/ir.model.access.csv',
         'generate_txt_view.xml',
         'txt_wh_report.xml',
-        'res_company_view.xml',
         'account_invoice_view.xml',
         'account_view.xml',
         'partner_view.xml',

=== modified file 'l10n_ve_withholding_iva/partner.py'
--- l10n_ve_withholding_iva/partner.py	2011-10-05 05:47:07 +0000
+++ l10n_ve_withholding_iva/partner.py	2011-10-06 18:14:24 +0000
@@ -89,13 +89,12 @@
             return 0.0
 
     def _parse_dom(self,dom,rif,url_seniat):
-        name = dom.childNodes[0].childNodes[0].firstChild.data 
         wh_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
         wh_rate = self._buscar_porcentaje(rif,url_seniat)
         self.logger.notifyChannel("info", netsvc.LOG_INFO,
             "RIF: %s Found" % rif)
-        return {'name':name, 'wh_iva_agent':wh_agent,'vat_subjected':vat_apply,'wh_iva_rate':wh_rate}
+        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())
 
     def _print_error(self, error, msg):
         raise osv.except_osv(error,msg)

=== modified file 'l10n_ve_withholding_iva/partner_view.xml'
--- l10n_ve_withholding_iva/partner_view.xml	2011-09-26 19:13:06 +0000
+++ l10n_ve_withholding_iva/partner_view.xml	2011-10-06 18:14:24 +0000
@@ -24,14 +24,11 @@
                                 <field name="wh_iva_rate"/>
                                 <field name="property_wh_iva_payable"/>
                                 <field name="property_wh_iva_receivable"/>
-                                <button name="update_rif" string="Update Data Vat" type="object" icon="gtk-execute"/>
                             </group>
                         </page>
                     </notebook>
                 </page>
             </field>
         </record>
-
-
     </data>
 </openerp>

=== removed file 'l10n_ve_withholding_iva/res_company.py'
--- l10n_ve_withholding_iva/res_company.py	2011-09-27 16:59:13 +0000
+++ l10n_ve_withholding_iva/res_company.py	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-# Copyright (c) 2011 OpenERP Venezuela (http://openerp.com.ve)
-# All Rights Reserved.
-# Programmed by: Miguel Delgado          <[e-mail]>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-###############################################################################
-from osv import osv
-from osv import fields
-from tools.translate import _
-
-class url_seniat_company(osv.osv):
-    _inherit = 'res.company'
-    _columns = {
-        'url_seniat1_company':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_seniat2_company':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'),
-    }
-    _defaults = {
-        'url_seniat1_company':'http://contribuyente.seniat.gob.ve/getContribuyente/getrif?rif=',
-        'url_seniat2_company':'http://contribuyente.seniat.gob.ve/BuscaRif/BuscaRif.jsp?p_rif=',
-    }
-url_seniat_company()

=== removed file 'l10n_ve_withholding_iva/res_company_view.xml'
--- l10n_ve_withholding_iva/res_company_view.xml	2011-09-27 16:59:13 +0000
+++ l10n_ve_withholding_iva/res_company_view.xml	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-    <record model="ir.ui.view" id="view_res_company_wh_iva_form_inherit">
-        <field name="name">res.company.form.inherit</field>
-        <field name="model">res.company</field>
-        <field name="type">form</field>
-        <field name="inherit_id" ref="base.view_company_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="/form/notebook/page[@string='Configuration']" position="inside">
-                <separator string="Fiscal Information" colspan="4"/>
-                <field name="url_seniat1_company" />
-                <field name="url_seniat2_company" />
-            </xpath>
-        </field>
-    </record>
-
-    </data>
-</openerp>