[IMP] add hr_expense_report_merge_attachment in "merged in core" modules in 18.0

[IMP] delete res.settings views in 18.0 pre-update to rebuild them latter
[IMP] manage the sequence issues in stock picking and pos orders in v18 post-upgrade
2026-06-04 10:43:57 +02:00 · 2026-06-01 23:33:50 +02:00 · 2026-06-01 23:33:32 +02:00
5 changed files with 48 additions and 276 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 final_404_addons
-migration.log
--- a/README.md
+++ b/README.md
@@ -9,7 +9,6 @@ A tool for migrating Odoo databases between major versions, using [OpenUpgrade](
 - [Project Structure](#project-structure)
 - [How It Works](#how-it-works)
 - [Usage](#usage)
- [Resuming a Failed Migration](#resuming-a-failed-migration)
 - [Customization](#customization)
 - [Troubleshooting](#troubleshooting)

@@ -159,7 +158,7 @@ The script performs a **step-by-step migration** between each major version. For
 ### Running the Migration

 ```bash
-./upgrade.sh <source_version> <target_version> <database_name> <source_service> [--resume-from|-r <version>]
+./upgrade.sh <source_version> <target_version> <database_name> <source_service>
 ```

 **Parameters:**
@@ -170,11 +169,6 @@ The script performs a **step-by-step migration** between each major version. For
 | `database_name` | Database name | `my_prod_db` |
 | `source_service` | Source Docker Compose service | `odoo14` |

-**Options:**
-| Option | Description |
-|--------|-------------|
-| `--resume-from <version>`, `-r <version>` | Resume from an intermediate checkpoint (see [Resuming a Failed Migration](#resuming-a-failed-migration)) |
-
 **Example:**
 ```bash
 ./upgrade.sh 14 17 elabore_20241208 odoo14
@@ -245,48 +239,6 @@ compose run odoo17 shell -d ou17 --no-http --stop-after-init < lib/python/valida
 - **JSON report** written to `/tmp/validation_views_<db>_<timestamp>.json`
 - **Exit code**: `0` = success, `1` = errors found

-## Resuming a Failed Migration
-
-Each version hop copies the database before modifying it (`ou14` → `ou15` → `ou16` → …). If a migration crashes mid-way, the intermediate databases from completed hops are still intact and can be used as a restart point.
-
-### How It Works
-
-Use `--resume-from <version>` (or `-r <version>`) to restart from an intermediate checkpoint:
-
-```bash
-./upgrade.sh <source_version> <target_version> <database_name> <source_service> --resume-from <checkpoint_version>
-```
-
-When a checkpoint is specified, the script:
- **Skips** the initial database and filestore copy
- **Skips** `prepare_db.sh` (already done before the crash)
- **Starts the migration loop** from `checkpoint_version + 1`
-
-### Example
-
-A migration from 14 to 18 crashes during the 16→17 hop. The database `ou15` was successfully created. Resume from there:
-
-```bash
-./upgrade.sh 14 18 my_database odoo14 --resume-from 15
-```
-
-This runs: `16.0 → 17.0 → 18.0`, starting from `ou15`.
-
-### Constraints
-
- The checkpoint version must be strictly between the source and target versions.
- The intermediate database (`ou<version>`) and its filestore must exist before resuming.
-
-### Restarting From Scratch
-
-To restart a full migration from the beginning (ignoring all intermediate databases):
-
-```bash
-./upgrade.sh 14 18 my_database odoo14
-```
-
-The script automatically drops and recreates the final target database (`ou18`) if it already exists.
-
 ## Customization

 ### Version Scripts
@@ -413,30 +365,10 @@ The script works on a **copy** of the original database. You can restart as many

 ### Viewing Detailed Logs

-All output (scripts, Docker containers, OpenUpgrade logs) is automatically saved to `migration.log` at the project root. The file is overwritten at the start of each run (full migration or resume).
-
-```bash
-# Follow live output while also saving to file (already done automatically)
-tail -f migration.log
-
-# Search for errors after the fact
-grep -i error migration.log
-
-# View with ANSI colors preserved (less handles CRLF line endings natively)
-less -R migration.log
-
-# Plain text output without CRLF artifacts
-cat migration.log | col -b
-```
-
-> **Note:** `migration.log` is recorded via a pseudo-TTY (`script`), which preserves
-> color output in the terminal. As a side effect, the file uses `\r\n` line endings.
-> Use `less -R` or `col -b` for clean viewing.
-
-For a problematic migration:
+Odoo/OpenUpgrade logs are displayed in real-time. For a problematic migration:

 1. Note the version where the error occurs
-2. Check `migration.log` to identify the problematic module/table
+2. Check the logs to identify the problematic module/table
 3. Add a fix in the `pre_upgrade.sh` for that version
 4. Restart the migration

--- a/scripts/finalize_db.sh
+++ b/scripts/finalize_db.sh
@@ -12,6 +12,17 @@ CLEANUP_SQL=$(cat <<'EOF'
 DROP SEQUENCE IF EXISTS base_registry_signaling;
 DROP SEQUENCE IF EXISTS base_cache_signaling;

+-- Reset website templates to their original state.
+-- Views with arch_fs (file source) that have been customized (arch_db not null)
+-- are reset to use the file version, EXCEPT for actual website pages which
+-- contain user content that must be preserved.
+UPDATE ir_ui_view
+SET arch_db = NULL
+WHERE arch_fs IS NOT NULL
+  AND arch_fs LIKE 'website/%'
+  AND arch_db IS NOT NULL
+  AND id NOT IN (SELECT view_id FROM website_page);
+
 -- Purge compiled frontend assets (CSS/JS bundles).
 -- These cached files reference old asset versions and must be regenerated
 -- by Odoo after migration to avoid broken stylesheets and scripts.
@@ -23,76 +34,6 @@ EOF
 )
 query_postgres_container "$CLEANUP_SQL" "$DB_NAME"

-# ────────────────────────────────────────────────────────────
-# Fix orphan ir_filters pointing to deleted ir_actions
-#
-# During OpenUpgrade migrations, ir_actions records can be deleted and
-# recreated with new ids, while ir_filters.action_id (custom user filters)
-# still points to the old, now-missing action. When a user opens the custom
-# filters list, Odoo tries to resolve the display_name of the many2one
-# action_id and raises "Record does not exist or has been deleted
-# (ir.actions.actions(<id>,))". We detach such filters (set action_id = NULL),
-# which keeps the filter usable and only drops the broken action link.
-# ────────────────────────────────────────────────────────────
-FIX_ORPHAN_FILTERS_SQL=$(cat <<'EOF'
-DO $$
-DECLARE
-    orphan_count INTEGER;
-    remaining INTEGER;
-BEGIN
-    SELECT COUNT(*) INTO orphan_count
-    FROM ir_filters f
-    LEFT JOIN ir_actions a ON a.id = f.action_id
-    WHERE f.action_id IS NOT NULL AND a.id IS NULL;
-
-    IF orphan_count > 0 THEN
-        UPDATE ir_filters f
-        SET action_id = NULL
-        FROM (
-            SELECT f2.id
-            FROM ir_filters f2
-            LEFT JOIN ir_actions a ON a.id = f2.action_id
-            WHERE f2.action_id IS NOT NULL AND a.id IS NULL
-        ) orphans
-        WHERE f.id = orphans.id;
-        RAISE NOTICE 'Detached % orphan ir_filters pointing to deleted ir_actions', orphan_count;
-    ELSE
-        RAISE NOTICE 'OK: no orphan ir_filters to fix';
-    END IF;
-
-    -- Verification
-    SELECT COUNT(*) INTO remaining
-    FROM ir_filters f
-    LEFT JOIN ir_actions a ON a.id = f.action_id
-    WHERE f.action_id IS NOT NULL AND a.id IS NULL;
-
-    IF remaining > 0 THEN
-        RAISE WARNING 'Still % orphan ir_filters remaining after fix', remaining;
-    END IF;
-END $$;
-EOF
-)
-echo "Fixing orphan ir_filters pointing to deleted ir_actions..."
-query_postgres_container "$FIX_ORPHAN_FILTERS_SQL" "$DB_NAME"
-
-# Reset modules still marked as 'to upgrade' before launching the Odoo shell
-# scripts below. Loading the registry in `odoo shell` re-triggers the upgrade
-# of these modules, which can fail on broken views (e.g. website_sale
-# TypeError). The controlled `-u all` at the end of this script performs the
-# real update afterwards. We deliberately do NOT touch 'to install' modules:
-# forcing them to 'installed' would skip their install scripts entirely.
-#
-# Uncomment the SELECT below to trace which modules were pending upgrade
-# before we neutralize their state (useful if the `-u all` above is removed).
-# query_postgres_container "
-# SELECT name FROM ir_module_module WHERE state = 'to upgrade' ORDER BY name;
-# " "$DB_NAME" || true
-query_postgres_container "
-UPDATE ir_module_module
-SET state = 'installed'
-WHERE state = 'to upgrade';
-" "$DB_NAME" || true
-
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"

 PYTHON_SCRIPT="${SCRIPT_DIR}/lib/python/fix_duplicated_views.py"
@@ -107,18 +48,13 @@ exec_python_script_in_odoo_shell "$DB_NAME" "$DB_NAME" "$PYTHON_SCRIPT"
 # Regenerate POS inalterability hashes if needed
 # ────────────────────────────────────────────────────────────
 HASHES_NEEDED=$(query_postgres_container "
-    SELECT COUNT(*) FROM information_schema.tables WHERE table_name = 'pos_order'
+    SELECT COUNT(*)
+    FROM pos_order po
+    JOIN res_company rc ON rc.id = po.company_id
+    WHERE po.state IN ('paid', 'done', 'invoiced')
+      AND rc.l10n_fr_pos_cert_sequence_id IS NOT NULL
+      AND (po.l10n_fr_hash IS NULL OR po.l10n_fr_secure_sequence_number IS NULL)
 " "$DB_NAME")
-if [[ "$HASHES_NEEDED" =~ ^[0-9]+$ && "$HASHES_NEEDED" -gt 0 ]]; then
-    HASHES_NEEDED=$(query_postgres_container "
-        SELECT COUNT(*)
-        FROM pos_order po
-        JOIN res_company rc ON rc.id = po.company_id
-        WHERE po.state IN ('paid', 'done', 'invoiced')
-          AND rc.l10n_fr_pos_cert_sequence_id IS NOT NULL
-          AND (po.l10n_fr_hash IS NULL OR po.l10n_fr_secure_sequence_number IS NULL)
-    " "$DB_NAME")
-fi

 if [[ "$HASHES_NEEDED" =~ ^[0-9]+$ && "$HASHES_NEEDED" -gt 0 ]]; then
    echo ""
@@ -136,7 +72,7 @@ fi


 # Launch Odoo with database in finale version to run all updates
-run_compose --debug run "$ODOO_SERVICE" -u all --log-level=debug --stop-after-init --no-http --load=base,web,openupgrade_framework
+run_compose --debug run "$ODOO_SERVICE" -u all --log-level=debug --stop-after-init --no-http

 echo ""
 echo "Running post-migration view validation..."
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -4,20 +4,13 @@ set -euo pipefail
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${SCRIPT_DIR}/lib/common.sh"

-readonly LOG_FILE="${SCRIPT_DIR}/migration.log"
-if [[ -z "${_MIGRATION_LOGGING:-}" ]]; then
-    rm -f "$LOG_FILE"
-    export _MIGRATION_LOGGING=1
-    exec script -q -c "$(printf '%q ' "$0" "$@")" "$LOG_FILE"
-fi
-
 ####################
 # USAGE & ARGUMENTS
 ####################

 usage() {
    cat <<EOF >&2
-Usage: $0 <origin_version> <final_version> <db_name> <service_name> [--resume-from|-r <version>]
+Usage: $0 <origin_version> <final_version> <db_name> <service_name>

 Arguments:
    origin_version   Origin Odoo version number (e.g., 12 for version 12.0)
@@ -25,22 +18,14 @@ Arguments:
    db_name          Name of the database to migrate
    service_name     Name of the origin Odoo service (docker compose service)

-Options:
-    --resume-from, -r <version>
-                     Resume migration from an already-migrated intermediate
-                     database (e.g., ou15). Skips the initial DB copy and
-                     prepare_db.sh phases. The intermediate DB must exist.
-
-Examples:
-    $0 14 18 elabore_20241208 odoo14
-    $0 14 18 elabore_20241208 odoo14 --resume-from 15
-    $0 14 18 elabore_20241208 odoo14 -r 15
+Example:
+    $0 14 16 elabore_20241208 odoo14
 EOF
    exit 1
 }

 if [[ $# -lt 4 ]]; then
-    log_error "Missing arguments. Expected at least 4, got $#."
+    log_error "Missing arguments. Expected 4, got $#."
    usage
 fi

@@ -53,50 +38,11 @@ readonly FINAL_VERSION
 readonly ORIGIN_DB_NAME="$3"
 readonly ORIGIN_SERVICE_NAME="$4"

-# Parse optional --resume-from / -r flag
-RESUME_FROM_VERSION=""
-shift 4
-while [[ $# -gt 0 ]]; do
-    case "$1" in
-        --resume-from|-r)
-            if [[ $# -lt 2 ]]; then
-                log_error "Option '$1' requires a version number argument."
-                usage
-            fi
-            RESUME_FROM_VERSION="$2"
-            shift 2
-            ;;
-        *)
-            log_error "Unknown option: '$1'"
-            usage
-            ;;
-    esac
-done
-readonly RESUME_FROM_VERSION
-
 readonly COPY_DB_NAME="ou${ORIGIN_VERSION}"
 export FINALE_DB_NAME="ou${FINAL_VERSION}"
 readonly FINALE_DB_NAME
 readonly FINALE_SERVICE_NAME="${FINALE_DB_NAME}"

-# Validate --resume-from value if provided
-if [[ -n "$RESUME_FROM_VERSION" ]]; then
-    if ! [[ "$RESUME_FROM_VERSION" =~ ^[0-9]+$ ]]; then
-        log_error "--resume-from value must be a numeric version number (got: '$RESUME_FROM_VERSION')."
-        exit 1
-    fi
-    if [[ "$RESUME_FROM_VERSION" -le "$ORIGIN_VERSION" ]]; then
-        log_error "--resume-from ($RESUME_FROM_VERSION) must be strictly greater than origin version ($ORIGIN_VERSION)."
-        log_error "To start a fresh migration, run without --resume-from."
-        exit 1
-    fi
-    if [[ "$RESUME_FROM_VERSION" -ge "$FINAL_VERSION" ]]; then
-        log_error "--resume-from ($RESUME_FROM_VERSION) must be strictly less than final version ($FINAL_VERSION)."
-        log_error "Nothing to migrate: checkpoint is at or beyond the target version."
-        exit 1
-    fi
-fi
-
 readarray -t postgres_containers < <(docker ps --format '{{.Names}}' | grep postgres || true)

 if [[ ${#postgres_containers[@]} -eq 0 ]]; then
@@ -115,13 +61,8 @@ readonly POSTGRES_SERVICE_NAME
 log_step "INPUT PARAMETERS"
 log_info "Origin version .......... $ORIGIN_VERSION"
 log_info "Final version ........... $FINAL_VERSION"
-log_info "Origin DB name .......... $ORIGIN_DB_NAME"
+log_info "Origin DB name ........... $ORIGIN_DB_NAME"
 log_info "Origin service name ..... $ORIGIN_SERVICE_NAME"
-if [[ -n "$RESUME_FROM_VERSION" ]]; then
-    log_info "Resume from version ..... $RESUME_FROM_VERSION (ou${RESUME_FROM_VERSION})"
-else
-    log_info "Resume from version ..... none (full migration)"
-fi

 log_step "COMPUTED GLOBAL VARIABLES"
 log_info "Copy DB name ............. $COPY_DB_NAME"
@@ -133,42 +74,20 @@ log_info "Postgres service name .... $POSTGRES_SERVICE_NAME"

 log_step "CHECKS ALL NEEDED COMPONENTS ARE AVAILABLE"

-if [[ -n "$RESUME_FROM_VERSION" ]]; then
-    readonly RESUME_DB_NAME="ou${RESUME_FROM_VERSION}"
-
-    resume_db_exists=$(docker exec -u 70 "$POSTGRES_SERVICE_NAME" psql -tc "SELECT 1 FROM pg_database WHERE datname = '${RESUME_DB_NAME}'" | tr -d '[:space:]')
-    if [[ "$resume_db_exists" ]]; then
-        log_info "Checkpoint database '${RESUME_DB_NAME}' found."
-    else
-        log_error "Checkpoint database '${RESUME_DB_NAME}' not found in the local postgres service."
-        log_error "Ensure the migration up to version ${RESUME_FROM_VERSION} completed successfully before resuming."
-        exit 1
-    fi
-
-    resume_filestore_path="${DATASTORE_PATH}/${RESUME_DB_NAME}/${FILESTORE_SUBPATH}/${RESUME_DB_NAME}"
-    if [[ -d "$resume_filestore_path" ]]; then
-        log_info "Checkpoint filestore '${resume_filestore_path}' found."
-    else
-        log_error "Checkpoint filestore '${resume_filestore_path}' not found."
-        log_error "Ensure the filestore for '${RESUME_DB_NAME}' is intact before resuming."
-        exit 1
-    fi
+db_exists=$(docker exec -it -u 70 "$POSTGRES_SERVICE_NAME" psql -tc "SELECT 1 FROM pg_database WHERE datname = '$ORIGIN_DB_NAME'" | tr -d '[:space:]')
+if [[ "$db_exists" ]]; then
+    log_info "Database '$ORIGIN_DB_NAME' found."
 else
-    db_exists=$(docker exec -u 70 "$POSTGRES_SERVICE_NAME" psql -tc "SELECT 1 FROM pg_database WHERE datname = '$ORIGIN_DB_NAME'" | tr -d '[:space:]')
-    if [[ "$db_exists" ]]; then
-        log_info "Database '$ORIGIN_DB_NAME' found."
-    else
-        log_error "Database '$ORIGIN_DB_NAME' not found in the local postgres service. Please add it and restart the upgrade process."
-        exit 1
-    fi
+    log_error "Database '$ORIGIN_DB_NAME' not found in the local postgres service. Please add it and restart the upgrade process."
+    exit 1
+fi

-    filestore_path="${DATASTORE_PATH}/${ORIGIN_SERVICE_NAME}/${FILESTORE_SUBPATH}/${ORIGIN_DB_NAME}"
-    if [[ -d "$filestore_path" ]]; then
-        log_info "Filestore '$filestore_path' found."
-    else
-        log_error "Filestore '$filestore_path' not found, please add it and restart the upgrade process."
-        exit 1
-    fi
+filestore_path="${DATASTORE_PATH}/${ORIGIN_SERVICE_NAME}/${FILESTORE_SUBPATH}/${ORIGIN_DB_NAME}"
+if [[ -d "$filestore_path" ]]; then
+    log_info "Filestore '$filestore_path' found."
+else
+    log_error "Filestore '$filestore_path' not found, please add it and restart the upgrade process."
+    exit 1
 fi

 log_step "LAUNCH VIRGIN ODOO IN FINAL VERSION"
@@ -183,36 +102,24 @@ run_compose --debug run "$FINALE_SERVICE_NAME" -i base --stop-after-init --no-ht

 log_info "Model database in final Odoo version created."

-if [[ -z "$RESUME_FROM_VERSION" ]]; then
-    log_step "COPY ORIGINAL COMPONENTS"
+log_step "COPY ORIGINAL COMPONENTS"

-    copy_database "$ORIGIN_DB_NAME" "$COPY_DB_NAME" "$COPY_DB_NAME"
-    log_info "Original database copied to ${COPY_DB_NAME}@${COPY_DB_NAME}."
+copy_database "$ORIGIN_DB_NAME" "$COPY_DB_NAME" "$COPY_DB_NAME"
+log_info "Original database copied to ${COPY_DB_NAME}@${COPY_DB_NAME}."

-    copy_filestore "$ORIGIN_SERVICE_NAME" "$ORIGIN_DB_NAME" "$COPY_DB_NAME" "$COPY_DB_NAME"
-    log_info "Original filestore copied."
-else
-    log_step "COPY ORIGINAL COMPONENTS — SKIPPED (resuming from checkpoint ou${RESUME_FROM_VERSION})"
-fi
+copy_filestore "$ORIGIN_SERVICE_NAME" "$ORIGIN_DB_NAME" "$COPY_DB_NAME" "$COPY_DB_NAME"
+log_info "Original filestore copied."


 log_step "PATH OF MIGRATION"

-if [[ -n "$RESUME_FROM_VERSION" ]]; then
-    readarray -t versions < <(seq $((RESUME_FROM_VERSION + 1)) "$FINAL_VERSION")
-    log_info "Resuming migration from ou${RESUME_FROM_VERSION} — path is ${versions[*]}"
-else
-    readarray -t versions < <(seq $((ORIGIN_VERSION + 1)) "$FINAL_VERSION")
-    log_info "Migration path is ${versions[*]}"
-fi
+readarray -t versions < <(seq $((ORIGIN_VERSION + 1)) "$FINAL_VERSION")
+log_info "Migration path is ${versions[*]}"


-if [[ -z "$RESUME_FROM_VERSION" ]]; then
-    log_step "DATABASE PREPARATION"
-    "${SCRIPT_DIR}/scripts/prepare_db.sh" "$COPY_DB_NAME" "$COPY_DB_NAME" "$FINALE_DB_NAME" "$FINALE_SERVICE_NAME"
-else
-    log_step "DATABASE PREPARATION — SKIPPED (resuming from checkpoint ou${RESUME_FROM_VERSION})"
-fi
+log_step "DATABASE PREPARATION"
+
+"${SCRIPT_DIR}/scripts/prepare_db.sh" "$COPY_DB_NAME" "$COPY_DB_NAME" "$FINALE_DB_NAME" "$FINALE_SERVICE_NAME"


 log_step "UPGRADE PROCESS"
@@ -232,4 +139,3 @@ log_step "POST-UPGRADE PROCESSES"
 "${SCRIPT_DIR}/scripts/finalize_db.sh" "$FINALE_DB_NAME" "$FINALE_SERVICE_NAME"

 log_step "UPGRADE PROCESS ENDED WITH SUCCESS"
-log_info "Full logs available at: ${LOG_FILE}"
--- a/versions/15.0/known_changes.yaml
+++ b/versions/15.0/known_changes.yaml
@@ -8,7 +8,6 @@ obsolete:
 # Modules merged into Odoo Core in version 15.0
 merged_in_core:
  - project_category
-  - project_deadline

 # Modules renamed in version 15.0
 renamed:
Author	SHA1	Message	Date
Stéphan Sainléger	d9a5bbde41	[IMP] add hr_expense_report_merge_attachment in "merged in core" modules in 18.0	2026-06-04 10:43:57 +02:00
Stéphan Sainléger	d40e8941fb	[IMP] delete res.settings views in 18.0 pre-update to rebuild them latter	2026-06-01 23:33:50 +02:00
Stéphan Sainléger	29dda445a2	[IMP] manage the sequence issues in stock picking and pos orders in v18 post-upgrade	2026-06-01 23:33:32 +02:00