diff --git a/base_vat_optional_vies/README.rst b/base_vat_optional_vies/README.rst index 2ece8acab..a4529a07c 100644 --- a/base_vat_optional_vies/README.rst +++ b/base_vat_optional_vies/README.rst @@ -12,18 +12,15 @@ validation was passed or not. Then you can use "VIES validation passed" field in order to show VAT ID with or without country preffix in invoices, for instance. -*NOTE*: Altought VIES validation is actived in your company, this validation -will not block VAT ID write (main different to Odoo standard behavior) if this +*NOTE*: Although VIES validation is set in your company, this validation +will not block VAT ID write (main difference to Odoo standard behavior) if this VAT ID is valid in its country. - Configuration ============= In order to activate VIES validation, you must set this option in your company: -Settings > Companies > Companies > Your Company > Configuration > Accounting -> VIES VAT Check - +Settings > Companies > Your Company > VIES VAT Check Usage ===== @@ -40,18 +37,20 @@ When VIES VAT Check is not activated: * "VIES validation passed" field will be always False -You must preffix VAT with country code (ISO 3166-1 alpha-2) and if you want to +You must prefix VAT with country code (ISO 3166-1 alpha-2) and if you want to bypass country validation you can use "EU" code +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/92/10.0 Bug Tracker =========== Bugs are tracked on `GitHub Issues -`_. In case of trouble, please -check there if your issue has already been reported. If you spotted it first, -help us smashing it by providing a detailed and welcomed feedback. - +`_. In case of trouble, +please check there if your issue has already been reported. If you spotted it +first, help us smash it by providing detailed and welcomed feedback. Credits ======= @@ -59,10 +58,10 @@ Credits Contributors ------------ -* Rafael Blasco -* Antonio Espinosa +* Rafael Blasco +* Antonio Espinosa * Sergio Teruel - +* David Vidal Maintainer ---------- @@ -77,4 +76,4 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -To contribute to this module, please visit http://odoo-community.org. +To contribute to this module, please visit https://odoo-community.org. diff --git a/base_vat_optional_vies/__openerp__.py b/base_vat_optional_vies/__manifest__.py similarity index 56% rename from base_vat_optional_vies/__openerp__.py rename to base_vat_optional_vies/__manifest__.py index d2f05aa79..32934552b 100644 --- a/base_vat_optional_vies/__openerp__.py +++ b/base_vat_optional_vies/__manifest__.py @@ -1,11 +1,12 @@ # -*- coding: utf-8 -*- -# License AGPL-3: Tecnativa S.L. - Antonio Espinosa -# See README.rst file on addon root folder for more details - +# Copyright 2015 Tecnativa - Antonio Espinosa +# Copyright 2016 Tecnativa - Sergio Teruel +# Copyright 2017 Tecnativa - David Vidal +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { 'name': "Optional validation of VAT via VIES", 'category': 'Accounting', - 'version': '8.0.1.0.0', + 'version': '10.0.1.0.0', 'depends': [ 'base_vat', ], @@ -15,11 +16,9 @@ 'data': [ 'views/res_partner_view.xml', ], - 'author': 'Antiun Ingeniería S.L., ' - 'Tecnativa,' + 'author': 'Tecnativa,' 'Odoo Community Association (OCA)', - 'website': 'http://www.tecnativa.com', + 'website': 'https://www.tecnativa.com', 'license': 'AGPL-3', - 'images': [], 'installable': True, } diff --git a/base_vat_optional_vies/i18n/es.po b/base_vat_optional_vies/i18n/es.po new file mode 100644 index 000000000..4ae1ab396 --- /dev/null +++ b/base_vat_optional_vies/i18n/es.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_vat_optional_vies +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-23 17:10+0000\n" +"PO-Revision-Date: 2017-06-23 19:11+0200\n" +"Last-Translator: David \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Language: es\n" +"X-Generator: Poedit 1.8.7.1\n" + +#. module: base_vat_optional_vies +#: model:ir.model,name:base_vat_optional_vies.model_res_partner +msgid "Partner" +msgstr "Empresa" + +#. module: base_vat_optional_vies +#: model:ir.model.fields,field_description:base_vat_optional_vies.field_res_partner_vies_passed +#: model:ir.model.fields,field_description:base_vat_optional_vies.field_res_users_vies_passed +msgid "VIES validation passed" +msgstr "Validación VIES aprobada" diff --git a/base_vat_optional_vies/models/__init__.py b/base_vat_optional_vies/models/__init__.py index 6097f3ebf..f261da797 100644 --- a/base_vat_optional_vies/models/__init__.py +++ b/base_vat_optional_vies/models/__init__.py @@ -1,3 +1,3 @@ -# See README.rst file on addon root folder for more details +# -*- coding: utf-8 -*- from . import res_partner diff --git a/base_vat_optional_vies/models/res_partner.py b/base_vat_optional_vies/models/res_partner.py index 4f1141251..864f028a4 100644 --- a/base_vat_optional_vies/models/res_partner.py +++ b/base_vat_optional_vies/models/res_partner.py @@ -1,23 +1,9 @@ # -*- coding: utf-8 -*- -# License AGPL-3: Tecnativa S.L. - Antonio Espinosa -# See README.rst file on addon root folder for more details +# Copyright 2015 Tecnativa - Antonio Espinosa +# Copyright 2017 Tecnativa - David Vidal +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -import logging -import re -from openerp import models, fields, api -from openerp.exceptions import ValidationError - -_logger = logging.getLogger(__name__) - -try: - import vatnumber -except ImportError: - _logger.warning( - "VAT validation partially unavailable because the `vatnumber` Python " - "library cannot be found. Install it to support more countries, " - "for example with `easy_install vatnumber` or " - "`pip install vatnumber`.") - vatnumber = None +from odoo import api, fields, models class ResPartner(models.Model): @@ -26,112 +12,31 @@ class ResPartner(models.Model): vies_passed = fields.Boolean( string="VIES validation passed", readonly=True) - def __init__(self, pool, cr): - super(ResPartner, self).__init__(pool, cr) - self._constraints = [] + @api.model + def simple_vat_check(self, country_code, vat_number): + res = super(ResPartner, self).simple_vat_check( + country_code, vat_number, + ) + partner = self.env.context.get('vat_partner') + if partner and self.vies_passed: + # Can not be sure that this VAT is signed up in VIES + partner.update({'vies_passed': False}) + return res + + @api.model + def vies_vat_check(self, country_code, vat_number): + partner = self.env.context.get('vat_partner') + if partner: + # If there's an exception checking VIES, the upstream method will + # call simple_vat_check and thus the flag will be removed + partner.update({'vies_passed': True}) + res = super(ResPartner, self).vies_vat_check(country_code, vat_number) + if not res: + return self.simple_vat_check(country_code, vat_number) + return res @api.constrains('vat') def check_vat(self): for partner in self: - if (not self.env.context.get('avoid_check_vat') and - not partner.parent_id): - if not partner.validate_vat(): - raise ValidationError(partner._construct_constraint_msg()) - - @api.multi - def button_check_vat(self): - if not self.validate_vat(): - raise ValidationError(self._construct_constraint_msg()) - return True - - def _split_vat(self, vat, country=False): - """ - @summary: Split Partner vat into country_code and number - @result: (vat_country, vat_number) - """ - vat_country = 'XX' - vat_number = vat - if vat and re.match(r'[A-Za-z]{2}', vat): - vat_country = vat[:2].lower() - vat_number = vat[2:].replace(' ', '') - elif country: - vat_country = country - return vat_country, vat_number - - @api.multi - def validate_vat(self): - self.ensure_one() - if self.company_id.vat_check_vies: - # VIES online check - check_func = self.vies_vat_optional_check - else: - # quick and partial off-line checksum validation - check_func = self.simple_vat_optional_check - vat_country, vat_number = self._split_vat(self.vat) - if vat_number and vat_country == 'XX': - _logger.info("VAT country not found!") - raise ValidationError(self._construct_constraint_msg()) - if vat_number and not check_func(vat_country, vat_number): - _logger.info("VAT Number [%s] is not valid !" % vat_number) - return False - return True - - @api.multi - def simple_vat_optional_check(self, country_code, vat_number): - """ - Check the VAT number depending of the country. - http://sima-pc.com/nif.php - """ - self.ensure_one() - res = self.simple_vat_check(country_code.lower(), vat_number) - data = {} - if res and self.vies_passed and not self.company_id.vat_check_vies: - # Can not be sure that this VAT is signed up in VIES - data['vies_passed'] = False - if res: - vat = country_code.upper() + vat_number - if self.vat != vat: - data['vat'] = vat - if data: - self.with_context(avoid_check_vat=True).write(data) - return res - - @api.multi - def vies_vat_optional_check(self, country_code, vat_number): - self.ensure_one() - data = {} - res = False - try: - # Validate against VAT Information Exchange System (VIES) - # see also http://ec.europa.eu/taxation_customs/vies/ - vat = country_code + vat_number - res = vatnumber.check_vies(vat) - if res and not self.vies_passed: - data['vies_passed'] = True - except Exception: - # See: - # http://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl - # Fault code may contain INVALID_INPUT, SERVICE_UNAVAILABLE, - # MS_UNAVAILABLE, TIMEOUT or SERVER_BUSY. There is no way we can - # validate the input with VIES if any of these arise, including - # the first one (it means invalid country code or empty - # VAT number), so we fall back to the simple check. - pass - - if not res: - res = self.simple_vat_optional_check(country_code, vat_number) - if self.vies_passed: - data['vies_passed'] = False - if res: - vat = country_code.upper() + vat_number - if self.vat != vat: - data['vat'] = vat - if data: - self.with_context(avoid_check_vat=True).write(data) - return res - - # Delete old api constraint defined in base_vat addon - @api.multi - def _validate_fields(self, field_names): - self._constraints = [x for x in self._constraints if 'vat' not in x[2]] - super(ResPartner, self)._validate_fields(field_names) + partner = partner.with_context(vat_partner=partner) + super(ResPartner, partner).check_vat() diff --git a/base_vat_optional_vies/tests/test_res_partner.py b/base_vat_optional_vies/tests/test_res_partner.py index 8aae1fd7d..a6d1862bb 100644 --- a/base_vat_optional_vies/tests/test_res_partner.py +++ b/base_vat_optional_vies/tests/test_res_partner.py @@ -1,70 +1,39 @@ # -*- coding: utf-8 -*- -# License AGPL-3: Tecnativa S.L. - Antonio Espinosa -# See README.rst file on addon root folder for more details +# Copyright 2015 Tecnativa - Antonio Espinosa +# Copyright 2016 Tecnativa - Sergio Teruel +# Copyright 2017 Tecnativa - David Vidal +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp.tests.common import TransactionCase +import mock +from odoo.tests import common -class TestResPartner(TransactionCase): - +class TestResPartner(common.TransactionCase): def setUp(self): super(TestResPartner, self).setUp() - self.m_partner = self.env['res.partner'] - self.m_company = self.env['res.company'] - self.company = self.m_company.browse(self.ref('base.main_company')) - self.partner = self.m_partner.browse(self.ref('base.res_partner_1')) - - def test_split_vat(self): - cases = ( - # vat, country, => vat_country, vat_number - ('ESB12345678', False, 'ES', 'B12345678'), - ('B12345678', False, 'XX', 'B12345678'), - ('1EB12345678', False, 'XX', '1EB12345678'), - ('ESB12345678', 'DE', 'ES', 'B12345678'), - ('B12345678', 'ES', 'ES', 'B12345678'), + self.company = self.env.user.company_id + self.company.vat_check_vies = True + self.partner = self.env['res.partner'].create({ + 'name': 'Test partner', + }) + self.vatnumber_path = ( + 'odoo.addons.base_vat.models.res_partner.vatnumber' ) - for vat, country, vat_country, vat_number in cases: - res_country, res_number = self.m_partner._split_vat(vat, country) - self.assertEqual(res_country, vat_country) - self.assertEqual(res_number, vat_number) - def _test_validate_vat(self, cases): - for vat, res_vat, res_vies in cases: - self.partner.write({ - 'vat': vat, - }) - self.assertEqual(self.partner.vat, res_vat) - self.assertEqual(self.partner.vies_passed, res_vies) + def test_validate_vat_vies(self): + with mock.patch(self.vatnumber_path) as mock_vatnumber: + mock_vatnumber.check_vies.return_value = True + self.partner.vat = 'ESB87530432' + self.assertEqual(self.partner.vies_passed, True) - # AEA: Can't use this test in Travis, VIES checking returns always False - # because of timeout - # def test_validate_vat_vies(self): - # """ - # Validate VAT when company 'vat_check_vies' option is True - # All VATs are valid, but some are not signed up in VIES database - # """ - # self.company.vat_check_vies = True - # cases = ( - # # vat => vat, vies_passed - # # VATs signed up in VIES - # ('ESB84718550', 'ESB84718550', True), - # ('de222070543', 'DE222070543', True), - # # Valid VATs don't signed up in VIES - # ('DE253130868', 'DE253130868', False), - # ('esB87286357', 'ESB87286357', False), - # ) - # self._test_validate_vat(cases) + def test_exception_vat_vies(self): + with mock.patch(self.vatnumber_path) as mock_vatnumber: + mock_vatnumber.check_vies.side_effect = Exception() + self.partner.vat = 'ESB87530432' + self.assertEqual(self.partner.vies_passed, False) - def test_validate_vat_no_vies(self): - """ - Validate VAT when company 'vat_check_vies' option is False - """ - self.company.vat_check_vies = False - cases = ( - # vat => vat, vies_passed - ('ESB84718550', 'ESB84718550', False), - ('de222070543', 'DE222070543', False), - ('DE253130868', 'DE253130868', False), - ('esB87286357', 'ESB87286357', False), - ) - self._test_validate_vat(cases) + def test_no_validate_vat(self): + with mock.patch(self.vatnumber_path) as mock_vatnumber: + mock_vatnumber.check_vies.return_value = False + self.partner.vat = 'ESB87530432' + self.assertEqual(self.partner.vies_passed, False) diff --git a/base_vat_optional_vies/views/res_partner_view.xml b/base_vat_optional_vies/views/res_partner_view.xml index e5880eb75..81faf4f6b 100644 --- a/base_vat_optional_vies/views/res_partner_view.xml +++ b/base_vat_optional_vies/views/res_partner_view.xml @@ -1,18 +1,15 @@ - - + Add VAT country and VIES passed fields res.partner - + - - - +