From dfbdcd1a99bf36d26138fd201a1ae8c2e2cffe8f Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Tue, 2 Sep 2025 14:04:25 +0200 Subject: [PATCH] fix(task): remove trailing ellipsis from various echo statements and update submodule references --- task | 36 +++++++++++++++++------------------ versions/18.0/.gitmodules | 4 ++++ versions/18.0/.gitmodules.csv | 35 +++++++++++++++++----------------- 3 files changed, 40 insertions(+), 35 deletions(-) diff --git a/task b/task index 306a929f..4e5060b5 100755 --- a/task +++ b/task @@ -1297,7 +1297,7 @@ function test-project() { docker logs odoo exit 1 fi - echo "Waiting for Odoo to be ready ..." + echo "Waiting for Odoo to be ready..." sleep 3 ELAPSED=$((ELAPSED + 3)) done @@ -1325,7 +1325,7 @@ function test-project() { sed -i 's/First name/Firstname/g' oca/partner-contact/partner_firstname/models/res_partner.py restart odoo until curl --silent --fail "http://localhost:8069/web/login" &> /dev/null; do - echo "Waiting for Odoo to be ready ..." + echo "Waiting for Odoo to be ready..." sleep 3 done docker logs odoo @@ -1429,7 +1429,7 @@ function import-csv() { fi FILE_NAME=$(basename "$FILE_PATH") - echo "Importing $FILE_NAME to $DATABASE ..." + echo "Importing $FILE_NAME to ${DATABASE}..." $CONTAINER_ENGINE cp "$FILE_PATH" db:/tmp/ $CONTAINER_ENGINE exec db psql "postgres://odoo:odoo@localhost:5432/$DATABASE" -c "\copy $FILE_NAME FROM '/tmp/$FILE_NAME' DELIMITER ',' CSV HEADER;" } @@ -1610,11 +1610,11 @@ function install-requirements() { CONTAINER_RUNNING=$($CONTAINER_ENGINE container inspect -f '{{.State.Running}}' odoo) if [ "$CONTAINER_RUNNING" == "true" ]; then - echo "Installing python packages in container ..." + echo "Installing python packages in container..." $CONTAINER_ENGINE exec -u root odoo python -m pip install -r "/mnt/$FILE_PATH" else activate-venv - echo "Installing python packages in virutal env ..." + echo "Installing python packages in virutal env..." uv pip install -r "$FILE_PATH" fi } @@ -1662,7 +1662,7 @@ function test-module-repo() { MODULES=$(get-modules "$MODULE_PATH" basename) for MODULE in ${MODULES//,/ }; do - echo "Testing module $MODULE ..." + echo "Testing module ${MODULE}..." test-module "$DATABASE" "$MODULE" done } @@ -1694,7 +1694,7 @@ function init-module() { activate-venv set-addons-path - echo "Initialize module $MODULES on $DATABASE ..." + echo "Initialize module $MODULES on ${DATABASE}..." odoo -d "$DATABASE" -i "$MODULES" --config "$ODOO_RC" \ --addons-path="$ADDONS_PATH" --stop-after-init --no-http } @@ -1707,14 +1707,14 @@ function upgrade-module() { set-addons-path if [ "$ODOO_VERSION" = "17.0" ]; then - echo "Migrate views of module $MODULE to $ODOO_VERSION ..." + echo "Migrate views of module $MODULE to ${ODOO_VERSION}..." odoo --database "$DATABASE" -i "$MODULE" --config "$ODOO_RC" --addons-path="$ADDONS_PATH" --load=base,web,views_migration_17 --stop-after-init fi SOURCE_ODOO_VERSION=$(get-module-version $MODULE | cut -d'.' -f1,2) if [ "$ODOO_VERSION" = "18.0" ]; then - echo "Upgrade code of module $MODULE from $SOURCE_ODOO_VERSION ..." + echo "Upgrade code of module $MODULE from ${SOURCE_ODOO_VERSION}..." odoo upgrade_code --addons-path "$MODULE" --from "$SOURCE_ODOO_VERSION" fi @@ -1736,7 +1736,7 @@ function update-module() { activate-venv set-addons-path - echo "Updating module $MODULE_NAME on $DATABASE ..." + echo "Updating module $MODULE_NAME on ${DATABASE}..." if [[ -n "$ODOO_PARAM" ]] ; then odoo --upgrade-path=upgrade-util/src --database "$DATABASE" --update "$MODULE_NAME" \ --config "$ODOO_RC" --addons-path="$ADDONS_PATH" --stop-after-init --no-http "$ODOO_PARAM" @@ -1764,7 +1764,7 @@ function translate-module() { activate-venv set-addons-path - echo "Generate $LANGUAGE tranlsation file for $MODULE_NAME on $DATABASE ..." + echo "Generate $LANGUAGE tranlsation file for $MODULE_NAME on ${DATABASE}..." mkdir -p "$MODULE_PATH/i18n/" odoo -d "$DATABASE" --config "$ODOO_RC" --addons-path="$ADDONS_PATH" --modules "$MODULE_NAME" -l "$LANGUAGE" --i18n-export "$MODULE_PATH/i18n/$LANGUAGE.po" @@ -1809,7 +1809,7 @@ function test-module() { activate-venv set-addons-path - echo "Testing module $MODULE_NAME on $DATABASE ..." + echo "Testing module $MODULE_NAME on ${DATABASE}..." odoo -d "$DATABASE" -i "$MODULE_NAME" --config "$ODOO_RC" --addons-path="$ADDONS_PATH" --stop-after-init --no-http --test-tags /"$MODULE_NAME" } @@ -1864,7 +1864,7 @@ function create-module() { PARENT_DIR=$(dirname "$1") activate-venv - echo "Scaffolding module $MODULE_NAME in $PARENT_DIR ..." + echo "Scaffolding module $MODULE_NAME in ${PARENT_DIR}..." odoo scaffold "$MODULE_NAME" "$PARENT_DIR" -t templates/module } @@ -2015,7 +2015,7 @@ function release-module() { LAST_TAG=$(git describe --tags) RELEASE_NOTES=$(git log "$LAST_TAG"..HEAD --oneline) - echo "Tag with v$VERSION ..." + echo "Tag with v${VERSION}..." git tag -a "v$VERSION" -m "v$VERSION" echo "Release notes:" @@ -2161,7 +2161,7 @@ function remove-snippet() { function lint-snippets() { - echo "Lint snippets files ..." + echo "Lint snippets files..." FILES="snippets/*.xml" @@ -2455,7 +2455,7 @@ function create-git-feature-branch(){ MODULE_NAME=$(basename "$1") MODULE_PATH=$(dirname "$1") - echo "Create feature branch for $MODULE_NAME in $MODULE_PATH ..." + echo "Create feature branch for $MODULE_NAME in ${MODULE_PATH}..." cd ./"$MODULE_PATH" || exit pwd git switch -c "feature-$MODULE_NAME" @@ -2467,7 +2467,7 @@ function create-git-mig-branch(){ MODULE_NAME=$(basename "$1") MODULE_PATH=$(dirname "$1") - echo "Create mig branch for $MODULE_NAME in $MODULE_PATH ..." + echo "Create mig branch for $MODULE_NAME in ${MODULE_PATH}..." cd ./"$MODULE_PATH" || exit pwd git switch -c "$ODOO_VERSION-mig-$MODULE_NAME" @@ -2557,7 +2557,7 @@ function checkout-revision() { load-revision "$ODOO_REVISION" - echo "Checkout and tag git repos ..." + echo "Checkout and tag git repos..." git -C odoo checkout $ODOO_REF git -C odoo tag -a $ODOO_REVISION -m "$ODOO_REVISION" git -C enterprise checkout $ODOO_ENTERPRISE_REF diff --git a/versions/18.0/.gitmodules b/versions/18.0/.gitmodules index 63038201..9adcd518 100644 --- a/versions/18.0/.gitmodules +++ b/versions/18.0/.gitmodules @@ -100,3 +100,7 @@ path = oca/web-api url = git@github.com:OCA/web-api.git branch = 18.0 +[submodule "oca/hr-attendance"] + path = oca/hr-attendance + url = git@github.com:OCA/hr-attendance.git + branch = 18.0 diff --git a/versions/18.0/.gitmodules.csv b/versions/18.0/.gitmodules.csv index 7dc23807..475b2a36 100644 --- a/versions/18.0/.gitmodules.csv +++ b/versions/18.0/.gitmodules.csv @@ -1,26 +1,27 @@ path,rev -addons/account_invoicing,0196807984d8ff4e59615bac329e8a383b2bc1bf -addons/connector,5753fdb371a24c4785e47f1fd9a62868274f1039 +addons/account_invoicing,287f1afa4332589f2b5f7f4ee6e4956e13582ed8 +addons/connector,60cc273893350860f1c1bed4ddc039dff0dda652 addons/hr,7c796ae6b9c73e1385a8dd8c3d67abb84f972e07 addons/management_system,18397a33f5fd66d0780b93e071ce2d6022f05ad7 addons/manufacture,a6ec23e3cd2cbf4f5a3b186883a946f73c1ef10e addons/partner_contact,35245c327207ff474138844e6f096e364327e493 addons/sale_workflow,61a64ac6b845e61542b52fa15be82fd34d8049e9 -addons/server_tools,0c6d8d63cef53018178c50e8c93dc7b047ed80ef -addons/stock_logistics_workflow,527d2685408a81a0d90d4611e3f8b464898b01f5 +addons/server_tools,27892a7f40463a6b46b9704c6d64ed498e9903f9 +addons/stock_logistics_workflow,25ddedcb5254fb8fcda7ac0aab1f61a03f960c7a addons/website,ce8da1bfd092f356528643984a0bd780dcd0ae6e -enterprise,9642f7d8026149a6524e036c523b65ccbdf17258 -oca/bank-payment,51f6fb6750537d4a4722ccdff63978fd99f8de9f -oca/bank-statement-import,ae458fe17dca15f5f66e2404238e745966a3f340 -oca/partner-contact,6336ccf6f88b856765a04aff022175ad16d5be5f -oca/project,903a2093f5c55cf0ea00dae86bad694030fb1930 +enterprise,ade44053cbcc76a54949b52d562eaab8b3deaa6a +oca/bank-payment,7b8540d6a1490a255e31f6d5a9e435637983d3f6 +oca/bank-statement-import,ef0d1f282443ab4b1ffd19ed27b8b483dbb25e14 +oca/hr-attendance,27d69ba2ef5ab141fc5243d5baa9f4eedd199e63 +oca/partner-contact,514eeea68b7afd84d9a3b8ad5c38a5bf8f235615 +oca/project,6ecb62390978cfab1d527d80bcea315316263c32 oca/queue,2e0ed2cc9022eecc517315308ce25c87e0c214ec -oca/sale-workflow,78a4f3251d169710793247bf49865351ef7e84f7 -oca/server-auth,4ef819dc04af88cfb0f2dce5e36a8bfaae9aadfe -oca/server-backend,5348f9d3d1d2dceb2ec343d63adf0d5fc40a7832 +oca/sale-workflow,308496fe309c61551f25bbd4b852e0a83e958104 +oca/server-auth,5afea9af55bf729dfcb8e47e502d82676af33846 +oca/server-backend,e5d1451c4e5582b185b0fad881ff040f9625a357 oca/server-env,03d8a0310bf2a5a3ab4cec09ff86ffecc26d0e64 -oca/server-tools,cbc00c9ba781a8316ee37660f445608c6297361e -oca/stock-logistics-workflow,821dcc1954a40b2ae6794c9f75c8794a6a4856b0 -oca/web-api,608338907f1c7b0fe06d3fcbf4aee7bb792fd29f -odoo,9d5a11ab3ed6a946cc30964a77540b104b323b2f -themes,3f7a6f4791a609a8db17a6d2ee373fde3f273ada +oca/server-tools,22ed5dc4fb76971dbce0bdfd463cff5f1719c2ec +oca/stock-logistics-workflow,5e864299d5ab5a44b8275ac0b45ba0a051d9e49b +oca/web-api,3bac3139d1ec3a512e2a2588eb869644c8cb5523 +odoo,d26148acaee5b5c995155780ec3993c5ae7210e6 +themes,f34b99fdb21fa4a6d14cec1e014b4b5df45840d2