From 29461d0cdbfd59bff7104fde67d21d83aabd37be Mon Sep 17 00:00:00 2001 From: Flectra Community Bot Date: Sun, 25 Jul 2021 02:10:08 +0000 Subject: [PATCH 01/24] Automatic Update form OCA2FC Migrator --- account_financial_report/COPYRIGHT | 1 + 1 file changed, 1 insertion(+) diff --git a/account_financial_report/COPYRIGHT b/account_financial_report/COPYRIGHT index 45b56cd..bcdff54 100644 --- a/account_financial_report/COPYRIGHT +++ b/account_financial_report/COPYRIGHT @@ -16,6 +16,7 @@ Most of the files are Copyright 2020 Onestein () Copyright 2021 Tecnativa - João Marques © 2016 Damien Crier (Camptocamp) + © 2016 Julien Coux (Camptocamp) © 2018 Forest and Biomass Romania SA Copyright 2018 Flectra Community From b31e1218f85fe3fbaafec0e090d84d3bd313a75f Mon Sep 17 00:00:00 2001 From: Flectra Community Bot Date: Sun, 8 Aug 2021 02:06:33 +0000 Subject: [PATCH 02/24] Automatic Update form OCA2FC Migrator --- .gitlab-ci.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8418004..37b6590 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,8 +26,6 @@ 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 @@ -39,7 +37,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-tools,~/others/server-ux + --addons-path ${CI_PROJECT_DIR},~/others/reporting-engine --db_host psql --db_port 5432 --db_user flectra @@ -65,8 +63,6 @@ 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 @@ -78,7 +74,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-tools,~/others/server-ux + --addons-path ${CI_PROJECT_DIR},~/others/reporting-engine --db_host psql --db_port 5432 --db_user flectra @@ -100,8 +96,6 @@ 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 @@ -113,7 +107,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-tools,~/others/server-ux + --addons-path ${CI_PROJECT_DIR},~/others/reporting-engine --db_host psql --db_port 5432 --db_user flectra From 1214bbbfa51b7f45cda942a6b5f1cb38f06f1fb4 Mon Sep 17 00:00:00 2001 From: Flectra Community Bot Date: Sun, 15 Aug 2021 02:09:46 +0000 Subject: [PATCH 03/24] 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 From 8de1f9db69118693f5a8e77b64db7007f16cd2ec Mon Sep 17 00:00:00 2001 From: Flectra Community Bot Date: Sun, 29 Aug 2021 02:10:40 +0000 Subject: [PATCH 04/24] Automatic Update form OCA2FC Migrator --- README.md | 2 +- account_financial_report/COPYRIGHT | 1 + account_financial_report/__manifest__.py | 2 +- account_financial_report/i18n/es.po | 20 ++++--- .../report/aged_partner_balance.py | 6 +-- .../report/templates/aged_partner_balance.xml | 52 +++++++++---------- account_financial_report/tests/__init__.py | 1 + .../tests/test_aged_partner_balance.py | 34 ++++++++++++ 8 files changed, 76 insertions(+), 42 deletions(-) create mode 100644 account_financial_report/tests/test_aged_partner_balance.py diff --git a/README.md b/README.md index f75a104..c76c873 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.1| OCA Financial Reports +[account_financial_report](account_financial_report/) | 2.0.1.3.2| OCA Financial Reports diff --git a/account_financial_report/COPYRIGHT b/account_financial_report/COPYRIGHT index bcdff54..8ebb221 100644 --- a/account_financial_report/COPYRIGHT +++ b/account_financial_report/COPYRIGHT @@ -14,6 +14,7 @@ Most of the files are Copyright 2019-20 ForgeFlow S.L. (https://www.forgeflow.com) Copyright 2020 ForgeFlow S.L. (https://www.forgeflow.com) Copyright 2020 Onestein () + Copyright 2021 Simone Rubino - Agile Business Group Copyright 2021 Tecnativa - João Marques © 2016 Damien Crier (Camptocamp) © 2016 Julien Coux (Camptocamp) diff --git a/account_financial_report/__manifest__.py b/account_financial_report/__manifest__.py index 1969db3..1bd9913 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.1", + "version": "2.0.1.3.2", "category": "Reporting", "summary": "OCA Financial Reports", "author": "Camptocamp SA," diff --git a/account_financial_report/i18n/es.po b/account_financial_report/i18n/es.po index 753bade..4b8a102 100644 --- a/account_financial_report/i18n/es.po +++ b/account_financial_report/i18n/es.po @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Odoo Server 12.0+e\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 13:00+0000\n" -"PO-Revision-Date: 2021-03-10 18:45+0000\n" -"Last-Translator: Ana Suárez \n" +"PO-Revision-Date: 2021-08-23 19:50+0000\n" +"Last-Translator: Ernesto Tejeda \n" "Language-Team: \n" "Language: es\n" "MIME-Version: 1.0\n" @@ -213,33 +213,32 @@ msgstr "Tiempo ≤ 90 d." #: model:ir.ui.menu,name:account_financial_report.menu_aged_partner_balance_wizard #, python-format msgid "Aged Partner Balance" -msgstr "Saldo vencidos de empresa" +msgstr "Calidad de la deuda" #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_base msgid "Aged Partner Balance -" -msgstr "Balance Empresa Vencido" +msgstr "Calidad de la deuda -" #. module: account_financial_report #: model:ir.model,name:account_financial_report.model_report_account_financial_report_aged_partner_balance msgid "Aged Partner Balance Report" -msgstr "Estado de antigüedad de saldos" +msgstr "Informe de Calidad de la deuda" #. module: account_financial_report #: model:ir.model,name:account_financial_report.model_aged_partner_balance_report_wizard msgid "Aged Partner Balance Wizard" -msgstr "Asistente de Estado de Antigüedad de Saldos" +msgstr "Asistente de Calidad de la deuda" #. module: account_financial_report #: model:ir.model,name:account_financial_report.model_report_a_f_r_report_aged_partner_balance_xlsx -#, fuzzy msgid "Aged Partner Balance XLSL Report" -msgstr "Saldo vencidos de empresa XLSX" +msgstr "Calidad de la deuda XLSX" #. module: account_financial_report #: model:ir.actions.report,name:account_financial_report.action_report_aged_partner_balance_xlsx msgid "Aged Partner Balance XLSX" -msgstr "Saldo vencidos de empresa XLSX" +msgstr "Calidad de la deuda XLSX" #. module: account_financial_report #: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:0 @@ -802,9 +801,8 @@ msgstr "Filtro Cuentas" #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.general_ledger_wizard -#, fuzzy msgid "Filter analytic accounts" -msgstr "Filtrar por etiquetas analíticas" +msgstr "Filtrar por cuentas analíticas" #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__analytic_tag_ids diff --git a/account_financial_report/report/aged_partner_balance.py b/account_financial_report/report/aged_partner_balance.py index 53271b0..0aaa158 100644 --- a/account_financial_report/report/aged_partner_balance.py +++ b/account_financial_report/report/aged_partner_balance.py @@ -218,9 +218,8 @@ class AgedPartnerBalanceReport(models.AbstractModel): "ref", "reconciled", ] - move_lines = self.env["account.move.line"].search_read( - domain=domain, fields=ml_fields - ) + line_model = self.env["account.move.line"] + move_lines = line_model.search_read(domain=domain, fields=ml_fields) journals_ids = set() partners_ids = set() partners_data = {} @@ -288,6 +287,7 @@ class AgedPartnerBalanceReport(models.AbstractModel): ref_label = move_line["ref"] + str(" - ") + move_line["name"] move_line_data.update( { + "line_rec": line_model.browse(move_line["id"]), "date": move_line["date"], "entry": move_line["move_id"][1], "jnl_id": move_line["journal_id"][0], diff --git a/account_financial_report/report/templates/aged_partner_balance.xml b/account_financial_report/report/templates/aged_partner_balance.xml index ca40531..1a376ca 100644 --- a/account_financial_report/report/templates/aged_partner_balance.xml +++ b/account_financial_report/report/templates/aged_partner_balance.xml @@ -249,7 +249,7 @@
@@ -260,7 +260,7 @@
@@ -270,7 +270,7 @@
@@ -280,7 +280,7 @@
@@ -290,7 +290,7 @@
@@ -300,7 +300,7 @@
@@ -310,7 +310,7 @@
@@ -324,7 +324,7 @@
- +
- +
- +
- +
- +
- + Date: Sun, 19 Sep 2021 02:09:40 +0000 Subject: [PATCH 05/24] Automatic Update form OCA2FC Migrator --- README.md | 2 +- account_financial_report/__manifest__.py | 2 +- account_financial_report/wizard/open_items_wizard_view.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c76c873..27a5b2a 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.2| OCA Financial Reports +[account_financial_report](account_financial_report/) | 2.0.1.4.0| OCA Financial Reports diff --git a/account_financial_report/__manifest__.py b/account_financial_report/__manifest__.py index 1bd9913..3bb71a6 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.2", + "version": "2.0.1.4.0", "category": "Reporting", "summary": "OCA Financial Reports", "author": "Camptocamp SA," diff --git a/account_financial_report/wizard/open_items_wizard_view.xml b/account_financial_report/wizard/open_items_wizard_view.xml index c1313fb..c1cefa2 100644 --- a/account_financial_report/wizard/open_items_wizard_view.xml +++ b/account_financial_report/wizard/open_items_wizard_view.xml @@ -103,7 +103,7 @@ open.items.report.wizard form - +