From c1de86380c87374304aba348efb363a1c5025c95 Mon Sep 17 00:00:00 2001
From: Dmytro Katyukha <dmytro.katyukha@gmail.com>
Date: Fri, 14 Apr 2023 19:41:57 +0300
Subject: [PATCH 01/14] [FIX] Improve cleanup of compiled assets

---
 lib/odoo.bash    | 10 ++++++++--
 lib/version.bash |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/odoo.bash b/lib/odoo.bash
index 4d9f339..d90857a 100644
--- a/lib/odoo.bash
+++ b/lib/odoo.bash
@@ -506,8 +506,14 @@ function odoo_clean_compiled_assets {
     for dbname in "${dbnames[@]}"; do
 # TODO select id,name,store_fname from ir_attachment where name ilike '%/web/content/%-%/%';
 PGAPPNAME="odoo-helper" postgres_psql -d "$dbname" << EOF
-            DELETE FROM ir_attachment WHERE name ILIKE '%/web/content/%/web.assets%';
-            DELETE FROM ir_attachment WHERE name ~* '/[a-z0-9_]+/static/(lib|src)/.*.(scss|less).css';
+        DELETE FROM ir_attachment WHERE name ILIKE '%/web/content/%/web.assets%';
+        DELETE FROM ir_attachment WHERE name ~* '/[a-z0-9_]+/static/(lib|src)/.*.(scss|less).css';
+
+        -- Version 15+?
+        DELETE FROM ir_attachment
+        WHERE res_model = 'ir.ui.view'
+          AND type = 'binary'
+          AND (url ILIKE '/web/content/%' OR url ILIKE '/web/assets/%');
 EOF
     done
 }
diff --git a/lib/version.bash b/lib/version.bash
index 0bbef97..ac44f15 100644
--- a/lib/version.bash
+++ b/lib/version.bash
@@ -9,5 +9,5 @@
 # Odoo Helper Scripts: Version
 
 # Define version number
-ODOO_HELPER_VERSION="1.3.0";
+ODOO_HELPER_VERSION="1.4.0-dev";
 ODOO_HELPER_CONFIG_VERSION="1";

From bff87b8f1fe6d06b8bdf02cda63249519e5966b0 Mon Sep 17 00:00:00 2001
From: Dmytro Katyukha <dmytro.katyukha@gmail.com>
Date: Sat, 15 Apr 2023 16:15:54 +0300
Subject: [PATCH 02/14] [FIX] Install latest versions of pyopenssl for 15.0+

---
 lib/install.bash | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/install.bash b/lib/install.bash
index fbf469b..4aa5a8f 100644
--- a/lib/install.bash
+++ b/lib/install.bash
@@ -553,6 +553,18 @@ function install_odoo_py_requirements_for_version {
                 # Recent versions of setup tools do not support `use_2to3` flag,so,
                 # we have to use another fork of suds to avoid errors during install
                 echo "suds-py3";
+            elif [ "odoo_major_version" -gt 14 ] && [[ "$dependency_stripped" =~ cryptography ]]; then
+                # We have to use only latest version of PyOpenSSL and cryptography,
+                # because otherwise, there is a great chance to break pip
+                # Specifing dependency this way, will install latest versions,
+                # that are compatible with each other
+                echo "cryptography";
+            elif [ "odoo_major_version" -gt 14 ] && [[ "$dependency_stripped" =~ pyopenssl ]]; then
+                # We have to use only latest version of PyOpenSSL and cryptography,
+                # because otherwise, there is a great chance to break pip
+                # Specifing dependency this way, will install latest versions,
+                # that are compatible with each other
+                echo "pyopenssl";
             else
                 # Echo dependency line unchanged to rmp file
                 echo "$dependency";

From d5ddbcf7e63f30a81ac6b7c674880d2fec1360b4 Mon Sep 17 00:00:00 2001
From: Dmytro Katyukha <dmytro.katyukha@gmail.com>
Date: Sat, 15 Apr 2023 16:17:00 +0300
Subject: [PATCH 03/14] [FIX] Add opt to she log on error in tests

---
 tests/test.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test.bash b/tests/test.bash
index aee02e1..d14c413 100755
--- a/tests/test.bash
+++ b/tests/test.bash
@@ -685,7 +685,7 @@ odoo-helper lsa ./repositories/crnd-inc/generic-addons;
 
 # Fetch bureaucrat_helpdesk_lite from Odoo market and try to install it
 odoo-helper fetch --odoo-app bureaucrat_helpdesk_lite;
-odoo-helper addons install --ual bureaucrat_helpdesk_lite;
+odoo-helper addons install --ual --show-log-on-error bureaucrat_helpdesk_lite;
 
 # Fetch helpdesk second time testing bechavior
 # when same addons already present in system

From 0f8a04f5622bb4965a22066b718a07be53341e87 Mon Sep 17 00:00:00 2001
From: Dmytro Katyukha <dmytro.katyukha@gmail.com>
Date: Sat, 15 Apr 2023 16:34:38 +0300
Subject: [PATCH 04/14] Revert "[FIX] Install latest versions of pyopenssl for
 15.0+"

This reverts commit bff87b8f1fe6d06b8bdf02cda63249519e5966b0.

It seems that this is not needed anymore.

But, in case, if installing any requirements on Odoo 15.0+ that
has cryptography as requirements, it is required to mention pyopenssl,
because otherwise, pip can install uncompatible version of cryptography
---
 lib/install.bash | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/lib/install.bash b/lib/install.bash
index 4aa5a8f..fbf469b 100644
--- a/lib/install.bash
+++ b/lib/install.bash
@@ -553,18 +553,6 @@ function install_odoo_py_requirements_for_version {
                 # Recent versions of setup tools do not support `use_2to3` flag,so,
                 # we have to use another fork of suds to avoid errors during install
                 echo "suds-py3";
-            elif [ "odoo_major_version" -gt 14 ] && [[ "$dependency_stripped" =~ cryptography ]]; then
-                # We have to use only latest version of PyOpenSSL and cryptography,
-                # because otherwise, there is a great chance to break pip
-                # Specifing dependency this way, will install latest versions,
-                # that are compatible with each other
-                echo "cryptography";
-            elif [ "odoo_major_version" -gt 14 ] && [[ "$dependency_stripped" =~ pyopenssl ]]; then
-                # We have to use only latest version of PyOpenSSL and cryptography,
-                # because otherwise, there is a great chance to break pip
-                # Specifing dependency this way, will install latest versions,
-                # that are compatible with each other
-                echo "pyopenssl";
             else
                 # Echo dependency line unchanged to rmp file
                 echo "$dependency";

From ca233364f3289b7867250b6053bd4c44f44122b7 Mon Sep 17 00:00:00 2001
From: Dmytro Katyukha <dmytro.katyukha@gmail.com>
Date: Sat, 15 Apr 2023 17:19:46 +0300
Subject: [PATCH 05/14] Install bashcov 1.8.2, because it is latest version
 that supports ruby 2.7.0

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 292d2cf..782fcae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -65,7 +65,8 @@ flake8:
         # Install deps
         - apt-get update -qq && apt-get install -yqq adduser sudo locales ruby git
         - update-locale LANG=C.UTF-8 && update-locale LC_ALL=C.UTF-8 && update-locale LANGUAGE=C.UTF-8
-        - gem install bashcov codecov simplecov-console
+        - gem install bashcov -v 1.8.2
+        - gem install codecov simplecov-console
 
         # Configure Odoo user
         - adduser -q odoo

From 4ada00e6519eb346d66522948a3173dca348e154 Mon Sep 17 00:00:00 2001
From: Dmytro Katyukha <dmytro.katyukha@gmail.com>
Date: Sat, 15 Apr 2023 19:01:07 +0300
Subject: [PATCH 06/14] [TESTS] Install poppler-utits for tests, needed by
 bureaucrat knowledge base

---
 tests/test.bash | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/test.bash b/tests/test.bash
index d14c413..d8a916d 100755
--- a/tests/test.bash
+++ b/tests/test.bash
@@ -683,6 +683,10 @@ odoo-helper addons install --ual --dir ./repositories/crnd-inc/generic-addons;
 # List addons in generic_addons
 odoo-helper lsa ./repositories/crnd-inc/generic-addons;
 
+# Install poppler utils package, that is required by bureaucrat knowledge base
+# that is part of bureaucrat helpdesk lite
+apt-get install -qqy poppler-utils
+
 # Fetch bureaucrat_helpdesk_lite from Odoo market and try to install it
 odoo-helper fetch --odoo-app bureaucrat_helpdesk_lite;
 odoo-helper addons install --ual --show-log-on-error bureaucrat_helpdesk_lite;

From 08bc369627bb358d213b76284f490e86d00f51ce Mon Sep 17 00:00:00 2001
From: Dmytro Katyukha <dmytro.katyukha@gmail.com>
Date: Wed, 19 Apr 2023 19:13:28 +0300
Subject: [PATCH 07/14] [FIX] Odoo install script, check if var defined, befor
 comparing to int

---
 bin/odoo-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/odoo-install b/bin/odoo-install
index 0611101..8bf1885 100755
--- a/bin/odoo-install
+++ b/bin/odoo-install
@@ -389,7 +389,7 @@ config_set_defaults;  # imported from common module
 
 install_create_project_dir_tree;  # imported from 'install' module
 
-if [ "$ODOO_INSTALL_SYS_DEPS_AUTO" -eq 1 ]; then
+if [ -n "$ODOO_INSTALL_SYS_DEPS_AUTO" ] && [ "$ODOO_INSTALL_SYS_DEPS_AUTO" -eq 1 ]; then
     echo -e "${BLUEC}Installing system dependencies for Odoo ${YELLOWC}${ODOO_VERSION}${BLUEC}...${NC}";
     install_sys_deps_for_odoo_version "${ODOO_VERSION}";
 fi

From e9c8a199cb87c03b325cf0188f7e30a4eba53377 Mon Sep 17 00:00:00 2001
From: Dmytro Katyukha <dmytro.katyukha@gmail.com>
Date: Mon, 30 Oct 2023 15:13:03 +0200
Subject: [PATCH 08/14] New opt --enforce-bump to odoo-helper ci fix-versions

---
 CHANGELOG.md |  6 ++++++
 lib/ci.bash  | 17 ++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 118e9cf..9e54083 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release Notes
 
+## Release (Unreleased)
+
+### Added
+
+- New option `--enforce-bump` to `odoo-helper ci fix-versions` and `odoo-helper ci check-versions` commands.
+
 ## Release 1.3.0 (2023-03-28)
 
 ### Added
diff --git a/lib/ci.bash b/lib/ci.bash
index 967a72c..766c610 100644
--- a/lib/ci.bash
+++ b/lib/ci.bash
@@ -198,6 +198,7 @@ function ci_check_versions_git {
                               addons. Increases major part of version number
         --fix-version-fp    - [experimental] Fix version conflicts during
                               forwardport
+        --enforce-bump      - [experimental] Enforce version bump for current module.
         -h|--help|help      - print this help message end exit
 
     Parametrs:
@@ -216,6 +217,7 @@ function ci_check_versions_git {
     local opt_fix_version_minor=0;
     local opt_fix_version_major=0;
     local opt_fix_version_fp=0;
+    local opt_enforce_version_bump=0
     local cdir;
     while [[ $# -gt 0 ]]
     do
@@ -261,6 +263,10 @@ function ci_check_versions_git {
                 opt_fix_version_fp=1;
                 shift;
             ;;
+            --enforce-bump)
+                opt_enforce_version_bump=1;
+                shift;
+            ;;
             *)
                 break;
             ;;
@@ -337,7 +343,7 @@ function ci_check_versions_git {
         fi
 
         # Compare version
-        if ci_ensure_versions_ok "$version_before" "$version_after"; then
+        if [ "$opt_enforce_version_bump" -eq 0 ] && ci_ensure_versions_ok "$version_before" "$version_after"; then
             # version before is less that version_after
             echoe -e "${GREENC}OK${NC}";
         else
@@ -412,6 +418,9 @@ function ci_cmd_git_fix_versions {
                              addons. Increases minor part of version number
         -M|--major         - Attempt to fix versions in changed
                              addons. Increases major part of version number
+        --ignore-trans     - ignore translations
+                             Note: this option may not work on old git versions
+        --enforce-bump     - [experimental] Enforce version bump for current module.
         -h|--help|help     - print this help message end exit
 
     Parametrs:
@@ -445,6 +454,12 @@ function ci_cmd_git_fix_versions {
                 git_check_versions_opts+=( --fix-version-major );
                 shift;
             ;;
+            --enforce-bump)
+                git_check_versions_opts+=( --enforce-bump );
+            ;;
+            --ignore-trans)
+                git_check_versions_opts+=( --ingore-trans );
+            ;;
             *)
                 break;
             ;;

From 86e183fa27917f9a437020823aa1047b1ef451db Mon Sep 17 00:00:00 2001
From: Dmytro Katyukha <dmytro.katyukha@gmail.com>
Date: Mon, 30 Oct 2023 15:14:55 +0200
Subject: [PATCH 09/14] Add minimal tests for Odoo 17

---
 tests/test.bash | 56 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/tests/test.bash b/tests/test.bash
index d8a916d..8924ce4 100755
--- a/tests/test.bash
+++ b/tests/test.bash
@@ -981,6 +981,62 @@ odoo-helper install website;
 odoo-helper db drop odoo16-odoo-test;
 
 
+echo -e "${YELLOWC}
+=================================
+Install and check Odoo 17.0 (Py3)
+=================================
+${NC}"
+
+cd ../;
+
+# Remove odoo 17
+# this is needed to bypass gitlab.com limitation of disk space for CI jobs
+rm -rf ./odoo-16.0
+
+# Install odoo 16
+odoo-helper install sys-deps -y 17.0;
+
+odoo-install --install-dir odoo-17.0 --odoo-version 17.0 \
+    --http-port 8569 --http-host local-odoo-16 \
+    --db-user odoo16 --db-pass odoo --create-db-user \
+    --build-python-if-needed
+
+cd odoo-17.0;
+
+# Install py-tools and js-tools
+odoo-helper install py-tools;
+odoo-helper install js-tools;
+
+odoo-helper server run --stop-after-init;  # test that it runs
+
+# Show project status
+odoo-helper status;
+odoo-helper server status;
+odoo-helper start;
+odoo-helper ps;
+odoo-helper status;
+odoo-helper server status;
+odoo-helper stop;
+
+# Show complete odoo-helper status
+odoo-helper status  --tools-versions --ci-tools-versions;
+
+# Database management
+odoo-helper db create --tdb --lang en_US;
+
+odoo-helper addons update-list --tdb;
+odoo-helper addons install --tdb --module crm;
+odoo-helper addons test-installed crm;
+
+odoo-helper lsd;  # List databases
+
+## Install addon website via 'odoo-helper install'
+odoo-helper install website;
+
+# Drop created databases
+odoo-helper db drop odoo17-odoo-test;
+
+
 echo -e "${YELLOWC}
 =============================================================
 Run 'prepare-docs' script to test generation of help messages

From 0f64dc7dbd1235c91b099586e075e722c638480a Mon Sep 17 00:00:00 2001
From: Dmytro Katyukha <dmytro.katyukha@gmail.com>
Date: Mon, 30 Oct 2023 21:08:11 +0200
Subject: [PATCH 10/14] [FIX][TESTS] Install poppler-utils in tests via sudo

---
 tests/test.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test.bash b/tests/test.bash
index 8924ce4..199efeb 100755
--- a/tests/test.bash
+++ b/tests/test.bash
@@ -685,7 +685,7 @@ odoo-helper lsa ./repositories/crnd-inc/generic-addons;
 
 # Install poppler utils package, that is required by bureaucrat knowledge base
 # that is part of bureaucrat helpdesk lite
-apt-get install -qqy poppler-utils
+sudo apt-get install -qqy poppler-utils
 
 # Fetch bureaucrat_helpdesk_lite from Odoo market and try to install it
 odoo-helper fetch --odoo-app bureaucrat_helpdesk_lite;

From 306fbf2414f5eaa609e16d67c3453e14cf4947ab Mon Sep 17 00:00:00 2001
From: Dmytro Katyukha <dmytro.katyukha@gmail.com>
Date: Tue, 7 Nov 2023 10:00:12 +0200
Subject: [PATCH 11/14] [TESTS] Update tests to avoid using helpdesk lite

because bureaucrat helpdesk lite is now paid addon
---
 tests/test.bash | 48 ++++++++++++++++++++++--------------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/tests/test.bash b/tests/test.bash
index 199efeb..99bbb95 100755
--- a/tests/test.bash
+++ b/tests/test.bash
@@ -684,16 +684,15 @@ odoo-helper addons install --ual --dir ./repositories/crnd-inc/generic-addons;
 odoo-helper lsa ./repositories/crnd-inc/generic-addons;
 
 # Install poppler utils package, that is required by bureaucrat knowledge base
-# that is part of bureaucrat helpdesk lite
 sudo apt-get install -qqy poppler-utils
 
-# Fetch bureaucrat_helpdesk_lite from Odoo market and try to install it
-odoo-helper fetch --odoo-app bureaucrat_helpdesk_lite;
-odoo-helper addons install --ual --show-log-on-error bureaucrat_helpdesk_lite;
+# Fetch bureaucrat_knowledge from Odoo market and try to install it
+odoo-helper fetch --odoo-app bureaucrat_knowledge;
+odoo-helper addons install --ual --show-log-on-error bureaucrat_knowledge;
 
-# Fetch helpdesk second time testing bechavior
+# Fetch knowledge base second time testing bechavior
 # when same addons already present in system
-odoo-helper-fetch --odoo-app bureaucrat_helpdesk_lite;
+odoo-helper-fetch --odoo-app bureaucrat_knowledge;
 
 # Prepare to test pull updates with --do-update option
 (cd ./repositories/crnd-inc/generic-addons && git reset --hard HEAD^^^1);
@@ -766,9 +765,9 @@ odoo-helper fetch --github crnd-inc/generic-addons
 # Install addons from OCA contract
 odoo-helper addons install --ual --dir ./repositories/crnd-inc/generic-addons;
 
-# Fetch bureaucrat_helpdesk_lite from Odoo market and try to install it
-odoo-helper fetch --odoo-app bureaucrat_helpdesk_lite;
-odoo-helper addons install --ual bureaucrat_helpdesk_lite;
+# Fetch bureaucrat_knowledge from Odoo market and try to install it
+odoo-helper fetch --odoo-app bureaucrat_knowledge;
+odoo-helper addons install --ual bureaucrat_knowledge;
 
 # Print list of installed addons
 odoo-helper addons find-installed --packager-format;
@@ -823,9 +822,9 @@ odoo-helper fetch --github crnd-inc/generic-addons
 # Install addons from OCA contract
 odoo-helper addons install --ual --dir ./repositories/crnd-inc/generic-addons;
 
-# Fetch bureaucrat_helpdesk_lite from Odoo market and try to install it
-odoo-helper fetch --odoo-app bureaucrat_helpdesk_lite;
-odoo-helper addons install --ual bureaucrat_helpdesk_lite;
+# Fetch bureaucrat_knowledge from Odoo market and try to install it
+odoo-helper fetch --odoo-app bureaucrat_knowledge;
+odoo-helper addons install --ual bureaucrat_knowledge;
 
 # Print list of installed addons
 odoo-helper addons find-installed;
@@ -896,15 +895,15 @@ odoo-helper fetch --github crnd-inc/generic-addons
 ## Install addons from OCA contract
 odoo-helper addons install --ual --dir ./repositories/crnd-inc/generic-addons;
 
-## Fetch bureaucrat_helpdesk_lite from Odoo market and try to install it
-odoo-helper fetch --odoo-app bureaucrat_helpdesk_lite;
-odoo-helper addons install --ual bureaucrat_helpdesk_lite;
+## Fetch bureaucrat_knowledge from Odoo market and try to install it
+odoo-helper fetch --odoo-app bureaucrat_knowledge;
+odoo-helper addons install --ual bureaucrat_knowledge;
 
 ## Print list of installed addons
 odoo-helper addons find-installed;
 
-## Run tests for helpdesk lite
-odoo-helper test generic_request crnd_wsd
+## Run tests for knowledge
+odoo-helper test bureaucrat_knowledge
 
 # Drop created databases
 odoo-helper db drop odoo15-odoo-test;
@@ -962,20 +961,17 @@ odoo-helper lsd;  # List databases
 odoo-helper install website;
 
 ## Fetch oca/contract
-#odoo-helper fetch --github crnd-inc/generic-addons
-
-## Install addons from OCA contract
-#odoo-helper addons install --ual --dir ./repositories/crnd-inc/generic-addons;
+odoo-helper fetch --github crnd-inc/generic-addons
 
-## Fetch bureaucrat_helpdesk_lite from Odoo market and try to install it
-#odoo-helper fetch --odoo-app bureaucrat_helpdesk_lite;
-#odoo-helper addons install --ual bureaucrat_helpdesk_lite;
+## Fetch bureaucrat_knowledge from Odoo market and try to install it
+odoo-helper fetch --odoo-app bureaucrat_knowledge;
+odoo-helper addons install --ual bureaucrat_knowledge;
 
 ## Print list of installed addons
-#odoo-helper addons find-installed;
+odoo-helper addons find-installed;
 
 ## Run tests for helpdesk lite
-#odoo-helper test generic_request crnd_wsd
+odoo-helper test bureaucrat_knowledge
 
 # Drop created databases
 odoo-helper db drop odoo16-odoo-test;

From 2444f3138f41e795b6e37ad914d900efb7489c20 Mon Sep 17 00:00:00 2001
From: Dmytro Katyukha <dmytro.katyukha@gmail.com>
Date: Tue, 7 Nov 2023 10:30:56 +0200
Subject: [PATCH 12/14] Update wkhtmltopdf to 0.12.6.1-r3

---
 CHANGELOG.md     |  6 ++++++
 lib/install.bash | 11 ++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e54083..a97a301 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,12 @@
 
 - New option `--enforce-bump` to `odoo-helper ci fix-versions` and `odoo-helper ci check-versions` commands.
 
+### Changed
+
+- Changed default installed version of [wkhtmltopdf](https://wkhtmltopdf.org/) to [0.12.6.1 r3](https://github.com/wkhtmltopdf/packaging/releases/tag/0.12.6.1-3). Thus it have to be working on Ubuntu 22.04+
+
+---
+
 ## Release 1.3.0 (2023-03-28)
 
 ### Added
diff --git a/lib/install.bash b/lib/install.bash
index fbf469b..3f040a9 100644
--- a/lib/install.bash
+++ b/lib/install.bash
@@ -130,11 +130,11 @@ function install_fetch_odoo {
 # install_wkhtmltopdf_get_dw_link <os_release_name> [wkhtmltopdf version]
 function install_wkhtmltopdf_get_dw_link {
     local os_release_name=$1;
-    local version=${2:-0.12.5};
+    local version=${2:-0.12.6.1-3};
     local system_arch;
     system_arch=$(dpkg --print-architecture);
 
-    echo "https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/$version/wkhtmltox_${version}-1.${os_release_name}_${system_arch}.deb"
+    echo "https://github.com/wkhtmltopdf/packaging/releases/download/$version/wkhtmltox_${version}.${os_release_name}_${system_arch}.deb"
 }
 
 
@@ -153,10 +153,11 @@ function install_wkhtmltopdf_download {
         local old_release=$release;
 
         if [ -n "$wkhtmltox_fallback" ] && [ "$(lsb_release -si)" == "Ubuntu" ]; then
-            # fallback to trusty release for ubuntu systems
-            release=focal;
+            # fallback to latest releases for ubuntu systems
+            release=jammy;
         elif [ -n "$wkhtmltox_fallback" ] && [ "$(lsb_release -si)" == "Debian" ]; then
-            release=stretch;
+            # fallback to latest releases for debian systems
+            release=bookworm;
         elif [ -z "$wkhtmltox_fallback" ]; then
             echoe -e "${REDC}ERROR:${NC} Cannot install ${BLUEC}wkhtmltopdf${NC}! Try to use --fallback option to install wkthmltopdf for other supported release, or install system's wkhtmltopdf.";
             if [ -e "$wkhtmltox_path" ]; then rm "$wkhtmltox_path"; fi

From 9860b4607f2c5ba67780e425df757b772d9815ae Mon Sep 17 00:00:00 2001
From: Dmytro Katyukha <dmytro.katyukha@gmail.com>
Date: Tue, 7 Nov 2023 11:41:30 +0200
Subject: [PATCH 13/14] [FIX] Installation of psycopg2 for python 3.6

Disable tests for Odoo 17 for now
---
 lib/install.bash |  2 +-
 tests/test.bash  | 80 ++++++++++++++++++++++++------------------------
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/lib/install.bash b/lib/install.bash
index 3f040a9..af22e0e 100644
--- a/lib/install.bash
+++ b/lib/install.bash
@@ -532,7 +532,7 @@ function install_odoo_py_requirements_for_version {
                 fi
             elif [ "$odoo_major_version" -lt 11 ] && [[ "$dependency_stripped" =~ psycopg2* ]]; then
                 echo "psycopg2==2.8.6";
-            elif [[ "$dependency_stripped" =~ psycopg2* ]] && exec_py -c "import sys; assert sys.version_info <= (3, 5);" > /dev/null 2>&1; then
+            elif [[ "$dependency_stripped" =~ psycopg2* ]] && exec_py -c "import sys; assert sys.version_info <= (3, 6);" > /dev/null 2>&1; then
                 echo "psycopg2-binary==2.8.6";
             elif [[ "$dependency_stripped" =~ psycopg2* ]]; then
                 echo "psycopg2-binary";
diff --git a/tests/test.bash b/tests/test.bash
index 99bbb95..6614e89 100755
--- a/tests/test.bash
+++ b/tests/test.bash
@@ -977,60 +977,60 @@ odoo-helper test bureaucrat_knowledge
 odoo-helper db drop odoo16-odoo-test;
 
 
-echo -e "${YELLOWC}
-=================================
-Install and check Odoo 17.0 (Py3)
-=================================
-${NC}"
+#echo -e "${YELLOWC}
+#=================================
+#Install and check Odoo 17.0 (Py3)
+#=================================
+#${NC}"
 
-cd ../;
+#cd ../;
 
-# Remove odoo 17
-# this is needed to bypass gitlab.com limitation of disk space for CI jobs
-rm -rf ./odoo-16.0
+## Remove odoo 17
+## this is needed to bypass gitlab.com limitation of disk space for CI jobs
+#rm -rf ./odoo-16.0
 
-# Install odoo 16
-odoo-helper install sys-deps -y 17.0;
+## Install odoo 17
+#odoo-helper install sys-deps -y 17.0;
 
-odoo-install --install-dir odoo-17.0 --odoo-version 17.0 \
-    --http-port 8569 --http-host local-odoo-16 \
-    --db-user odoo16 --db-pass odoo --create-db-user \
-    --build-python-if-needed
+#odoo-install --install-dir odoo-17.0 --odoo-version 17.0 \
+    #--http-port 8569 --http-host local-odoo-16 \
+    #--db-user odoo16 --db-pass odoo --create-db-user \
+    #--build-python-if-needed
 
-cd odoo-17.0;
+#cd odoo-17.0;
 
-# Install py-tools and js-tools
-odoo-helper install py-tools;
-odoo-helper install js-tools;
+## Install py-tools and js-tools
+#odoo-helper install py-tools;
+#odoo-helper install js-tools;
 
-odoo-helper server run --stop-after-init;  # test that it runs
+#odoo-helper server run --stop-after-init;  # test that it runs
 
-# Show project status
-odoo-helper status;
-odoo-helper server status;
-odoo-helper start;
-odoo-helper ps;
-odoo-helper status;
-odoo-helper server status;
-odoo-helper stop;
+## Show project status
+#odoo-helper status;
+#odoo-helper server status;
+#odoo-helper start;
+#odoo-helper ps;
+#odoo-helper status;
+#odoo-helper server status;
+#odoo-helper stop;
 
-# Show complete odoo-helper status
-odoo-helper status  --tools-versions --ci-tools-versions;
+## Show complete odoo-helper status
+#odoo-helper status  --tools-versions --ci-tools-versions;
 
-# Database management
-odoo-helper db create --tdb --lang en_US;
+## Database management
+#odoo-helper db create --tdb --lang en_US;
 
-odoo-helper addons update-list --tdb;
-odoo-helper addons install --tdb --module crm;
-odoo-helper addons test-installed crm;
+#odoo-helper addons update-list --tdb;
+#odoo-helper addons install --tdb --module crm;
+#odoo-helper addons test-installed crm;
 
-odoo-helper lsd;  # List databases
+#odoo-helper lsd;  # List databases
 
-## Install addon website via 'odoo-helper install'
-odoo-helper install website;
+### Install addon website via 'odoo-helper install'
+#odoo-helper install website;
 
-# Drop created databases
-odoo-helper db drop odoo17-odoo-test;
+## Drop created databases
+#odoo-helper db drop odoo17-odoo-test;
 
 
 echo -e "${YELLOWC}

From f6633fd8c8b724b029b3f5f74c62824ca7ffc346 Mon Sep 17 00:00:00 2001
From: Dmytro Katyukha <dmytro.katyukha@gmail.com>
Date: Wed, 8 Nov 2023 13:19:58 +0200
Subject: [PATCH 14/14] [CI] Drop support (and tests) for Ubuntu 18.04

---
 .gitlab-ci.yml | 6 ------
 README.md      | 4 ++--
 docs/index.md  | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 782fcae..3987b18 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -89,12 +89,6 @@ flake8:
         - if: $CI_COMMIT_BRANCH
 
 
-tests:ubuntu:18.04:
-    image: ubuntu:18.04
-    variables:
-      ODOO_INSTALL_NODE_VERSION: "16.15.1"
-    <<: *tests-definition
-
 tests:ubuntu:20.04:
     image: ubuntu:20.04
     <<: *tests-definition
diff --git a/README.md b/README.md
index 4e3a9d2..2cf06c1 100644
--- a/README.md
+++ b/README.md
@@ -91,9 +91,9 @@ The canonical source of odoo-helper-scripts is hosted on [GitLab](https://gitlab
     - *13.0*
     - *14.0*
     - *15.0*
-    - *16.0* (**experimental**)
+    - *16.0*
 - OS support:
-    - On *Ubuntu* should work nice (auto tested on *Ubuntu 18.04, 20.04*)
+    - On *Ubuntu* should work nice (auto tested on *Ubuntu 20.04, 22.04*)
     - Also should work on *Debian* based systems, but some troubles may happen with installation of system dependencies.
     - Other linux systems - in most cases should work, but system dependecies must be installed manualy.
 - Missed feature? [Fill an issue](https://gitlab.com/katyukha/odoo-helper-scripts/issues/new)
diff --git a/docs/index.md b/docs/index.md
index 06c0b20..d5ba212 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -93,7 +93,7 @@ please, read carefully [Usage notes](#usage-note) section.
     - *13.0*
     - *14.0*
     - *15.0*
-    - *16.0* (**experimental**)
+    - *16.0*
 - OS support:
     - On *Ubuntu* should work nice
     - Also should work on *Debian* based systems, but some troubles may happen with installation of system dependencies.