From 1da7aa3e464bc8fe9ec223a1f3ea6c310975034f Mon Sep 17 00:00:00 2001 From: Antonio Espinosa Date: Tue, 6 Oct 2015 11:10:40 +0200 Subject: [PATCH 1/6] base_vat_optional_vies addon --- base_vat_optional_vies/README.rst | 78 ++++++++++ base_vat_optional_vies/__init__.py | 5 + base_vat_optional_vies/__openerp__.py | 25 ++++ base_vat_optional_vies/i18n/.gitkeep | 0 base_vat_optional_vies/models/__init__.py | 5 + base_vat_optional_vies/models/res_partner.py | 137 ++++++++++++++++++ .../static/description/icon.png | Bin 0 -> 9455 bytes base_vat_optional_vies/tests/__init__.py | 5 + .../tests/test_res_partner.py | 68 +++++++++ .../views/res_partner_view.xml | 18 +++ 10 files changed, 341 insertions(+) create mode 100644 base_vat_optional_vies/README.rst create mode 100644 base_vat_optional_vies/__init__.py create mode 100644 base_vat_optional_vies/__openerp__.py create mode 100644 base_vat_optional_vies/i18n/.gitkeep create mode 100644 base_vat_optional_vies/models/__init__.py create mode 100644 base_vat_optional_vies/models/res_partner.py create mode 100644 base_vat_optional_vies/static/description/icon.png create mode 100644 base_vat_optional_vies/tests/__init__.py create mode 100644 base_vat_optional_vies/tests/test_res_partner.py create mode 100644 base_vat_optional_vies/views/res_partner_view.xml diff --git a/base_vat_optional_vies/README.rst b/base_vat_optional_vies/README.rst new file mode 100644 index 000000000..9a1d3eea1 --- /dev/null +++ b/base_vat_optional_vies/README.rst @@ -0,0 +1,78 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +=================================== +Optional validation of VAT via VIES +=================================== + +This module extends base_vat module features allowing to know if VIES +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 +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 + + +Usage +===== + +When VIES VAT Check is activated: + +* Odoo will try to validate VAT against VIES online service +* If passed, then "VIES validation passed" field will be True +* If not passed, then try to validate using country validation method +* If validated, then "VIES validation passed" field will be False +* If not validated, then a ValidationError will be shown to user + +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 +bypass country validation you can use "EU" code + + +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 +`here `_. + + +Credits +======= + +Contributors +------------ + +* Rafael Blasco +* Antonio Espinosa + + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +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. diff --git a/base_vat_optional_vies/__init__.py b/base_vat_optional_vies/__init__.py new file mode 100644 index 000000000..ab13a6219 --- /dev/null +++ b/base_vat_optional_vies/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# License AGPL-3: Antiun Ingenieria S.L. - Antonio Espinosa +# See README.rst file on addon root folder for more details + +from . import models diff --git a/base_vat_optional_vies/__openerp__.py b/base_vat_optional_vies/__openerp__.py new file mode 100644 index 000000000..c8c90f922 --- /dev/null +++ b/base_vat_optional_vies/__openerp__.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# License AGPL-3: Antiun Ingenieria S.L. - Antonio Espinosa +# See README.rst file on addon root folder for more details + +{ + 'name': "Optional validation of VAT via VIES", + 'category': 'Accounting', + 'version': '8.0.1.0.0', + 'depends': [ + 'base_vat', + ], + 'external_dependencies': { + 'python': ['vatnumber'], + }, + 'data': [ + 'views/res_partner_view.xml', + ], + 'author': 'Antiun Ingeniería S.L., ' + 'Odoo Community Association (OCA)', + 'website': 'http://www.antiun.com', + 'license': 'AGPL-3', + 'demo': [], + 'test': [], + 'installable': True, +} diff --git a/base_vat_optional_vies/i18n/.gitkeep b/base_vat_optional_vies/i18n/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/base_vat_optional_vies/models/__init__.py b/base_vat_optional_vies/models/__init__.py new file mode 100644 index 000000000..31fca90e8 --- /dev/null +++ b/base_vat_optional_vies/models/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# License AGPL-3: Antiun Ingenieria S.L. - Antonio Espinosa +# See README.rst file on addon root folder for more details + +from . import res_partner diff --git a/base_vat_optional_vies/models/res_partner.py b/base_vat_optional_vies/models/res_partner.py new file mode 100644 index 000000000..5193e23bf --- /dev/null +++ b/base_vat_optional_vies/models/res_partner.py @@ -0,0 +1,137 @@ +# -*- coding: utf-8 -*- +# License AGPL-3: Antiun Ingenieria S.L. - Antonio Espinosa +# See README.rst file on addon root folder for more details + +import logging +import re +_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 openerp import models, fields, api +from openerp.exceptions import ValidationError + + +class ResPartner(models.Model): + _inherit = 'res.partner' + + vies_passed = fields.Boolean( + string="VIES validation passed", readonly=True) + + def __init__(self, pool, cr): + super(ResPartner, self).__init__(pool, cr) + self._constraints = [] + + @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 = False + vat_number = vat + if vat and re.match(r'[A-Za-z]{2}', vat): + vat_country = vat[:2].upper() + 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 not vat_country: + _logger.info("VAT country not found!") + raise ValidationError(self._construct_constraint_msg()) + if 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 + 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 + 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) diff --git a/base_vat_optional_vies/static/description/icon.png b/base_vat_optional_vies/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/base_vat_optional_vies/tests/__init__.py b/base_vat_optional_vies/tests/__init__.py new file mode 100644 index 000000000..64a6a530b --- /dev/null +++ b/base_vat_optional_vies/tests/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# License AGPL-3: Antiun Ingenieria S.L. - Antonio Espinosa +# See README.rst file on addon root folder for more details + +from . import test_res_partner diff --git a/base_vat_optional_vies/tests/test_res_partner.py b/base_vat_optional_vies/tests/test_res_partner.py new file mode 100644 index 000000000..d91226b64 --- /dev/null +++ b/base_vat_optional_vies/tests/test_res_partner.py @@ -0,0 +1,68 @@ +# -*- coding: utf-8 -*- +# License AGPL-3: Antiun Ingenieria S.L. - Antonio Espinosa +# See README.rst file on addon root folder for more details + +from openerp.tests.common import TransactionCase + + +class TestResPartner(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, False, 'B12345678'), + ('1EB12345678', False, False, '1EB12345678'), + ('ESB12345678', 'DE', 'ES', 'B12345678'), + ('B12345678', 'ES', 'ES', 'B12345678'), + ) + 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): + """ + 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_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) diff --git a/base_vat_optional_vies/views/res_partner_view.xml b/base_vat_optional_vies/views/res_partner_view.xml new file mode 100644 index 000000000..e5880eb75 --- /dev/null +++ b/base_vat_optional_vies/views/res_partner_view.xml @@ -0,0 +1,18 @@ + + + + + + Add VAT country and VIES passed fields + res.partner + + + + + + + + + + + From a00b59717a09adf5b007da1a63b33cb2e0d4333b Mon Sep 17 00:00:00 2001 From: Antonio Espinosa Date: Wed, 30 Dec 2015 12:11:06 +0100 Subject: [PATCH 2/6] Disable VIES test --- .../tests/test_res_partner.py | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/base_vat_optional_vies/tests/test_res_partner.py b/base_vat_optional_vies/tests/test_res_partner.py index d91226b64..657b0eb5b 100644 --- a/base_vat_optional_vies/tests/test_res_partner.py +++ b/base_vat_optional_vies/tests/test_res_partner.py @@ -36,22 +36,24 @@ class TestResPartner(TransactionCase): self.assertEqual(self.partner.vat, res_vat) self.assertEqual(self.partner.vies_passed, res_vies) - 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) + # 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_validate_vat_no_vies(self): """ From 10faa187cd4172449f3d05a7ccd28c5ade3cd0c0 Mon Sep 17 00:00:00 2001 From: Antonio Espinosa Date: Tue, 5 Jan 2016 11:13:40 +0100 Subject: [PATCH 3/6] Fixes to avoid exception when using default _construct_constraint_msg method --- base_vat_optional_vies/__openerp__.py | 3 +-- base_vat_optional_vies/models/res_partner.py | 12 ++++++------ base_vat_optional_vies/tests/test_res_partner.py | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/base_vat_optional_vies/__openerp__.py b/base_vat_optional_vies/__openerp__.py index c8c90f922..08f8dfe36 100644 --- a/base_vat_optional_vies/__openerp__.py +++ b/base_vat_optional_vies/__openerp__.py @@ -19,7 +19,6 @@ 'Odoo Community Association (OCA)', 'website': 'http://www.antiun.com', 'license': 'AGPL-3', - 'demo': [], - 'test': [], + 'images': [], 'installable': True, } diff --git a/base_vat_optional_vies/models/res_partner.py b/base_vat_optional_vies/models/res_partner.py index 5193e23bf..20c7668e0 100644 --- a/base_vat_optional_vies/models/res_partner.py +++ b/base_vat_optional_vies/models/res_partner.py @@ -4,6 +4,9 @@ import logging import re +from openerp import models, fields, api +from openerp.exceptions import ValidationError + _logger = logging.getLogger(__name__) try: @@ -16,9 +19,6 @@ except ImportError: "`pip install vatnumber`.") vatnumber = None -from openerp import models, fields, api -from openerp.exceptions import ValidationError - class ResPartner(models.Model): _inherit = 'res.partner' @@ -49,7 +49,7 @@ class ResPartner(models.Model): @summary: Split Partner vat into country_code and number @result: (vat_country, vat_number) """ - vat_country = False + vat_country = 'XX' vat_number = vat if vat and re.match(r'[A-Za-z]{2}', vat): vat_country = vat[:2].upper() @@ -68,10 +68,10 @@ class ResPartner(models.Model): # quick and partial off-line checksum validation check_func = self.simple_vat_optional_check vat_country, vat_number = self._split_vat(self.vat) - if not vat_country: + if vat_number and vat_country == 'XX': _logger.info("VAT country not found!") raise ValidationError(self._construct_constraint_msg()) - if not check_func(vat_country, vat_number): + 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 diff --git a/base_vat_optional_vies/tests/test_res_partner.py b/base_vat_optional_vies/tests/test_res_partner.py index 657b0eb5b..50dbd2e42 100644 --- a/base_vat_optional_vies/tests/test_res_partner.py +++ b/base_vat_optional_vies/tests/test_res_partner.py @@ -18,8 +18,8 @@ class TestResPartner(TransactionCase): cases = ( # vat, country, => vat_country, vat_number ('ESB12345678', False, 'ES', 'B12345678'), - ('B12345678', False, False, 'B12345678'), - ('1EB12345678', False, False, '1EB12345678'), + ('B12345678', False, 'XX', 'B12345678'), + ('1EB12345678', False, 'XX', '1EB12345678'), ('ESB12345678', 'DE', 'ES', 'B12345678'), ('B12345678', 'ES', 'ES', 'B12345678'), ) From c680989e30e912b5d2b8c7b7450ee959207b9995 Mon Sep 17 00:00:00 2001 From: Sergio Teruel Albert Date: Tue, 13 Dec 2016 12:57:06 +0100 Subject: [PATCH 4/6] base_vat_optional_vies: Fix pass lower country code in _split_vat function to find parent function check_vat_'xx' instead of check_vat_'XX' --- base_vat_optional_vies/README.rst | 12 +++++++----- base_vat_optional_vies/__init__.py | 2 -- base_vat_optional_vies/__openerp__.py | 5 +++-- base_vat_optional_vies/models/__init__.py | 2 -- base_vat_optional_vies/models/res_partner.py | 4 ++-- base_vat_optional_vies/tests/__init__.py | 2 -- base_vat_optional_vies/tests/test_res_partner.py | 2 +- 7 files changed, 13 insertions(+), 16 deletions(-) diff --git a/base_vat_optional_vies/README.rst b/base_vat_optional_vies/README.rst index 9a1d3eea1..2ece8acab 100644 --- a/base_vat_optional_vies/README.rst +++ b/base_vat_optional_vies/README.rst @@ -21,7 +21,8 @@ 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 > Companies > Your Company > Configuration > Accounting +> VIES VAT Check Usage @@ -46,10 +47,10 @@ bypass country validation you can use "EU" code 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 -`here `_. +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. Credits @@ -60,6 +61,7 @@ Contributors * Rafael Blasco * Antonio Espinosa +* Sergio Teruel Maintainer diff --git a/base_vat_optional_vies/__init__.py b/base_vat_optional_vies/__init__.py index ab13a6219..cde864bae 100644 --- a/base_vat_optional_vies/__init__.py +++ b/base_vat_optional_vies/__init__.py @@ -1,5 +1,3 @@ # -*- coding: utf-8 -*- -# License AGPL-3: Antiun Ingenieria S.L. - Antonio Espinosa -# See README.rst file on addon root folder for more details from . import models diff --git a/base_vat_optional_vies/__openerp__.py b/base_vat_optional_vies/__openerp__.py index 08f8dfe36..d2f05aa79 100644 --- a/base_vat_optional_vies/__openerp__.py +++ b/base_vat_optional_vies/__openerp__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# License AGPL-3: Antiun Ingenieria S.L. - Antonio Espinosa +# License AGPL-3: Tecnativa S.L. - Antonio Espinosa # See README.rst file on addon root folder for more details { @@ -16,8 +16,9 @@ 'views/res_partner_view.xml', ], 'author': 'Antiun Ingeniería S.L., ' + 'Tecnativa,' 'Odoo Community Association (OCA)', - 'website': 'http://www.antiun.com', + 'website': 'http://www.tecnativa.com', 'license': 'AGPL-3', 'images': [], 'installable': True, diff --git a/base_vat_optional_vies/models/__init__.py b/base_vat_optional_vies/models/__init__.py index 31fca90e8..6097f3ebf 100644 --- a/base_vat_optional_vies/models/__init__.py +++ b/base_vat_optional_vies/models/__init__.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- -# License AGPL-3: Antiun Ingenieria S.L. - Antonio Espinosa # See README.rst file on addon root folder for more details 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 20c7668e0..1b7c55c1f 100644 --- a/base_vat_optional_vies/models/res_partner.py +++ b/base_vat_optional_vies/models/res_partner.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# License AGPL-3: Antiun Ingenieria S.L. - Antonio Espinosa +# License AGPL-3: Tecnativa S.L. - Antonio Espinosa # See README.rst file on addon root folder for more details import logging @@ -52,7 +52,7 @@ class ResPartner(models.Model): vat_country = 'XX' vat_number = vat if vat and re.match(r'[A-Za-z]{2}', vat): - vat_country = vat[:2].upper() + vat_country = vat[:2].lower() vat_number = vat[2:].replace(' ', '') elif country: vat_country = country diff --git a/base_vat_optional_vies/tests/__init__.py b/base_vat_optional_vies/tests/__init__.py index 64a6a530b..db0b977db 100644 --- a/base_vat_optional_vies/tests/__init__.py +++ b/base_vat_optional_vies/tests/__init__.py @@ -1,5 +1,3 @@ # -*- coding: utf-8 -*- -# License AGPL-3: Antiun Ingenieria S.L. - Antonio Espinosa -# See README.rst file on addon root folder for more details from . import test_res_partner diff --git a/base_vat_optional_vies/tests/test_res_partner.py b/base_vat_optional_vies/tests/test_res_partner.py index 50dbd2e42..8aae1fd7d 100644 --- a/base_vat_optional_vies/tests/test_res_partner.py +++ b/base_vat_optional_vies/tests/test_res_partner.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# License AGPL-3: Antiun Ingenieria S.L. - Antonio Espinosa +# License AGPL-3: Tecnativa S.L. - Antonio Espinosa # See README.rst file on addon root folder for more details from openerp.tests.common import TransactionCase From d10a402c2142a220afca78e9407f6db8ec50f022 Mon Sep 17 00:00:00 2001 From: Sergio Teruel Albert Date: Thu, 22 Dec 2016 10:38:22 +0100 Subject: [PATCH 5/6] base_vat_optional_vies: Convert to upper when write NIF into database --- base_vat_optional_vies/models/res_partner.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base_vat_optional_vies/models/res_partner.py b/base_vat_optional_vies/models/res_partner.py index 1b7c55c1f..4f1141251 100644 --- a/base_vat_optional_vies/models/res_partner.py +++ b/base_vat_optional_vies/models/res_partner.py @@ -89,7 +89,7 @@ class ResPartner(models.Model): # Can not be sure that this VAT is signed up in VIES data['vies_passed'] = False if res: - vat = country_code + vat_number + vat = country_code.upper() + vat_number if self.vat != vat: data['vat'] = vat if data: @@ -123,7 +123,7 @@ class ResPartner(models.Model): if self.vies_passed: data['vies_passed'] = False if res: - vat = country_code + vat_number + vat = country_code.upper() + vat_number if self.vat != vat: data['vat'] = vat if data: From dddf0b139b59253b8fbefdc5a4d4bd976e9f91a8 Mon Sep 17 00:00:00 2001 From: David Vidal Date: Fri, 23 Jun 2017 19:53:23 +0200 Subject: [PATCH 6/6] [MIG] base_vat_optional_vies: Migration to 10.0 --- base_vat_optional_vies/README.rst | 29 ++-- .../{__openerp__.py => __manifest__.py} | 15 +- base_vat_optional_vies/i18n/es.po | 29 ++++ base_vat_optional_vies/models/__init__.py | 2 +- base_vat_optional_vies/models/res_partner.py | 151 ++++-------------- .../tests/test_res_partner.py | 89 ++++------- .../views/res_partner_view.xml | 9 +- 7 files changed, 111 insertions(+), 213 deletions(-) rename base_vat_optional_vies/{__openerp__.py => __manifest__.py} (56%) create mode 100644 base_vat_optional_vies/i18n/es.po 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 - + - - - +