From 07807a5f96baaae360f5b78bbfc6b82c074a88dc Mon Sep 17 00:00:00 2001 From: Flectra Community Bot Date: Sun, 13 Jun 2021 02:13:00 +0000 Subject: [PATCH] Automatic Update form OCA2FC Migrator --- .gitlab-ci.yml | 9 ++++++--- README.md | 2 +- account_financial_report/__manifest__.py | 2 +- account_financial_report/report/trial_balance_xlsx.py | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b16e00a..8418004 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,6 +26,7 @@ test_all_modules: - 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/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-tools.git ~/others/server-tools" - 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 @@ -38,7 +39,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},~/others/reporting-engine,~/others/server-ux + --addons-path ${CI_PROJECT_DIR},~/others/reporting-engine,~/others/server-tools,~/others/server-ux --db_host psql --db_port 5432 --db_user flectra @@ -64,6 +65,7 @@ test_module_account_tax_balance: - 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-tools.git ~/others/server-tools" - 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 @@ -76,7 +78,7 @@ test_module_account_tax_balance: - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_account_tax_balance - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_account_tax_balance - su - flectra -c "/opt/flectra/flectra-bin - --addons-path ${CI_PROJECT_DIR},~/others/reporting-engine,~/others/server-ux + --addons-path ${CI_PROJECT_DIR},~/others/reporting-engine,~/others/server-tools,~/others/server-ux --db_host psql --db_port 5432 --db_user flectra @@ -98,6 +100,7 @@ test_module_account_financial_report: - 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-tools.git ~/others/server-tools" - 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 @@ -110,7 +113,7 @@ test_module_account_financial_report: - 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 + --addons-path ${CI_PROJECT_DIR},~/others/reporting-engine,~/others/server-tools,~/others/server-ux --db_host psql --db_port 5432 --db_user flectra diff --git a/README.md b/README.md index 953975b..2c1e197 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,6 @@ Available addons addon | version | summary --- | --- | --- [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 +[account_financial_report](account_financial_report/) | 2.0.1.2.4| OCA Financial Reports diff --git a/account_financial_report/__manifest__.py b/account_financial_report/__manifest__.py index 0b354d2..3038eed 100644 --- a/account_financial_report/__manifest__.py +++ b/account_financial_report/__manifest__.py @@ -6,7 +6,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Account Financial Reports", - "version": "2.0.1.2.3", + "version": "2.0.1.2.4", "category": "Reporting", "summary": "OCA Financial Reports", "author": "Camptocamp SA," diff --git a/account_financial_report/report/trial_balance_xlsx.py b/account_financial_report/report/trial_balance_xlsx.py index 4bf0852..ad8113f 100644 --- a/account_financial_report/report/trial_balance_xlsx.py +++ b/account_financial_report/report/trial_balance_xlsx.py @@ -149,7 +149,7 @@ class TrialBalanceXslx(models.AbstractModel): [ _("Target moves filter"), _("All posted entries") - if report.target_move == "all" + if report.target_move == "posted" else _("All entries"), ], [