feat: sync from 18.0

CHANGELOG.md

@@ -8,6 +8,11 @@ All notable changes to this project will be documented in this file. The format
 
 * Run the Odoo upgrade script with `upgrade-odoo`.
 * Upgrade module code with `upgrade-module`.
+* After switching version branch with `checkout` the new branch is pulled
+
+### Fixed
+
+* Append nested module paths to the addons path env var.
 
 ## 2024-12-16
 

build/entrypoint.sh

@@ -91,7 +91,10 @@ set_odoo_config_env() {
         ODOO_MODULE_PATH=$(echo "$ODOO_ADDONS_PATH" | tr "," "\n" | xargs -I {} find {} -type f -name "__manifest__.py" | xargs grep -l "version.*${ODOO_VERSION}" | xargs -r dirname | sort -u | tr "\n" ",")
         
         # Set parent folder of module paths as new addons path
-        ODOO_ADDONS_PATH=$(echo "$ODOO_MODULE_PATH" | tr "," "\n" | xargs -I {} dirname {} | sort -u | tr "\n" "," | sed 's/,$//')
+        ODOO_MODULE_PATH=$(echo "$ODOO_MODULE_PATH" | tr "," "\n" | xargs -I {} dirname {} | sort -u | tr "\n" "," | sed 's/,$//')
+    
+        # Append module paths to addons path
+        ODOO_ADDONS_PATH="$ODOO_ADDONS_PATH,$ODOO_MODULE_PATH"
     fi
 
     : "${LOG_LEVEL:=info}"

requirements.txt

@@ -10,4 +10,5 @@ rst2html5==2.0.1
 docutils==0.21.2
 setuptools
 wheel
-watchdog
+watchdog
+pdfminer.six