diff --git a/odoo/modules/migration.py b/odoo/modules/migration.py index 8354967a2670cb521e0fea5a789c3b2fcf0918f4..141a11134a4d33f2dc57688ca5d0915f294e3d53 100644 --- a/odoo/modules/migration.py +++ b/odoo/modules/migration.py @@ -145,12 +145,23 @@ class MigrationManager(object): parsed_installed_version = parse_version(installed_version) current_version = parse_version(convert_version(pkg.data['version'])) - versions = _get_migration_versions(pkg, stage) + def compare(version): + if version == "0.0.0" and parsed_installed_version < current_version: + return True - for version in versions: - if ((version == "0.0.0" and parsed_installed_version < current_version) - or parsed_installed_version < parse_version(convert_version(version)) <= current_version): + full_version = convert_version(version) + majorless_version = (version != full_version) + + if majorless_version: + # We should not re-execute major-less scripts when upgrading to new Odoo version + # a module in `9.0.2.0` should not re-execute a `2.0` script when upgrading to `10.0.2.0`. + return parsed_installed_version < parse_version(full_version) < current_version + return parsed_installed_version < parse_version(full_version) <= current_version + + versions = _get_migration_versions(pkg, stage) + for version in versions: + if compare(version): strfmt = {'addon': pkg.name, 'stage': stage, 'version': stageformat[stage] % version,