diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e30199..f29f7f1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,6 +25,7 @@ test_all_modules:
     - apt-get install -y p7zip-full
     - apt-get install -y expect-dev
     - su - flectra -c "mkdir ~/others"
+    - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/account-payment.git ~/others/account-payment"
     - sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=en_US.UTF-8
     - mkdir ${CI_PROJECT_DIR}/ci_data
     - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
@@ -36,7 +37,7 @@ test_all_modules:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_all
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_all
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/account-payment
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -70,6 +71,7 @@ test_module_account_payment_order_return:
     - 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/account-payment.git ~/others/account-payment"
     - 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
@@ -81,7 +83,7 @@ test_module_account_payment_order_return:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_account_payment_order_return
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_account_payment_order_return
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/account-payment
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -102,6 +104,7 @@ test_module_account_payment_partner:
     - 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/account-payment.git ~/others/account-payment"
     - 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
@@ -113,7 +116,7 @@ test_module_account_payment_partner:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_account_payment_partner
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_account_payment_partner
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/account-payment
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -134,6 +137,7 @@ test_module_account_payment_order:
     - 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/account-payment.git ~/others/account-payment"
     - 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
@@ -145,7 +149,7 @@ test_module_account_payment_order:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_account_payment_order
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_account_payment_order
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/account-payment
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -166,6 +170,7 @@ test_module_account_payment_purchase:
     - 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/account-payment.git ~/others/account-payment"
     - 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
@@ -177,7 +182,7 @@ test_module_account_payment_purchase:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_account_payment_purchase
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_account_payment_purchase
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/account-payment
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -198,6 +203,7 @@ test_module_account_payment_mode:
     - 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/account-payment.git ~/others/account-payment"
     - 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
@@ -209,7 +215,7 @@ test_module_account_payment_mode:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_account_payment_mode
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_account_payment_mode
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/account-payment
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -230,6 +236,7 @@ test_module_account_banking_sepa_direct_debit:
     - 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/account-payment.git ~/others/account-payment"
     - 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
@@ -241,7 +248,7 @@ test_module_account_banking_sepa_direct_debit:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_account_banking_sepa_direct_debit
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_account_banking_sepa_direct_debit
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/account-payment
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -262,6 +269,7 @@ test_module_account_banking_sepa_credit_transfer:
     - 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/account-payment.git ~/others/account-payment"
     - 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
@@ -273,7 +281,7 @@ test_module_account_banking_sepa_credit_transfer:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_account_banking_sepa_credit_transfer
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_account_banking_sepa_credit_transfer
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/account-payment
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -294,6 +302,7 @@ test_module_account_banking_mandate_sale:
     - 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/account-payment.git ~/others/account-payment"
     - 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
@@ -305,7 +314,7 @@ test_module_account_banking_mandate_sale:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_account_banking_mandate_sale
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_account_banking_mandate_sale
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/account-payment
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -326,6 +335,7 @@ test_module_account_banking_pain_base:
     - 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/account-payment.git ~/others/account-payment"
     - 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
@@ -337,7 +347,7 @@ test_module_account_banking_pain_base:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_account_banking_pain_base
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_account_banking_pain_base
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/account-payment
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -358,6 +368,7 @@ test_module_account_payment_sale:
     - 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/account-payment.git ~/others/account-payment"
     - 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
@@ -369,7 +380,7 @@ test_module_account_payment_sale:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_account_payment_sale
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_account_payment_sale
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/account-payment
         --db_host psql
         --db_port 5432
         --db_user flectra
@@ -390,6 +401,7 @@ test_module_account_banking_mandate:
     - 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/account-payment.git ~/others/account-payment"
     - 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
@@ -401,7 +413,7 @@ test_module_account_banking_mandate:
     - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_account_banking_mandate
     - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_account_banking_mandate
     - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
+        --addons-path ${CI_PROJECT_DIR},~/others/account-payment
         --db_host psql
         --db_port 5432
         --db_user flectra