From 1214bbbfa51b7f45cda942a6b5f1cb38f06f1fb4 Mon Sep 17 00:00:00 2001 From: Flectra Community Bot Date: Sun, 15 Aug 2021 02:09:46 +0000 Subject: [PATCH] Automatic Update form OCA2FC Migrator --- .gitlab-ci.yml | 12 +++++++++--- README.md | 2 +- account_financial_report/__manifest__.py | 2 +- account_financial_report/report/open_items_xlsx.py | 8 ++++---- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 37b6590..8418004 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,6 +26,8 @@ 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 - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip @@ -37,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 + --addons-path ${CI_PROJECT_DIR},~/others/reporting-engine,~/others/server-tools,~/others/server-ux --db_host psql --db_port 5432 --db_user flectra @@ -63,6 +65,8 @@ 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 - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip @@ -74,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 + --addons-path ${CI_PROJECT_DIR},~/others/reporting-engine,~/others/server-tools,~/others/server-ux --db_host psql --db_port 5432 --db_user flectra @@ -96,6 +100,8 @@ 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 - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip @@ -107,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 + --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 b5cf7d5..f75a104 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.3.0| OCA Financial Reports +[account_financial_report](account_financial_report/) | 2.0.1.3.1| OCA Financial Reports diff --git a/account_financial_report/__manifest__.py b/account_financial_report/__manifest__.py index 49aad2e..1969db3 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.3.0", + "version": "2.0.1.3.1", "category": "Reporting", "summary": "OCA Financial Reports", "author": "Camptocamp SA," diff --git a/account_financial_report/report/open_items_xlsx.py b/account_financial_report/report/open_items_xlsx.py index 8e0c0d8..e4096a4 100644 --- a/account_financial_report/report/open_items_xlsx.py +++ b/account_financial_report/report/open_items_xlsx.py @@ -160,8 +160,8 @@ class OpenItemsXslx(models.AbstractModel): type_object, total_amount, report_data, - account_id, - partner_id, + account_id=account_id, + partner_id=partner_id, ) # Line break @@ -185,9 +185,9 @@ class OpenItemsXslx(models.AbstractModel): self.write_ending_balance_from_dict( accounts_data[account_id], type_object, - report_data, total_amount, - account_id, + report_data, + account_id=account_id, ) # 2 lines break