diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3ce7dac..58ce19e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,6 +25,8 @@ test_all_modules:
     - apt-get install -y p7zip-full
     - apt-get install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -36,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,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -101,6 +103,8 @@ test_module_partner_tz:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -112,7 +116,7 @@ test_module_partner_tz:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_tz
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_tz
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -133,6 +137,8 @@ test_module_partner_contact_nationality:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -144,7 +150,7 @@ test_module_partner_contact_nationality:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_contact_nationality
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_contact_nationality
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -165,6 +171,8 @@ test_module_portal_partner_select_all:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -176,7 +184,7 @@ test_module_portal_partner_select_all:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_portal_partner_select_all
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_portal_partner_select_all
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -197,6 +205,8 @@ test_module_base_location_geonames_import:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -208,7 +218,7 @@ test_module_base_location_geonames_import:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_base_location_geonames_import
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_base_location_geonames_import
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -229,6 +239,8 @@ test_module_base_location_nuts:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -240,7 +252,7 @@ test_module_base_location_nuts:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_base_location_nuts
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_base_location_nuts
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -261,6 +273,8 @@ test_module_partner_industry_secondary:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -272,7 +286,7 @@ test_module_partner_industry_secondary:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_industry_secondary
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_industry_secondary
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -293,6 +307,8 @@ test_module_partner_contact_gender:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -304,7 +320,7 @@ test_module_partner_contact_gender:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_contact_gender
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_contact_gender
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -325,6 +341,8 @@ test_module_animal:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -336,7 +354,7 @@ test_module_animal:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_animal
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_animal
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -357,6 +375,8 @@ test_module_partner_priority:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -368,7 +388,7 @@ test_module_partner_priority:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_priority
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_priority
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -389,6 +409,8 @@ test_module_partner_disable_gravatar:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -400,7 +422,7 @@ test_module_partner_disable_gravatar:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_disable_gravatar
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_disable_gravatar
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -421,6 +443,8 @@ test_module_base_location:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -432,7 +456,7 @@ test_module_base_location:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_base_location
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_base_location
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -453,6 +477,8 @@ test_module_partner_phone_secondary:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -464,7 +490,7 @@ test_module_partner_phone_secondary:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_phone_secondary
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_phone_secondary
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -485,6 +511,8 @@ test_module_partner_contact_lang:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -496,7 +524,7 @@ test_module_partner_contact_lang:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_contact_lang
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_contact_lang
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -517,6 +545,8 @@ test_module_partner_manual_rank:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -528,7 +558,7 @@ test_module_partner_manual_rank:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_manual_rank
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_manual_rank
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -549,6 +579,8 @@ test_module_partner_firstname:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -560,7 +592,7 @@ test_module_partner_firstname:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_firstname
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_firstname
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -581,6 +613,8 @@ test_module_partner_contact_job_position:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -592,7 +626,7 @@ test_module_partner_contact_job_position:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_contact_job_position
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_contact_job_position
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -613,6 +647,8 @@ test_module_partner_phone_extension:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -624,7 +660,7 @@ test_module_partner_phone_extension:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_phone_extension
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_phone_extension
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -645,6 +681,8 @@ test_module_partner_contact_department:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -656,7 +694,7 @@ test_module_partner_contact_department:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_contact_department
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_contact_department
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -677,6 +715,8 @@ test_module_partner_affiliate:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -688,7 +728,7 @@ test_module_partner_affiliate:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_affiliate
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_affiliate
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -709,6 +749,8 @@ test_module_partner_ref_unique:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -720,7 +762,7 @@ test_module_partner_ref_unique:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_ref_unique
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_ref_unique
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -741,6 +783,8 @@ test_module_base_country_state_translatable:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -752,7 +796,7 @@ test_module_base_country_state_translatable:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_base_country_state_translatable
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_base_country_state_translatable
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -773,6 +817,8 @@ test_module_partner_identification_unique_by_category:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -784,7 +830,7 @@ test_module_partner_identification_unique_by_category:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_identification_unique_by_category
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_identification_unique_by_category
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -805,6 +851,8 @@ test_module_partner_company_group:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -816,7 +864,7 @@ test_module_partner_company_group:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_company_group
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_company_group
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -837,6 +885,8 @@ test_module_partner_address_street3:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -848,7 +898,7 @@ test_module_partner_address_street3:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_address_street3
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_address_street3
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -869,6 +919,8 @@ test_module_partner_company_type:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -880,7 +932,7 @@ test_module_partner_company_type:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_company_type
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_company_type
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -901,6 +953,8 @@ test_module_partner_vat_unique:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -912,7 +966,7 @@ test_module_partner_vat_unique:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_vat_unique
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_vat_unique
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -933,6 +987,8 @@ test_module_partner_contact_personal_information_page:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -944,7 +1000,7 @@ test_module_partner_contact_personal_information_page:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_contact_personal_information_page
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_contact_personal_information_page
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -965,6 +1021,8 @@ test_module_partner_second_lastname:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -976,7 +1034,7 @@ test_module_partner_second_lastname:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_second_lastname
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_second_lastname
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -997,6 +1055,8 @@ test_module_partner_employee_quantity:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -1008,7 +1068,7 @@ test_module_partner_employee_quantity:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_employee_quantity
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_employee_quantity
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -1029,6 +1089,8 @@ test_module_partner_contact_in_several_companies:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -1040,7 +1102,7 @@ test_module_partner_contact_in_several_companies:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_contact_in_several_companies
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_contact_in_several_companies
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -1061,6 +1123,8 @@ test_module_partner_contact_birthdate:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -1072,7 +1136,7 @@ test_module_partner_contact_birthdate:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_contact_birthdate
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_contact_birthdate
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -1093,6 +1157,8 @@ test_module_partner_tier_validation:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -1104,7 +1170,7 @@ test_module_partner_tier_validation:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_tier_validation
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_tier_validation
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -1125,6 +1191,8 @@ test_module_partner_helper:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -1136,7 +1204,7 @@ test_module_partner_helper:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_helper
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_helper
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -1157,6 +1225,8 @@ test_module_partner_fax:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -1168,7 +1238,7 @@ test_module_partner_fax:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_fax
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_fax
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -1189,6 +1259,8 @@ test_module_partner_contact_access_link:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -1200,7 +1272,7 @@ test_module_partner_contact_access_link:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_contact_access_link
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_contact_access_link
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -1221,6 +1293,8 @@ test_module_partner_deduplicate_acl:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -1232,7 +1306,7 @@ test_module_partner_deduplicate_acl:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_deduplicate_acl
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_deduplicate_acl
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -1253,6 +1327,8 @@ test_module_partner_multi_relation:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -1264,7 +1340,7 @@ test_module_partner_multi_relation:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_multi_relation
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_multi_relation
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -1285,6 +1361,8 @@ test_module_partner_identification:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -1296,7 +1374,7 @@ test_module_partner_identification:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_identification
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_identification
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -1317,6 +1395,8 @@ test_module_partner_address_version:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -1328,7 +1408,7 @@ test_module_partner_address_version:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_address_version
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_address_version
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -1349,6 +1429,8 @@ test_module_base_partner_sequence:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -1360,7 +1442,7 @@ test_module_base_partner_sequence:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_base_partner_sequence
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_base_partner_sequence
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -1381,6 +1463,8 @@ test_module_partner_iterative_archive:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -1392,7 +1476,7 @@ test_module_partner_iterative_archive:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_iterative_archive
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_iterative_archive
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -1413,6 +1497,8 @@ test_module_partner_contact_age_range:
     - apt-get install -y p7zip-full
     - apt install -y expect-dev
     - 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"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
     - 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
@@ -1424,7 +1510,7 @@ test_module_partner_contact_age_range:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_contact_age_range
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_contact_age_range
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra