From 572d9ab9cc51be1f7cf7ee862d1f555ee1f25389 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Sun, 30 Mar 2014 23:50:40 +0200 Subject: [PATCH 01/15] Add module base_location_geonames_import Add support for states (if states are already present in res.country.state). Add POT file and FR translation. Allow to skip entries in the _prepare method. Insist on the fact that the wizard deletes current better zip entries in the module description and in the wizard itself. Better error message when the country code inside the file is wrong. Add a FOR UPDATE NOWAIT at the beginning of the transaction. Remove France-specific code ; moved to new module l10n_fr_base_location_geonames_import on lp:openerp-french-localization Add module base_location_geonames_import Add support for states (if states are already present in res.country.state). Add POT file and FR translation. Allow to skip entries in the _prepare method. Insist on the fact that the wizard deletes current better zip entries in the module description and in the wizard itself. Better error message when the country code inside the file is wrong. Add a FOR UPDATE NOWAIT at the beginning of the transaction. Remove France-specific code ; moved to new module l10n_fr_base_location_geonames_import on lp:openerp-french-localization --- base_location_geonames_import/__init__.py | 23 ++++ base_location_geonames_import/__openerp__.py | 60 +++++++++ .../i18n/base_location_geonames_import.pot | 68 ++++++++++ base_location_geonames_import/i18n/fr.po | 68 ++++++++++ .../wizard/__init__.py | 23 ++++ .../wizard/geonames_import.py | 127 ++++++++++++++++++ .../wizard/geonames_import_view.xml | 44 ++++++ 7 files changed, 413 insertions(+) create mode 100644 base_location_geonames_import/__init__.py create mode 100644 base_location_geonames_import/__openerp__.py create mode 100644 base_location_geonames_import/i18n/base_location_geonames_import.pot create mode 100644 base_location_geonames_import/i18n/fr.po create mode 100644 base_location_geonames_import/wizard/__init__.py create mode 100644 base_location_geonames_import/wizard/geonames_import.py create mode 100644 base_location_geonames_import/wizard/geonames_import_view.xml diff --git a/base_location_geonames_import/__init__.py b/base_location_geonames_import/__init__.py new file mode 100644 index 000000000..b63234221 --- /dev/null +++ b/base_location_geonames_import/__init__.py @@ -0,0 +1,23 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Base Location Geonames Import module for OpenERP +# Copyright (C) 2014 Akretion (http://www.akretion.com) +# @author Alexis de Lattre +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from . import wizard diff --git a/base_location_geonames_import/__openerp__.py b/base_location_geonames_import/__openerp__.py new file mode 100644 index 000000000..8a91dacc1 --- /dev/null +++ b/base_location_geonames_import/__openerp__.py @@ -0,0 +1,60 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Base Location Geonames Import module for OpenERP +# Copyright (C) 2014 Akretion (http://www.akretion.com) +# @author Alexis de Lattre +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + + +{ + 'name': 'Base Location Geonames Import', + 'version': '0.1', + 'category': 'Extra Tools', + 'license': 'AGPL-3', + 'summary': 'Import better zip entries from Geonames', + 'description': """ +Base Location Geonames Import +============================= + +This module adds a wizard to import better zip entries from Geonames (http://download.geonames.org/export/zip/). + +When you start the wizard, +it will ask you to select a country. Then, for the selected country, +it will delete all the current better zip entries, download the latest version +of the list of cities from geonames.org and create new better zip entries. + +Please contact Alexis de Lattre from Akretion +for any help or question about this module. + + +Contributors +------------ + +- Alexis de Lattre +- Lorenzo Battistini +""", + 'author': "Akretion,Odoo Community Association (OCA)", + 'website': 'http://www.akretion.com', + 'depends': ['base_location'], + 'external_dependencies': {'python': ['requests', 'unicodecsv']}, + 'data': [ + 'wizard/geonames_import_view.xml', + ], + 'installable': True, + 'active': False, +} diff --git a/base_location_geonames_import/i18n/base_location_geonames_import.pot b/base_location_geonames_import/i18n/base_location_geonames_import.pot new file mode 100644 index 000000000..7c5782ea3 --- /dev/null +++ b/base_location_geonames_import/i18n/base_location_geonames_import.pot @@ -0,0 +1,68 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * base_location_geonames_import +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 7.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-04-11 20:55+0000\n" +"PO-Revision-Date: 2014-04-11 20:55+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: base_location_geonames_import +#: view:better.zip.geonames.import:0 +msgid "Cancel" +msgstr "" + +#. module: base_location_geonames_import +#: field:better.zip.geonames.import,country_id:0 +msgid "Country" +msgstr "" + +#. module: base_location_geonames_import +#: code:addons/base_location_geonames_import/wizard/geonames_import.py:66 +#: code:addons/base_location_geonames_import/wizard/geonames_import.py:90 +#, python-format +msgid "Error:" +msgstr "" + +#. module: base_location_geonames_import +#: view:better.zip.geonames.import:0 +msgid "For the country selected above, this wizard will DELETE ALL THE CURRENT BETTER ZIP ENTRIES, download the latest version of the list of cities from geonames.org and create new better zip entries." +msgstr "" + +#. module: base_location_geonames_import +#: code:addons/base_location_geonames_import/wizard/geonames_import.py:91 +#, python-format +msgid "Got an error %d when trying to download the file %s." +msgstr "" + +#. module: base_location_geonames_import +#: view:better.zip.geonames.import:0 +msgid "Import" +msgstr "" + +#. module: base_location_geonames_import +#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import +msgid "Import Better Zip from Geonames" +msgstr "" + +#. module: base_location_geonames_import +#: view:better.zip.geonames.import:0 +#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action +#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu +msgid "Import Geonames" +msgstr "" + +#. module: base_location_geonames_import +#: code:addons/base_location_geonames_import/wizard/geonames_import.py:67 +#, python-format +msgid "The country code inside the file (%s) doesn't correspond to the selected country (%s)." +msgstr "" + diff --git a/base_location_geonames_import/i18n/fr.po b/base_location_geonames_import/i18n/fr.po new file mode 100644 index 000000000..699ad7519 --- /dev/null +++ b/base_location_geonames_import/i18n/fr.po @@ -0,0 +1,68 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * base_location_geonames_import +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 7.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-04-11 20:56+0000\n" +"PO-Revision-Date: 2014-04-11 20:56+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: base_location_geonames_import +#: view:better.zip.geonames.import:0 +msgid "Cancel" +msgstr "Annuler" + +#. module: base_location_geonames_import +#: field:better.zip.geonames.import,country_id:0 +msgid "Country" +msgstr "Pays" + +#. module: base_location_geonames_import +#: code:addons/base_location_geonames_import/wizard/geonames_import.py:66 +#: code:addons/base_location_geonames_import/wizard/geonames_import.py:90 +#, python-format +msgid "Error:" +msgstr "Erreur :" + +#. module: base_location_geonames_import +#: view:better.zip.geonames.import:0 +msgid "For the country selected above, this wizard will DELETE ALL THE CURRENT BETTER ZIP ENTRIES, download the latest version of the list of cities from geonames.org and create new better zip entries." +msgstr "Pour le pays sélectionné ci-dessus, cet assistant va SUPPRIMER TOUTES LES ENTREES BETTER ZIP, télécharger la dernière version de la liste des villes depuis geonames.org et créer de nouveaux enregistrements better zip." + +#. module: base_location_geonames_import +#: code:addons/base_location_geonames_import/wizard/geonames_import.py:91 +#, python-format +msgid "Got an error %d when trying to download the file %s." +msgstr "Erreur %d reçue suite à la tentative de téléchargement du fichier %s." + +#. module: base_location_geonames_import +#: view:better.zip.geonames.import:0 +msgid "Import" +msgstr "Importer" + +#. module: base_location_geonames_import +#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import +msgid "Import Better Zip from Geonames" +msgstr "Import Better Zip from Geonames" + +#. module: base_location_geonames_import +#: view:better.zip.geonames.import:0 +#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action +#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu +msgid "Import Geonames" +msgstr "Importer Geonames" + +#. module: base_location_geonames_import +#: code:addons/base_location_geonames_import/wizard/geonames_import.py:67 +#, python-format +msgid "The country code inside the file (%s) doesn't correspond to the selected country (%s)." +msgstr "Le code pays utilisé à l'intérieur du fichier (%s) ne correspond pas au pays sélectionné (%s)." + diff --git a/base_location_geonames_import/wizard/__init__.py b/base_location_geonames_import/wizard/__init__.py new file mode 100644 index 000000000..2c9462e69 --- /dev/null +++ b/base_location_geonames_import/wizard/__init__.py @@ -0,0 +1,23 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Base Location Geonames Import module for OpenERP +# Copyright (C) 2014 Akretion (http://www.akretion.com) +# @author Alexis de Lattre +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from . import geonames_import diff --git a/base_location_geonames_import/wizard/geonames_import.py b/base_location_geonames_import/wizard/geonames_import.py new file mode 100644 index 000000000..d93967895 --- /dev/null +++ b/base_location_geonames_import/wizard/geonames_import.py @@ -0,0 +1,127 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Base Location Geonames Import module for OpenERP +# Copyright (C) 2014 Akretion (http://www.akretion.com) +# @author Alexis de Lattre +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from openerp.osv import orm, fields +from openerp.tools.translate import _ +import requests +import tempfile +import StringIO +import unicodecsv +import zipfile +import os +import logging + +logger = logging.getLogger(__name__) + + +class better_zip_geonames_import(orm.TransientModel): + _name = 'better.zip.geonames.import' + _description = 'Import Better Zip from Geonames' + + _columns = { + 'country_id': fields.many2one('res.country', 'Country', required=True), + } + + def _prepare_better_zip( + self, cr, uid, row, country_id, states, context=None): + '''This function is designed to be inherited''' + state_id = False + if states and row[4] and row[4] in states: + state_id = states[row[4].upper()] + vals = { + 'name': row[1], + 'city': row[2], + 'state_id': state_id, + 'country_id': country_id, + } + return vals + + def create_better_zip( + self, cr, uid, row, country_id, country_code, states, + context=None): + bzip_id = False + if row[0] != country_code: + raise orm.except_orm( + _('Error:'), + _("The country code inside the file (%s) doesn't " + "correspond to the selected country (%s).") + % (row[0], country_code)) + logger.debug('ZIP = %s - City = %s' % (row[1], row[2])) + if row[1] and row[2]: + vals = self._prepare_better_zip( + cr, uid, row, country_id, states, context=context) + if vals: + bzip_id = self.pool['res.better.zip'].create( + cr, uid, vals, context=context) + return bzip_id + + def run_import(self, cr, uid, ids, context=None): + assert len(ids) == 1, 'Only one ID for the better zip import wizard' + bzip_obj = self.pool['res.better.zip'] + wizard = self.browse(cr, uid, ids[0], context=context) + country_id = wizard.country_id.id + country_code = wizard.country_id.code.upper() + url = 'http://download.geonames.org/export/zip/%s.zip' % country_code + logger.info('Starting to download %s' % url) + res_request = requests.get(url) + if res_request.status_code != requests.codes.ok: + raise orm.except_orm( + _('Error:'), + _('Got an error %d when trying to download the file %s.') + % (res_request.status_code, url)) + bzip_ids_to_delete = bzip_obj.search( + cr, uid, [('country_id', '=', country_id)], context=context) + if bzip_ids_to_delete: + cr.execute('SELECT id FROM res_better_zip WHERE id in %s ' + 'FOR UPDATE NOWAIT', (tuple(bzip_ids_to_delete), )) + bzip_obj.unlink(cr, uid, bzip_ids_to_delete, context=context) + logger.info( + '%d better zip entries deleted for country %s' + % (len(bzip_ids_to_delete), wizard.country_id.name)) + state_ids = self.pool['res.country.state'].search( + cr, uid, [('country_id', '=', country_id)], context=context) + states = {} + # key = code of the state ; value = ID of the state in OpenERP + if state_ids: + states_r = self.pool['res.country.state'].read( + cr, uid, state_ids, ['code', 'country_id'], context=context) + for state in states_r: + states[state['code'].upper()] = state['id'] + f_geonames = zipfile.ZipFile(StringIO.StringIO(res_request.content)) + tempdir = tempfile.mkdtemp(prefix='openerp') + f_geonames.extract('%s.txt' % country_code, tempdir) + logger.info('The geonames zipfile has been decompressed') + data_file = open(os.path.join(tempdir, '%s.txt' % country_code), 'r') + data_file.seek(0) + logger.info( + 'Starting to create the better zip entries %s state information' + % (states and 'with' or 'without')) + for row in unicodecsv.reader( + data_file, encoding='utf-8', delimiter=' '): + self.create_better_zip( + cr, uid, row, country_id, country_code, states, + context=context) + data_file.close() + logger.info( + 'The wizard to create better zip entries from geonames ' + 'has been successfully completed.') + return True diff --git a/base_location_geonames_import/wizard/geonames_import_view.xml b/base_location_geonames_import/wizard/geonames_import_view.xml new file mode 100644 index 000000000..efd37057d --- /dev/null +++ b/base_location_geonames_import/wizard/geonames_import_view.xml @@ -0,0 +1,44 @@ + + + + + + + + asterisk.server.company + better.zip.geonames.import + +
+ + + +
+
+
+ + + + + Import Geonames + better.zip.geonames.import + form + form + new + + + + + + From 1b012ec30b6c1beef9f803890a45e092fad65da1 Mon Sep 17 00:00:00 2001 From: Lorenzo Battistini Date: Sun, 10 Aug 2014 23:07:34 +0200 Subject: [PATCH 02/15] [FIX] WARNING test_8 openerp.models: Cannot execute name_search, no _rec_name defined on better.zip.geonames.import [REF] porting to new api [IMP] removing 'FOR UPDATE NOWAIT' as ROW EXCLUSIVE lock is already acquired by DELETE and INSERT http://www.postgresql.org/docs/9.2/static/explicit-locking.html [REF] select_or_create_state and tests [FIX] __openerp__.py PEP8 [FIX] TypeError: unlink() got multiple values for keyword argument 'context' [IMP] using ir.config_parameter for geonames URL [FIX] missing cr uid --- base_location_geonames_import/__openerp__.py | 14 ++- base_location_geonames_import/test/import.yml | 54 ++++++++++ .../wizard/geonames_import.py | 100 +++++++++--------- 3 files changed, 117 insertions(+), 51 deletions(-) create mode 100644 base_location_geonames_import/test/import.yml diff --git a/base_location_geonames_import/__openerp__.py b/base_location_geonames_import/__openerp__.py index 8a91dacc1..d57674f3e 100644 --- a/base_location_geonames_import/__openerp__.py +++ b/base_location_geonames_import/__openerp__.py @@ -4,6 +4,8 @@ # Base Location Geonames Import module for OpenERP # Copyright (C) 2014 Akretion (http://www.akretion.com) # @author Alexis de Lattre +# Copyright (C) 2014 Agile Business Group (http://www.agilebg.com) +# @author Lorenzo Battistini # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -23,7 +25,7 @@ { 'name': 'Base Location Geonames Import', - 'version': '0.1', + 'version': '8.0.0.2.0', 'category': 'Extra Tools', 'license': 'AGPL-3', 'summary': 'Import better zip entries from Geonames', @@ -31,7 +33,10 @@ Base Location Geonames Import ============================= -This module adds a wizard to import better zip entries from Geonames (http://download.geonames.org/export/zip/). +This module adds a wizard to import better zip entries from Geonames +(http://download.geonames.org/export/zip/). +If want want/need to modify the URL, you can set the 'geonames.url' +system parameter. When you start the wizard, it will ask you to select a country. Then, for the selected country, @@ -54,7 +59,10 @@ Contributors 'external_dependencies': {'python': ['requests', 'unicodecsv']}, 'data': [ 'wizard/geonames_import_view.xml', - ], + ], + 'test': [ + 'test/import.yml' + ], 'installable': True, 'active': False, } diff --git a/base_location_geonames_import/test/import.yml b/base_location_geonames_import/test/import.yml new file mode 100644 index 000000000..66243d24a --- /dev/null +++ b/base_location_geonames_import/test/import.yml @@ -0,0 +1,54 @@ +- + I create the wizard +- + !record {model: better.zip.geonames.import, id: import_wizard_1, view: better_zip_geonames_import_form}: + country_id: base.it +- + I run the import +- + !python {model: better.zip.geonames.import}: | + self.run_import(cr, uid, [ref('import_wizard_1')], context=context) +- + I check the data +- + !python {model: res.better.zip}: | + state_obj = self.pool['res.country.state'] + state_ids = state_obj.search(cr, uid, [ + ('code', '=', 'LG'), + ('country_id', '=', ref('base.it')), + ], context=context) + assert len(state_ids) == 1, "There must be 1 LG" + zip_ids = self.search(cr, uid, [ + ('name', '=', '16017'), + ('city', '=', 'Isola Del Cantone'), + ('state_id', '=', state_ids[0]), + ('country_id', '=', ref('base.it')) + ], context=context) + assert len(zip_ids) == 1, "There must be 1 'Isola Del Cantone'" +- + I create the wizard again +- + !record {model: better.zip.geonames.import, id: import_wizard_2, view: better_zip_geonames_import_form}: + country_id: base.it +- + I run the import again +- + !python {model: better.zip.geonames.import}: | + self.run_import(cr, uid, [ref('import_wizard_2')], context=context) +- + I check the data +- + !python {model: res.better.zip}: | + state_obj = self.pool['res.country.state'] + state_ids = state_obj.search(cr, uid, [ + ('code', '=', 'LG'), + ('country_id', '=', ref('base.it')), + ], context=context) + assert len(state_ids) == 1, "There must be 1 LG" + zip_ids = self.search(cr, uid, [ + ('name', '=', '16017'), + ('city', '=', 'Isola Del Cantone'), + ('state_id', '=', state_ids[0]), + ('country_id', '=', ref('base.it')) + ], context=context) + assert len(zip_ids) == 1, "There must be 1 'Isola Del Cantone'" diff --git a/base_location_geonames_import/wizard/geonames_import.py b/base_location_geonames_import/wizard/geonames_import.py index d93967895..9fb2cf355 100644 --- a/base_location_geonames_import/wizard/geonames_import.py +++ b/base_location_geonames_import/wizard/geonames_import.py @@ -4,6 +4,8 @@ # Base Location Geonames Import module for OpenERP # Copyright (C) 2014 Akretion (http://www.akretion.com) # @author Alexis de Lattre +# Copyright (C) 2014 Agile Business Group (http://www.agilebg.com) +# @author Lorenzo Battistini # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -20,8 +22,8 @@ # ############################################################################## -from openerp.osv import orm, fields -from openerp.tools.translate import _ +from openerp import models, fields, api, _ +from openerp.exceptions import Warning import requests import tempfile import StringIO @@ -33,79 +35,84 @@ import logging logger = logging.getLogger(__name__) -class better_zip_geonames_import(orm.TransientModel): +class better_zip_geonames_import(models.TransientModel): _name = 'better.zip.geonames.import' _description = 'Import Better Zip from Geonames' + _rec_name = 'country_id' - _columns = { - 'country_id': fields.many2one('res.country', 'Country', required=True), - } + country_id = fields.Many2one('res.country', 'Country', required=True) - def _prepare_better_zip( - self, cr, uid, row, country_id, states, context=None): - '''This function is designed to be inherited''' - state_id = False - if states and row[4] and row[4] in states: - state_id = states[row[4].upper()] + @api.model + def _prepare_better_zip(self, row, country_id): + state = self.select_or_create_state(row, country_id) vals = { 'name': row[1], 'city': row[2], - 'state_id': state_id, + 'state_id': state.id, 'country_id': country_id, } return vals + @api.model def create_better_zip( - self, cr, uid, row, country_id, country_code, states, - context=None): + self, row, country_id, country_code): bzip_id = False if row[0] != country_code: - raise orm.except_orm( + raise Warning( _('Error:'), _("The country code inside the file (%s) doesn't " "correspond to the selected country (%s).") % (row[0], country_code)) logger.debug('ZIP = %s - City = %s' % (row[1], row[2])) if row[1] and row[2]: - vals = self._prepare_better_zip( - cr, uid, row, country_id, states, context=context) + vals = self._prepare_better_zip(row, country_id) if vals: - bzip_id = self.pool['res.better.zip'].create( - cr, uid, vals, context=context) + bzip_id = self.env['res.better.zip'].create(vals) return bzip_id - def run_import(self, cr, uid, ids, context=None): - assert len(ids) == 1, 'Only one ID for the better zip import wizard' - bzip_obj = self.pool['res.better.zip'] - wizard = self.browse(cr, uid, ids[0], context=context) - country_id = wizard.country_id.id - country_code = wizard.country_id.code.upper() - url = 'http://download.geonames.org/export/zip/%s.zip' % country_code + @api.model + def select_or_create_state( + self, row, country_id, code_row_index=4, name_row_index=3 + ): + states = self.env['res.country.state'].search([ + ('country_id', '=', country_id), + ('code', '=', row[code_row_index]), + ]) + if len(states) > 1: + raise Warning( + _("Too many states with code %s for counrty %s") + % (row[code_row_index], country_id)) + if len(states) == 1: + return states[0] + else: + return self.env['res.country.state'].create({ + 'name': row[name_row_index], + 'code': row[code_row_index], + 'country_id': country_id + }) + + @api.one + def run_import(self): + bzip_obj = self.env['res.better.zip'] + country_id = self.country_id.id + country_code = self.country_id.code.upper() + config_url = self.pool['ir.config_parameter'].get_param( + self._cr, self._uid, 'geonames.url', + default='http://download.geonames.org/export/zip/%s.zip') + url = config_url % country_code logger.info('Starting to download %s' % url) res_request = requests.get(url) if res_request.status_code != requests.codes.ok: - raise orm.except_orm( + raise Warning( _('Error:'), _('Got an error %d when trying to download the file %s.') % (res_request.status_code, url)) - bzip_ids_to_delete = bzip_obj.search( - cr, uid, [('country_id', '=', country_id)], context=context) + bzip_ids_to_delete = bzip_obj.search([('country_id', '=', country_id)]) if bzip_ids_to_delete: - cr.execute('SELECT id FROM res_better_zip WHERE id in %s ' - 'FOR UPDATE NOWAIT', (tuple(bzip_ids_to_delete), )) - bzip_obj.unlink(cr, uid, bzip_ids_to_delete, context=context) + bzip_ids_to_delete.unlink() logger.info( '%d better zip entries deleted for country %s' - % (len(bzip_ids_to_delete), wizard.country_id.name)) - state_ids = self.pool['res.country.state'].search( - cr, uid, [('country_id', '=', country_id)], context=context) - states = {} - # key = code of the state ; value = ID of the state in OpenERP - if state_ids: - states_r = self.pool['res.country.state'].read( - cr, uid, state_ids, ['code', 'country_id'], context=context) - for state in states_r: - states[state['code'].upper()] = state['id'] + % (len(bzip_ids_to_delete), self.country_id.name)) f_geonames = zipfile.ZipFile(StringIO.StringIO(res_request.content)) tempdir = tempfile.mkdtemp(prefix='openerp') f_geonames.extract('%s.txt' % country_code, tempdir) @@ -113,13 +120,10 @@ class better_zip_geonames_import(orm.TransientModel): data_file = open(os.path.join(tempdir, '%s.txt' % country_code), 'r') data_file.seek(0) logger.info( - 'Starting to create the better zip entries %s state information' - % (states and 'with' or 'without')) + 'Starting to create the better zip entries') for row in unicodecsv.reader( data_file, encoding='utf-8', delimiter=' '): - self.create_better_zip( - cr, uid, row, country_id, country_code, states, - context=context) + self.create_better_zip(row, country_id, country_code) data_file.close() logger.info( 'The wizard to create better zip entries from geonames ' From 50e119b6ace45f8789a76b445f5e43d6afbbf68c Mon Sep 17 00:00:00 2001 From: Franco Tampieri Date: Mon, 22 Sep 2014 17:31:05 +0200 Subject: [PATCH 03/15] [Add] Add some italian translation --- base_location_geonames_import/i18n/it.po | 79 ++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 base_location_geonames_import/i18n/it.po diff --git a/base_location_geonames_import/i18n/it.po b/base_location_geonames_import/i18n/it.po new file mode 100644 index 000000000..cf2a22ed7 --- /dev/null +++ b/base_location_geonames_import/i18n/it.po @@ -0,0 +1,79 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * base_location_geonames_import +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 7.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-04-11 20:56+0000\n" +"PO-Revision-Date: 2014-09-22 17:30+0100\n" +"Last-Translator: Franco Tampieri \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: \n" +"Language: it\n" +"X-Generator: Poedit 1.6.9\n" + +#. module: base_location_geonames_import +#: view:better.zip.geonames.import:0 +msgid "Cancel" +msgstr "Annulla" + +#. module: base_location_geonames_import +#: field:better.zip.geonames.import,country_id:0 +msgid "Country" +msgstr "Paese" + +#. module: base_location_geonames_import +#: code:addons/base_location_geonames_import/wizard/geonames_import.py:66 +#: code:addons/base_location_geonames_import/wizard/geonames_import.py:90 +#, python-format +msgid "Error:" +msgstr "Errore:" + +#. module: base_location_geonames_import +#: view:better.zip.geonames.import:0 +msgid "" +"For the country selected above, this wizard will DELETE ALL THE CURRENT " +"BETTER ZIP ENTRIES, download the latest version of the list of cities from " +"geonames.org and create new better zip entries." +msgstr "" +"Per il paese selezionato, questo wizard CANCELLERA' TUTTE LE RIGHE CORRENTI " +"DELL'OGGETTO BETTER ZIP, scaricherà la lista delle città da geonames.org e " +"creerà le nuove righe di better zip." + +#. module: base_location_geonames_import +#: code:addons/base_location_geonames_import/wizard/geonames_import.py:91 +#, python-format +msgid "Got an error %d when trying to download the file %s." +msgstr "Errore %d mentre si stava scaricando il file %s." + +#. module: base_location_geonames_import +#: view:better.zip.geonames.import:0 +msgid "Import" +msgstr "Importa" + +#. module: base_location_geonames_import +#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import +msgid "Import Better Zip from Geonames" +msgstr "Importa Better Zip da Geonames" + +#. module: base_location_geonames_import +#: view:better.zip.geonames.import:0 +#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action +#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu +msgid "Import Geonames" +msgstr "Importa Geonames" + +#. module: base_location_geonames_import +#: code:addons/base_location_geonames_import/wizard/geonames_import.py:67 +#, python-format +msgid "" +"The country code inside the file (%s) doesn't correspond to the selected " +"country (%s)." +msgstr "" +"Il codice paese all'interno del file (%s) non corrisponde al paese " +"selezionato (%s)." From de4790a8fc0980acb93a119ebab93bc41ceefbb0 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Wed, 25 Feb 2015 22:56:47 +0100 Subject: [PATCH 04/15] [IMP] base_location_geonames_import: Several improvements and added hooks * Added Icon. * Improve module description and extracted to README.rst. * Pass country instead of country_id for advance comparisons. * Allow to transform city name. * Some code style. * Do not remove all entries of a country, but only not found. * Include hooks for transforming some things. * Include spanish translation. [FIX] base_location_geonames_import: Use self.env and recordsets --- base_location_geonames_import/README.rst | 61 ++ base_location_geonames_import/__openerp__.py | 30 +- .../i18n/base_location_geonames_import.pot | 4 +- base_location_geonames_import/i18n/es.po | 68 ++ base_location_geonames_import/i18n/fr.po | 4 +- base_location_geonames_import/i18n/it.po | 2 +- .../static/description/icon.png | Bin 0 -> 13202 bytes .../static/description/icon.svg | 782 ++++++++++++++++++ .../wizard/geonames_import.py | 96 ++- .../wizard/geonames_import_view.xml | 68 +- 10 files changed, 1011 insertions(+), 104 deletions(-) create mode 100644 base_location_geonames_import/README.rst create mode 100644 base_location_geonames_import/i18n/es.po create mode 100644 base_location_geonames_import/static/description/icon.png create mode 100644 base_location_geonames_import/static/description/icon.svg diff --git a/base_location_geonames_import/README.rst b/base_location_geonames_import/README.rst new file mode 100644 index 000000000..219404f94 --- /dev/null +++ b/base_location_geonames_import/README.rst @@ -0,0 +1,61 @@ +Base Location Geonames Import +============================= + +This module adds a wizard to import better zip entries from Geonames database. + +Installation +============ +For installing this module, you need these Python libraries: requests and +unicodecsv. + +Configuration +============= + +For seeing the menu, you need to activate *Technical features* option in your +user and to be *Sales manager*. + +If want want/need to modify the default URL +(http://download.geonames.org/export/zip/), you can set the 'geonames.url' +system parameter. + +Usage +===== + +Go to *Sales > Configuration > Address book > Localization > Import from Geonames*, +and click on it to open a wizard. + +When you start the wizard, it will ask you to select a country. Then, for the +selected country, it will delete all the current better zip entries, download +the latest version of the list of cities from geonames.org and create new +better zip entries. + +Credits +======= + +Contributors +------------ + +* Alexis de Lattre +* Lorenzo Battistini +* Pedro M. Baeza + +Icon +---- +* http://icon-park.com/icon/location-map-pin-orange3/ +* http://commons.wikimedia.org/wiki/File:View-refresh.svg + + +Maintainer +---------- + +.. image:: http://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: http://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_location_geonames_import/__openerp__.py b/base_location_geonames_import/__openerp__.py index d57674f3e..7ced3b180 100644 --- a/base_location_geonames_import/__openerp__.py +++ b/base_location_geonames_import/__openerp__.py @@ -29,31 +29,11 @@ 'category': 'Extra Tools', 'license': 'AGPL-3', 'summary': 'Import better zip entries from Geonames', - 'description': """ -Base Location Geonames Import -============================= - -This module adds a wizard to import better zip entries from Geonames -(http://download.geonames.org/export/zip/). -If want want/need to modify the URL, you can set the 'geonames.url' -system parameter. - -When you start the wizard, -it will ask you to select a country. Then, for the selected country, -it will delete all the current better zip entries, download the latest version -of the list of cities from geonames.org and create new better zip entries. - -Please contact Alexis de Lattre from Akretion -for any help or question about this module. - - -Contributors ------------- - -- Alexis de Lattre -- Lorenzo Battistini -""", - 'author': "Akretion,Odoo Community Association (OCA)", + 'author': 'Akretion,' + 'Agile Business Group,' + 'Antiun Ingeniería S.L.,' + 'Serv. Tecnol. Avanzados - Pedro M. Baeza,' + 'Odoo Community Association (OCA)', 'website': 'http://www.akretion.com', 'depends': ['base_location'], 'external_dependencies': {'python': ['requests', 'unicodecsv']}, diff --git a/base_location_geonames_import/i18n/base_location_geonames_import.pot b/base_location_geonames_import/i18n/base_location_geonames_import.pot index 7c5782ea3..8b8fed1c9 100644 --- a/base_location_geonames_import/i18n/base_location_geonames_import.pot +++ b/base_location_geonames_import/i18n/base_location_geonames_import.pot @@ -34,7 +34,7 @@ msgstr "" #. module: base_location_geonames_import #: view:better.zip.geonames.import:0 -msgid "For the country selected above, this wizard will DELETE ALL THE CURRENT BETTER ZIP ENTRIES, download the latest version of the list of cities from geonames.org and create new better zip entries." +msgid "For the country selected above, this wizard will download the latest version of the list of cities from geonames.org, create new location entries if not found already in the system, and DELETE MISSING ENTRIES from new file." msgstr "" #. module: base_location_geonames_import @@ -57,7 +57,7 @@ msgstr "" #: view:better.zip.geonames.import:0 #: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action #: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu -msgid "Import Geonames" +msgid "Import from Geonames" msgstr "" #. module: base_location_geonames_import diff --git a/base_location_geonames_import/i18n/es.po b/base_location_geonames_import/i18n/es.po new file mode 100644 index 000000000..d90390cec --- /dev/null +++ b/base_location_geonames_import/i18n/es.po @@ -0,0 +1,68 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * base_location_geonames_import +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 7.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-04-11 20:55+0000\n" +"PO-Revision-Date: 2014-04-11 20:55+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: base_location_geonames_import +#: view:better.zip.geonames.import:0 +msgid "Cancel" +msgstr "Cancelar" + +#. module: base_location_geonames_import +#: field:better.zip.geonames.import,country_id:0 +msgid "Country" +msgstr "País" + +#. module: base_location_geonames_import +#: code:addons/base_location_geonames_import/wizard/geonames_import.py:66 +#: code:addons/base_location_geonames_import/wizard/geonames_import.py:90 +#, python-format +msgid "Error:" +msgstr "Error:" + +#. module: base_location_geonames_import +#: view:better.zip.geonames.import:0 +msgid "For the country selected above, this wizard will download the latest version of the list of cities from geonames.org, create new location entries if not found already in the system, and DELETE MISSING ENTRIES from new file." +msgstr "Para el país seleccionado arriba, este asistente descargará la última versión de la lista de ciudades de geonames.org, creará nuevas entradas de ubicaciones si no se encuentran ya en el sistema, y BORRARÁ LOS REGISTROS DESAPARECIDOS en el nuevo archivo." + +#. module: base_location_geonames_import +#: code:addons/base_location_geonames_import/wizard/geonames_import.py:91 +#, python-format +msgid "Got an error %d when trying to download the file %s." +msgstr "Se obtuvo un error %d cuando se descargaba el archivo %s." + +#. module: base_location_geonames_import +#: view:better.zip.geonames.import:0 +msgid "Import" +msgstr "Importar" + +#. module: base_location_geonames_import +#: model:ir.model,name:base_location_geonames_import.model_better_zip_geonames_import +msgid "Import Better Zip from Geonames" +msgstr "Importar ubicaciones de Geonames" + +#. module: base_location_geonames_import +#: view:better.zip.geonames.import:0 +#: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action +#: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu +msgid "Import from Geonames" +msgstr "Importar de GeoNames" + +#. module: base_location_geonames_import +#: code:addons/base_location_geonames_import/wizard/geonames_import.py:67 +#, python-format +msgid "The country code inside the file (%s) doesn't correspond to the selected country (%s)." +msgstr "El código de país dentro del archivo (%s) no se corresponde con el país seleccionado (%s)." + diff --git a/base_location_geonames_import/i18n/fr.po b/base_location_geonames_import/i18n/fr.po index 699ad7519..83d187777 100644 --- a/base_location_geonames_import/i18n/fr.po +++ b/base_location_geonames_import/i18n/fr.po @@ -57,8 +57,8 @@ msgstr "Import Better Zip from Geonames" #: view:better.zip.geonames.import:0 #: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action #: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu -msgid "Import Geonames" -msgstr "Importer Geonames" +msgid "Import from Geonames" +msgstr "Importer de Geonames" #. module: base_location_geonames_import #: code:addons/base_location_geonames_import/wizard/geonames_import.py:67 diff --git a/base_location_geonames_import/i18n/it.po b/base_location_geonames_import/i18n/it.po index cf2a22ed7..63e061099 100644 --- a/base_location_geonames_import/i18n/it.po +++ b/base_location_geonames_import/i18n/it.po @@ -66,7 +66,7 @@ msgstr "Importa Better Zip da Geonames" #: model:ir.actions.act_window,name:base_location_geonames_import.better_zip_geonames_import_action #: model:ir.ui.menu,name:base_location_geonames_import.better_zip_geonames_import_menu msgid "Import Geonames" -msgstr "Importa Geonames" +msgstr "Importa da Geonames" #. module: base_location_geonames_import #: code:addons/base_location_geonames_import/wizard/geonames_import.py:67 diff --git a/base_location_geonames_import/static/description/icon.png b/base_location_geonames_import/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9b0eb86e37a8f01b63254f10c8e0f6cf670e9724 GIT binary patch literal 13202 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 XC#<&@dn+O5{Qy-(Erl96n~47biYxHo literal 0 HcmV?d00001 diff --git a/base_location_geonames_import/static/description/icon.svg b/base_location_geonames_import/static/description/icon.svg new file mode 100644 index 000000000..60d8003eb --- /dev/null +++ b/base_location_geonames_import/static/description/icon.svg @@ -0,0 +1,782 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/base_location_geonames_import/wizard/geonames_import.py b/base_location_geonames_import/wizard/geonames_import.py index 9fb2cf355..a3535be8f 100644 --- a/base_location_geonames_import/wizard/geonames_import.py +++ b/base_location_geonames_import/wizard/geonames_import.py @@ -27,15 +27,19 @@ from openerp.exceptions import Warning import requests import tempfile import StringIO -import unicodecsv import zipfile import os import logging +try: + import unicodecsv +except ImportError: + unicodecsv = None + logger = logging.getLogger(__name__) -class better_zip_geonames_import(models.TransientModel): +class BetterZipGeonamesImport(models.TransientModel): _name = 'better.zip.geonames.import' _description = 'Import Better Zip from Geonames' _rec_name = 'country_id' @@ -43,88 +47,106 @@ class better_zip_geonames_import(models.TransientModel): country_id = fields.Many2one('res.country', 'Country', required=True) @api.model - def _prepare_better_zip(self, row, country_id): - state = self.select_or_create_state(row, country_id) + def transform_city_name(self, city, country): + """Override it for transforming city name (if needed) + :param city: Original city name + :param country: Country record + :return: Transformed city name + """ + return city + + @api.model + def _domain_search_better_zip(self, row, country): + return [('name', '=', row[1]), + ('city', '=', self.transform_city_name(row[2], country)), + ('country_id', '=', country.id)] + + @api.model + def _prepare_better_zip(self, row, country): + state = self.select_or_create_state(row, country) vals = { 'name': row[1], - 'city': row[2], + 'city': self.transform_city_name(row[2], country), 'state_id': state.id, - 'country_id': country_id, + 'country_id': country.id, } return vals @api.model - def create_better_zip( - self, row, country_id, country_code): - bzip_id = False - if row[0] != country_code: + def create_better_zip(self, row, country): + if row[0] != country.code: raise Warning( - _('Error:'), _("The country code inside the file (%s) doesn't " "correspond to the selected country (%s).") - % (row[0], country_code)) + % (row[0], country.code)) logger.debug('ZIP = %s - City = %s' % (row[1], row[2])) if row[1] and row[2]: - vals = self._prepare_better_zip(row, country_id) - if vals: - bzip_id = self.env['res.better.zip'].create(vals) - return bzip_id + zip_model = self.env['res.better.zip'] + zips = zip_model.search(self._domain_search_better_zip( + row, country)) + if zips: + return zips[0] + else: + vals = self._prepare_better_zip(row, country) + if vals: + return zip_model.create(vals) + else: + return False @api.model def select_or_create_state( - self, row, country_id, code_row_index=4, name_row_index=3 - ): + self, row, country, code_row_index=4, name_row_index=3): states = self.env['res.country.state'].search([ - ('country_id', '=', country_id), + ('country_id', '=', country.id), ('code', '=', row[code_row_index]), ]) if len(states) > 1: raise Warning( - _("Too many states with code %s for counrty %s") - % (row[code_row_index], country_id)) + _("Too many states with code %s for country %s") + % (row[code_row_index], country.code)) if len(states) == 1: return states[0] else: return self.env['res.country.state'].create({ 'name': row[name_row_index], 'code': row[code_row_index], - 'country_id': country_id + 'country_id': country.id }) @api.one def run_import(self): - bzip_obj = self.env['res.better.zip'] - country_id = self.country_id.id - country_code = self.country_id.code.upper() - config_url = self.pool['ir.config_parameter'].get_param( - self._cr, self._uid, 'geonames.url', + zip_model = self.env['res.better.zip'] + country_code = self.country_id.code + config_url = self.env['ir.config_parameter'].get_param( + 'geonames.url', default='http://download.geonames.org/export/zip/%s.zip') url = config_url % country_code logger.info('Starting to download %s' % url) res_request = requests.get(url) if res_request.status_code != requests.codes.ok: raise Warning( - _('Error:'), _('Got an error %d when trying to download the file %s.') % (res_request.status_code, url)) - bzip_ids_to_delete = bzip_obj.search([('country_id', '=', country_id)]) - if bzip_ids_to_delete: - bzip_ids_to_delete.unlink() - logger.info( - '%d better zip entries deleted for country %s' - % (len(bzip_ids_to_delete), self.country_id.name)) + # Store current record list + zips_to_delete = zip_model.search( + [('country_id', '=', self.country_id.id)]) f_geonames = zipfile.ZipFile(StringIO.StringIO(res_request.content)) tempdir = tempfile.mkdtemp(prefix='openerp') f_geonames.extract('%s.txt' % country_code, tempdir) logger.info('The geonames zipfile has been decompressed') data_file = open(os.path.join(tempdir, '%s.txt' % country_code), 'r') data_file.seek(0) - logger.info( - 'Starting to create the better zip entries') + logger.info('Starting to create the better zip entries') for row in unicodecsv.reader( data_file, encoding='utf-8', delimiter=' '): - self.create_better_zip(row, country_id, country_code) + zip = self.create_better_zip(row, self.country_id) + if zip in zips_to_delete: + zips_to_delete -= zip data_file.close() + if zips_to_delete: + zips_to_delete.unlink() + logger.info('%d better zip entries deleted for country %s' % + (len(zips_to_delete), self.country_id.name)) logger.info( 'The wizard to create better zip entries from geonames ' 'has been successfully completed.') diff --git a/base_location_geonames_import/wizard/geonames_import_view.xml b/base_location_geonames_import/wizard/geonames_import_view.xml index efd37057d..ce535f799 100644 --- a/base_location_geonames_import/wizard/geonames_import_view.xml +++ b/base_location_geonames_import/wizard/geonames_import_view.xml @@ -1,44 +1,38 @@ - - - + - - asterisk.server.company - better.zip.geonames.import - -
- - - -
-
-
- - + + asterisk.server.company + better.zip.geonames.import + +
+ + + +
+
+
+ + - - Import Geonames - better.zip.geonames.import - form - form - new - + + Import from Geonames + better.zip.geonames.import + form + form + new + - + - + From 11ec70625ed8cc40cddbd6d1b050a8ba2657a6fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Todorovich?= Date: Mon, 21 Dec 2015 17:51:00 -0300 Subject: [PATCH 05/15] Added option to convert retreived names to Title Case. OCA requirements --- base_location_geonames_import/__openerp__.py | 4 ++-- base_location_geonames_import/wizard/geonames_import.py | 9 ++++++++- .../wizard/geonames_import_view.xml | 3 +++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/base_location_geonames_import/__openerp__.py b/base_location_geonames_import/__openerp__.py index 7ced3b180..2a1c3a180 100644 --- a/base_location_geonames_import/__openerp__.py +++ b/base_location_geonames_import/__openerp__.py @@ -1,4 +1,4 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## # # Base Location Geonames Import module for OpenERP @@ -25,7 +25,7 @@ { 'name': 'Base Location Geonames Import', - 'version': '8.0.0.2.0', + 'version': '8.0.0.3.0', 'category': 'Extra Tools', 'license': 'AGPL-3', 'summary': 'Import better zip entries from Geonames', diff --git a/base_location_geonames_import/wizard/geonames_import.py b/base_location_geonames_import/wizard/geonames_import.py index a3535be8f..f04881c60 100644 --- a/base_location_geonames_import/wizard/geonames_import.py +++ b/base_location_geonames_import/wizard/geonames_import.py @@ -1,4 +1,4 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## # # Base Location Geonames Import module for OpenERP @@ -45,6 +45,10 @@ class BetterZipGeonamesImport(models.TransientModel): _rec_name = 'country_id' country_id = fields.Many2one('res.country', 'Country', required=True) + title_case = fields.Boolean( + string='Title Case', + help='Converts retreived city and state names to Title Case.', + ) @api.model def transform_city_name(self, city, country): @@ -80,6 +84,9 @@ class BetterZipGeonamesImport(models.TransientModel): "correspond to the selected country (%s).") % (row[0], country.code)) logger.debug('ZIP = %s - City = %s' % (row[1], row[2])) + if (self.title_case): + row[2] = row[2].title() + row[3] = row[3].title() if row[1] and row[2]: zip_model = self.env['res.better.zip'] zips = zip_model.search(self._domain_search_better_zip( diff --git a/base_location_geonames_import/wizard/geonames_import_view.xml b/base_location_geonames_import/wizard/geonames_import_view.xml index ce535f799..ea7a102a6 100644 --- a/base_location_geonames_import/wizard/geonames_import_view.xml +++ b/base_location_geonames_import/wizard/geonames_import_view.xml @@ -12,6 +12,9 @@