Merge branch '1.0-fixed' into '1.0'

Automatic MR created by OCA2FC Migrator See merge request flectra-community/account-closing!1
2024-11-22 05:32:03 +00:00 · 2022-01-31 10:43:51 +00:00 · 2022-01-31 10:43:51 +00:00 · 8316d8fa67
commit 8316d8fa67
parent ceed178a45 ce04578eca
2 changed files with 46 additions and 46 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -43,49 +43,17 @@ test_all_modules:
        --db_password flectra
        --database test_all
        --test-enable
-        --init account_invoice_start_end_dates,account_multicurrency_revaluation,account_cutoff_base,account_cutoff_accrual_base,account_cutoff_prepaid
+        --init account_multicurrency_revaluation,account_invoice_start_end_dates,account_cutoff_accrual_base,account_cutoff_base,account_cutoff_prepaid
        --stop-after-init
        --log-level error
-        --log-handler flectra.addons.account_invoice_start_end_dates:TEST
        --log-handler flectra.addons.account_multicurrency_revaluation:TEST
-        --log-handler flectra.addons.account_cutoff_base:TEST
+        --log-handler flectra.addons.account_invoice_start_end_dates:TEST
        --log-handler flectra.addons.account_cutoff_accrual_base:TEST
+        --log-handler flectra.addons.account_cutoff_base:TEST
        --log-handler flectra.addons.account_cutoff_prepaid:TEST
        "


-test_module_account_invoice_start_end_dates:
-  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 python-lxml
-    - 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_invoice_start_end_dates
-    - psql -h psql -U flectra -d test_account_invoice_start_end_dates -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_invoice_start_end_dates
-    - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_account_invoice_start_end_dates
-    - 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_invoice_start_end_dates
-        --test-enable -i account_invoice_start_end_dates
-        --stop-after-init
-        --log-level error
-        --log-handler flectra.addons.account_invoice_start_end_dates:TEST"
-
 test_module_account_multicurrency_revaluation:
  stage: testsingle
  when: on_failure
@ -118,7 +86,7 @@ test_module_account_multicurrency_revaluation:
        --log-level error
        --log-handler flectra.addons.account_multicurrency_revaluation:TEST"

-test_module_account_cutoff_base:
+test_module_account_invoice_start_end_dates:
  stage: testsingle
  when: on_failure
  image:
@ -133,22 +101,22 @@ test_module_account_cutoff_base:
    - 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_base
-    - psql -h psql -U flectra -d test_account_cutoff_base -f ${CI_PROJECT_DIR}/ci_data/dump.sql
+    - createdb -h psql -U flectra -O flectra -T template1 test_account_invoice_start_end_dates
+    - psql -h psql -U flectra -d test_account_invoice_start_end_dates -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_base
-    - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_account_cutoff_base
+    - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_account_invoice_start_end_dates
+    - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_account_invoice_start_end_dates
    - 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_base
-        --test-enable -i account_cutoff_base
+        --database test_account_invoice_start_end_dates
+        --test-enable -i account_invoice_start_end_dates
        --stop-after-init
        --log-level error
-        --log-handler flectra.addons.account_cutoff_base:TEST"
+        --log-handler flectra.addons.account_invoice_start_end_dates:TEST"

 test_module_account_cutoff_accrual_base:
  stage: testsingle
@ -182,6 +150,38 @@ test_module_account_cutoff_accrual_base:
        --log-level error
        --log-handler flectra.addons.account_cutoff_accrual_base:TEST"

+test_module_account_cutoff_base:
+  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 python-lxml
+    - 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_base
+    - psql -h psql -U flectra -d test_account_cutoff_base -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_base
+    - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_account_cutoff_base
+    - 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_base
+        --test-enable -i account_cutoff_base
+        --stop-after-init
+        --log-level error
+        --log-handler flectra.addons.account_cutoff_base:TEST"
+
 test_module_account_cutoff_prepaid:
  stage: testsingle
  when: on_failure
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-# Flectra Community / Flectra 2.0 / account-closing
+# Flectra Community / account-closing

 None

@ -9,10 +9,10 @@ Available addons

 addon | version | summary
 --- | --- | ---
-[account_invoice_start_end_dates](account_invoice_start_end_dates/) | 1.0.1.0.0| Adds start/end dates on invoice lines and move lines
 [account_multicurrency_revaluation](account_multicurrency_revaluation/) | 1.0.1.0.2| Manage revaluation for multicurrency environment
-[account_cutoff_base](account_cutoff_base/) | 1.0.1.0.0| Base module for Account Cut-offs
+[account_invoice_start_end_dates](account_invoice_start_end_dates/) | 1.0.1.0.0| Adds start/end dates on invoice lines and move lines
 [account_cutoff_accrual_base](account_cutoff_accrual_base/) | 1.0.1.0.0| Base module for accrued expenses and revenues
+[account_cutoff_base](account_cutoff_base/) | 1.0.1.0.0| Base module for Account Cut-offs
 [account_cutoff_prepaid](account_cutoff_prepaid/) | 1.0.1.0.0| Prepaid Expense, Prepaid Revenue