diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ce61e9..e4b885e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,15 +43,47 @@ test_all_modules:
         --db_password flectra
         --database test_all
         --test-enable
-        --init account_invoice_start_end_dates,account_cutoff_base,account_cutoff_accrual_picking
+        --init account_cutoff_accrual_picking,account_invoice_start_end_dates,account_cutoff_base
         --stop-after-init
         --log-level error
+        --log-handler flectra.addons.account_cutoff_accrual_picking:TEST
         --log-handler flectra.addons.account_invoice_start_end_dates:TEST
         --log-handler flectra.addons.account_cutoff_base:TEST
-        --log-handler flectra.addons.account_cutoff_accrual_picking:TEST
         "
 
 
+test_module_account_cutoff_accrual_picking:
+  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"
+    - 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_account_cutoff_accrual_picking
+    - psql -h psql -U flectra -d test_account_cutoff_accrual_picking -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_account_cutoff_accrual_picking
+    - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_account_cutoff_accrual_picking
+    - su - flectra -c "/opt/flectra/flectra-bin
+        --addons-path ${CI_PROJECT_DIR}
+        --db_host psql
+        --db_port 5432
+        --db_user flectra
+        --db_password flectra
+        --database test_account_cutoff_accrual_picking
+        --test-enable -i account_cutoff_accrual_picking
+        --stop-after-init
+        --log-level error
+        --log-handler flectra.addons.account_cutoff_accrual_picking:TEST"
+
 test_module_account_invoice_start_end_dates:
   stage: testsingle
   when: on_failure
@@ -116,35 +148,3 @@ test_module_account_cutoff_base:
         --log-level error
         --log-handler flectra.addons.account_cutoff_base:TEST"
 
-test_module_account_cutoff_accrual_picking:
-  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"
-    - 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_account_cutoff_accrual_picking
-    - psql -h psql -U flectra -d test_account_cutoff_accrual_picking -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_account_cutoff_accrual_picking
-    - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_account_cutoff_accrual_picking
-    - su - flectra -c "/opt/flectra/flectra-bin
-        --addons-path ${CI_PROJECT_DIR}
-        --db_host psql
-        --db_port 5432
-        --db_user flectra
-        --db_password flectra
-        --database test_account_cutoff_accrual_picking
-        --test-enable -i account_cutoff_accrual_picking
-        --stop-after-init
-        --log-level error
-        --log-handler flectra.addons.account_cutoff_accrual_picking:TEST"
-
diff --git a/README.md b/README.md
index 0eddd1f..e3df24e 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,8 @@ Available addons
 
 addon | version | summary
 --- | --- | ---
+[account_cutoff_accrual_picking](account_cutoff_accrual_picking/) | 2.0.1.1.0| Accrued expense & accrued revenue from pickings
 [account_invoice_start_end_dates](account_invoice_start_end_dates/) | 2.0.1.0.1| Adds start/end dates on invoice/move lines
 [account_cutoff_base](account_cutoff_base/) | 2.0.1.0.0| Base module for Account Cut-offs
-[account_cutoff_accrual_picking](account_cutoff_accrual_picking/) | 2.0.1.1.0| Accrued expense & accrued revenue from pickings