diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fb55756..4ffe3ec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,6 +26,7 @@ test_all_modules:
     - apt-get install -y expect-dev graphviz
     - pip3 install -r ${CI_PROJECT_DIR}/requirements.txt
     - su - flectra -c "mkdir ~/others"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-tools.git ~/others/server-tools"
     - sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=en_US.UTF-8
     - mkdir ${CI_PROJECT_DIR}/ci_data
     - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
@@ -37,7 +38,7 @@ test_all_modules:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_all
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_all
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -74,6 +75,7 @@ test_module_base_comment_template:
     - apt install -y expect-dev graphviz
     - pip3 install -r ${CI_PROJECT_DIR}/requirements.txt
     - su - flectra -c "mkdir ~/others"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-tools.git ~/others/server-tools"
     - sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=en_US.UTF-8
     - mkdir ${CI_PROJECT_DIR}/ci_data
     - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
@@ -85,7 +87,7 @@ test_module_base_comment_template:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_base_comment_template
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_base_comment_template
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -107,6 +109,7 @@ test_module_report_xml:
     - apt install -y expect-dev graphviz
     - pip3 install -r ${CI_PROJECT_DIR}/requirements.txt
     - su - flectra -c "mkdir ~/others"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-tools.git ~/others/server-tools"
     - sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=en_US.UTF-8
     - mkdir ${CI_PROJECT_DIR}/ci_data
     - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
@@ -118,7 +121,7 @@ test_module_report_xml:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_report_xml
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_report_xml
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -140,6 +143,7 @@ test_module_report_xlsx_helper_demo:
     - apt install -y expect-dev graphviz
     - pip3 install -r ${CI_PROJECT_DIR}/requirements.txt
     - su - flectra -c "mkdir ~/others"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-tools.git ~/others/server-tools"
     - sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=en_US.UTF-8
     - mkdir ${CI_PROJECT_DIR}/ci_data
     - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
@@ -151,7 +155,7 @@ test_module_report_xlsx_helper_demo:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_report_xlsx_helper_demo
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_report_xlsx_helper_demo
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -173,6 +177,7 @@ test_module_bi_sql_editor:
     - apt install -y expect-dev graphviz
     - pip3 install -r ${CI_PROJECT_DIR}/requirements.txt
     - su - flectra -c "mkdir ~/others"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-tools.git ~/others/server-tools"
     - sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=en_US.UTF-8
     - mkdir ${CI_PROJECT_DIR}/ci_data
     - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
@@ -184,7 +189,7 @@ test_module_bi_sql_editor:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_bi_sql_editor
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_bi_sql_editor
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -206,6 +211,7 @@ test_module_report_wkhtmltopdf_param:
     - apt install -y expect-dev graphviz
     - pip3 install -r ${CI_PROJECT_DIR}/requirements.txt
     - su - flectra -c "mkdir ~/others"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-tools.git ~/others/server-tools"
     - sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=en_US.UTF-8
     - mkdir ${CI_PROJECT_DIR}/ci_data
     - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
@@ -217,7 +223,7 @@ test_module_report_wkhtmltopdf_param:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_report_wkhtmltopdf_param
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_report_wkhtmltopdf_param
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -239,6 +245,7 @@ test_module_report_qweb_pdf_watermark:
     - apt install -y expect-dev graphviz
     - pip3 install -r ${CI_PROJECT_DIR}/requirements.txt
     - su - flectra -c "mkdir ~/others"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-tools.git ~/others/server-tools"
     - sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=en_US.UTF-8
     - mkdir ${CI_PROJECT_DIR}/ci_data
     - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
@@ -250,7 +257,7 @@ test_module_report_qweb_pdf_watermark:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_report_qweb_pdf_watermark
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_report_qweb_pdf_watermark
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -272,6 +279,7 @@ test_module_report_xlsx_helper:
     - apt install -y expect-dev graphviz
     - pip3 install -r ${CI_PROJECT_DIR}/requirements.txt
     - su - flectra -c "mkdir ~/others"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-tools.git ~/others/server-tools"
     - sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=en_US.UTF-8
     - mkdir ${CI_PROJECT_DIR}/ci_data
     - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
@@ -283,7 +291,7 @@ test_module_report_xlsx_helper:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_report_xlsx_helper
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_report_xlsx_helper
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -305,6 +313,7 @@ test_module_report_xlsx:
     - apt install -y expect-dev graphviz
     - pip3 install -r ${CI_PROJECT_DIR}/requirements.txt
     - su - flectra -c "mkdir ~/others"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-tools.git ~/others/server-tools"
     - sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=en_US.UTF-8
     - mkdir ${CI_PROJECT_DIR}/ci_data
     - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
@@ -316,7 +325,7 @@ test_module_report_xlsx:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_report_xlsx
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_report_xlsx
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -338,6 +347,7 @@ test_module_bi_view_editor:
     - apt install -y expect-dev graphviz
     - pip3 install -r ${CI_PROJECT_DIR}/requirements.txt
     - su - flectra -c "mkdir ~/others"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-tools.git ~/others/server-tools"
     - sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=en_US.UTF-8
     - mkdir ${CI_PROJECT_DIR}/ci_data
     - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
@@ -349,7 +359,7 @@ test_module_bi_view_editor:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_bi_view_editor
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_bi_view_editor
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -371,6 +381,7 @@ test_module_report_qweb_encrypt:
     - apt install -y expect-dev graphviz
     - pip3 install -r ${CI_PROJECT_DIR}/requirements.txt
     - su - flectra -c "mkdir ~/others"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-tools.git ~/others/server-tools"
     - sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=en_US.UTF-8
     - mkdir ${CI_PROJECT_DIR}/ci_data
     - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
@@ -382,7 +393,7 @@ test_module_report_qweb_encrypt:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_report_qweb_encrypt
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_report_qweb_encrypt
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -404,6 +415,7 @@ test_module_report_qweb_parameter:
     - apt install -y expect-dev graphviz
     - pip3 install -r ${CI_PROJECT_DIR}/requirements.txt
     - su - flectra -c "mkdir ~/others"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-tools.git ~/others/server-tools"
     - sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=en_US.UTF-8
     - mkdir ${CI_PROJECT_DIR}/ci_data
     - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
@@ -415,7 +427,7 @@ test_module_report_qweb_parameter:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_report_qweb_parameter
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_report_qweb_parameter
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -437,6 +449,7 @@ test_module_kpi_dashboard:
     - apt install -y expect-dev graphviz
     - pip3 install -r ${CI_PROJECT_DIR}/requirements.txt
     - su - flectra -c "mkdir ~/others"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-tools.git ~/others/server-tools"
     - sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=en_US.UTF-8
     - mkdir ${CI_PROJECT_DIR}/ci_data
     - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
@@ -448,7 +461,7 @@ test_module_kpi_dashboard:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_kpi_dashboard
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_kpi_dashboard
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -470,6 +483,7 @@ test_module_report_qweb_element_page_visibility:
     - apt install -y expect-dev graphviz
     - pip3 install -r ${CI_PROJECT_DIR}/requirements.txt
     - su - flectra -c "mkdir ~/others"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-tools.git ~/others/server-tools"
     - sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=en_US.UTF-8
     - mkdir ${CI_PROJECT_DIR}/ci_data
     - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
@@ -481,7 +495,7 @@ test_module_report_qweb_element_page_visibility:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_report_qweb_element_page_visibility
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_report_qweb_element_page_visibility
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools
         --db_host psql
         --db_port 5432
         --db_user flectra