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

[Miguel Delgado (Vauxoo)]

[ADD] the functionality to update all partner info into the module l10n_ve_fiscal_requirements and this functionality was removed from module l10n_ve_withholding_iva.

[Javier Duran (javieredm)]

Merged in trunk.

revno: 436 [merge]
revision-id: javier@squezee-vir-20111011193946-z7y26wnnuot78xmk

review: Approve

=== modified file 'l10n_ve_fiscal_requirements/__openerp__.py'
--- l10n_ve_fiscal_requirements/__openerp__.py	2011-10-10 01:50:28 +0000
+++ l10n_ve_fiscal_requirements/__openerp__.py	2011-10-11 19:26:23 +0000
@@ -64,6 +64,7 @@
         'wizard/wizard_invoice_nro_ctrl_view.xml',
         'wizard/wizard_nro_ctrl_view.xml',
         'wizard/wizard_url_seniat_view.xml',
+        'wizard/update_info_partner.xml',
     ],
     'demo_xml': [
         'demo/demo_partners.xml',

=== modified file 'l10n_ve_fiscal_requirements/partner.py'
--- l10n_ve_fiscal_requirements/partner.py	2011-10-09 19:18:15 +0000
+++ l10n_ve_fiscal_requirements/partner.py	2011-10-11 19:26:23 +0000
@@ -141,14 +141,22 @@
         raise osv.except_osv(error,msg)
 
     def _eval_seniat_data(self,xml_data,context={}):
+
         if xml_data.find('450')>=0:
-            self._print_error(_('Vat Error !'),_('Invalid VAT!'))
+            if not 'all_rif' in context:
+                self._print_error(_('Vat Error !'),_('Invalid VAT!'))
+            else:
+                return True
 
         if xml_data.find('452')>=0:
-            self._print_error(_('Vat Error !'),_('Unregistered VAT!'))
+            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):
@@ -166,12 +174,25 @@
         url2 = url_obj.url_seniat + '%s'
         if context.get('exec_wizard'):
             return self._dom_giver(url1, url2, context, context['vat'])
-
         for partner in self.browse(cr,uid,ids):
             if partner.vat:
-                data = self._dom_giver(url1, url2, context, partner.vat[2:])
-                print data
-                self.write(cr,uid,partner.id,data)
+                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
+
+    def connect_seniat(self, cr, uid, ids, context={}, all_rif=False):
+        if all_rif:
+            ctx = context.copy()
+            ctx.update({'all_rif': True})
+        for partner in self.browse(cr,uid,ids):
+            self.update_rif(cr, uid, [partner.id], context=ctx)
         return True
 
 res_partner()

=== modified file 'l10n_ve_fiscal_requirements/wizard/__init__.py'
--- l10n_ve_fiscal_requirements/wizard/__init__.py	2011-10-09 17:01:04 +0000
+++ l10n_ve_fiscal_requirements/wizard/__init__.py	2011-10-11 19:26:23 +0000
@@ -26,3 +26,4 @@
 import wizard_nro_ctrl
 import wizard_invoice_nro_ctrl
 import wizard_url_seniat
+import update_info_partner

=== added file 'l10n_ve_fiscal_requirements/wizard/update_info_partner.py'
--- l10n_ve_fiscal_requirements/wizard/update_info_partner.py	1970-01-01 00:00:00 +0000
+++ l10n_ve_fiscal_requirements/wizard/update_info_partner.py	2011-10-11 19:26:23 +0000
@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    [e-mail]
+#
+#    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 3 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, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import wizard
+import pooler
+from osv import osv, fields
+from tools.translate import _
+
+class update_info_partner(osv.osv_memory):
+    """
+    OpenERP osv memory wizard : update_info_partner
+    """
+    _name = 'update.info.partner'
+    
+    def update_info(self, cr, uid, ids, context={}):
+        res_part_obj = self.pool.get('res.partner')
+        es_partner_ids= res_part_obj.search(cr, uid, [])
+        res_part_obj.connect_seniat(cr, uid, es_partner_ids, context,True)
+        return{}
+
+   
+update_info_partner()

=== added file 'l10n_ve_fiscal_requirements/wizard/update_info_partner.xml'
--- l10n_ve_fiscal_requirements/wizard/update_info_partner.xml	1970-01-01 00:00:00 +0000
+++ l10n_ve_fiscal_requirements/wizard/update_info_partner.xml	2011-10-11 19:26:23 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <menuitem id="menu_finance_partner_fiscal_information" name="Partner Fiscal Information" parent="account.menu_finance" groups="account.group_account_manager"/>
+
+        <record id="view_wizard_update_info_partner" model="ir.ui.view">
+            <field name="name">view.update.info.partner</field>
+            <field name="model">update.info.partner</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="">
+                    <separator string="Are you sure you want to do this?" colspan="4"/>
+                    <group colspan="8" col="8">
+                            <button icon="gtk-ok" name="update_info" type="object" string="Yes"/>
+                            <button icon="gtk-cancel" special="cancel" string="No"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="wizard_update_info_partner" model="ir.actions.act_window">
+            <field name="name">Update Info Partner</field>
+            <field name="res_model">update.info.partner</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_wizard_update_info_partner"/>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem name="Update All Partner Information" id="wizard_update_all_partner_information" 
+            parent="menu_finance_partner_fiscal_information" action="wizard_update_info_partner"
+        />
+    </data>
+</openerp>

=== modified file 'l10n_ve_withholding_iva/__openerp__.py'
--- l10n_ve_withholding_iva/__openerp__.py	2011-10-06 17:08:59 +0000
+++ l10n_ve_withholding_iva/__openerp__.py	2011-10-11 19:26:23 +0000
@@ -46,7 +46,6 @@
         "account_workflow.xml",        
         "l10n_ve_withholding_iva_installer.xml",
         "account_workflow.xml",
-        "wizard/update_info_partner.xml",
     ],
     'demo_xml': ["demo/l10n_ve_withholding_iva_demo.xml"],
     'test': [],

=== modified file 'l10n_ve_withholding_iva/partner.py'
--- l10n_ve_withholding_iva/partner.py	2011-10-09 17:45:08 +0000
+++ l10n_ve_withholding_iva/partner.py	2011-10-11 19:26:23 +0000
@@ -56,23 +56,6 @@
 
     }
 
-    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 _buscar_porcentaje(self,rif,url):
         context={}
@@ -95,53 +78,5 @@
             "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())
-
-    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 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'
-        for partner in self.browse(cr,uid,ids):
-            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
-
-    def connect_seniat(self, cr, uid, ids, context={}, all_rif=False):
-        if all_rif:
-            ctx = context.copy()
-            ctx.update({'all_rif': True})
-        for partner in self.browse(cr,uid,ids):
-            self.update_rif(cr, uid, [partner.id], context=ctx)
-
-        return True
     
 res_partner()

=== removed file 'l10n_ve_withholding_iva/wizard/__init__.py'
--- l10n_ve_withholding_iva/wizard/__init__.py	2011-10-04 21:06:55 +0000
+++ l10n_ve_withholding_iva/wizard/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    [e-mail]
-#
-#    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 3 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, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-import update_info_partner

=== removed file 'l10n_ve_withholding_iva/wizard/update_info_partner.py'
--- l10n_ve_withholding_iva/wizard/update_info_partner.py	2011-10-04 22:09:51 +0000
+++ l10n_ve_withholding_iva/wizard/update_info_partner.py	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    [e-mail]
-#
-#    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 3 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, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-import wizard
-import pooler
-from osv import osv, fields
-from tools.translate import _
-
-class update_info_partner(osv.osv_memory):
-    """
-    OpenERP osv memory wizard : update_info_partner
-    """
-    _name = 'update.info.partner'
-    
-    def update_info(self, cr, uid, ids, context={}):
-        res_part_obj = self.pool.get('res.partner')
-        es_partner_ids= res_part_obj.search(cr, uid, [])
-        res_part_obj.connect_seniat(cr, uid, es_partner_ids, context,True)
-        return{}
-
-   
-update_info_partner()

=== removed file 'l10n_ve_withholding_iva/wizard/update_info_partner.xml'
--- l10n_ve_withholding_iva/wizard/update_info_partner.xml	2011-10-04 21:23:37 +0000
+++ l10n_ve_withholding_iva/wizard/update_info_partner.xml	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <menuitem id="menu_finance_partner_fiscal_information" name="Partner Fiscal Information" parent="account.menu_finance" groups="account.group_account_manager"/>
-
-        <record id="view_wizard_update_info_partner" model="ir.ui.view">
-            <field name="name">view.update.info.partner</field>
-            <field name="model">update.info.partner</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="">
-                    <separator string="Are you sure you want to do this?" colspan="4"/>
-                    <group colspan="8" col="8">
-                            <button icon="gtk-ok" name="update_info" type="object" string="Yes"/>
-                            <button icon="gtk-cancel" special="cancel" string="No"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record id="wizard_update_info_partner" model="ir.actions.act_window">
-            <field name="name">Update Info Partner</field>
-            <field name="res_model">update.info.partner</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_wizard_update_info_partner"/>
-            <field name="target">new</field>
-        </record>
-
-        <menuitem name="Update All Partner Information" id="wizard_update_all_partner_information" 
-            parent="menu_finance_partner_fiscal_information" action="wizard_update_info_partner"
-        />
-    </data>
-</openerp>