diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee2e556..e9ed918 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,48 +44,48 @@ test_all_modules:
         --db_password flectra
         --database test_all
         --test-enable
-        --init partner_tier_validation,partner_company_type,partner_ref_unique,partner_employee_quantity,partner_company_group,partner_contact_age_range,base_location,base_location_nuts,partner_contact_access_link,partner_contact_department,partner_priority,partner_phone_secondary,partner_contact_in_several_companies,partner_second_lastname,partner_contact_gender,partner_contact_lang,partner_vat_unique,partner_contact_job_position,partner_firstname,partner_contact_personal_information_page,partner_contact_birthdate,portal_partner_select_all,partner_multi_relation,partner_fax,base_partner_sequence,partner_iterative_archive,base_country_state_translatable,partner_affiliate,partner_phone_extension,partner_industry_secondary,partner_contact_nationality,base_location_geonames_import,partner_address_version,partner_identification,partner_helper
+        --init partner_address_version,partner_firstname,partner_contact_job_position,partner_fax,partner_employee_quantity,base_location_nuts,partner_contact_age_range,partner_second_lastname,partner_contact_department,partner_contact_nationality,partner_phone_secondary,partner_affiliate,partner_tier_validation,partner_phone_extension,partner_priority,partner_ref_unique,partner_industry_secondary,partner_helper,base_partner_sequence,partner_multi_relation,partner_iterative_archive,partner_company_type,portal_partner_select_all,base_location_geonames_import,partner_contact_birthdate,partner_identification,partner_vat_unique,partner_contact_access_link,partner_contact_personal_information_page,partner_contact_gender,partner_contact_lang,base_location,partner_contact_in_several_companies,partner_company_group,base_country_state_translatable
         --stop-after-init
         --log-level error
-        --log-handler flectra.addons.partner_tier_validation:TEST
-        --log-handler flectra.addons.partner_company_type:TEST
-        --log-handler flectra.addons.partner_ref_unique:TEST
+        --log-handler flectra.addons.partner_address_version:TEST
+        --log-handler flectra.addons.partner_firstname:TEST
+        --log-handler flectra.addons.partner_contact_job_position:TEST
+        --log-handler flectra.addons.partner_fax:TEST
         --log-handler flectra.addons.partner_employee_quantity:TEST
-        --log-handler flectra.addons.partner_company_group:TEST
-        --log-handler flectra.addons.partner_contact_age_range:TEST
-        --log-handler flectra.addons.base_location:TEST
         --log-handler flectra.addons.base_location_nuts:TEST
-        --log-handler flectra.addons.partner_contact_access_link:TEST
-        --log-handler flectra.addons.partner_contact_department:TEST
-        --log-handler flectra.addons.partner_priority:TEST
-        --log-handler flectra.addons.partner_phone_secondary:TEST
-        --log-handler flectra.addons.partner_contact_in_several_companies:TEST
+        --log-handler flectra.addons.partner_contact_age_range:TEST
         --log-handler flectra.addons.partner_second_lastname:TEST
+        --log-handler flectra.addons.partner_contact_department:TEST
+        --log-handler flectra.addons.partner_contact_nationality:TEST
+        --log-handler flectra.addons.partner_phone_secondary:TEST
+        --log-handler flectra.addons.partner_affiliate:TEST
+        --log-handler flectra.addons.partner_tier_validation:TEST
+        --log-handler flectra.addons.partner_phone_extension:TEST
+        --log-handler flectra.addons.partner_priority:TEST
+        --log-handler flectra.addons.partner_ref_unique:TEST
+        --log-handler flectra.addons.partner_industry_secondary:TEST
+        --log-handler flectra.addons.partner_helper:TEST
+        --log-handler flectra.addons.base_partner_sequence:TEST
+        --log-handler flectra.addons.partner_multi_relation:TEST
+        --log-handler flectra.addons.partner_iterative_archive:TEST
+        --log-handler flectra.addons.partner_company_type:TEST
+        --log-handler flectra.addons.portal_partner_select_all:TEST
+        --log-handler flectra.addons.base_location_geonames_import:TEST
+        --log-handler flectra.addons.partner_contact_birthdate:TEST
+        --log-handler flectra.addons.partner_identification:TEST
+        --log-handler flectra.addons.partner_vat_unique:TEST
+        --log-handler flectra.addons.partner_contact_access_link:TEST
+        --log-handler flectra.addons.partner_contact_personal_information_page:TEST
         --log-handler flectra.addons.partner_contact_gender:TEST
         --log-handler flectra.addons.partner_contact_lang:TEST
-        --log-handler flectra.addons.partner_vat_unique:TEST
-        --log-handler flectra.addons.partner_contact_job_position:TEST
-        --log-handler flectra.addons.partner_firstname:TEST
-        --log-handler flectra.addons.partner_contact_personal_information_page:TEST
-        --log-handler flectra.addons.partner_contact_birthdate:TEST
-        --log-handler flectra.addons.portal_partner_select_all:TEST
-        --log-handler flectra.addons.partner_multi_relation:TEST
-        --log-handler flectra.addons.partner_fax:TEST
-        --log-handler flectra.addons.base_partner_sequence:TEST
-        --log-handler flectra.addons.partner_iterative_archive:TEST
+        --log-handler flectra.addons.base_location:TEST
+        --log-handler flectra.addons.partner_contact_in_several_companies:TEST
+        --log-handler flectra.addons.partner_company_group:TEST
         --log-handler flectra.addons.base_country_state_translatable:TEST
-        --log-handler flectra.addons.partner_affiliate:TEST
-        --log-handler flectra.addons.partner_phone_extension:TEST
-        --log-handler flectra.addons.partner_industry_secondary:TEST
-        --log-handler flectra.addons.partner_contact_nationality:TEST
-        --log-handler flectra.addons.base_location_geonames_import:TEST
-        --log-handler flectra.addons.partner_address_version:TEST
-        --log-handler flectra.addons.partner_identification:TEST
-        --log-handler flectra.addons.partner_helper:TEST
         "
 
 
-test_module_partner_tier_validation:
+test_module_partner_address_version:
   stage: testsingle
   when: on_failure
   image:
@@ -101,24 +101,24 @@ test_module_partner_tier_validation:
     - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
     - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
     - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_partner_tier_validation
-    - psql -h psql -U flectra -d test_partner_tier_validation -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - createdb -h psql -U flectra -O flectra -T template1 test_partner_address_version
+    - psql -h psql -U flectra -d test_partner_address_version -f ${CI_PROJECT_DIR}/ci_data/dump.sql
     - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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
+    - 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},~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
         --db_password flectra
-        --database test_partner_tier_validation
-        --test-enable -i partner_tier_validation
+        --database test_partner_address_version
+        --test-enable -i partner_address_version
         --stop-after-init
         --log-level error
-        --log-handler flectra.addons.partner_tier_validation:TEST"
+        --log-handler flectra.addons.partner_address_version:TEST"
 
-test_module_partner_company_type:
+test_module_partner_firstname:
   stage: testsingle
   when: on_failure
   image:
@@ -134,24 +134,24 @@ test_module_partner_company_type:
     - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
     - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
     - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_partner_company_type
-    - psql -h psql -U flectra -d test_partner_company_type -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - createdb -h psql -U flectra -O flectra -T template1 test_partner_firstname
+    - psql -h psql -U flectra -d test_partner_firstname -f ${CI_PROJECT_DIR}/ci_data/dump.sql
     - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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
+    - 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},~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
         --db_password flectra
-        --database test_partner_company_type
-        --test-enable -i partner_company_type
+        --database test_partner_firstname
+        --test-enable -i partner_firstname
         --stop-after-init
         --log-level error
-        --log-handler flectra.addons.partner_company_type:TEST"
+        --log-handler flectra.addons.partner_firstname:TEST"
 
-test_module_partner_ref_unique:
+test_module_partner_contact_job_position:
   stage: testsingle
   when: on_failure
   image:
@@ -167,22 +167,55 @@ test_module_partner_ref_unique:
     - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
     - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
     - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_partner_ref_unique
-    - psql -h psql -U flectra -d test_partner_ref_unique -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - createdb -h psql -U flectra -O flectra -T template1 test_partner_contact_job_position
+    - psql -h psql -U flectra -d test_partner_contact_job_position -f ${CI_PROJECT_DIR}/ci_data/dump.sql
     - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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
+    - 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},~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
         --db_password flectra
-        --database test_partner_ref_unique
-        --test-enable -i partner_ref_unique
+        --database test_partner_contact_job_position
+        --test-enable -i partner_contact_job_position
         --stop-after-init
         --log-level error
-        --log-handler flectra.addons.partner_ref_unique:TEST"
+        --log-handler flectra.addons.partner_contact_job_position:TEST"
+
+test_module_partner_fax:
+  stage: testsingle
+  when: on_failure
+  image:
+    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
+    entrypoint: ["/bin/sh", "-c"]
+  script:
+    - 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-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
+    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
+    - export PGPASSWORD="flectra"
+    - createdb -h psql -U flectra -O flectra -T template1 test_partner_fax
+    - psql -h psql -U flectra -d test_partner_fax -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - su - flectra -c "mkdir -p ~/.local/share/filestore"
+    - 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},~/others/server-ux
+        --db_host psql
+        --db_port 5432
+        --db_user flectra
+        --db_password flectra
+        --database test_partner_fax
+        --test-enable -i partner_fax
+        --stop-after-init
+        --log-level error
+        --log-handler flectra.addons.partner_fax:TEST"
 
 test_module_partner_employee_quantity:
   stage: testsingle
@@ -217,7 +250,7 @@ test_module_partner_employee_quantity:
         --log-level error
         --log-handler flectra.addons.partner_employee_quantity:TEST"
 
-test_module_partner_company_group:
+test_module_base_location_nuts:
   stage: testsingle
   when: on_failure
   image:
@@ -233,22 +266,22 @@ test_module_partner_company_group:
     - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
     - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
     - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_partner_company_group
-    - psql -h psql -U flectra -d test_partner_company_group -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - createdb -h psql -U flectra -O flectra -T template1 test_base_location_nuts
+    - psql -h psql -U flectra -d test_base_location_nuts -f ${CI_PROJECT_DIR}/ci_data/dump.sql
     - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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
+    - 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},~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
         --db_password flectra
-        --database test_partner_company_group
-        --test-enable -i partner_company_group
+        --database test_base_location_nuts
+        --test-enable -i base_location_nuts
         --stop-after-init
         --log-level error
-        --log-handler flectra.addons.partner_company_group:TEST"
+        --log-handler flectra.addons.base_location_nuts:TEST"
 
 test_module_partner_contact_age_range:
   stage: testsingle
@@ -283,7 +316,7 @@ test_module_partner_contact_age_range:
         --log-level error
         --log-handler flectra.addons.partner_contact_age_range:TEST"
 
-test_module_base_location:
+test_module_partner_second_lastname:
   stage: testsingle
   when: on_failure
   image:
@@ -299,88 +332,22 @@ test_module_base_location:
     - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
     - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
     - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_base_location
-    - psql -h psql -U flectra -d test_base_location -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - createdb -h psql -U flectra -O flectra -T template1 test_partner_second_lastname
+    - psql -h psql -U flectra -d test_partner_second_lastname -f ${CI_PROJECT_DIR}/ci_data/dump.sql
     - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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
+    - 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},~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
         --db_password flectra
-        --database test_base_location
-        --test-enable -i base_location
+        --database test_partner_second_lastname
+        --test-enable -i partner_second_lastname
         --stop-after-init
         --log-level error
-        --log-handler flectra.addons.base_location:TEST"
-
-test_module_base_location_nuts:
-  stage: testsingle
-  when: on_failure
-  image:
-    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
-    entrypoint: ["/bin/sh", "-c"]
-  script:
-    - 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-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
-    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
-    - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_base_location_nuts
-    - psql -h psql -U flectra -d test_base_location_nuts -f ${CI_PROJECT_DIR}/ci_data/dump.sql
-    - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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},~/others/server-ux
-        --db_host psql
-        --db_port 5432
-        --db_user flectra
-        --db_password flectra
-        --database test_base_location_nuts
-        --test-enable -i base_location_nuts
-        --stop-after-init
-        --log-level error
-        --log-handler flectra.addons.base_location_nuts:TEST"
-
-test_module_partner_contact_access_link:
-  stage: testsingle
-  when: on_failure
-  image:
-    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
-    entrypoint: ["/bin/sh", "-c"]
-  script:
-    - 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-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
-    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
-    - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_partner_contact_access_link
-    - psql -h psql -U flectra -d test_partner_contact_access_link -f ${CI_PROJECT_DIR}/ci_data/dump.sql
-    - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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},~/others/server-ux
-        --db_host psql
-        --db_port 5432
-        --db_user flectra
-        --db_password flectra
-        --database test_partner_contact_access_link
-        --test-enable -i partner_contact_access_link
-        --stop-after-init
-        --log-level error
-        --log-handler flectra.addons.partner_contact_access_link:TEST"
+        --log-handler flectra.addons.partner_second_lastname:TEST"
 
 test_module_partner_contact_department:
   stage: testsingle
@@ -415,7 +382,7 @@ test_module_partner_contact_department:
         --log-level error
         --log-handler flectra.addons.partner_contact_department:TEST"
 
-test_module_partner_priority:
+test_module_partner_contact_nationality:
   stage: testsingle
   when: on_failure
   image:
@@ -431,22 +398,22 @@ test_module_partner_priority:
     - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
     - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
     - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_partner_priority
-    - psql -h psql -U flectra -d test_partner_priority -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - createdb -h psql -U flectra -O flectra -T template1 test_partner_contact_nationality
+    - psql -h psql -U flectra -d test_partner_contact_nationality -f ${CI_PROJECT_DIR}/ci_data/dump.sql
     - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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
+    - 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},~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
         --db_password flectra
-        --database test_partner_priority
-        --test-enable -i partner_priority
+        --database test_partner_contact_nationality
+        --test-enable -i partner_contact_nationality
         --stop-after-init
         --log-level error
-        --log-handler flectra.addons.partner_priority:TEST"
+        --log-handler flectra.addons.partner_contact_nationality:TEST"
 
 test_module_partner_phone_secondary:
   stage: testsingle
@@ -481,7 +448,7 @@ test_module_partner_phone_secondary:
         --log-level error
         --log-handler flectra.addons.partner_phone_secondary:TEST"
 
-test_module_partner_contact_in_several_companies:
+test_module_partner_affiliate:
   stage: testsingle
   when: on_failure
   image:
@@ -497,24 +464,24 @@ test_module_partner_contact_in_several_companies:
     - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
     - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
     - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_partner_contact_in_several_companies
-    - psql -h psql -U flectra -d test_partner_contact_in_several_companies -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - createdb -h psql -U flectra -O flectra -T template1 test_partner_affiliate
+    - psql -h psql -U flectra -d test_partner_affiliate -f ${CI_PROJECT_DIR}/ci_data/dump.sql
     - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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
+    - 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},~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
         --db_password flectra
-        --database test_partner_contact_in_several_companies
-        --test-enable -i partner_contact_in_several_companies
+        --database test_partner_affiliate
+        --test-enable -i partner_affiliate
         --stop-after-init
         --log-level error
-        --log-handler flectra.addons.partner_contact_in_several_companies:TEST"
+        --log-handler flectra.addons.partner_affiliate:TEST"
 
-test_module_partner_second_lastname:
+test_module_partner_tier_validation:
   stage: testsingle
   when: on_failure
   image:
@@ -530,22 +497,550 @@ test_module_partner_second_lastname:
     - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
     - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
     - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_partner_second_lastname
-    - psql -h psql -U flectra -d test_partner_second_lastname -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - createdb -h psql -U flectra -O flectra -T template1 test_partner_tier_validation
+    - psql -h psql -U flectra -d test_partner_tier_validation -f ${CI_PROJECT_DIR}/ci_data/dump.sql
     - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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
+    - 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},~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
         --db_password flectra
-        --database test_partner_second_lastname
-        --test-enable -i partner_second_lastname
+        --database test_partner_tier_validation
+        --test-enable -i partner_tier_validation
         --stop-after-init
         --log-level error
-        --log-handler flectra.addons.partner_second_lastname:TEST"
+        --log-handler flectra.addons.partner_tier_validation:TEST"
+
+test_module_partner_phone_extension:
+  stage: testsingle
+  when: on_failure
+  image:
+    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
+    entrypoint: ["/bin/sh", "-c"]
+  script:
+    - 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-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
+    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
+    - export PGPASSWORD="flectra"
+    - createdb -h psql -U flectra -O flectra -T template1 test_partner_phone_extension
+    - psql -h psql -U flectra -d test_partner_phone_extension -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - su - flectra -c "mkdir -p ~/.local/share/filestore"
+    - 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},~/others/server-ux
+        --db_host psql
+        --db_port 5432
+        --db_user flectra
+        --db_password flectra
+        --database test_partner_phone_extension
+        --test-enable -i partner_phone_extension
+        --stop-after-init
+        --log-level error
+        --log-handler flectra.addons.partner_phone_extension:TEST"
+
+test_module_partner_priority:
+  stage: testsingle
+  when: on_failure
+  image:
+    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
+    entrypoint: ["/bin/sh", "-c"]
+  script:
+    - 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-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
+    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
+    - export PGPASSWORD="flectra"
+    - createdb -h psql -U flectra -O flectra -T template1 test_partner_priority
+    - psql -h psql -U flectra -d test_partner_priority -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - su - flectra -c "mkdir -p ~/.local/share/filestore"
+    - 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},~/others/server-ux
+        --db_host psql
+        --db_port 5432
+        --db_user flectra
+        --db_password flectra
+        --database test_partner_priority
+        --test-enable -i partner_priority
+        --stop-after-init
+        --log-level error
+        --log-handler flectra.addons.partner_priority:TEST"
+
+test_module_partner_ref_unique:
+  stage: testsingle
+  when: on_failure
+  image:
+    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
+    entrypoint: ["/bin/sh", "-c"]
+  script:
+    - 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-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
+    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
+    - export PGPASSWORD="flectra"
+    - createdb -h psql -U flectra -O flectra -T template1 test_partner_ref_unique
+    - psql -h psql -U flectra -d test_partner_ref_unique -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - su - flectra -c "mkdir -p ~/.local/share/filestore"
+    - 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},~/others/server-ux
+        --db_host psql
+        --db_port 5432
+        --db_user flectra
+        --db_password flectra
+        --database test_partner_ref_unique
+        --test-enable -i partner_ref_unique
+        --stop-after-init
+        --log-level error
+        --log-handler flectra.addons.partner_ref_unique:TEST"
+
+test_module_partner_industry_secondary:
+  stage: testsingle
+  when: on_failure
+  image:
+    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
+    entrypoint: ["/bin/sh", "-c"]
+  script:
+    - 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-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
+    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
+    - export PGPASSWORD="flectra"
+    - createdb -h psql -U flectra -O flectra -T template1 test_partner_industry_secondary
+    - psql -h psql -U flectra -d test_partner_industry_secondary -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - su - flectra -c "mkdir -p ~/.local/share/filestore"
+    - 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},~/others/server-ux
+        --db_host psql
+        --db_port 5432
+        --db_user flectra
+        --db_password flectra
+        --database test_partner_industry_secondary
+        --test-enable -i partner_industry_secondary
+        --stop-after-init
+        --log-level error
+        --log-handler flectra.addons.partner_industry_secondary:TEST"
+
+test_module_partner_helper:
+  stage: testsingle
+  when: on_failure
+  image:
+    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
+    entrypoint: ["/bin/sh", "-c"]
+  script:
+    - 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-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
+    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
+    - export PGPASSWORD="flectra"
+    - createdb -h psql -U flectra -O flectra -T template1 test_partner_helper
+    - psql -h psql -U flectra -d test_partner_helper -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - su - flectra -c "mkdir -p ~/.local/share/filestore"
+    - 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},~/others/server-ux
+        --db_host psql
+        --db_port 5432
+        --db_user flectra
+        --db_password flectra
+        --database test_partner_helper
+        --test-enable -i partner_helper
+        --stop-after-init
+        --log-level error
+        --log-handler flectra.addons.partner_helper:TEST"
+
+test_module_base_partner_sequence:
+  stage: testsingle
+  when: on_failure
+  image:
+    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
+    entrypoint: ["/bin/sh", "-c"]
+  script:
+    - 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-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
+    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
+    - export PGPASSWORD="flectra"
+    - createdb -h psql -U flectra -O flectra -T template1 test_base_partner_sequence
+    - psql -h psql -U flectra -d test_base_partner_sequence -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - su - flectra -c "mkdir -p ~/.local/share/filestore"
+    - 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},~/others/server-ux
+        --db_host psql
+        --db_port 5432
+        --db_user flectra
+        --db_password flectra
+        --database test_base_partner_sequence
+        --test-enable -i base_partner_sequence
+        --stop-after-init
+        --log-level error
+        --log-handler flectra.addons.base_partner_sequence:TEST"
+
+test_module_partner_multi_relation:
+  stage: testsingle
+  when: on_failure
+  image:
+    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
+    entrypoint: ["/bin/sh", "-c"]
+  script:
+    - 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-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
+    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
+    - export PGPASSWORD="flectra"
+    - createdb -h psql -U flectra -O flectra -T template1 test_partner_multi_relation
+    - psql -h psql -U flectra -d test_partner_multi_relation -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - su - flectra -c "mkdir -p ~/.local/share/filestore"
+    - 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},~/others/server-ux
+        --db_host psql
+        --db_port 5432
+        --db_user flectra
+        --db_password flectra
+        --database test_partner_multi_relation
+        --test-enable -i partner_multi_relation
+        --stop-after-init
+        --log-level error
+        --log-handler flectra.addons.partner_multi_relation:TEST"
+
+test_module_partner_iterative_archive:
+  stage: testsingle
+  when: on_failure
+  image:
+    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
+    entrypoint: ["/bin/sh", "-c"]
+  script:
+    - 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-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
+    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
+    - export PGPASSWORD="flectra"
+    - createdb -h psql -U flectra -O flectra -T template1 test_partner_iterative_archive
+    - psql -h psql -U flectra -d test_partner_iterative_archive -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - su - flectra -c "mkdir -p ~/.local/share/filestore"
+    - 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},~/others/server-ux
+        --db_host psql
+        --db_port 5432
+        --db_user flectra
+        --db_password flectra
+        --database test_partner_iterative_archive
+        --test-enable -i partner_iterative_archive
+        --stop-after-init
+        --log-level error
+        --log-handler flectra.addons.partner_iterative_archive:TEST"
+
+test_module_partner_company_type:
+  stage: testsingle
+  when: on_failure
+  image:
+    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
+    entrypoint: ["/bin/sh", "-c"]
+  script:
+    - 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-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
+    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
+    - export PGPASSWORD="flectra"
+    - createdb -h psql -U flectra -O flectra -T template1 test_partner_company_type
+    - psql -h psql -U flectra -d test_partner_company_type -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - su - flectra -c "mkdir -p ~/.local/share/filestore"
+    - 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},~/others/server-ux
+        --db_host psql
+        --db_port 5432
+        --db_user flectra
+        --db_password flectra
+        --database test_partner_company_type
+        --test-enable -i partner_company_type
+        --stop-after-init
+        --log-level error
+        --log-handler flectra.addons.partner_company_type:TEST"
+
+test_module_portal_partner_select_all:
+  stage: testsingle
+  when: on_failure
+  image:
+    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
+    entrypoint: ["/bin/sh", "-c"]
+  script:
+    - 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-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
+    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
+    - export PGPASSWORD="flectra"
+    - createdb -h psql -U flectra -O flectra -T template1 test_portal_partner_select_all
+    - psql -h psql -U flectra -d test_portal_partner_select_all -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - su - flectra -c "mkdir -p ~/.local/share/filestore"
+    - 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},~/others/server-ux
+        --db_host psql
+        --db_port 5432
+        --db_user flectra
+        --db_password flectra
+        --database test_portal_partner_select_all
+        --test-enable -i portal_partner_select_all
+        --stop-after-init
+        --log-level error
+        --log-handler flectra.addons.portal_partner_select_all:TEST"
+
+test_module_base_location_geonames_import:
+  stage: testsingle
+  when: on_failure
+  image:
+    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
+    entrypoint: ["/bin/sh", "-c"]
+  script:
+    - 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-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
+    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
+    - export PGPASSWORD="flectra"
+    - createdb -h psql -U flectra -O flectra -T template1 test_base_location_geonames_import
+    - psql -h psql -U flectra -d test_base_location_geonames_import -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - su - flectra -c "mkdir -p ~/.local/share/filestore"
+    - 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},~/others/server-ux
+        --db_host psql
+        --db_port 5432
+        --db_user flectra
+        --db_password flectra
+        --database test_base_location_geonames_import
+        --test-enable -i base_location_geonames_import
+        --stop-after-init
+        --log-level error
+        --log-handler flectra.addons.base_location_geonames_import:TEST"
+
+test_module_partner_contact_birthdate:
+  stage: testsingle
+  when: on_failure
+  image:
+    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
+    entrypoint: ["/bin/sh", "-c"]
+  script:
+    - 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-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
+    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
+    - export PGPASSWORD="flectra"
+    - createdb -h psql -U flectra -O flectra -T template1 test_partner_contact_birthdate
+    - psql -h psql -U flectra -d test_partner_contact_birthdate -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - su - flectra -c "mkdir -p ~/.local/share/filestore"
+    - 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},~/others/server-ux
+        --db_host psql
+        --db_port 5432
+        --db_user flectra
+        --db_password flectra
+        --database test_partner_contact_birthdate
+        --test-enable -i partner_contact_birthdate
+        --stop-after-init
+        --log-level error
+        --log-handler flectra.addons.partner_contact_birthdate:TEST"
+
+test_module_partner_identification:
+  stage: testsingle
+  when: on_failure
+  image:
+    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
+    entrypoint: ["/bin/sh", "-c"]
+  script:
+    - 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-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
+    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
+    - export PGPASSWORD="flectra"
+    - createdb -h psql -U flectra -O flectra -T template1 test_partner_identification
+    - psql -h psql -U flectra -d test_partner_identification -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - su - flectra -c "mkdir -p ~/.local/share/filestore"
+    - 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},~/others/server-ux
+        --db_host psql
+        --db_port 5432
+        --db_user flectra
+        --db_password flectra
+        --database test_partner_identification
+        --test-enable -i partner_identification
+        --stop-after-init
+        --log-level error
+        --log-handler flectra.addons.partner_identification:TEST"
+
+test_module_partner_vat_unique:
+  stage: testsingle
+  when: on_failure
+  image:
+    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
+    entrypoint: ["/bin/sh", "-c"]
+  script:
+    - 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-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
+    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
+    - export PGPASSWORD="flectra"
+    - createdb -h psql -U flectra -O flectra -T template1 test_partner_vat_unique
+    - psql -h psql -U flectra -d test_partner_vat_unique -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - su - flectra -c "mkdir -p ~/.local/share/filestore"
+    - 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},~/others/server-ux
+        --db_host psql
+        --db_port 5432
+        --db_user flectra
+        --db_password flectra
+        --database test_partner_vat_unique
+        --test-enable -i partner_vat_unique
+        --stop-after-init
+        --log-level error
+        --log-handler flectra.addons.partner_vat_unique:TEST"
+
+test_module_partner_contact_access_link:
+  stage: testsingle
+  when: on_failure
+  image:
+    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
+    entrypoint: ["/bin/sh", "-c"]
+  script:
+    - 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-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
+    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
+    - export PGPASSWORD="flectra"
+    - createdb -h psql -U flectra -O flectra -T template1 test_partner_contact_access_link
+    - psql -h psql -U flectra -d test_partner_contact_access_link -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - su - flectra -c "mkdir -p ~/.local/share/filestore"
+    - 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},~/others/server-ux
+        --db_host psql
+        --db_port 5432
+        --db_user flectra
+        --db_password flectra
+        --database test_partner_contact_access_link
+        --test-enable -i partner_contact_access_link
+        --stop-after-init
+        --log-level error
+        --log-handler flectra.addons.partner_contact_access_link:TEST"
+
+test_module_partner_contact_personal_information_page:
+  stage: testsingle
+  when: on_failure
+  image:
+    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
+    entrypoint: ["/bin/sh", "-c"]
+  script:
+    - 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-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
+    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
+    - export PGPASSWORD="flectra"
+    - createdb -h psql -U flectra -O flectra -T template1 test_partner_contact_personal_information_page
+    - psql -h psql -U flectra -d test_partner_contact_personal_information_page -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - su - flectra -c "mkdir -p ~/.local/share/filestore"
+    - 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},~/others/server-ux
+        --db_host psql
+        --db_port 5432
+        --db_user flectra
+        --db_password flectra
+        --database test_partner_contact_personal_information_page
+        --test-enable -i partner_contact_personal_information_page
+        --stop-after-init
+        --log-level error
+        --log-handler flectra.addons.partner_contact_personal_information_page:TEST"
 
 test_module_partner_contact_gender:
   stage: testsingle
@@ -613,7 +1108,7 @@ test_module_partner_contact_lang:
         --log-level error
         --log-handler flectra.addons.partner_contact_lang:TEST"
 
-test_module_partner_vat_unique:
+test_module_base_location:
   stage: testsingle
   when: on_failure
   image:
@@ -629,24 +1124,24 @@ test_module_partner_vat_unique:
     - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
     - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
     - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_partner_vat_unique
-    - psql -h psql -U flectra -d test_partner_vat_unique -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - createdb -h psql -U flectra -O flectra -T template1 test_base_location
+    - psql -h psql -U flectra -d test_base_location -f ${CI_PROJECT_DIR}/ci_data/dump.sql
     - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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
+    - 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},~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
         --db_password flectra
-        --database test_partner_vat_unique
-        --test-enable -i partner_vat_unique
+        --database test_base_location
+        --test-enable -i base_location
         --stop-after-init
         --log-level error
-        --log-handler flectra.addons.partner_vat_unique:TEST"
+        --log-handler flectra.addons.base_location:TEST"
 
-test_module_partner_contact_job_position:
+test_module_partner_contact_in_several_companies:
   stage: testsingle
   when: on_failure
   image:
@@ -662,24 +1157,24 @@ test_module_partner_contact_job_position:
     - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
     - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
     - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_partner_contact_job_position
-    - psql -h psql -U flectra -d test_partner_contact_job_position -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - createdb -h psql -U flectra -O flectra -T template1 test_partner_contact_in_several_companies
+    - psql -h psql -U flectra -d test_partner_contact_in_several_companies -f ${CI_PROJECT_DIR}/ci_data/dump.sql
     - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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
+    - 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},~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
         --db_password flectra
-        --database test_partner_contact_job_position
-        --test-enable -i partner_contact_job_position
+        --database test_partner_contact_in_several_companies
+        --test-enable -i partner_contact_in_several_companies
         --stop-after-init
         --log-level error
-        --log-handler flectra.addons.partner_contact_job_position:TEST"
+        --log-handler flectra.addons.partner_contact_in_several_companies:TEST"
 
-test_module_partner_firstname:
+test_module_partner_company_group:
   stage: testsingle
   when: on_failure
   image:
@@ -695,253 +1190,22 @@ test_module_partner_firstname:
     - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
     - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
     - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_partner_firstname
-    - psql -h psql -U flectra -d test_partner_firstname -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - createdb -h psql -U flectra -O flectra -T template1 test_partner_company_group
+    - psql -h psql -U flectra -d test_partner_company_group -f ${CI_PROJECT_DIR}/ci_data/dump.sql
     - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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
+    - 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},~/others/server-ux
         --db_host psql
         --db_port 5432
         --db_user flectra
         --db_password flectra
-        --database test_partner_firstname
-        --test-enable -i partner_firstname
+        --database test_partner_company_group
+        --test-enable -i partner_company_group
         --stop-after-init
         --log-level error
-        --log-handler flectra.addons.partner_firstname:TEST"
-
-test_module_partner_contact_personal_information_page:
-  stage: testsingle
-  when: on_failure
-  image:
-    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
-    entrypoint: ["/bin/sh", "-c"]
-  script:
-    - 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-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
-    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
-    - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_partner_contact_personal_information_page
-    - psql -h psql -U flectra -d test_partner_contact_personal_information_page -f ${CI_PROJECT_DIR}/ci_data/dump.sql
-    - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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},~/others/server-ux
-        --db_host psql
-        --db_port 5432
-        --db_user flectra
-        --db_password flectra
-        --database test_partner_contact_personal_information_page
-        --test-enable -i partner_contact_personal_information_page
-        --stop-after-init
-        --log-level error
-        --log-handler flectra.addons.partner_contact_personal_information_page:TEST"
-
-test_module_partner_contact_birthdate:
-  stage: testsingle
-  when: on_failure
-  image:
-    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
-    entrypoint: ["/bin/sh", "-c"]
-  script:
-    - 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-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
-    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
-    - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_partner_contact_birthdate
-    - psql -h psql -U flectra -d test_partner_contact_birthdate -f ${CI_PROJECT_DIR}/ci_data/dump.sql
-    - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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},~/others/server-ux
-        --db_host psql
-        --db_port 5432
-        --db_user flectra
-        --db_password flectra
-        --database test_partner_contact_birthdate
-        --test-enable -i partner_contact_birthdate
-        --stop-after-init
-        --log-level error
-        --log-handler flectra.addons.partner_contact_birthdate:TEST"
-
-test_module_portal_partner_select_all:
-  stage: testsingle
-  when: on_failure
-  image:
-    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
-    entrypoint: ["/bin/sh", "-c"]
-  script:
-    - 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-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
-    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
-    - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_portal_partner_select_all
-    - psql -h psql -U flectra -d test_portal_partner_select_all -f ${CI_PROJECT_DIR}/ci_data/dump.sql
-    - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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},~/others/server-ux
-        --db_host psql
-        --db_port 5432
-        --db_user flectra
-        --db_password flectra
-        --database test_portal_partner_select_all
-        --test-enable -i portal_partner_select_all
-        --stop-after-init
-        --log-level error
-        --log-handler flectra.addons.portal_partner_select_all:TEST"
-
-test_module_partner_multi_relation:
-  stage: testsingle
-  when: on_failure
-  image:
-    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
-    entrypoint: ["/bin/sh", "-c"]
-  script:
-    - 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-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
-    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
-    - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_partner_multi_relation
-    - psql -h psql -U flectra -d test_partner_multi_relation -f ${CI_PROJECT_DIR}/ci_data/dump.sql
-    - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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},~/others/server-ux
-        --db_host psql
-        --db_port 5432
-        --db_user flectra
-        --db_password flectra
-        --database test_partner_multi_relation
-        --test-enable -i partner_multi_relation
-        --stop-after-init
-        --log-level error
-        --log-handler flectra.addons.partner_multi_relation:TEST"
-
-test_module_partner_fax:
-  stage: testsingle
-  when: on_failure
-  image:
-    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
-    entrypoint: ["/bin/sh", "-c"]
-  script:
-    - 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-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
-    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
-    - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_partner_fax
-    - psql -h psql -U flectra -d test_partner_fax -f ${CI_PROJECT_DIR}/ci_data/dump.sql
-    - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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},~/others/server-ux
-        --db_host psql
-        --db_port 5432
-        --db_user flectra
-        --db_password flectra
-        --database test_partner_fax
-        --test-enable -i partner_fax
-        --stop-after-init
-        --log-level error
-        --log-handler flectra.addons.partner_fax:TEST"
-
-test_module_base_partner_sequence:
-  stage: testsingle
-  when: on_failure
-  image:
-    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
-    entrypoint: ["/bin/sh", "-c"]
-  script:
-    - 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-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
-    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
-    - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_base_partner_sequence
-    - psql -h psql -U flectra -d test_base_partner_sequence -f ${CI_PROJECT_DIR}/ci_data/dump.sql
-    - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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},~/others/server-ux
-        --db_host psql
-        --db_port 5432
-        --db_user flectra
-        --db_password flectra
-        --database test_base_partner_sequence
-        --test-enable -i base_partner_sequence
-        --stop-after-init
-        --log-level error
-        --log-handler flectra.addons.base_partner_sequence:TEST"
-
-test_module_partner_iterative_archive:
-  stage: testsingle
-  when: on_failure
-  image:
-    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
-    entrypoint: ["/bin/sh", "-c"]
-  script:
-    - 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-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
-    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
-    - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_partner_iterative_archive
-    - psql -h psql -U flectra -d test_partner_iterative_archive -f ${CI_PROJECT_DIR}/ci_data/dump.sql
-    - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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},~/others/server-ux
-        --db_host psql
-        --db_port 5432
-        --db_user flectra
-        --db_password flectra
-        --database test_partner_iterative_archive
-        --test-enable -i partner_iterative_archive
-        --stop-after-init
-        --log-level error
-        --log-handler flectra.addons.partner_iterative_archive:TEST"
+        --log-handler flectra.addons.partner_company_group:TEST"
 
 test_module_base_country_state_translatable:
   stage: testsingle
@@ -976,267 +1240,3 @@ test_module_base_country_state_translatable:
         --log-level error
         --log-handler flectra.addons.base_country_state_translatable:TEST"
 
-test_module_partner_affiliate:
-  stage: testsingle
-  when: on_failure
-  image:
-    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
-    entrypoint: ["/bin/sh", "-c"]
-  script:
-    - 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-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
-    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
-    - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_partner_affiliate
-    - psql -h psql -U flectra -d test_partner_affiliate -f ${CI_PROJECT_DIR}/ci_data/dump.sql
-    - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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},~/others/server-ux
-        --db_host psql
-        --db_port 5432
-        --db_user flectra
-        --db_password flectra
-        --database test_partner_affiliate
-        --test-enable -i partner_affiliate
-        --stop-after-init
-        --log-level error
-        --log-handler flectra.addons.partner_affiliate:TEST"
-
-test_module_partner_phone_extension:
-  stage: testsingle
-  when: on_failure
-  image:
-    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
-    entrypoint: ["/bin/sh", "-c"]
-  script:
-    - 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-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
-    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
-    - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_partner_phone_extension
-    - psql -h psql -U flectra -d test_partner_phone_extension -f ${CI_PROJECT_DIR}/ci_data/dump.sql
-    - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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},~/others/server-ux
-        --db_host psql
-        --db_port 5432
-        --db_user flectra
-        --db_password flectra
-        --database test_partner_phone_extension
-        --test-enable -i partner_phone_extension
-        --stop-after-init
-        --log-level error
-        --log-handler flectra.addons.partner_phone_extension:TEST"
-
-test_module_partner_industry_secondary:
-  stage: testsingle
-  when: on_failure
-  image:
-    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
-    entrypoint: ["/bin/sh", "-c"]
-  script:
-    - 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-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
-    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
-    - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_partner_industry_secondary
-    - psql -h psql -U flectra -d test_partner_industry_secondary -f ${CI_PROJECT_DIR}/ci_data/dump.sql
-    - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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},~/others/server-ux
-        --db_host psql
-        --db_port 5432
-        --db_user flectra
-        --db_password flectra
-        --database test_partner_industry_secondary
-        --test-enable -i partner_industry_secondary
-        --stop-after-init
-        --log-level error
-        --log-handler flectra.addons.partner_industry_secondary:TEST"
-
-test_module_partner_contact_nationality:
-  stage: testsingle
-  when: on_failure
-  image:
-    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
-    entrypoint: ["/bin/sh", "-c"]
-  script:
-    - 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-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
-    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
-    - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_partner_contact_nationality
-    - psql -h psql -U flectra -d test_partner_contact_nationality -f ${CI_PROJECT_DIR}/ci_data/dump.sql
-    - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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},~/others/server-ux
-        --db_host psql
-        --db_port 5432
-        --db_user flectra
-        --db_password flectra
-        --database test_partner_contact_nationality
-        --test-enable -i partner_contact_nationality
-        --stop-after-init
-        --log-level error
-        --log-handler flectra.addons.partner_contact_nationality:TEST"
-
-test_module_base_location_geonames_import:
-  stage: testsingle
-  when: on_failure
-  image:
-    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
-    entrypoint: ["/bin/sh", "-c"]
-  script:
-    - 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-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
-    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
-    - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_base_location_geonames_import
-    - psql -h psql -U flectra -d test_base_location_geonames_import -f ${CI_PROJECT_DIR}/ci_data/dump.sql
-    - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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},~/others/server-ux
-        --db_host psql
-        --db_port 5432
-        --db_user flectra
-        --db_password flectra
-        --database test_base_location_geonames_import
-        --test-enable -i base_location_geonames_import
-        --stop-after-init
-        --log-level error
-        --log-handler flectra.addons.base_location_geonames_import:TEST"
-
-test_module_partner_address_version:
-  stage: testsingle
-  when: on_failure
-  image:
-    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
-    entrypoint: ["/bin/sh", "-c"]
-  script:
-    - 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-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
-    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
-    - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_partner_address_version
-    - psql -h psql -U flectra -d test_partner_address_version -f ${CI_PROJECT_DIR}/ci_data/dump.sql
-    - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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},~/others/server-ux
-        --db_host psql
-        --db_port 5432
-        --db_user flectra
-        --db_password flectra
-        --database test_partner_address_version
-        --test-enable -i partner_address_version
-        --stop-after-init
-        --log-level error
-        --log-handler flectra.addons.partner_address_version:TEST"
-
-test_module_partner_identification:
-  stage: testsingle
-  when: on_failure
-  image:
-    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
-    entrypoint: ["/bin/sh", "-c"]
-  script:
-    - 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-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
-    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
-    - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_partner_identification
-    - psql -h psql -U flectra -d test_partner_identification -f ${CI_PROJECT_DIR}/ci_data/dump.sql
-    - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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},~/others/server-ux
-        --db_host psql
-        --db_port 5432
-        --db_user flectra
-        --db_password flectra
-        --database test_partner_identification
-        --test-enable -i partner_identification
-        --stop-after-init
-        --log-level error
-        --log-handler flectra.addons.partner_identification:TEST"
-
-test_module_partner_helper:
-  stage: testsingle
-  when: on_failure
-  image:
-    name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest
-    entrypoint: ["/bin/sh", "-c"]
-  script:
-    - 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-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
-    - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
-    - export PGPASSWORD="flectra"
-    - createdb -h psql -U flectra -O flectra -T template1 test_partner_helper
-    - psql -h psql -U flectra -d test_partner_helper -f ${CI_PROJECT_DIR}/ci_data/dump.sql
-    - su - flectra -c "mkdir -p ~/.local/share/filestore"
-    - 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},~/others/server-ux
-        --db_host psql
-        --db_port 5432
-        --db_user flectra
-        --db_password flectra
-        --database test_partner_helper
-        --test-enable -i partner_helper
-        --stop-after-init
-        --log-level error
-        --log-handler flectra.addons.partner_helper:TEST"
-
diff --git a/README.md b/README.md
index 93b3943..6d26207 100644
--- a/README.md
+++ b/README.md
@@ -9,40 +9,40 @@ Available addons
 
 addon | version | summary
 --- | --- | ---
-[partner_tier_validation](partner_tier_validation/) | 2.0.1.1.0| Support a tier validation process for Contacts
-[partner_company_type](partner_company_type/) | 2.0.1.0.1| Adds a company type to partner that are companies
-[partner_ref_unique](partner_ref_unique/) | 2.0.1.0.0| Add an unique constraint to partner ref field
+[partner_address_version](partner_address_version/) | 2.0.1.0.0| Partner Address Version
+[partner_firstname](partner_firstname/) | 2.0.1.0.1| Split first name and last name for non company partners
+[partner_contact_job_position](partner_contact_job_position/) | 2.0.1.0.0| Categorize job positions for contacts
+[partner_fax](partner_fax/) | 2.0.1.0.0| Add fax number on partner
 [partner_employee_quantity](partner_employee_quantity/) | 2.0.1.0.0| Know how many employees a partner has
-[partner_company_group](partner_company_group/) | 2.0.1.0.1| Adds the possibility to add a company group to a company
-[partner_contact_age_range](partner_contact_age_range/) | 2.0.1.0.1| Age Range for Contact's
-[base_location](base_location/) | 2.0.1.0.1| Enhanced zip/npa management system
 [base_location_nuts](base_location_nuts/) | 2.0.1.0.1| NUTS Regions
-[partner_contact_access_link](partner_contact_access_link/) | 2.0.1.0.0| Allow to visit the full contact form from a company
-[partner_contact_department](partner_contact_department/) | 2.0.1.0.1| Assign contacts to departments
-[partner_priority](partner_priority/) | 2.0.1.0.0| Adds priority to partners.
-[partner_phone_secondary](partner_phone_secondary/) | 2.0.1.0.0| Adds a secondary phone number on partners
-[partner_contact_in_several_companies](partner_contact_in_several_companies/) | 2.0.1.1.0| Allow to have one contact in several partners
+[partner_contact_age_range](partner_contact_age_range/) | 2.0.1.0.1| Age Range for Contact's
 [partner_second_lastname](partner_second_lastname/) | 2.0.1.0.0| Have split first and second lastnames
+[partner_contact_department](partner_contact_department/) | 2.0.1.0.1| Assign contacts to departments
+[partner_contact_nationality](partner_contact_nationality/) | 2.0.1.0.1| Add nationality field to contacts
+[partner_phone_secondary](partner_phone_secondary/) | 2.0.1.0.0| Adds a secondary phone number on partners
+[partner_affiliate](partner_affiliate/) | 2.0.1.0.1| Partner Affiliates
+[partner_tier_validation](partner_tier_validation/) | 2.0.1.1.0| Support a tier validation process for Contacts
+[partner_phone_extension](partner_phone_extension/) | 2.0.1.0.1| Partner Phone Number Extension
+[partner_priority](partner_priority/) | 2.0.1.0.0| Adds priority to partners.
+[partner_ref_unique](partner_ref_unique/) | 2.0.1.0.0| Add an unique constraint to partner ref field
+[partner_industry_secondary](partner_industry_secondary/) | 2.0.1.0.0| Add secondary partner industries
+[partner_helper](partner_helper/) | 2.0.1.0.0| Add specific helper methods
+[base_partner_sequence](base_partner_sequence/) | 2.0.1.0.1| Sets customer's code from a sequence
+[partner_multi_relation](partner_multi_relation/) | 2.0.1.0.0| Partner Relations
+[partner_iterative_archive](partner_iterative_archive/) | 2.0.1.0.1| Archive all contacts when parent is archived
+[partner_company_type](partner_company_type/) | 2.0.1.0.1| Adds a company type to partner that are companies
+[portal_partner_select_all](portal_partner_select_all/) | 2.0.1.1.0| Portal Partner Select All
+[base_location_geonames_import](base_location_geonames_import/) | 2.0.1.0.0| Import zip entries from Geonames
+[partner_contact_birthdate](partner_contact_birthdate/) | 2.0.1.0.0| Contact's birthdate
+[partner_identification](partner_identification/) | 2.0.1.2.0| Partner Identification Numbers
+[partner_vat_unique](partner_vat_unique/) | 2.0.1.0.0| Module to make the VAT number unique for customers and suppliers.
+[partner_contact_access_link](partner_contact_access_link/) | 2.0.1.0.0| Allow to visit the full contact form from a company
+[partner_contact_personal_information_page](partner_contact_personal_information_page/) | 2.0.1.0.0| Add a page to contacts form to put personal information
 [partner_contact_gender](partner_contact_gender/) | 2.0.1.0.1| Add gender field to contacts
 [partner_contact_lang](partner_contact_lang/) | 2.0.1.0.0| Manage language in contacts
-[partner_vat_unique](partner_vat_unique/) | 2.0.1.0.0| Module to make the VAT number unique for customers and suppliers.
-[partner_contact_job_position](partner_contact_job_position/) | 2.0.1.0.0| Categorize job positions for contacts
-[partner_firstname](partner_firstname/) | 2.0.1.0.1| Split first name and last name for non company partners
-[partner_contact_personal_information_page](partner_contact_personal_information_page/) | 2.0.1.0.0| Add a page to contacts form to put personal information
-[partner_contact_birthdate](partner_contact_birthdate/) | 2.0.1.0.0| Contact's birthdate
-[portal_partner_select_all](portal_partner_select_all/) | 2.0.1.1.0| Portal Partner Select All
-[partner_multi_relation](partner_multi_relation/) | 2.0.1.0.0| Partner Relations
-[partner_fax](partner_fax/) | 2.0.1.0.0| Add fax number on partner
-[base_partner_sequence](base_partner_sequence/) | 2.0.1.0.1| Sets customer's code from a sequence
-[partner_iterative_archive](partner_iterative_archive/) | 2.0.1.0.1| Archive all contacts when parent is archived
+[base_location](base_location/) | 2.0.1.0.1| Enhanced zip/npa management system
+[partner_contact_in_several_companies](partner_contact_in_several_companies/) | 2.0.1.1.0| Allow to have one contact in several partners
+[partner_company_group](partner_company_group/) | 2.0.1.0.1| Adds the possibility to add a company group to a company
 [base_country_state_translatable](base_country_state_translatable/) | 2.0.1.0.0| Translate Country States
-[partner_affiliate](partner_affiliate/) | 2.0.1.0.1| Partner Affiliates
-[partner_phone_extension](partner_phone_extension/) | 2.0.1.0.1| Partner Phone Number Extension
-[partner_industry_secondary](partner_industry_secondary/) | 2.0.1.0.0| Add secondary partner industries
-[partner_contact_nationality](partner_contact_nationality/) | 2.0.1.0.1| Add nationality field to contacts
-[base_location_geonames_import](base_location_geonames_import/) | 2.0.1.0.0| Import zip entries from Geonames
-[partner_address_version](partner_address_version/) | 2.0.1.0.0| Partner Address Version
-[partner_identification](partner_identification/) | 2.0.1.2.0| Partner Identification Numbers
-[partner_helper](partner_helper/) | 2.0.1.0.0| Add specific helper methods
 
 
diff --git a/partner_firstname/COPYRIGHT b/partner_firstname/COPYRIGHT
index c80b5e9..85d08e9 100644
--- a/partner_firstname/COPYRIGHT
+++ b/partner_firstname/COPYRIGHT
@@ -1,7 +1,6 @@
 Most of the files are
 
   :Copyright: This stylesheet has been placed in the public domain.
-  <!-- Copyright 2015 Antiun Ingenieria S.L. - Antonio Espinosa
   Copyright 2013 Nicolas Bessi (Camptocamp SA)
   Copyright 2014 Agile Business Group (<http://www.agilebg.com>)
   Copyright 2014 Nemry Jonathan (Acsone SA/NV) (http://www.acsone.eu)
diff --git a/partner_industry_secondary/COPYRIGHT b/partner_industry_secondary/COPYRIGHT
index 2527a84..983febf 100644
--- a/partner_industry_secondary/COPYRIGHT
+++ b/partner_industry_secondary/COPYRIGHT
@@ -1,7 +1,6 @@
 Most of the files are
 
   :Copyright: This stylesheet has been placed in the public domain.
-  <!-- Copyright 2015 Antiun Ingenieria S.L. - Javier Iniesta
   Copyright 2015 Antiun Ingenieria S.L. - Javier Iniesta
   Copyright 2016 Tecnativa S.L. - Pedro M. Baeza
   Copyright 2016 Tecnativa S.L. - Vicent Cubells