diff options
| -rw-r--r-- | odoo/modules/registry.py | 5 | ||||
| -rw-r--r-- | odoo/tools/config.py | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/odoo/modules/registry.py b/odoo/modules/registry.py index 9b39758a30a..b42ebc988d5 100644 --- a/odoo/modules/registry.py +++ b/odoo/modules/registry.py @@ -142,10 +142,7 @@ class Registry(Mapping): self.cache_invalidated = False with closing(self.cursor()) as cr: - has_unaccent = odoo.modules.db.has_unaccent(cr) - if odoo.tools.config['unaccent'] and not has_unaccent: - _logger.warning("The option --unaccent was given but no unaccent() function was found in database.") - self.has_unaccent = odoo.tools.config['unaccent'] and has_unaccent + self.has_unaccent = odoo.modules.db.has_unaccent(cr) @classmethod def delete(cls, db_name): diff --git a/odoo/tools/config.py b/odoo/tools/config.py index 0430b7d3dc9..0ac8c40e31b 100644 --- a/odoo/tools/config.py +++ b/odoo/tools/config.py @@ -293,7 +293,7 @@ class configmanager(object): help="Maximum number of threads processing concurrently cron jobs (default 2).", type="int") group.add_option("--unaccent", dest="unaccent", my_default=False, action="store_true", - help="Use the unaccent function provided by the database when available.") + help="Try to enable the unaccent extension when creating new databases.") group.add_option("--geoip-db", dest="geoip_database", my_default='/usr/share/GeoIP/GeoLite2-City.mmdb', help="Absolute path to the GeoIP database file.") parser.add_option_group(group) |