diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b2a72a..b16e00a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,48 +45,14 @@ test_all_modules: --db_password flectra --database test_all --test-enable - --init account_financial_report,account_tax_balance + --init account_tax_balance,account_financial_report --stop-after-init --log-level error - --log-handler flectra.addons.account_financial_report:TEST --log-handler flectra.addons.account_tax_balance:TEST + --log-handler flectra.addons.account_financial_report:TEST " -test_module_account_financial_report: - 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/reporting-engine.git ~/others/reporting-engine" - - 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_account_financial_report - - psql -h psql -U flectra -d test_account_financial_report -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_financial_report - - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_account_financial_report - - su - flectra -c "/opt/flectra/flectra-bin - --addons-path ${CI_PROJECT_DIR},~/others/reporting-engine,~/others/server-ux - --db_host psql - --db_port 5432 - --db_user flectra - --db_password flectra - --database test_account_financial_report - --test-enable -i account_financial_report - --stop-after-init - --log-level error - --log-handler flectra.addons.account_financial_report:TEST" - test_module_account_tax_balance: stage: testsingle when: on_failure @@ -121,3 +87,37 @@ test_module_account_tax_balance: --log-level error --log-handler flectra.addons.account_tax_balance:TEST" +test_module_account_financial_report: + 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/reporting-engine.git ~/others/reporting-engine" + - 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_account_financial_report + - psql -h psql -U flectra -d test_account_financial_report -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_financial_report + - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_account_financial_report + - su - flectra -c "/opt/flectra/flectra-bin + --addons-path ${CI_PROJECT_DIR},~/others/reporting-engine,~/others/server-ux + --db_host psql + --db_port 5432 + --db_user flectra + --db_password flectra + --database test_account_financial_report + --test-enable -i account_financial_report + --stop-after-init + --log-level error + --log-handler flectra.addons.account_financial_report:TEST" + diff --git a/README.md b/README.md index ce43bc8..6cc4cfc 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Available addons addon | version | summary --- | --- | --- -[account_financial_report](account_financial_report/) | 2.0.1.2.3| OCA Financial Reports [account_tax_balance](account_tax_balance/) | 2.0.1.1.0| Compute tax balances based on date range +[account_financial_report](account_financial_report/) | 2.0.1.2.3| OCA Financial Reports diff --git a/account_tax_balance/COPYRIGHT b/account_tax_balance/COPYRIGHT index 744e63e..28f0e7d 100644 --- a/account_tax_balance/COPYRIGHT +++ b/account_tax_balance/COPYRIGHT @@ -1,7 +1,6 @@ Most of the files are :Copyright: This stylesheet has been placed in the public domain. -