From 9f8e32733af68ac09abdad29f2df2e270c165bf8 Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Tue, 2 Feb 2016 15:50:39 +0100 Subject: [PATCH] Make method recieve the level as int. Fix linter. Fix typo. --- base_location_nuts/README.rst | 2 +- base_location_nuts/__manifest__.py | 3 +++ base_location_nuts/images/new_fields.png | Bin 0 -> 17020 bytes base_location_nuts/models/res_partner.py | 18 +++++++++--------- base_location_nuts/wizard/nuts_import.py | 19 +++++++++---------- 5 files changed, 22 insertions(+), 20 deletions(-) create mode 100644 base_location_nuts/images/new_fields.png diff --git a/base_location_nuts/README.rst b/base_location_nuts/README.rst index 4acd2944d..39c4c3545 100644 --- a/base_location_nuts/README.rst +++ b/base_location_nuts/README.rst @@ -19,7 +19,7 @@ Installation ============ We recommend to install another addon (one for each country) in order to relate -NUTS with states define by each localization addon, for example: +NUTS with states defined by each localization addon, for example: * l10n_es_location_nuts : Spanish Provinces (NUTS level 4) related to Partner State * l10n_de_location_nuts : German states (NUTS level 2) related to Partner State diff --git a/base_location_nuts/__manifest__.py b/base_location_nuts/__manifest__.py index ee617bd1b..6c0b63cb4 100644 --- a/base_location_nuts/__manifest__.py +++ b/base_location_nuts/__manifest__.py @@ -35,6 +35,9 @@ 'wizard/nuts_import_view.xml', 'security/ir.model.access.csv', ], + 'images': [ + 'images/new_fields.png', + ], 'author': 'Antiun IngenierĂ­a S.L., ' 'Odoo Community Association (OCA)', 'website': 'http://www.antiun.com', diff --git a/base_location_nuts/images/new_fields.png b/base_location_nuts/images/new_fields.png new file mode 100644 index 0000000000000000000000000000000000000000..24f235bf5c4d0dc2ccb8ca0a2956a313ac6f2b71 GIT binary patch literal 17020 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 0: - parent_id = self[field].parent_id.id + parent_id = field.parent_id.id if parent_id: parent_field = 'nuts%d_id' % (level - 1) if self[parent_field].id != parent_id: @@ -54,22 +54,22 @@ class ResPartner(models.Model): @api.multi @api.onchange('nuts4_id') def _onchange_nuts4_id(self): - return self._onchange_nuts('nuts4_id') + return self._onchange_nuts(4) @api.multi @api.onchange('nuts3_id') def _onchange_nuts3_id(self): - return self._onchange_nuts('nuts3_id') + return self._onchange_nuts(3) @api.multi @api.onchange('nuts2_id') def _onchange_nuts2_id(self): - return self._onchange_nuts('nuts2_id') + return self._onchange_nuts(2) @api.multi @api.onchange('nuts1_id') def _onchange_nuts1_id(self): - return self._onchange_nuts('nuts1_id') + return self._onchange_nuts(1) @api.multi @api.onchange('country_id') diff --git a/base_location_nuts/wizard/nuts_import.py b/base_location_nuts/wizard/nuts_import.py index 31cc49548..2073bceff 100644 --- a/base_location_nuts/wizard/nuts_import.py +++ b/base_location_nuts/wizard/nuts_import.py @@ -4,15 +4,13 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from openerp import models, api, _ -from openerp.exceptions import Warning +from openerp.exceptions import Warning as UserError import requests import re import logging from lxml import etree from collections import OrderedDict -from pprint import pformat - logger = logging.getLogger(__name__) @@ -93,7 +91,7 @@ class NutsImport(models.TransientModel): else: logger.debug("xpath = '%s', not found" % field_xpath) if field_required and not value: - raise Warning( + raise UserError( _('Value not found for mandatory field %s' % k)) item[k] = value return item @@ -114,11 +112,11 @@ class NutsImport(models.TransientModel): try: res_request = requests.get(url) except Exception, e: - raise Warning( + raise UserError( _('Got an error when trying to download the file: %s.') % str(e)) if res_request.status_code != requests.codes.ok: - raise Warning( + raise UserError( _('Got an error %d when trying to download the file %s.') % (res_request.status_code, url)) logger.info('Download successfully %d bytes' % @@ -127,7 +125,7 @@ class NutsImport(models.TransientModel): pattern = re.compile(r'^.*<\?xml', re.DOTALL) content_fixed = re.sub(pattern, '