From 2d0ae9ced0e55c183c31f99e3a92fe11160f1093 Mon Sep 17 00:00:00 2001 From: Flectra Community Bot Date: Wed, 29 Jun 2022 20:38:07 +0200 Subject: [PATCH] Automatic Update form OCA2FC Migrator --- .gitlab-ci.yml | 146 +++++++------ README.md | 4 +- mis_builder/README.rst | 8 + mis_builder/__manifest__.py | 2 +- mis_builder/i18n/ca.po | 196 +++++++++++++---- mis_builder/i18n/de.po | 17 +- mis_builder/i18n/el.po | 17 +- mis_builder/i18n/el_GR.po | 17 +- mis_builder/i18n/es.po | 35 +-- mis_builder/i18n/fr.po | 89 ++++---- mis_builder/i18n/hr.po | 22 +- mis_builder/i18n/it.po | 30 ++- mis_builder/i18n/mis_builder.pot | 17 +- mis_builder/i18n/nl.po | 37 ++-- mis_builder/i18n/nl_NL.po | 37 ++-- mis_builder/i18n/pt.po | 17 +- mis_builder/i18n/pt_BR.po | 35 +-- mis_builder/i18n/sv.po | 27 +-- mis_builder/models/aep.py | 6 - mis_builder/models/data_error.py | 2 +- mis_builder/models/expression_evaluator.py | 5 - mis_builder/models/kpimatrix.py | 16 +- mis_builder/models/mis_kpi_data.py | 2 +- mis_builder/models/mis_report.py | 53 ++--- mis_builder/models/mis_report_instance.py | 28 ++- mis_builder/models/mis_report_style.py | 30 +-- mis_builder/models/mis_report_subreport.py | 2 +- .../models/prorata_read_group_mixin.py | 2 +- .../report/mis_report_instance_qweb.py | 4 +- .../report/mis_report_instance_xlsx.py | 4 +- mis_builder/static/description/index.html | 206 +++++++++--------- mis_builder/tests/test_aep.py | 2 +- mis_builder/tests/test_analytic_filters.py | 8 +- mis_builder/tests/test_data_sources.py | 2 +- mis_builder/tests/test_kpi_data.py | 4 +- mis_builder/tests/test_mis_report_instance.py | 22 +- mis_builder/tests/test_multi_company_aep.py | 2 +- mis_builder/tests/test_period_dates.py | 2 +- mis_builder/tests/test_render.py | 152 +++++++------ mis_builder/tests/test_subreport.py | 2 +- mis_builder/views/mis_report.xml | 10 +- mis_builder/views/mis_report_instance.xml | 3 +- mis_builder/views/mis_report_style.xml | 2 +- mis_builder/wizard/mis_builder_dashboard.py | 4 +- mis_builder_budget/__manifest__.py | 2 +- mis_builder_budget/i18n/ca.po | 13 +- .../models/mis_budget_abstract.py | 2 +- .../models/mis_budget_by_account_item.py | 4 +- mis_builder_budget/models/mis_budget_item.py | 4 +- .../models/mis_report_instance.py | 12 +- .../models/mis_report_instance_period.py | 4 +- .../models/mis_report_kpi_expression.py | 4 +- mis_builder_budget/tests/test_mis_budget.py | 2 +- .../tests/test_mis_budget_by_account.py | 4 +- mis_builder_demo/COPYRIGHT | 1 + mis_builder_demo/i18n/ca.po | 19 +- 56 files changed, 774 insertions(+), 625 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df5e6b4..2bbf91e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,17 +34,20 @@ test_all_modules: - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/community-data-files.git ~/others/community-data-files" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/connector.git ~/others/connector" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/connector-telephony.git ~/others/connector-telephony" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/contract.git ~/others/contract" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/delivery-carrier.git ~/others/delivery-carrier" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/edi.git ~/others/edi" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/intrastat-extrastat.git ~/others/intrastat-extrastat" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/partner-contact.git ~/others/partner-contact" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/product-attribute.git ~/others/product-attribute" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/purchase-workflow.git ~/others/purchase-workflow" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/queue.git ~/others/queue" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/report-print-send.git ~/others/report-print-send" - 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/rest-framework.git ~/others/rest-framework" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/sale-workflow.git ~/others/sale-workflow" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-auth.git ~/others/server-auth" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-backend.git ~/others/server-backend" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-env.git ~/others/server-env" - 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" @@ -66,19 +69,19 @@ 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/account-analytic,~/others/account-closing,~/others/account-financial-tools,~/others/account-invoicing,~/others/account-payment,~/others/bank-payment,~/others/brand,~/others/community-data-files,~/others/connector,~/others/connector-telephony,~/others/delivery-carrier,~/others/edi,~/others/intrastat-extrastat,~/others/partner-contact,~/others/product-attribute,~/others/queue,~/others/report-print-send,~/others/reporting-engine,~/others/rest-framework,~/others/sale-workflow,~/others/server-auth,~/others/server-env,~/others/server-tools,~/others/server-ux,~/others/social,~/others/stock-logistics-transport,~/others/stock-logistics-warehouse,~/others/stock-logistics-workflow,~/others/storage,~/others/web,~/others/wms + --addons-path ${CI_PROJECT_DIR},~/others/account-analytic,~/others/account-closing,~/others/account-financial-tools,~/others/account-invoicing,~/others/account-payment,~/others/bank-payment,~/others/brand,~/others/community-data-files,~/others/connector,~/others/connector-telephony,~/others/contract,~/others/delivery-carrier,~/others/edi,~/others/intrastat-extrastat,~/others/partner-contact,~/others/product-attribute,~/others/purchase-workflow,~/others/queue,~/others/report-print-send,~/others/reporting-engine,~/others/rest-framework,~/others/sale-workflow,~/others/server-auth,~/others/server-backend,~/others/server-env,~/others/server-tools,~/others/server-ux,~/others/social,~/others/stock-logistics-transport,~/others/stock-logistics-warehouse,~/others/stock-logistics-workflow,~/others/storage,~/others/web,~/others/wms --db_host psql --db_port 5432 --db_user flectra --db_password flectra --database test_all --test-enable - --init mis_builder_budget,mis_builder,mis_builder_demo + --init mis_builder_budget,mis_builder_demo,mis_builder --stop-after-init --log-level error --log-handler flectra.addons.mis_builder_budget:TEST - --log-handler flectra.addons.mis_builder:TEST --log-handler flectra.addons.mis_builder_demo:TEST + --log-handler flectra.addons.mis_builder:TEST " @@ -101,17 +104,20 @@ test_module_mis_builder_budget: - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/community-data-files.git ~/others/community-data-files" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/connector.git ~/others/connector" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/connector-telephony.git ~/others/connector-telephony" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/contract.git ~/others/contract" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/delivery-carrier.git ~/others/delivery-carrier" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/edi.git ~/others/edi" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/intrastat-extrastat.git ~/others/intrastat-extrastat" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/partner-contact.git ~/others/partner-contact" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/product-attribute.git ~/others/product-attribute" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/purchase-workflow.git ~/others/purchase-workflow" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/queue.git ~/others/queue" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/report-print-send.git ~/others/report-print-send" - 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/rest-framework.git ~/others/rest-framework" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/sale-workflow.git ~/others/sale-workflow" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-auth.git ~/others/server-auth" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-backend.git ~/others/server-backend" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-env.git ~/others/server-env" - 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" @@ -133,7 +139,7 @@ test_module_mis_builder_budget: - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_mis_builder_budget - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_mis_builder_budget - su - flectra -c "/opt/flectra/flectra-bin - --addons-path ${CI_PROJECT_DIR},~/others/account-analytic,~/others/account-closing,~/others/account-financial-tools,~/others/account-invoicing,~/others/account-payment,~/others/bank-payment,~/others/brand,~/others/community-data-files,~/others/connector,~/others/connector-telephony,~/others/delivery-carrier,~/others/edi,~/others/intrastat-extrastat,~/others/partner-contact,~/others/product-attribute,~/others/queue,~/others/report-print-send,~/others/reporting-engine,~/others/rest-framework,~/others/sale-workflow,~/others/server-auth,~/others/server-env,~/others/server-tools,~/others/server-ux,~/others/social,~/others/stock-logistics-transport,~/others/stock-logistics-warehouse,~/others/stock-logistics-workflow,~/others/storage,~/others/web,~/others/wms + --addons-path ${CI_PROJECT_DIR},~/others/account-analytic,~/others/account-closing,~/others/account-financial-tools,~/others/account-invoicing,~/others/account-payment,~/others/bank-payment,~/others/brand,~/others/community-data-files,~/others/connector,~/others/connector-telephony,~/others/contract,~/others/delivery-carrier,~/others/edi,~/others/intrastat-extrastat,~/others/partner-contact,~/others/product-attribute,~/others/purchase-workflow,~/others/queue,~/others/report-print-send,~/others/reporting-engine,~/others/rest-framework,~/others/sale-workflow,~/others/server-auth,~/others/server-backend,~/others/server-env,~/others/server-tools,~/others/server-ux,~/others/social,~/others/stock-logistics-transport,~/others/stock-logistics-warehouse,~/others/stock-logistics-workflow,~/others/storage,~/others/web,~/others/wms --db_host psql --db_port 5432 --db_user flectra @@ -144,68 +150,6 @@ test_module_mis_builder_budget: --log-level error --log-handler flectra.addons.mis_builder_budget:TEST" -test_module_mis_builder: - 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 - - 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/account-analytic.git ~/others/account-analytic" - - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/account-closing.git ~/others/account-closing" - - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/account-financial-tools.git ~/others/account-financial-tools" - - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/account-invoicing.git ~/others/account-invoicing" - - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/account-payment.git ~/others/account-payment" - - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/bank-payment.git ~/others/bank-payment" - - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/brand.git ~/others/brand" - - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/community-data-files.git ~/others/community-data-files" - - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/connector.git ~/others/connector" - - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/connector-telephony.git ~/others/connector-telephony" - - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/delivery-carrier.git ~/others/delivery-carrier" - - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/edi.git ~/others/edi" - - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/intrastat-extrastat.git ~/others/intrastat-extrastat" - - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/partner-contact.git ~/others/partner-contact" - - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/product-attribute.git ~/others/product-attribute" - - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/queue.git ~/others/queue" - - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/report-print-send.git ~/others/report-print-send" - - 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/rest-framework.git ~/others/rest-framework" - - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/sale-workflow.git ~/others/sale-workflow" - - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-auth.git ~/others/server-auth" - - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-env.git ~/others/server-env" - - 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" - - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/social.git ~/others/social" - - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/stock-logistics-transport.git ~/others/stock-logistics-transport" - - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/stock-logistics-warehouse.git ~/others/stock-logistics-warehouse" - - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/stock-logistics-workflow.git ~/others/stock-logistics-workflow" - - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/storage.git ~/others/storage" - - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/web.git ~/others/web" - - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/wms.git ~/others/wms" - - 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_mis_builder - - psql -h psql -U flectra -d test_mis_builder -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_mis_builder - - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_mis_builder - - su - flectra -c "/opt/flectra/flectra-bin - --addons-path ${CI_PROJECT_DIR},~/others/account-analytic,~/others/account-closing,~/others/account-financial-tools,~/others/account-invoicing,~/others/account-payment,~/others/bank-payment,~/others/brand,~/others/community-data-files,~/others/connector,~/others/connector-telephony,~/others/delivery-carrier,~/others/edi,~/others/intrastat-extrastat,~/others/partner-contact,~/others/product-attribute,~/others/queue,~/others/report-print-send,~/others/reporting-engine,~/others/rest-framework,~/others/sale-workflow,~/others/server-auth,~/others/server-env,~/others/server-tools,~/others/server-ux,~/others/social,~/others/stock-logistics-transport,~/others/stock-logistics-warehouse,~/others/stock-logistics-workflow,~/others/storage,~/others/web,~/others/wms - --db_host psql - --db_port 5432 - --db_user flectra - --db_password flectra - --database test_mis_builder - --test-enable -i mis_builder - --stop-after-init - --log-level error - --log-handler flectra.addons.mis_builder:TEST" - test_module_mis_builder_demo: stage: testsingle when: on_failure @@ -225,17 +169,20 @@ test_module_mis_builder_demo: - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/community-data-files.git ~/others/community-data-files" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/connector.git ~/others/connector" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/connector-telephony.git ~/others/connector-telephony" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/contract.git ~/others/contract" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/delivery-carrier.git ~/others/delivery-carrier" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/edi.git ~/others/edi" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/intrastat-extrastat.git ~/others/intrastat-extrastat" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/partner-contact.git ~/others/partner-contact" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/product-attribute.git ~/others/product-attribute" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/purchase-workflow.git ~/others/purchase-workflow" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/queue.git ~/others/queue" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/report-print-send.git ~/others/report-print-send" - 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/rest-framework.git ~/others/rest-framework" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/sale-workflow.git ~/others/sale-workflow" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-auth.git ~/others/server-auth" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-backend.git ~/others/server-backend" - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-env.git ~/others/server-env" - 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" @@ -257,7 +204,7 @@ test_module_mis_builder_demo: - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_mis_builder_demo - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_mis_builder_demo - su - flectra -c "/opt/flectra/flectra-bin - --addons-path ${CI_PROJECT_DIR},~/others/account-analytic,~/others/account-closing,~/others/account-financial-tools,~/others/account-invoicing,~/others/account-payment,~/others/bank-payment,~/others/brand,~/others/community-data-files,~/others/connector,~/others/connector-telephony,~/others/delivery-carrier,~/others/edi,~/others/intrastat-extrastat,~/others/partner-contact,~/others/product-attribute,~/others/queue,~/others/report-print-send,~/others/reporting-engine,~/others/rest-framework,~/others/sale-workflow,~/others/server-auth,~/others/server-env,~/others/server-tools,~/others/server-ux,~/others/social,~/others/stock-logistics-transport,~/others/stock-logistics-warehouse,~/others/stock-logistics-workflow,~/others/storage,~/others/web,~/others/wms + --addons-path ${CI_PROJECT_DIR},~/others/account-analytic,~/others/account-closing,~/others/account-financial-tools,~/others/account-invoicing,~/others/account-payment,~/others/bank-payment,~/others/brand,~/others/community-data-files,~/others/connector,~/others/connector-telephony,~/others/contract,~/others/delivery-carrier,~/others/edi,~/others/intrastat-extrastat,~/others/partner-contact,~/others/product-attribute,~/others/purchase-workflow,~/others/queue,~/others/report-print-send,~/others/reporting-engine,~/others/rest-framework,~/others/sale-workflow,~/others/server-auth,~/others/server-backend,~/others/server-env,~/others/server-tools,~/others/server-ux,~/others/social,~/others/stock-logistics-transport,~/others/stock-logistics-warehouse,~/others/stock-logistics-workflow,~/others/storage,~/others/web,~/others/wms --db_host psql --db_port 5432 --db_user flectra @@ -268,3 +215,68 @@ test_module_mis_builder_demo: --log-level error --log-handler flectra.addons.mis_builder_demo:TEST" +test_module_mis_builder: + 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 + - 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/account-analytic.git ~/others/account-analytic" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/account-closing.git ~/others/account-closing" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/account-financial-tools.git ~/others/account-financial-tools" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/account-invoicing.git ~/others/account-invoicing" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/account-payment.git ~/others/account-payment" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/bank-payment.git ~/others/bank-payment" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/brand.git ~/others/brand" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/community-data-files.git ~/others/community-data-files" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/connector.git ~/others/connector" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/connector-telephony.git ~/others/connector-telephony" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/contract.git ~/others/contract" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/delivery-carrier.git ~/others/delivery-carrier" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/edi.git ~/others/edi" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/intrastat-extrastat.git ~/others/intrastat-extrastat" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/partner-contact.git ~/others/partner-contact" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/product-attribute.git ~/others/product-attribute" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/purchase-workflow.git ~/others/purchase-workflow" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/queue.git ~/others/queue" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/report-print-send.git ~/others/report-print-send" + - 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/rest-framework.git ~/others/rest-framework" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/sale-workflow.git ~/others/sale-workflow" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-auth.git ~/others/server-auth" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-backend.git ~/others/server-backend" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-env.git ~/others/server-env" + - 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" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/social.git ~/others/social" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/stock-logistics-transport.git ~/others/stock-logistics-transport" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/stock-logistics-warehouse.git ~/others/stock-logistics-warehouse" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/stock-logistics-workflow.git ~/others/stock-logistics-workflow" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/storage.git ~/others/storage" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/web.git ~/others/web" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/wms.git ~/others/wms" + - 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_mis_builder + - psql -h psql -U flectra -d test_mis_builder -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_mis_builder + - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_mis_builder + - su - flectra -c "/opt/flectra/flectra-bin + --addons-path ${CI_PROJECT_DIR},~/others/account-analytic,~/others/account-closing,~/others/account-financial-tools,~/others/account-invoicing,~/others/account-payment,~/others/bank-payment,~/others/brand,~/others/community-data-files,~/others/connector,~/others/connector-telephony,~/others/contract,~/others/delivery-carrier,~/others/edi,~/others/intrastat-extrastat,~/others/partner-contact,~/others/product-attribute,~/others/purchase-workflow,~/others/queue,~/others/report-print-send,~/others/reporting-engine,~/others/rest-framework,~/others/sale-workflow,~/others/server-auth,~/others/server-backend,~/others/server-env,~/others/server-tools,~/others/server-ux,~/others/social,~/others/stock-logistics-transport,~/others/stock-logistics-warehouse,~/others/stock-logistics-workflow,~/others/storage,~/others/web,~/others/wms + --db_host psql + --db_port 5432 + --db_user flectra + --db_password flectra + --database test_mis_builder + --test-enable -i mis_builder + --stop-after-init + --log-level error + --log-handler flectra.addons.mis_builder:TEST" + diff --git a/README.md b/README.md index 6683d95..53a2c1f 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ Available addons addon | version | summary --- | --- | --- -[mis_builder_budget](mis_builder_budget/) | 2.0.4.0.0| Create budgets for MIS reports -[mis_builder](mis_builder/) | 2.0.4.0.0| Build 'Management Information System' Reports and Dashboards +[mis_builder_budget](mis_builder_budget/) | 2.0.4.0.1| Create budgets for MIS reports [mis_builder_demo](mis_builder_demo/) | 2.0.3.1.3| Demo addon for MIS Builder +[mis_builder](mis_builder/) | 2.0.4.0.3| Build 'Management Information System' Reports and Dashboards diff --git a/mis_builder/README.rst b/mis_builder/README.rst index 5413279..5333c33 100644 --- a/mis_builder/README.rst +++ b/mis_builder/README.rst @@ -97,6 +97,14 @@ be found on GitHub. Changelog ========= +14.0.4.0.2 (2022-02-16) +~~~~~~~~~~~~~~~~~~~~~~~ + +**Bugfixes** + +- Fix access right issue when clicking the "Save" button on a MIS Report Instance form. (`#410 `_) + + 14.0.4.0.0 (2022-01-08) ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/mis_builder/__manifest__.py b/mis_builder/__manifest__.py index 9a3f71f..879cd92 100644 --- a/mis_builder/__manifest__.py +++ b/mis_builder/__manifest__.py @@ -3,7 +3,7 @@ { "name": "MIS Builder", - "version": "2.0.4.0.0", + "version": "2.0.4.0.3", "category": "Reporting", "summary": """ Build 'Management Information System' Reports and Dashboards diff --git a/mis_builder/i18n/ca.po b/mis_builder/i18n/ca.po index 96fbeeb..92b7511 100644 --- a/mis_builder/i18n/ca.po +++ b/mis_builder/i18n/ca.po @@ -6,15 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2020-08-31 13:00+0000\n" -"Last-Translator: brendapaniagua \n" +"PO-Revision-Date: 2022-02-25 11:17+0000\n" +"Last-Translator: Noel estudillo \n" "Language-Team: none\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.10\n" +"X-Generator: Weblate 4.3.2\n" #. module: mis_builder #: code:addons/mis_builder/models/mis_report.py:0 @@ -36,6 +36,15 @@ msgid "" "all receivable\n" " accounts over the period." msgstr "" +"\n" +" balp[('user_type_id', '=',\n" +" ref('account.\n" +" " +"data_account_type_receivable').id)][]\n" +" \n" +" : variació del saldo de tots els " +"crèdits\n" +" comptes al llarg del període." #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -50,6 +59,15 @@ msgid "" "to tax grid\n" " 56." msgstr "" +"\n" +" balp[][(" +"'tax_line_id.tag_ids', '=',\n" +" ref('l10n_be.tax_tag_56')." +"id)]\n" +" \n" +" : saldo de línies de moviment " +"relacionades amb la xarxa fiscal\n" +" 56." #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -63,6 +81,14 @@ msgid "" "55 and\n" " journal BNK1 during the period." msgstr "" +"\n" +" debp[55%][(" +"'journal_id.code', '=',\n" +" 'BNK1')]\n" +" \n" +" : suma de tots els dèbits dels " +"comptes 55 i\n" +" revista BNK1 durant el període." #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -72,6 +98,10 @@ msgid "" "in\n" " arithmetic operations." msgstr "" +"AccountingNone\n" +" : un valor nul que es comporta " +"com a 0 polzades\n" +" operacions aritmètiques." #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -81,6 +111,10 @@ msgid "" "positive balance,\n" " negative balance." msgstr "" +"bal, crd, deb, pbal, nbal\n" +" : saldo, dèbit, crèdit, saldo " +"positiu,\n" +" saldo negatiu." #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -91,6 +125,11 @@ msgid "" " over the period (it is the same " "as balp[70]." msgstr "" +"bal[70]\n" +" : variació del saldo del compte " +"70\n" +" durant el període (és el mateix " +"que balp[70]." #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -100,6 +139,10 @@ msgid "" "with 1 at end\n" " of period." msgstr "" +"bale[1%]\n" +" : saldo dels comptes començant " +"per 1 al final\n" +" de període." #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -108,6 +151,9 @@ msgid "" " : initial balance of accounts 70 " "and 60." msgstr "" +"bali[70,60]\n" +" : saldo inicial dels comptes 70 " +"i 60." #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -120,6 +166,13 @@ msgid "" " profit/loss of previous\n" " fiscal years." msgstr "" +"balu[]\n" +" : (u per no assignat) és un " +"especial\n" +" expressió que mostra el no " +"assignat\n" +" guanys/pèrdues anteriors\n" +" exercicis fiscals." #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -129,6 +182,10 @@ msgid "" "starting\n" " with 40 during the period." msgstr "" +"crdp[40%]\n" +" : suma de tots els crèdits dels " +"comptes que s'inicien\n" +" amb 40 durant el període." #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -137,6 +194,9 @@ msgid "" " : beginning and end date of the " "period." msgstr "" +"date_from, date_to\n" +" : data d'inici i finalització " +"del període." #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -144,6 +204,8 @@ msgid "" "datetime, datetime, dateutil\n" " : the python modules." msgstr "" +"datetime, datetime, dateutil\n" +" : els mòduls Python." #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -153,6 +215,10 @@ msgid "" "the period,\n" " initial balance, ending balance" msgstr "" +"p, i, e\n" +" : respectivament variació al " +"llarg del període,\n" +" saldo inicial, saldo final" #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -163,6 +229,11 @@ msgid "" " starting with 55 whose\n" " ending balance is positive." msgstr "" +"pbale[55%]\n" +" : suma de tots els saldos finals " +"dels comptes\n" +" començant per 55 els quals\n" +" el saldo final és positiu." #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -172,6 +243,10 @@ msgid "" "similar to the\n" " python builtins." msgstr "" +"sum, min, max, len, avg\n" +" : comportar-se com s'esperava, " +"molt semblant al\n" +" python integrats." #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance_period__source_aml_model_id @@ -200,7 +275,7 @@ msgstr "Un filtre de data és obligatori per aquest origen a la columna %s." #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__account_model -msgid "Account model" +msgid "Account Model" msgstr "Model de compte" #. module: mis_builder @@ -266,6 +341,8 @@ msgid "" "Additionally following variables are available\n" " in the evaluation context:" msgstr "" +"A més, hi ha disponibles les variables següents\n" +" en el context d'avaluació:" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_query__aggregate @@ -290,17 +367,17 @@ msgstr "Tots els assentaments assentats" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__allowed_cmpcol_ids msgid "Allowed Cmpcol" -msgstr "" +msgstr "Cmpcol permès" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids msgid "Allowed companies" -msgstr "" +msgstr "Empreses permeses" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id msgid "Allowed company" -msgstr "" +msgstr "Empresa permesa" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_kpi_data__amount @@ -336,13 +413,13 @@ msgstr "Filtre Analític de Comptes" #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__analytic_group_id #, python-format msgid "Analytic Account Group" -msgstr "" +msgstr "Grup de comptes analítics" #. module: mis_builder #: code:addons/mis_builder/models/mis_report_instance.py:0 #, python-format msgid "Analytic Account Group: %s" -msgstr "" +msgstr "Grup de comptes analítics: %s" #. module: mis_builder #: code:addons/mis_builder/models/mis_report_instance.py:0 @@ -422,7 +499,7 @@ msgstr "Cancel·lar" #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__multi_company msgid "Check if you wish to specify several companies to be searched for data." -msgstr "" +msgstr "Comproveu si voleu especificar diverses empreses per buscar dades." #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_style_view_form @@ -447,9 +524,11 @@ msgstr "La columna %s no es pot comparar amb itrec." #. module: mis_builder #: code:addons/mis_builder/models/mis_report_instance.py:0 -#, fuzzy, python-format +#, python-format msgid "Column %s with move lines source must have from/to dates." -msgstr "La columna %s amb font de dades reals ha de tenir data des de/fins a." +msgstr "" +"La columna %s amb l'origen de les línies de moviment ha de tenir dates des/" +"fins." #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_instance_view_form @@ -686,7 +765,7 @@ msgstr "Durada" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids msgid "Effective companies" -msgstr "" +msgstr "Empreses efectives" #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -736,6 +815,10 @@ msgid "" "kpi2,\n" " kpi2.subkpi1, query1.field1)." msgstr "" +"Les expressions poden incloure altres KPI, sub KPI i\n" +" consulteu els resultats pel nom (p. " +"ex. kpi1 + kpi2,\n" +" kpi2.subkpi1, query1.field1)." #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__normalize_factor @@ -782,6 +865,9 @@ msgid "" "This filter is combined with a AND with the report-level filters and cannot " "be modified in the preview." msgstr "" +"Filtreu la columna a les entrades de diari que coincideixin amb aquest grup " +"de comptes analítics. Aquest filtre es combina amb un AND amb els filtres a " +"nivell d'informe i no es pot modificar a la vista prèvia." #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance_period__analytic_account_id @@ -1080,14 +1166,13 @@ msgstr "Disseny" #. module: mis_builder #: model:ir.model,name:mis_builder.model_report_mis_builder_mis_report_instance_xlsx -#, fuzzy msgid "MIS Builder XLSX report" -msgstr "Informe XLS d'instància d'informe MIS" +msgstr "Informe MIS Builder XLSX" #. module: mis_builder #: model:ir.model,name:mis_builder.model_mis_kpi_data msgid "MIS Kpi Data Abtract class" -msgstr "Classe abstracta de dades KPI MIS" +msgstr "Classe d'abstract de dades MIS Kpi" #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_form @@ -1101,9 +1186,8 @@ msgstr "Informe MIS - Relació Subinformes" #. module: mis_builder #: model:ir.model,name:mis_builder.model_add_mis_report_instance_dashboard_wizard -#, fuzzy msgid "MIS Report Add to Dashboard Wizard" -msgstr "Informe MIS Afegir a l'assistent de tauler de control" +msgstr "Assistent per afegir un informe MIS al tauler de control" #. module: mis_builder #: model:ir.model,name:mis_builder.model_mis_report_instance @@ -1113,26 +1197,19 @@ msgstr "Instància d'informe MIS" #. module: mis_builder #: model:ir.model,name:mis_builder.model_mis_report_instance_period -#, fuzzy msgid "MIS Report Instance Period" -msgstr "Període Instància d'Informe MIS" +msgstr "Període de la instància de l'informe MIS" #. module: mis_builder #: model:ir.model,name:mis_builder.model_mis_report_instance_period_sum -#, fuzzy msgid "MIS Report Instance Period Sum" -msgstr "Suma Període Instància d'informe MIS" - -#. module: mis_builder -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_instance_view_tree -msgid "MIS Report Instances" -msgstr "Instàncies d'informes MIS" +msgstr "Suma del període de la instància de l'informe MIS" #. module: mis_builder #: model:ir.model,name:mis_builder.model_mis_report_kpi #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "MIS Report KPI" -msgstr "KPI d'informe MIS" +msgstr "KPI de l'informe MIS" #. module: mis_builder #: model:ir.model,name:mis_builder.model_mis_report_kpi_expression @@ -1158,7 +1235,6 @@ msgstr "Estil de format MIS" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_style_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_style_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_style_view_tree msgid "MIS Report Styles" msgstr "Estils d'informes MIS" @@ -1187,7 +1263,6 @@ msgstr "MIS" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_instance_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_instance_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_tree msgid "MIS Reports" msgstr "Informes MIS" @@ -1234,15 +1309,18 @@ msgstr "Mes" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__move_lines_source +msgid "Move Lines Source" +msgstr "Font de línies MultiMove" + +#. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_aml_model_id msgid "Move lines source" msgstr "Origen dels apunts" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_aml_model_name -#, fuzzy msgid "Move lines source model name" -msgstr "Mou el nom del model d'origen de les línies." +msgstr "Moveu el nom del model font de línies" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi__multi @@ -1350,14 +1428,14 @@ msgstr "Períodes" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__pivot_date -msgid "Pivot date" -msgstr "Data pivot" +msgid "Pivot Date" +msgstr "Data de pivot" #. module: mis_builder #: code:addons/mis_builder/models/mis_report_instance.py:0 #, python-format msgid "Please provide both columns to compare in %s." -msgstr "Si us plau, introdueixi ambdues columnes a comparar en %s." +msgstr "Proporcioneu les dues columnes per comparar en %s." #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_style__prefix @@ -1394,9 +1472,9 @@ msgstr "Consultes" #. module: mis_builder #: code:addons/mis_builder/models/mis_report.py:0 -#, fuzzy, python-format +#, python-format msgid "Query name ({}) must be valid python identifier" -msgstr "El nom de la consulta ({}) ha de ser un identificador Python vàlid" +msgstr "El nom de la consulta ({}) ha de ser un identificador de Python vàlid" #. module: mis_builder #. openerp-web @@ -1482,13 +1560,12 @@ msgstr "Configuració" #. module: mis_builder #: model:ir.model.constraint,message:mis_builder.constraint_mis_report_subreport_subreport_unique -#, fuzzy msgid "" "Should not include the same report more than once as sub report of a given " "report" msgstr "" -"No hauria d’incloure el mateix informe més d’una vegada que el subinforme " -"d’un informe determinat" +"No s'ha d'incloure el mateix informe més d'una vegada com a subinforme d'un " +"informe determinat" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period_sum__sign @@ -1517,7 +1594,7 @@ msgstr "Estil" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi__style_expression -msgid "Style expression" +msgid "Style Expression" msgstr "Expressió d'estil" #. module: mis_builder @@ -1595,9 +1672,8 @@ msgstr "El nom del subinforme ({}) ha de ser un identificador Python vàlid" #. module: mis_builder #: model:ir.model.constraint,message:mis_builder.constraint_mis_report_subreport_name_unique -#, fuzzy msgid "Subreport name should be unique by report" -msgstr "El nom del subinforme ha de ser únic per a cada informe" +msgstr "El nom del subinforme ha de ser únic per a l'informe" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_style__suffix @@ -1672,6 +1748,11 @@ msgid "" "account code (eg\n" " 70%, etc)." msgstr "" +"El\n" +" selector de comptes\n" +" és una expressió semblant al " +"codi del compte (p. ex\n" +" 70%, etc)." #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -1681,6 +1762,11 @@ msgid "" " is an Odoo domain filter on " "journal items." msgstr "" +"El\n" +" domini d'articles de diari" +"\n" +" és un filtre de domini d'Odoo " +"sobre articles de diari." #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -1695,6 +1781,16 @@ msgid "" " \n" " ." msgstr "" +"Els següents elements especials es reconeixen a\n" +" les expressions per calcular dades " +"comptables:\n" +" \n" +" {bal|crd|deb|pbal|nbal}{pieu}[" +"compte\n" +" selector][domini d'articles de " +"diari]\n" +" \n" +" ." #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_kpi_data__date_to @@ -1718,7 +1814,7 @@ msgstr "Mètode d'acumulació %s no esperat per a %s." #: code:addons/mis_builder/models/mis_report.py:0 #, python-format msgid "Unexpected value %s for target_move." -msgstr "" +msgstr "Valor inesperat %s per a target_move." #. module: mis_builder #: code:addons/mis_builder/models/prorata_read_group_mixin.py:0 @@ -1841,6 +1937,18 @@ msgstr "extra-súper-gran" msgid "xx-small" msgstr "extra-súper-petita" +#~ msgid "Account model" +#~ msgstr "Model de compte" + +#~ msgid "MIS Report Instances" +#~ msgstr "Instàncies d'informes MIS" + +#~ msgid "Pivot date" +#~ msgstr "Data pivot" + +#~ msgid "Style expression" +#~ msgstr "Expressió d'estil" + #~ msgid "" #~ "Check if you wish to specify children companies to be searched for data." #~ msgstr "" diff --git a/mis_builder/i18n/de.po b/mis_builder/i18n/de.po index b16cf26..e329df7 100644 --- a/mis_builder/i18n/de.po +++ b/mis_builder/i18n/de.po @@ -197,7 +197,7 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__account_model -msgid "Account model" +msgid "Account Model" msgstr "" #. module: mis_builder @@ -1075,11 +1075,6 @@ msgstr "" msgid "MIS Report Instance Period Sum" msgstr "" -#. module: mis_builder -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_instance_view_tree -msgid "MIS Report Instances" -msgstr "" - #. module: mis_builder #: model:ir.model,name:mis_builder.model_mis_report_kpi #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -1110,7 +1105,6 @@ msgstr "" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_style_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_style_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_style_view_tree msgid "MIS Report Styles" msgstr "" @@ -1139,7 +1133,6 @@ msgstr "" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_instance_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_instance_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_tree msgid "MIS Reports" msgstr "" @@ -1186,6 +1179,10 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__move_lines_source +msgid "Move Lines Source" +msgstr "" + +#. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_aml_model_id msgid "Move lines source" msgstr "" @@ -1301,7 +1298,7 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__pivot_date -msgid "Pivot date" +msgid "Pivot Date" msgstr "" #. module: mis_builder @@ -1463,7 +1460,7 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi__style_expression -msgid "Style expression" +msgid "Style Expression" msgstr "" #. module: mis_builder diff --git a/mis_builder/i18n/el.po b/mis_builder/i18n/el.po index 6ea1168..18017ed 100644 --- a/mis_builder/i18n/el.po +++ b/mis_builder/i18n/el.po @@ -193,7 +193,7 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__account_model -msgid "Account model" +msgid "Account Model" msgstr "" #. module: mis_builder @@ -1071,11 +1071,6 @@ msgstr "" msgid "MIS Report Instance Period Sum" msgstr "" -#. module: mis_builder -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_instance_view_tree -msgid "MIS Report Instances" -msgstr "" - #. module: mis_builder #: model:ir.model,name:mis_builder.model_mis_report_kpi #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -1106,7 +1101,6 @@ msgstr "" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_style_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_style_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_style_view_tree msgid "MIS Report Styles" msgstr "" @@ -1135,7 +1129,6 @@ msgstr "" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_instance_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_instance_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_tree msgid "MIS Reports" msgstr "" @@ -1182,6 +1175,10 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__move_lines_source +msgid "Move Lines Source" +msgstr "" + +#. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_aml_model_id msgid "Move lines source" msgstr "" @@ -1297,7 +1294,7 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__pivot_date -msgid "Pivot date" +msgid "Pivot Date" msgstr "" #. module: mis_builder @@ -1459,7 +1456,7 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi__style_expression -msgid "Style expression" +msgid "Style Expression" msgstr "" #. module: mis_builder diff --git a/mis_builder/i18n/el_GR.po b/mis_builder/i18n/el_GR.po index d7c7857..0cc06ea 100644 --- a/mis_builder/i18n/el_GR.po +++ b/mis_builder/i18n/el_GR.po @@ -193,7 +193,7 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__account_model -msgid "Account model" +msgid "Account Model" msgstr "" #. module: mis_builder @@ -1071,11 +1071,6 @@ msgstr "" msgid "MIS Report Instance Period Sum" msgstr "" -#. module: mis_builder -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_instance_view_tree -msgid "MIS Report Instances" -msgstr "" - #. module: mis_builder #: model:ir.model,name:mis_builder.model_mis_report_kpi #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -1106,7 +1101,6 @@ msgstr "" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_style_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_style_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_style_view_tree msgid "MIS Report Styles" msgstr "" @@ -1135,7 +1129,6 @@ msgstr "" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_instance_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_instance_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_tree msgid "MIS Reports" msgstr "" @@ -1182,6 +1175,10 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__move_lines_source +msgid "Move Lines Source" +msgstr "" + +#. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_aml_model_id msgid "Move lines source" msgstr "" @@ -1297,7 +1294,7 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__pivot_date -msgid "Pivot date" +msgid "Pivot Date" msgstr "" #. module: mis_builder @@ -1459,7 +1456,7 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi__style_expression -msgid "Style expression" +msgid "Style Expression" msgstr "" #. module: mis_builder diff --git a/mis_builder/i18n/es.po b/mis_builder/i18n/es.po index 69735ec..c1ece3e 100644 --- a/mis_builder/i18n/es.po +++ b/mis_builder/i18n/es.po @@ -203,8 +203,8 @@ msgstr "Un filtro de fecha es obligatorio para este origen en la columna %s." #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__account_model -msgid "Account model" -msgstr "Modelo de cuenta" +msgid "Account Model" +msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi__accumulation_method @@ -1121,11 +1121,6 @@ msgstr "Período de instancia del informe MIS" msgid "MIS Report Instance Period Sum" msgstr "Suma del período de instancia del informe MIS" -#. module: mis_builder -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_instance_view_tree -msgid "MIS Report Instances" -msgstr "Instancias de informes MIS" - #. module: mis_builder #: model:ir.model,name:mis_builder.model_mis_report_kpi #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -1156,7 +1151,6 @@ msgstr "Estilo del informe MIS" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_style_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_style_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_style_view_tree msgid "MIS Report Styles" msgstr "Estilos del informe MIS" @@ -1185,7 +1179,6 @@ msgstr "MIS" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_instance_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_instance_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_tree msgid "MIS Reports" msgstr "Informes MIS" @@ -1232,6 +1225,10 @@ msgstr "Mes" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__move_lines_source +msgid "Move Lines Source" +msgstr "" + +#. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_aml_model_id msgid "Move lines source" msgstr "Origen de los apuntes" @@ -1347,8 +1344,8 @@ msgstr "Periodos" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__pivot_date -msgid "Pivot date" -msgstr "Fecha pivote" +msgid "Pivot Date" +msgstr "" #. module: mis_builder #: code:addons/mis_builder/models/mis_report_instance.py:0 @@ -1514,8 +1511,8 @@ msgstr "Estilo" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi__style_expression -msgid "Style expression" -msgstr "Expresión de estilo" +msgid "Style Expression" +msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi__auto_expand_accounts_style_id @@ -1838,6 +1835,18 @@ msgstr "extra-súper-grande" msgid "xx-small" msgstr "extra-súper-pequeña" +#~ msgid "Account model" +#~ msgstr "Modelo de cuenta" + +#~ msgid "MIS Report Instances" +#~ msgstr "Instancias de informes MIS" + +#~ msgid "Pivot date" +#~ msgstr "Fecha pivote" + +#~ msgid "Style expression" +#~ msgstr "Expresión de estilo" + #~ msgid "" #~ "Check if you wish to specify children companies to be searched for data." #~ msgstr "" diff --git a/mis_builder/i18n/fr.po b/mis_builder/i18n/fr.po index 39d7655..cb9c95c 100644 --- a/mis_builder/i18n/fr.po +++ b/mis_builder/i18n/fr.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-02-10 07:59+0000\n" -"PO-Revision-Date: 2022-02-10 23:16+0000\n" -"Last-Translator: Abdourahmane Wone \n" +"PO-Revision-Date: 2022-06-07 11:23+0000\n" +"Last-Translator: Yann Papouin \n" "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -43,8 +43,8 @@ msgstr "" "\n" " balp[('user_type_id', '=',\n" " ref('account.\n" -" " -"data_account_type_receivable').id)][]\n" +" data_account_type_receivable')." +"id)][]\n" " \n" " :variation du solde de toutes " "les créances\n" @@ -64,8 +64,8 @@ msgid "" " 56." msgstr "" "\n" -" balp[][(" -"'tax_line_id.tag_ids', '=',\n" +" balp[][('tax_line_id." +"tag_ids', '=',\n" " ref('l10n_be.tax_tag_56')." "id)]\n" " \n" @@ -86,8 +86,8 @@ msgid "" " journal BNK1 during the period." msgstr "" "\n" -" debp[55%][(" -"'journal_id.code', '=',\n" +" debp[55%][('journal_id." +"code', '=',\n" " 'BNK1')]\n" " \n" " : somme de tous les debits sur " @@ -279,8 +279,8 @@ msgstr "Un filtre date est obligatoire pour cette source dans la colonne %s." #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__account_model -msgid "Account model" -msgstr "Additionne le détail des comptes" +msgid "Account Model" +msgstr "Modèle de Compte" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi__accumulation_method @@ -317,11 +317,12 @@ msgid "" "Sum columns: summation (+/-) of other columns.\n" "Compare to column: compare to other column.\n" msgstr "" -"Réels: données actuelles, de la comptabilité et autres requêtes.\n" -"Réels (autre): données actuelles d'une autre source (eg une vue d'une base " -"de données fournissant des lignes de mouvements de comptes similaires).\n" -"Somme colonnes: somme (+/-) d'autres colonnes.\n" -"Comparer colonnes: compare à  une autre colonne.\n" +"Réels : données actuelles, de la comptabilité et autres requêtes.\n" +"Réels (autre) : données actuelles d'une autre source (ex : une vue d'une " +"base de données fournissant des lignes de mouvements de comptes similaires)." +"\n" +"Somme colonnes : somme (+/-) d'autres colonnes.\n" +"Comparer colonnes : compare à  une autre colonne.\n" #. module: mis_builder #: model:ir.model,name:mis_builder.model_prorata_read_group_mixin @@ -368,7 +369,7 @@ msgstr "Écritures comptabilisées seulement" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__allowed_cmpcol_ids msgid "Allowed Cmpcol" -msgstr "" +msgstr "Cmpcol autorisée" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids @@ -521,17 +522,17 @@ msgstr "Colonne" #. module: mis_builder #: code:addons/mis_builder/models/mis_report_instance.py:0 -#, fuzzy, python-format +#, python-format msgid "Column %s cannot be compared to itrec." -msgstr "Colonne %s ne peut pas être comparée à  elle-même." +msgstr "Colonne %s ne peut pas être comparée à elle-même." #. module: mis_builder #: code:addons/mis_builder/models/mis_report_instance.py:0 #, python-format msgid "Column %s with move lines source must have from/to dates." msgstr "" -"Colonne %s avec les lignes d’écritures comme source doit avoir des dates dé" -"but/fin ." +"Colonne %s avec les lignes d’écritures comme source doit avoir des dates " +"début/fin ." #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_instance_view_form @@ -756,8 +757,8 @@ msgstr "Dp par défaut" msgid "" "Dummy field that adapts searches on date to searches on date_from/date_to." msgstr "" -"Champ factice qui adapte les recherches sur dates aux recherches sur date dé" -"but/fin." +"Champ factice qui adapte les recherches sur dates aux recherches sur date " +"début/fin." #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__duration @@ -1096,7 +1097,7 @@ msgstr "Indicateurs clés de performance (KPIs) de ce rapport et sous-rapports." #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi_expression__kpi_id msgid "Kpi" -msgstr "Kpi" +msgstr "Icp" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__name @@ -1209,11 +1210,6 @@ msgstr "Période d'Instance de rapport MIS" msgid "MIS Report Instance Period Sum" msgstr "Somme sur la période d'Instance de rapport MIS" -#. module: mis_builder -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_instance_view_tree -msgid "MIS Report Instances" -msgstr "Instances de rapport MIS" - #. module: mis_builder #: model:ir.model,name:mis_builder.model_mis_report_kpi #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -1244,7 +1240,6 @@ msgstr "Style de Rapport MIS" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_style_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_style_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_style_view_tree msgid "MIS Report Styles" msgstr "Styles de Rapport MIS" @@ -1273,7 +1268,6 @@ msgstr "MIS Reporting" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_instance_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_instance_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_tree msgid "MIS Reports" msgstr "Rapports MIS" @@ -1320,6 +1314,10 @@ msgstr "Mois" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__move_lines_source +msgid "Move Lines Source" +msgstr "Source des lignes de nouvement" + +#. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_aml_model_id msgid "Move lines source" msgstr "Source des lignes d'écriture" @@ -1435,7 +1433,7 @@ msgstr "Périodes" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__pivot_date -msgid "Pivot date" +msgid "Pivot Date" msgstr "Date pivot" #. module: mis_builder @@ -1542,7 +1540,8 @@ msgstr "Sauvegarder" #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__company_ids msgid "Select companies for which data will be searched." -msgstr "Sélectionnez les sociétés pour lesquelles les données seront cherchées." +msgstr "" +"Sélectionnez les sociétés pour lesquelles les données seront cherchées." #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__currency_id @@ -1574,8 +1573,8 @@ msgid "" "Should not include the same report more than once as sub report of a given " "report" msgstr "" -"Ne devrait pas inclure le même rapport plus d’une fois comme sous-rapport d’" -"un rapport donné" +"Ne devrait pas inclure le même rapport plus d’une fois comme sous-rapport " +"d’un rapport donné" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period_sum__sign @@ -1604,7 +1603,7 @@ msgstr "Style" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi__style_expression -msgid "Style expression" +msgid "Style Expression" msgstr "Expression du style" #. module: mis_builder @@ -1759,7 +1758,7 @@ msgid "" "account code (eg\n" " 70%, etc)." msgstr "" -"le\n" +"Le\n" " sélecteur de compte\n" " est une expression similaire " "sur le code de compte (par exemple\n" @@ -1773,7 +1772,7 @@ msgid "" " is an Odoo domain filter on " "journal items." msgstr "" -"le\n" +"Le\n" " domaine des écriture de " "journal\n" " est un filtre de domaine Odoo " @@ -1796,8 +1795,8 @@ msgstr "" " les expressions pour calculer les " "données comptables :\n" " \n" -" {bal|crd|deb|pbal|nbal}{pieu}[" -"sélecteur de compte\n" +" {bal|crd|deb|pbal|nbal}{pieu}" +"[sélecteur de compte\n" " ][domaine des écritures de " "journal]\n" " \n" @@ -1948,6 +1947,18 @@ msgstr "xx-grand" msgid "xx-small" msgstr "xx-petit" +#~ msgid "Account model" +#~ msgstr "Additionne le détail des comptes" + +#~ msgid "MIS Report Instances" +#~ msgstr "Instances de rapport MIS" + +#~ msgid "Pivot date" +#~ msgstr "Date pivot" + +#~ msgid "Style expression" +#~ msgstr "Expression du style" + #~ msgid "" #~ "Check if you wish to specify children companies to be searched for data." #~ msgstr "" diff --git a/mis_builder/i18n/hr.po b/mis_builder/i18n/hr.po index b4aacef..bf33d5d 100644 --- a/mis_builder/i18n/hr.po +++ b/mis_builder/i18n/hr.po @@ -205,8 +205,8 @@ msgstr "Filter po datumu je obavezan za izvor podataka u koloni %s." #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__account_model -msgid "Account model" -msgstr "Model konta" +msgid "Account Model" +msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi__accumulation_method @@ -1085,11 +1085,6 @@ msgstr "" msgid "MIS Report Instance Period Sum" msgstr "" -#. module: mis_builder -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_instance_view_tree -msgid "MIS Report Instances" -msgstr "" - #. module: mis_builder #: model:ir.model,name:mis_builder.model_mis_report_kpi #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -1120,7 +1115,6 @@ msgstr "" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_style_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_style_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_style_view_tree msgid "MIS Report Styles" msgstr "" @@ -1149,7 +1143,6 @@ msgstr "" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_instance_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_instance_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_tree msgid "MIS Reports" msgstr "" @@ -1196,6 +1189,10 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__move_lines_source +msgid "Move Lines Source" +msgstr "" + +#. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_aml_model_id msgid "Move lines source" msgstr "" @@ -1311,7 +1308,7 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__pivot_date -msgid "Pivot date" +msgid "Pivot Date" msgstr "" #. module: mis_builder @@ -1473,7 +1470,7 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi__style_expression -msgid "Style expression" +msgid "Style Expression" msgstr "" #. module: mis_builder @@ -1794,6 +1791,9 @@ msgstr "" msgid "xx-small" msgstr "" +#~ msgid "Account model" +#~ msgstr "Model konta" + #~ msgid "Company" #~ msgstr "Tvrtka" diff --git a/mis_builder/i18n/it.po b/mis_builder/i18n/it.po index ce8cdf1..aa530f7 100644 --- a/mis_builder/i18n/it.po +++ b/mis_builder/i18n/it.po @@ -196,8 +196,8 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__account_model -msgid "Account model" -msgstr "Modello contabile" +msgid "Account Model" +msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi__accumulation_method @@ -1082,11 +1082,6 @@ msgstr "Periodo istanza MIS Report" msgid "MIS Report Instance Period Sum" msgstr "Istanza somma nel periodo MIS Report" -#. module: mis_builder -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_instance_view_tree -msgid "MIS Report Instances" -msgstr "Istanze MIS Report" - #. module: mis_builder #: model:ir.model,name:mis_builder.model_mis_report_kpi #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -1117,7 +1112,6 @@ msgstr "Stile MIS Report" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_style_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_style_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_style_view_tree msgid "MIS Report Styles" msgstr "Stili MIS Report" @@ -1146,7 +1140,6 @@ msgstr "" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_instance_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_instance_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_tree msgid "MIS Reports" msgstr "MIS Reports" @@ -1193,6 +1186,10 @@ msgstr "Mese" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__move_lines_source +msgid "Move Lines Source" +msgstr "" + +#. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_aml_model_id msgid "Move lines source" msgstr "" @@ -1308,8 +1305,8 @@ msgstr "Periodi" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__pivot_date -msgid "Pivot date" -msgstr "Data Pivot" +msgid "Pivot Date" +msgstr "" #. module: mis_builder #: code:addons/mis_builder/models/mis_report_instance.py:0 @@ -1474,7 +1471,7 @@ msgstr "Stile" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi__style_expression -msgid "Style expression" +msgid "Style Expression" msgstr "" #. module: mis_builder @@ -1797,6 +1794,15 @@ msgstr "" msgid "xx-small" msgstr "" +#~ msgid "Account model" +#~ msgstr "Modello contabile" + +#~ msgid "MIS Report Instances" +#~ msgstr "Istanze MIS Report" + +#~ msgid "Pivot date" +#~ msgstr "Data Pivot" + #~ msgid "" #~ "Check if you wish to specify children companies to be searched for data." #~ msgstr "" diff --git a/mis_builder/i18n/mis_builder.pot b/mis_builder/i18n/mis_builder.pot index 9e8eaa8..f353ae4 100644 --- a/mis_builder/i18n/mis_builder.pot +++ b/mis_builder/i18n/mis_builder.pot @@ -172,7 +172,7 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__account_model -msgid "Account model" +msgid "Account Model" msgstr "" #. module: mis_builder @@ -1046,11 +1046,6 @@ msgstr "" msgid "MIS Report Instance Period Sum" msgstr "" -#. module: mis_builder -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_instance_view_tree -msgid "MIS Report Instances" -msgstr "" - #. module: mis_builder #: model:ir.model,name:mis_builder.model_mis_report_kpi #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -1081,7 +1076,6 @@ msgstr "" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_style_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_style_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_style_view_tree msgid "MIS Report Styles" msgstr "" @@ -1110,7 +1104,6 @@ msgstr "" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_instance_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_instance_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_tree msgid "MIS Reports" msgstr "" @@ -1157,6 +1150,10 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__move_lines_source +msgid "Move Lines Source" +msgstr "" + +#. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_aml_model_id msgid "Move lines source" msgstr "" @@ -1274,7 +1271,7 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__pivot_date -msgid "Pivot date" +msgid "Pivot Date" msgstr "" #. module: mis_builder @@ -1436,7 +1433,7 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi__style_expression -msgid "Style expression" +msgid "Style Expression" msgstr "" #. module: mis_builder diff --git a/mis_builder/i18n/nl.po b/mis_builder/i18n/nl.po index b52b22d..535ff9f 100644 --- a/mis_builder/i18n/nl.po +++ b/mis_builder/i18n/nl.po @@ -202,9 +202,8 @@ msgstr "Een datum filter is verplicht voor deze bron in kolom %s." #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__account_model -#, fuzzy -msgid "Account model" -msgstr "Rekening details optellen" +msgid "Account Model" +msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi__accumulation_method @@ -1110,11 +1109,6 @@ msgstr "MIS Rapport Instantie" msgid "MIS Report Instance Period Sum" msgstr "MIS Rapport Instantie" -#. module: mis_builder -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_instance_view_tree -msgid "MIS Report Instances" -msgstr "MIS Rapport Instanties" - #. module: mis_builder #: model:ir.model,name:mis_builder.model_mis_report_kpi #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -1147,7 +1141,6 @@ msgstr "MIS Rapport Stijl" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_style_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_style_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_style_view_tree msgid "MIS Report Styles" msgstr "MIS Rapport Stijlen" @@ -1178,7 +1171,6 @@ msgstr "MIS Rapportage" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_instance_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_instance_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_tree msgid "MIS Reports" msgstr "MIS Rapporten" @@ -1225,6 +1217,10 @@ msgstr "Maand" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__move_lines_source +msgid "Move Lines Source" +msgstr "" + +#. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_aml_model_id msgid "Move lines source" msgstr "Bron boekingsregels" @@ -1341,8 +1337,8 @@ msgstr "Periodes" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__pivot_date -msgid "Pivot date" -msgstr "Uitgangsdatum" +msgid "Pivot Date" +msgstr "" #. module: mis_builder #: code:addons/mis_builder/models/mis_report_instance.py:0 @@ -1506,8 +1502,8 @@ msgstr "Stijl" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi__style_expression -msgid "Style expression" -msgstr "Stijl uitdrukking" +msgid "Style Expression" +msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi__auto_expand_accounts_style_id @@ -1834,6 +1830,19 @@ msgstr "XXL" msgid "xx-small" msgstr "XXS" +#, fuzzy +#~ msgid "Account model" +#~ msgstr "Rekening details optellen" + +#~ msgid "MIS Report Instances" +#~ msgstr "MIS Rapport Instanties" + +#~ msgid "Pivot date" +#~ msgstr "Uitgangsdatum" + +#~ msgid "Style expression" +#~ msgstr "Stijl uitdrukking" + #~ msgid "" #~ "Check if you wish to specify children companies to be searched for data." #~ msgstr "" diff --git a/mis_builder/i18n/nl_NL.po b/mis_builder/i18n/nl_NL.po index cd05165..1a7da1e 100644 --- a/mis_builder/i18n/nl_NL.po +++ b/mis_builder/i18n/nl_NL.po @@ -205,9 +205,8 @@ msgstr "Een datum filter is verplicht voor deze bron in kolom %s." #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__account_model -#, fuzzy -msgid "Account model" -msgstr "Rekening details optellen" +msgid "Account Model" +msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi__accumulation_method @@ -1113,11 +1112,6 @@ msgstr "MIS Rapport Instantie" msgid "MIS Report Instance Period Sum" msgstr "MIS Rapport Instantie" -#. module: mis_builder -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_instance_view_tree -msgid "MIS Report Instances" -msgstr "MIS Rapport Instanties" - #. module: mis_builder #: model:ir.model,name:mis_builder.model_mis_report_kpi #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -1150,7 +1144,6 @@ msgstr "MIS Rapport Stijl" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_style_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_style_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_style_view_tree msgid "MIS Report Styles" msgstr "MIS Rapport Stijlen" @@ -1181,7 +1174,6 @@ msgstr "MIS Rapportage" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_instance_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_instance_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_tree msgid "MIS Reports" msgstr "MIS Rapporten" @@ -1228,6 +1220,10 @@ msgstr "Maand" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__move_lines_source +msgid "Move Lines Source" +msgstr "" + +#. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_aml_model_id msgid "Move lines source" msgstr "Bron boekingsregels" @@ -1344,8 +1340,8 @@ msgstr "Periodes" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__pivot_date -msgid "Pivot date" -msgstr "Uitgangsdatum" +msgid "Pivot Date" +msgstr "" #. module: mis_builder #: code:addons/mis_builder/models/mis_report_instance.py:0 @@ -1509,8 +1505,8 @@ msgstr "Stijl" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi__style_expression -msgid "Style expression" -msgstr "Stijl uitdrukking" +msgid "Style Expression" +msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi__auto_expand_accounts_style_id @@ -1837,6 +1833,19 @@ msgstr "XXL" msgid "xx-small" msgstr "XXS" +#, fuzzy +#~ msgid "Account model" +#~ msgstr "Rekening details optellen" + +#~ msgid "MIS Report Instances" +#~ msgstr "MIS Rapport Instanties" + +#~ msgid "Pivot date" +#~ msgstr "Uitgangsdatum" + +#~ msgid "Style expression" +#~ msgstr "Stijl uitdrukking" + #~ msgid "" #~ "Check if you wish to specify children companies to be searched for data." #~ msgstr "" diff --git a/mis_builder/i18n/pt.po b/mis_builder/i18n/pt.po index a2f85ba..a5b90a5 100644 --- a/mis_builder/i18n/pt.po +++ b/mis_builder/i18n/pt.po @@ -197,7 +197,7 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__account_model -msgid "Account model" +msgid "Account Model" msgstr "" #. module: mis_builder @@ -1075,11 +1075,6 @@ msgstr "" msgid "MIS Report Instance Period Sum" msgstr "" -#. module: mis_builder -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_instance_view_tree -msgid "MIS Report Instances" -msgstr "" - #. module: mis_builder #: model:ir.model,name:mis_builder.model_mis_report_kpi #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -1110,7 +1105,6 @@ msgstr "" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_style_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_style_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_style_view_tree msgid "MIS Report Styles" msgstr "" @@ -1139,7 +1133,6 @@ msgstr "" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_instance_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_instance_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_tree msgid "MIS Reports" msgstr "" @@ -1186,6 +1179,10 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__move_lines_source +msgid "Move Lines Source" +msgstr "" + +#. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_aml_model_id msgid "Move lines source" msgstr "" @@ -1301,7 +1298,7 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__pivot_date -msgid "Pivot date" +msgid "Pivot Date" msgstr "" #. module: mis_builder @@ -1463,7 +1460,7 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi__style_expression -msgid "Style expression" +msgid "Style Expression" msgstr "" #. module: mis_builder diff --git a/mis_builder/i18n/pt_BR.po b/mis_builder/i18n/pt_BR.po index 8ff211b..cfaa75d 100644 --- a/mis_builder/i18n/pt_BR.po +++ b/mis_builder/i18n/pt_BR.po @@ -200,8 +200,8 @@ msgstr "Um filtro de data é obrigatório para esta fonte na coluna %s." #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__account_model -msgid "Account model" -msgstr "Modelo de conta" +msgid "Account Model" +msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi__accumulation_method @@ -1110,11 +1110,6 @@ msgstr "Período da Instância do Relatório SIG" msgid "MIS Report Instance Period Sum" msgstr "Soma do Período da Instância do Relatório SIG" -#. module: mis_builder -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_instance_view_tree -msgid "MIS Report Instances" -msgstr "Instâncias do Relatório SIG" - #. module: mis_builder #: model:ir.model,name:mis_builder.model_mis_report_kpi #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -1145,7 +1140,6 @@ msgstr "Estilo do Relatório SIG" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_style_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_style_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_style_view_tree msgid "MIS Report Styles" msgstr "Estilos do Relatório SIG" @@ -1174,7 +1168,6 @@ msgstr "Relatórios SIG" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_instance_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_instance_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_tree msgid "MIS Reports" msgstr "Relatórios SIG" @@ -1221,6 +1214,10 @@ msgstr "Mês" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__move_lines_source +msgid "Move Lines Source" +msgstr "" + +#. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_aml_model_id msgid "Move lines source" msgstr "Mover fonte de linhas" @@ -1336,8 +1333,8 @@ msgstr "Períodos" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__pivot_date -msgid "Pivot date" -msgstr "Data do Pivot" +msgid "Pivot Date" +msgstr "" #. module: mis_builder #: code:addons/mis_builder/models/mis_report_instance.py:0 @@ -1500,8 +1497,8 @@ msgstr "Estilo" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi__style_expression -msgid "Style expression" -msgstr "Expressão de Estilo" +msgid "Style Expression" +msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi__auto_expand_accounts_style_id @@ -1827,6 +1824,18 @@ msgstr "grandíssimo" msgid "xx-small" msgstr "Pequeníssimo" +#~ msgid "Account model" +#~ msgstr "Modelo de conta" + +#~ msgid "MIS Report Instances" +#~ msgstr "Instâncias do Relatório SIG" + +#~ msgid "Pivot date" +#~ msgstr "Data do Pivot" + +#~ msgid "Style expression" +#~ msgstr "Expressão de Estilo" + #~ msgid "" #~ "Check if you wish to specify children companies to be searched for data." #~ msgstr "" diff --git a/mis_builder/i18n/sv.po b/mis_builder/i18n/sv.po index d1e38cf..741d03b 100644 --- a/mis_builder/i18n/sv.po +++ b/mis_builder/i18n/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2021-11-17 11:36+0000\n" +"PO-Revision-Date: 2022-02-14 11:16+0000\n" "Last-Translator: Simon S \n" "Language-Team: none\n" "Language: sv\n" @@ -195,7 +195,7 @@ msgstr "Ett datumfilter är obligatoriskt för denna källa i kolumn %s." #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__account_model -msgid "Account model" +msgid "Account Model" msgstr "" #. module: mis_builder @@ -965,7 +965,7 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__name msgid "Label" -msgstr "" +msgstr "Etikett" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__landscape_pdf @@ -1010,7 +1010,7 @@ msgstr "Senast genererade rapporter" #: model:ir.model.fields,field_description:mis_builder.field_mis_report_subkpi__write_uid #: model:ir.model.fields,field_description:mis_builder.field_mis_report_subreport__write_uid msgid "Last Updated by" -msgstr "" +msgstr "Senast uppdaterad av" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_add_mis_report_instance_dashboard_wizard__write_date @@ -1025,7 +1025,7 @@ msgstr "" #: model:ir.model.fields,field_description:mis_builder.field_mis_report_subkpi__write_date #: model:ir.model.fields,field_description:mis_builder.field_mis_report_subreport__write_date msgid "Last Updated on" -msgstr "" +msgstr "Senast uppdaterad den" #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_instance_view_form @@ -1073,11 +1073,6 @@ msgstr "" msgid "MIS Report Instance Period Sum" msgstr "" -#. module: mis_builder -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_instance_view_tree -msgid "MIS Report Instances" -msgstr "" - #. module: mis_builder #: model:ir.model,name:mis_builder.model_mis_report_kpi #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form @@ -1108,7 +1103,6 @@ msgstr "" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_style_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_style_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_style_view_tree msgid "MIS Report Styles" msgstr "" @@ -1137,7 +1131,6 @@ msgstr "MIS-rapportering" #. module: mis_builder #: model:ir.actions.act_window,name:mis_builder.mis_report_instance_view_action #: model:ir.ui.menu,name:mis_builder.mis_report_instance_view_menu -#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_tree msgid "MIS Reports" msgstr "MIS-rapporter" @@ -1184,6 +1177,10 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report__move_lines_source +msgid "Move Lines Source" +msgstr "" + +#. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_aml_model_id msgid "Move lines source" msgstr "" @@ -1299,7 +1296,7 @@ msgstr "Perioder" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__pivot_date -msgid "Pivot date" +msgid "Pivot Date" msgstr "" #. module: mis_builder @@ -1461,7 +1458,7 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_kpi__style_expression -msgid "Style expression" +msgid "Style Expression" msgstr "" #. module: mis_builder @@ -1647,7 +1644,7 @@ msgstr "Till" #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__date_to msgid "To (computed)" -msgstr "" +msgstr "Till (beräknad)" #. module: mis_builder #: code:addons/mis_builder/models/mis_kpi_data.py:0 diff --git a/mis_builder/models/aep.py b/mis_builder/models/aep.py index 9eb07d8..fa7ee00 100644 --- a/mis_builder/models/aep.py +++ b/mis_builder/models/aep.py @@ -12,12 +12,6 @@ from flectra.tools.safe_eval import datetime, dateutil, safe_eval, time from .accounting_none import AccountingNone -try: - import itertools.izip as zip -except ImportError: - pass # python 3 - - _DOMAIN_START_RE = re.compile(r"\(|(['\"])[!&|]\1") diff --git a/mis_builder/models/data_error.py b/mis_builder/models/data_error.py index 8b53921..22421e0 100644 --- a/mis_builder/models/data_error.py +++ b/mis_builder/models/data_error.py @@ -5,7 +5,7 @@ class DataError(Exception): def __init__(self, name, msg): - super(DataError, self).__init__() + super().__init__() self.name = name self.msg = msg diff --git a/mis_builder/models/expression_evaluator.py b/mis_builder/models/expression_evaluator.py index 94ff403..32705f5 100644 --- a/mis_builder/models/expression_evaluator.py +++ b/mis_builder/models/expression_evaluator.py @@ -3,11 +3,6 @@ from .mis_safe_eval import NameDataError, mis_safe_eval -try: - import itertools.izip as zip -except ImportError: - pass # python 3 - class ExpressionEvaluator(object): def __init__( diff --git a/mis_builder/models/kpimatrix.py b/mis_builder/models/kpimatrix.py index 764eacb..9db4ece 100644 --- a/mis_builder/models/kpimatrix.py +++ b/mis_builder/models/kpimatrix.py @@ -12,12 +12,6 @@ from .mis_kpi_data import ACC_SUM from .mis_safe_eval import DataError, mis_safe_eval from .simple_array import SimpleArray -try: - import itertools.izip as zip -except ImportError: - pass # python 3 - - _logger = logging.getLogger(__name__) @@ -250,13 +244,13 @@ class KpiMatrix(object): self.lang, row.style_props, kpi.type, val ) if row.kpi.multi and subcol.subkpi: - val_comment = u"{}.{} = {}".format( + val_comment = "{}.{} = {}".format( row.kpi.name, subcol.subkpi.name, row.kpi._get_expression_str_for_subkpi(subcol.subkpi), ) else: - val_comment = u"{} = {}".format(row.kpi.name, row.kpi.expression) + val_comment = "{} = {}".format(row.kpi.name, row.kpi.expression) cell_style_props = row.style_props if row.kpi.style_expression: # evaluate style expression @@ -319,7 +313,7 @@ class KpiMatrix(object): ) ) if not label: - label = u"{} vs {}".format(col.label, base_col.label) + label = "{} vs {}".format(col.label, base_col.label) comparison_col = KpiMatrixCol( cmpcol_key, label, @@ -476,9 +470,9 @@ class KpiMatrix(object): self._account_names = {a.id: self._get_account_name(a) for a in accounts} def _get_account_name(self, account): - result = u"{} {}".format(account.code, account.name) + result = "{} {}".format(account.code, account.name) if self._multi_company: - result = u"{} [{}]".format(result, account.company_id.name) + result = "{} [{}]".format(result, account.company_id.name) return result def get_account_name(self, account_id): diff --git a/mis_builder/models/mis_kpi_data.py b/mis_builder/models/mis_kpi_data.py index 9592143..fbfff90 100644 --- a/mis_builder/models/mis_kpi_data.py +++ b/mis_builder/models/mis_kpi_data.py @@ -62,7 +62,7 @@ class MisKpiData(models.AbstractModel): subkpi_name = "." + subkpi_name else: subkpi_name = "" - rec.name = u"{}{}: {} - {}".format( + rec.name = "{}{}: {} - {}".format( rec.kpi_expression_id.kpi_id.name, subkpi_name, rec.date_from, diff --git a/mis_builder/models/mis_report.py b/mis_builder/models/mis_report.py index 423d6ee..d722969 100644 --- a/mis_builder/models/mis_report.py +++ b/mis_builder/models/mis_report.py @@ -78,13 +78,12 @@ class MisReportKpi(models.Model): _name = "mis.report.kpi" _description = "MIS Report KPI" - name = fields.Char(required=True, string="Name") - description = fields.Char(required=True, string="Description", translate=True) + name = fields.Char(required=True) + description = fields.Char(required=True, translate=True) multi = fields.Boolean() expression = fields.Char( compute="_compute_expression", inverse="_inverse_expression", - string="Expression", ) expression_ids = fields.One2many( comodel_name="mis.report.kpi.expression", @@ -102,7 +101,6 @@ class MisReportKpi(models.Model): string="Style", comodel_name="mis.report.style", required=False ) style_expression = fields.Char( - string="Style expression", help="An expression that returns a style depending on the KPI value. " "Such style is applied on top of the row style.", ) @@ -129,7 +127,6 @@ class MisReportKpi(models.Model): accumulation_method = fields.Selection( [(ACC_SUM, _("Sum")), (ACC_AVG, _("Average")), (ACC_NONE, _("None"))], required=True, - string="Accumulation Method", default=ACC_SUM, help="Determines how values of this kpi spanning over a " "time period are transformed to match the reporting period. " @@ -139,17 +136,15 @@ class MisReportKpi(models.Model): "Average: values of included period are averaged " "with a pro-rata temporis weight.", ) - sequence = fields.Integer(string="Sequence", default=100) - report_id = fields.Many2one( - "mis.report", string="Report", required=True, ondelete="cascade" - ) + sequence = fields.Integer(default=100) + report_id = fields.Many2one("mis.report", required=True, ondelete="cascade") _order = "sequence, id" def name_get(self): res = [] for rec in self: - name = u"{} ({})".format(rec.description, rec.name) + name = "{} ({})".format(rec.description, rec.name) res.append((rec.id, name)) return res @@ -176,7 +171,7 @@ class MisReportKpi(models.Model): for expression in kpi.expression_ids: if expression.subkpi_id: exprs.append( - u"{}\xa0=\xa0{}".format( + "{}\xa0=\xa0{}".format( expression.subkpi_id.name, expression.name ) ) @@ -263,8 +258,8 @@ class MisReportSubkpi(models.Model): report_id = fields.Many2one( comodel_name="mis.report", required=True, ondelete="cascade" ) - name = fields.Char(required=True, string="Name") - description = fields.Char(required=True, string="Description", translate=True) + name = fields.Char(required=True) + description = fields.Char(required=True, translate=True) expression_ids = fields.One2many("mis.report.kpi.expression", "subkpi_id") @api.constrains("name") @@ -313,7 +308,7 @@ class MisReportKpiExpression(models.Model): kpi = rec.kpi_id subkpi = rec.subkpi_id if subkpi: - name = u"{} / {} ({}.{})".format( + name = "{} / {} ({}.{})".format( kpi.description, subkpi.description, kpi.name, subkpi.name ) else: @@ -374,10 +369,8 @@ class MisReportQuery(models.Model): field_names = [field.name for field in record.field_ids] record.field_names = ", ".join(field_names) - name = fields.Char(required=True, string="Name") - model_id = fields.Many2one( - "ir.model", required=True, string="Model", ondelete="cascade" - ) + name = fields.Char(required=True) + model_id = fields.Many2one("ir.model", required=True, ondelete="cascade") field_ids = fields.Many2many( "ir.model.fields", required=True, string="Fields to fetch" ) @@ -391,7 +384,6 @@ class MisReportQuery(models.Model): ("min", _("Min")), ("max", _("Max")), ], - string="Aggregate", ) date_field = fields.Many2one( comodel_name="ir.model.fields", @@ -399,9 +391,9 @@ class MisReportQuery(models.Model): domain=[("ttype", "in", ("date", "datetime"))], ondelete="cascade", ) - domain = fields.Char(string="Domain") + domain = fields.Char() report_id = fields.Many2one( - comodel_name="mis.report", string="Report", required=True, ondelete="cascade" + comodel_name="mis.report", required=True, ondelete="cascade" ) _order = "name" @@ -437,8 +429,8 @@ class MisReport(models.Model): def _default_move_lines_source(self): return self.env["ir.model"].search([("model", "=", "account.move.line")]) - name = fields.Char(required=True, string="Name", translate=True) - description = fields.Char(required=False, string="Description", translate=True) + name = fields.Char(required=True, translate=True) + description = fields.Char(required=False, translate=True) style_id = fields.Many2one(string="Style", comodel_name="mis.report.style") query_ids = fields.One2many( "mis.report.query", "report_id", string="Queries", copy=True @@ -457,7 +449,6 @@ class MisReport(models.Model): ) move_lines_source = fields.Many2one( comodel_name="ir.model", - string="Move lines source", domain=[ ("field_id.name", "=", "debit"), ("field_id.name", "=", "credit"), @@ -472,9 +463,7 @@ class MisReport(models.Model): "date, account_id and company_id fields. This model is the " "data source for column Actuals.", ) - account_model = fields.Char( - compute="_compute_account_model", string="Account model" - ) + account_model = fields.Char(compute="_compute_account_model") @api.depends("kpi_ids", "subreport_ids") def _compute_all_kpi_ids(self): @@ -514,10 +503,10 @@ class MisReport(models.Model): kpi.expressions_ids = expressions def get_wizard_report_action(self): - action = self.env.ref("mis_builder.mis_report_instance_view_action") - res = action.read()[0] + xmlid = "mis_builder.mis_report_instance_view_action" + action = self.env["ir.actions.act_window"]._for_xml_id(xmlid) view = self.env.ref("mis_builder.wizard_mis_report_instance_view_form") - res.update( + action.update( { "view_id": view.id, "views": [(view.id, "form")], @@ -529,13 +518,13 @@ class MisReport(models.Model): }, } ) - return res + return action def copy(self, default=None): self.ensure_one() default = dict(default or []) default["name"] = _("%s (copy)") % self.name - new = super(MisReport, self).copy(default) + new = super().copy(default) # after a copy, we have new subkpis, but the expressions # subkpi_id fields still point to the original one, so # we patch them after copying diff --git a/mis_builder/models/mis_report_instance.py b/mis_builder/models/mis_report_instance.py index 3a1847d..216c505 100644 --- a/mis_builder/models/mis_report_instance.py +++ b/mis_builder/models/mis_report_instance.py @@ -205,17 +205,15 @@ class MisReportInstancePeriod(models.Model): string="Date Range Type", domain=[("allow_overlap", "=", False)], ) - offset = fields.Integer( - string="Offset", help="Offset from current period", default=-1 - ) - duration = fields.Integer(string="Duration", help="Number of periods", default=1) + offset = fields.Integer(help="Offset from current period", default=-1) + duration = fields.Integer(help="Number of periods", default=1) date_from = fields.Date(compute="_compute_dates", string="From (computed)") date_to = fields.Date(compute="_compute_dates", string="To (computed)") manual_date_from = fields.Date(string="From") manual_date_to = fields.Date(string="To") date_range_id = fields.Many2one(comodel_name="date.range", string="Date Range") - valid = fields.Boolean(compute="_compute_dates", type="boolean", string="Valid") - sequence = fields.Integer(string="Sequence", default=100) + valid = fields.Boolean(compute="_compute_dates", type="boolean") + sequence = fields.Integer(default=100) report_instance_id = fields.Many2one( comodel_name="mis.report.instance", string="Report Instance", @@ -508,12 +506,12 @@ class MisReportInstance(models.Model): _name = "mis.report.instance" _description = "MIS Report Instance" - name = fields.Char(required=True, string="Name", translate=True) + name = fields.Char(required=True, translate=True) description = fields.Char(related="report_id.description", readonly=True) date = fields.Date( string="Base date", help="Report base date " "(leave empty to use current date)" ) - pivot_date = fields.Date(compute="_compute_pivot_date", string="Pivot date") + pivot_date = fields.Date(compute="_compute_pivot_date") report_id = fields.Many2one("mis.report", required=True, string="Report") period_ids = fields.One2many( comodel_name="mis.report.instance.period", @@ -647,11 +645,11 @@ class MisReportInstance(models.Model): def save_report(self): self.ensure_one() self.write({"temporary": False}) - action = self.env.ref("mis_builder.mis_report_instance_view_action") - res = action.read()[0] + xmlid = "mis_builder.mis_report_instance_view_action" + action = self.env["ir.actions.act_window"]._for_xml_id(xmlid) view = self.env.ref("mis_builder.mis_report_instance_view_form") - res.update({"views": [(view.id, "form")], "res_id": self.id}) - return res + action.update({"views": [(view.id, "form")], "res_id": self.id}) + return action @api.model def _vacuum_report(self, hours=24): @@ -668,7 +666,7 @@ class MisReportInstance(models.Model): self.ensure_one() default = dict(default or {}) default["name"] = _("%s (copy)") % self.name - return super(MisReportInstance, self).copy(default) + return super().copy(default) def _format_date(self, date): # format date following user language @@ -757,7 +755,7 @@ class MisReportInstance(models.Model): context = dict(self._context_with_filters(), landscape=self.landscape_pdf) return ( self.env.ref("mis_builder.qweb_pdf_export") - .with_context(context) + .with_context(**context) .report_action(self, data=dict(dummy=True)) # required to propagate context ) @@ -766,7 +764,7 @@ class MisReportInstance(models.Model): context = dict(self._context_with_filters()) return ( self.env.ref("mis_builder.xls_export") - .with_context(context) + .with_context(**context) .report_action(self, data=dict(dummy=True)) # required to propagate context ) diff --git a/mis_builder/models/mis_report_style.py b/mis_builder/models/mis_report_style.py index a486cf7..d74fca9 100644 --- a/mis_builder/models/mis_report_style.py +++ b/mis_builder/models/mis_report_style.py @@ -112,9 +112,9 @@ class MisReportKpiStyle(models.Model): indent_level = fields.Integer() # number format prefix_inherit = fields.Boolean(default=True) - prefix = fields.Char(string="Prefix") + prefix = fields.Char() suffix_inherit = fields.Boolean(default=True) - suffix = fields.Char(string="Suffix") + suffix = fields.Char() dp_inherit = fields.Boolean(default=True) dp = fields.Integer(string="Rounding", default=0) divider_inherit = fields.Boolean(default=True) @@ -177,14 +177,14 @@ class MisReportKpiStyle(models.Model): ): # format number following user language if value is None or value is AccountingNone: - return u"" + return "" value = round(value / float(divider or 1), dp or 0) or 0 r = lang.format("%%%s.%df" % (sign, dp or 0), value, grouping=True) - r = r.replace("-", u"\N{NON-BREAKING HYPHEN}") + r = r.replace("-", "\N{NON-BREAKING HYPHEN}") if prefix: - r = prefix + u"\N{NO-BREAK SPACE}" + r + r = prefix + "\N{NO-BREAK SPACE}" + r if suffix: - r = r + u"\N{NO-BREAK SPACE}" + suffix + r = r + "\N{NO-BREAK SPACE}" + suffix return r @api.model @@ -194,7 +194,7 @@ class MisReportKpiStyle(models.Model): @api.model def render_str(self, lang, value): if value is None or value is AccountingNone: - return u"" + return "" return unicode(value) @api.model @@ -275,20 +275,20 @@ class MisReportKpiStyle(models.Model): ("bg_color", props.background_color), ] if type == TYPE_NUM: - num_format = u"#,##0" + num_format = "#,##0" if props.dp: - num_format += u"." - num_format += u"0" * props.dp + num_format += "." + num_format += "0" * props.dp if props.prefix: - num_format = u'"{} "{}'.format(props.prefix, num_format) + num_format = '"{} "{}'.format(props.prefix, num_format) if props.suffix: - num_format = u'{}" {}"'.format(num_format, props.suffix) + num_format = '{}" {}"'.format(num_format, props.suffix) xlsx_attributes.append(("num_format", num_format)) elif type == TYPE_PCT: - num_format = u"0" + num_format = "0" if props.dp: - num_format += u"." - num_format += u"0" * props.dp + num_format += "." + num_format += "0" * props.dp num_format += "%" xlsx_attributes.append(("num_format", num_format)) if props.indent_level is not None and not no_indent: diff --git a/mis_builder/models/mis_report_subreport.py b/mis_builder/models/mis_report_subreport.py index fad629f..a234879 100644 --- a/mis_builder/models/mis_report_subreport.py +++ b/mis_builder/models/mis_report_subreport.py @@ -4,7 +4,7 @@ from flectra import _, api, fields, models from flectra.exceptions import ValidationError -from flectra.addons.mis_builder.models.mis_report import _is_valid_python_var +from .mis_report import _is_valid_python_var class ParentLoopError(ValidationError): diff --git a/mis_builder/models/prorata_read_group_mixin.py b/mis_builder/models/prorata_read_group_mixin.py index 5fd83d3..2e3f201 100644 --- a/mis_builder/models/prorata_read_group_mixin.py +++ b/mis_builder/models/prorata_read_group_mixin.py @@ -85,7 +85,7 @@ class ProRataReadGroupMixin(models.AbstractModel): ) res_item[sum_field] += item[sum_field] * i_days / item_days return res.values() - return super(ProRataReadGroupMixin, self).read_group( + return super().read_group( domain, fields, groupby, diff --git a/mis_builder/report/mis_report_instance_qweb.py b/mis_builder/report/mis_report_instance_qweb.py index d385fd5..e820da8 100644 --- a/mis_builder/report/mis_report_instance_qweb.py +++ b/mis_builder/report/mis_report_instance_qweb.py @@ -22,7 +22,7 @@ class Report(models.Model): ) # data=None, because it was there only to force Flectra # to propagate context - return super(Report, self.with_context(context))._render_qweb_pdf( + return super(Report, self.with_context(**context))._render_qweb_pdf( res_ids, data=None ) - return super(Report, self)._render_qweb_pdf(res_ids, data) + return super()._render_qweb_pdf(res_ids, data) diff --git a/mis_builder/report/mis_report_instance_xlsx.py b/mis_builder/report/mis_report_instance_xlsx.py index 67c4e27..0dccaa7 100644 --- a/mis_builder/report/mis_report_instance_xlsx.py +++ b/mis_builder/report/mis_report_instance_xlsx.py @@ -33,8 +33,8 @@ class MisBuilderXlsx(models.AbstractModel): style_obj = self.env["mis.report.style"] # create worksheet - report_name = u"{} - {}".format( - objects[0].name, u", ".join([a.name for a in objects[0].query_company_ids]) + report_name = "{} - {}".format( + objects[0].name, ", ".join([a.name for a in objects[0].query_company_ids]) ) sheet = workbook.add_worksheet(report_name[:31]) row_pos = 0 diff --git a/mis_builder/static/description/index.html b/mis_builder/static/description/index.html index b8c0cc2..ef51c5e 100644 --- a/mis_builder/static/description/index.html +++ b/mis_builder/static/description/index.html @@ -376,51 +376,52 @@ can be added to Odoo dashboards.

Table of contents

-

Installation

+

Installation

Your preferred way to install addons will work with MIS Builder.

An easy way to install it with all its dependencies is using pip:

    @@ -430,7 +431,7 @@ the MIS Builder application.
-

Usage

+

Usage

To configure this module, you need to:

  • Go to Accounting > Configuration > MIS Reporting > MIS Report Templates where @@ -456,7 +457,7 @@ and export it to PDF or Excel.
-

Development

+

Development

A typical extension is to provide a mechanism to filter reports on analytic dimensions or operational units. To implement this, you can override _get_additional_move_line_filter and _get_additional_filter to further filter move lines or queries based on a user @@ -465,15 +466,22 @@ or even on mis.report.instance.period if you want different columns to show diff analytic accounts.

-

Known issues / Roadmap

+

Known issues / Roadmap

The mis_builder roadmap and known issues can be found on GitHub.

-

Changelog

+

Changelog

-

14.0.4.0.0 (2022-01-08)

+

14.0.4.0.2 (2022-02-16)

+

Bugfixes

+
    +
  • Fix access right issue when clicking the “Save” button on a MIS Report Instance form. (#410)
    • +
+
+
+

14.0.4.0.0 (2022-01-08)

Features

  • Remove various field size limits. (#332)
    • @@ -498,8 +506,8 @@ change to use parent_state, we now remove this
-
-

14.0.3.6.7 (2021-06-02)

+
+

14.0.3.6.7 (2021-06-02)

Bugfixes

  • When on a MIS Report Instance, if you wanted to generate a new line of type comparison, you couldn’t currently select any existing period to compare. @@ -507,15 +515,15 @@ This happened because the field domain was searching in a NewId context, thus no Changing the domain and making it use a computed field with a search for the _origin record solves the problem. (#361)
-
-

14.0.3.6.6 (2021-04-23)

+
+

14.0.3.6.6 (2021-04-23)

Bugfixes

  • Fix drilldown action name when the account model has been customized. (#350)
-
-

14.0.3.6.5 (2021-04-23)

+
+

14.0.3.6.5 (2021-04-23)

Bugfixes

  • While duplicating a MIS report instance, comparison columns are ignored because @@ -523,8 +531,8 @@ they would raise an error otherwise, as they keep the old source_cmpcol_from_id and source_cmpcol_to_id from the original record. (#343)
-
-

14.0.3.6.4 (2021-04-06)

+
+

14.0.3.6.4 (2021-04-06)

Features

  • The drilldown action name displayed on the breadcrumb has been revised. @@ -534,8 +542,8 @@ of the kpi’s technical definition. (#320)
-
-

13.0.3.6.3 (2020-08-28)

+
+

13.0.3.6.3 (2020-08-28)

Bugfixes

  • Having a “Compare columns” added on a KPI with an associated style using a @@ -547,23 +555,23 @@ when exporting to XLSX. (#280, #296
-
-

13.0.3.6.2 (2020-04-22)

+
+

13.0.3.6.2 (2020-04-22)

Bugfixes

  • The “Settings” button is now displayed for users with the “Show full accounting features” right when previewing a report. (#281)
-
-

13.0.3.6.1 (2020-04-22)

+
+

13.0.3.6.1 (2020-04-22)

Bugfixes

  • Fix TypeError: 'module' object is not iterable when using budgets by account. (#276)
-
-

13.0.3.6.0 (2020-03-28)

+
+

13.0.3.6.0 (2020-03-28)

Features

  • Add column-level filters on analytic account and analytic tags. @@ -578,12 +586,12 @@ Sheet” to create new KPI’s for the ratios (e.g. balance_sheet.current_assets balance_sheet.total_assets). (#155)
-
-

13.0.3.5.0 (2020-01-??)

+
+

13.0.3.5.0 (2020-01-??)

Migration to odoo 13.0.

-
-

12.0.3.5.0 (2019-10-26)

+
+

12.0.3.5.0 (2019-10-26)

Features

  • The account_id field of the model selected in ‘Move lines source’ @@ -613,8 +621,8 @@ style. (#220)
-
-

12.0.3.4.0 (2019-07-09)

+
+

12.0.3.4.0 (2019-07-09)

Features

  • New year-to-date mode for defining periods. (#165)
    • @@ -632,8 +640,8 @@ non-multi expressions yield tuples of incorrect lenght. (#192)
-
-

12.0.3.3.0 (2019-01-26)

+
+

12.0.3.3.0 (2019-01-26)

Features

Dynamic analytic filters in report preview are not yet available in 11, this requires an update to the JS widget that proved difficult to implement @@ -673,8 +681,8 @@ is checked, as for all other syle elements. (#121 <https://github.com/O

If you use Actuals (alternative) data source in combination with analytic filters, the underlying model must now have an analytic_account_id field.

-
-

11.0.3.2.2 (2018-06-30)

+
+

11.0.3.2.2 (2018-06-30)

  • [FIX] Fix bug in company_default_get call returning id instead of recordset @@ -685,16 +693,16 @@ need to be displayed). (#46)
-
-

11.0.3.2.1 (2018-05-29)

+
+

11.0.3.2.1 (2018-05-29)

  • [FIX] Missing comparison operator for AccountingNone leading to errors in pbal computations (#93)
-
-

10.0.3.2.0 (2018-05-02)

+
+

10.0.3.2.0 (2018-05-02)

  • [FIX] make subkpi ordering deterministic (#71)
    • @@ -708,13 +716,13 @@ resp positive balances) (#86)
-
-

11.0.3.1.2 (2018-02-04)

+
+

11.0.3.1.2 (2018-02-04)

Migration to Odoo 11. No new feature. (#67)

-
-

10.0.3.1.1 (2017-11-14)

+
+

10.0.3.1.1 (2017-11-14)

New features:

  • [ADD] month and year relative periods, easier to use than @@ -751,24 +759,24 @@ created (not yet saved) report instances.
  • Alternative move line data sources must have a company_id field.
-
-

10.0.3.0.4 (2017-10-14)

+
+

10.0.3.0.4 (2017-10-14)

Bug fix:

  • [FIX] issue with initial balance rounding. #30
-
-

10.0.3.0.3 (2017-10-03)

+
+

10.0.3.0.3 (2017-10-03)

Bug fix:

  • [FIX] fix error saving KPI on newly created reports. #18
-
-

10.0.3.0.2 (2017-10-01)

+
+

10.0.3.0.2 (2017-10-01)

New features:

  • [ADD] Alternative move line source per report column. @@ -812,7 +820,7 @@ expressions were used in a KPI
-

10.0.2.0.3 (unreleased)

+

10.0.2.0.3 (unreleased)

  • [IMP] more robust behaviour in presence of missing expressions
  • [FIX] indent style
    • @@ -824,23 +832,23 @@ reports with no objects
  • [IMP] provide full access to mis builder style for group Adviser.
-
-

9.0.2.0.2 (2016-09-27)

+
+

9.0.2.0.2 (2016-09-27)

  • [IMP] Add refresh button in mis report preview.
  • [IMP] Widget code changes to allow to add fields in the widget more easily.
-
-

9.0.2.0.1 (2016-05-26)

+
+

9.0.2.0.1 (2016-05-26)

  • [IMP] remove unused argument in declare_and_compute_period() for a cleaner API. This is a breaking API changing merged in urgency before it is used by other modules.
-
-

9.0.2.0.0 (2016-05-24)

+
+

9.0.2.0.0 (2016-05-24)

Part of the work for this release has been done at the Sorrento sprint April 26-29, 2016. The rest (ie a major refactoring) has been done in the weeks after.

@@ -887,8 +895,8 @@ flexible alternative to fiscal periods consolidation accounts have been removed
-
-

8.0.1.0.0 (2016-04-27)

+
+

8.0.1.0.0 (2016-04-27)

-
-

8.0.0.2.0

+
+

8.0.0.2.0

Pre-history. Or rather, you need to look at the git log.

-

Bug Tracker

+

Bug Tracker

Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed @@ -926,15 +934,15 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

Do not contact contributors directly about support or help with technical issues.

-

Credits

+

Credits

-

Authors

+

Authors

  • ACSONE SA/NV
-

Contributors

+

Contributors

-

Maintainers

+

Maintainers

This module is maintained by the OCA.

Odoo Community Association

OCA, or the Odoo Community Association, is a nonprofit organization whose diff --git a/mis_builder/tests/test_aep.py b/mis_builder/tests/test_aep.py index 9d5e167..a2cd660 100644 --- a/mis_builder/tests/test_aep.py +++ b/mis_builder/tests/test_aep.py @@ -14,7 +14,7 @@ from ..models.aep import AccountingExpressionProcessor as AEP, _is_domain class TestAEP(common.TransactionCase): def setUp(self): - super(TestAEP, self).setUp() + super().setUp() self.res_company = self.env["res.company"] self.account_model = self.env["account.account"] self.move_model = self.env["account.move"] diff --git a/mis_builder/tests/test_analytic_filters.py b/mis_builder/tests/test_analytic_filters.py index b88c2ca..f9b09f5 100644 --- a/mis_builder/tests/test_analytic_filters.py +++ b/mis_builder/tests/test_analytic_filters.py @@ -6,7 +6,7 @@ from flectra.tests.common import TransactionCase class TestAnalyticFilters(TransactionCase): def setUp(self): - super(TestAnalyticFilters, self).setUp() + super().setUp() self.aag = self.env["account.analytic.group"].search([], limit=1) def test_context_with_filters(self): @@ -23,9 +23,9 @@ class TestAnalyticFilters(TransactionCase): } # test _context_with_filters does nothing is a filter is already # in the context - mri.with_context(mis_report_filters={"f": 1})._context_with_filters().get( - "mis_report_filters" - ) == {"f": 1} + assert mri.with_context( + mis_report_filters={"f": 1} + )._context_with_filters().get("mis_report_filters") == {"f": 1} def _check_get_filter_domain_from_context( self, mis_report_filters, expected_domain diff --git a/mis_builder/tests/test_data_sources.py b/mis_builder/tests/test_data_sources.py index 66f98d9..5aec078 100644 --- a/mis_builder/tests/test_data_sources.py +++ b/mis_builder/tests/test_data_sources.py @@ -36,7 +36,7 @@ class TestMisReportInstanceDataSources(common.TransactionCase): return move def setUp(self): - super(TestMisReportInstanceDataSources, self).setUp() + super().setUp() self.account_model = self.env["account.account"] self.move_model = self.env["account.move"] self.journal_model = self.env["account.journal"] diff --git a/mis_builder/tests/test_kpi_data.py b/mis_builder/tests/test_kpi_data.py index cef731c..ec09fd6 100644 --- a/mis_builder/tests/test_kpi_data.py +++ b/mis_builder/tests/test_kpi_data.py @@ -17,7 +17,7 @@ class TestKpiData(SavepointCase): @classmethod def setUpClass(cls): - super(TestKpiData, cls).setUpClass() + super().setUpClass() setup_test_model(cls.env, cls.MisKpiDataTestItem) report = cls.env["mis.report"].create(dict(name="test report")) @@ -75,7 +75,7 @@ class TestKpiData(SavepointCase): @classmethod def tearDownClass(cls): teardown_test_model(cls.env, cls.MisKpiDataTestItem) - super(TestKpiData, cls).tearDownClass() + return super().tearDownClass() def test_kpi_data_name(self): self.assertEqual(self.kd11.name, "k1: 2017-05-01 - 2017-05-10") diff --git a/mis_builder/tests/test_mis_report_instance.py b/mis_builder/tests/test_mis_report_instance.py index c991128..5861b2b 100644 --- a/mis_builder/tests/test_mis_report_instance.py +++ b/mis_builder/tests/test_mis_report_instance.py @@ -16,7 +16,7 @@ class TestMisReportInstance(common.HttpCase): """ def setUp(self): - super(TestMisReportInstance, self).setUp() + super().setUp() partner_model_id = self.env.ref("base.model_res_partner").id partner_create_date_field_id = self.env.ref( "base.field_res_partner__create_date" @@ -409,7 +409,14 @@ class TestMisReportInstance(common.HttpCase): dict(expr="balp[200%]", period_id=self.report_instance.period_ids[0].id) ) account_ids = ( - self.env["account.account"].search([("code", "=like", "200%")]).ids + self.env["account.account"] + .search( + [ + ("code", "=like", "200%"), + ("company_id", "=", self.env.ref("base.main_company").id), + ] + ) + .ids ) self.assertTrue(("account_id", "in", tuple(account_ids)) in action["domain"]) self.assertEqual(action["res_model"], "account.move.line") @@ -465,7 +472,14 @@ class TestMisReportInstance(common.HttpCase): def test_get_kpis_by_account_id(self): account_ids = ( - self.env["account.account"].search([("code", "=like", "200%")]).mapped("id") + self.env["account.account"] + .search( + [ + ("code", "=like", "200%"), + ("company_id", "=", self.env.ref("base.main_company").id), + ] + ) + .ids ) kpi200 = {self.kpi1, self.kpi2} res = self.report.get_kpis_by_account_id(self.env.ref("base.main_company")) @@ -510,7 +524,7 @@ class TestMisReportInstance(common.HttpCase): self.report_instance.company_ids |= c1 self.report_instance.company_ids |= c2 assert len(self.report_instance.company_ids) == 2 - assert self.report_instance.query_company_ids == self.env.companies + self.assertFalse(self.report_instance.query_company_ids - self.env.companies) # In a user context where there is only one company, ensure # query_company_ids only has one company too. assert ( diff --git a/mis_builder/tests/test_multi_company_aep.py b/mis_builder/tests/test_multi_company_aep.py index e5cd0e0..d8af287 100644 --- a/mis_builder/tests/test_multi_company_aep.py +++ b/mis_builder/tests/test_multi_company_aep.py @@ -13,7 +13,7 @@ from ..models.aep import AccountingExpressionProcessor as AEP class TestMultiCompanyAEP(common.TransactionCase): def setUp(self): - super(TestMultiCompanyAEP, self).setUp() + super().setUp() self.res_company = self.env["res.company"] self.account_model = self.env["account.account"] self.move_model = self.env["account.move"] diff --git a/mis_builder/tests/test_period_dates.py b/mis_builder/tests/test_period_dates.py index c849c34..2901511 100644 --- a/mis_builder/tests/test_period_dates.py +++ b/mis_builder/tests/test_period_dates.py @@ -17,7 +17,7 @@ from .common import assert_matrix class TestPeriodDates(common.TransactionCase): def setUp(self): - super(TestPeriodDates, self).setUp() + super().setUp() self.report_obj = self.env["mis.report"] self.instance_obj = self.env["mis.report.instance"] self.period_obj = self.env["mis.report.instance.period"] diff --git a/mis_builder/tests/test_render.py b/mis_builder/tests/test_render.py index af2ae26..91c15c5 100644 --- a/mis_builder/tests/test_render.py +++ b/mis_builder/tests/test_render.py @@ -10,7 +10,7 @@ from ..models.mis_report_style import CMP_DIFF, CMP_PCT, TYPE_NUM, TYPE_PCT, TYP class TestRendering(common.TransactionCase): def setUp(self): - super(TestRendering, self).setUp() + super().setUp() self.style_obj = self.env["mis.report.style"] self.kpi_obj = self.env["mis.report.kpi"] self.style = self.style_obj.create(dict(name="teststyle")) @@ -37,146 +37,144 @@ class TestRendering(common.TransactionCase): return r def test_render(self): - self.assertEqual(u"1", self._render(1)) - self.assertEqual(u"1", self._render(1.1)) - self.assertEqual(u"2", self._render(1.6)) + self.assertEqual("1", self._render(1)) + self.assertEqual("1", self._render(1.1)) + self.assertEqual("2", self._render(1.6)) self.style.dp_inherit = False self.style.dp = 2 - self.assertEqual(u"1.00", self._render(1)) - self.assertEqual(u"1.10", self._render(1.1)) - self.assertEqual(u"1.60", self._render(1.6)) - self.assertEqual(u"1.61", self._render(1.606)) - self.assertEqual(u"12,345.67", self._render(12345.67)) + self.assertEqual("1.00", self._render(1)) + self.assertEqual("1.10", self._render(1.1)) + self.assertEqual("1.60", self._render(1.6)) + self.assertEqual("1.61", self._render(1.606)) + self.assertEqual("12,345.67", self._render(12345.67)) def test_render_negative(self): # non breaking hyphen - self.assertEqual(u"\u20111", self._render(-1)) + self.assertEqual("\u20111", self._render(-1)) def test_render_zero(self): - self.assertEqual(u"0", self._render(0)) - self.assertEqual(u"", self._render(None)) - self.assertEqual(u"", self._render(AccountingNone)) + self.assertEqual("0", self._render(0)) + self.assertEqual("", self._render(None)) + self.assertEqual("", self._render(AccountingNone)) def test_render_suffix(self): self.style.suffix_inherit = False - self.style.suffix = u"€" - self.assertEqual(u"1\xa0€", self._render(1)) - self.style.suffix = u"k€" + self.style.suffix = "€" + self.assertEqual("1\xa0€", self._render(1)) + self.style.suffix = "k€" self.style.divider_inherit = False self.style.divider = "1e3" - self.assertEqual(u"1\xa0k€", self._render(1000)) + self.assertEqual("1\xa0k€", self._render(1000)) def test_render_prefix(self): self.style.prefix_inherit = False - self.style.prefix = u"$" - self.assertEqual(u"$\xa01", self._render(1)) - self.style.prefix = u"k$" + self.style.prefix = "$" + self.assertEqual("$\xa01", self._render(1)) + self.style.prefix = "k$" self.style.divider_inherit = False self.style.divider = "1e3" - self.assertEqual(u"k$\xa01", self._render(1000)) + self.assertEqual("k$\xa01", self._render(1000)) def test_render_divider(self): self.style.divider_inherit = False self.style.divider = "1e3" self.style.dp_inherit = False self.style.dp = 0 - self.assertEqual(u"1", self._render(1000)) + self.assertEqual("1", self._render(1000)) self.style.divider = "1e6" self.style.dp = 3 - self.assertEqual(u"0.001", self._render(1000)) + self.assertEqual("0.001", self._render(1000)) self.style.divider = "1e-3" self.style.dp = 0 - self.assertEqual(u"1,000", self._render(1)) + self.assertEqual("1,000", self._render(1)) self.style.divider = "1e-6" self.style.dp = 0 - self.assertEqual(u"1,000,000", self._render(1)) + self.assertEqual("1,000,000", self._render(1)) def test_render_pct(self): - self.assertEqual(u"100\xa0%", self._render(1, TYPE_PCT)) - self.assertEqual(u"50\xa0%", self._render(0.5, TYPE_PCT)) + self.assertEqual("100\xa0%", self._render(1, TYPE_PCT)) + self.assertEqual("50\xa0%", self._render(0.5, TYPE_PCT)) self.style.dp_inherit = False self.style.dp = 2 - self.assertEqual(u"51.23\xa0%", self._render(0.5123, TYPE_PCT)) + self.assertEqual("51.23\xa0%", self._render(0.5123, TYPE_PCT)) def test_render_string(self): - self.assertEqual(u"", self._render("", TYPE_STR)) - self.assertEqual(u"", self._render(None, TYPE_STR)) - self.assertEqual(u"abcdé", self._render(u"abcdé", TYPE_STR)) + self.assertEqual("", self._render("", TYPE_STR)) + self.assertEqual("", self._render(None, TYPE_STR)) + self.assertEqual("abcdé", self._render("abcdé", TYPE_STR)) def test_compare_num_pct(self): - self.assertEqual((1.0, u"+100.0\xa0%"), self._compare_and_render(100, 50)) - self.assertEqual((0.5, u"+50.0\xa0%"), self._compare_and_render(75, 50)) - self.assertEqual((0.5, u"+50.0\xa0%"), self._compare_and_render(-25, -50)) - self.assertEqual((1.0, u"+100.0\xa0%"), self._compare_and_render(0, -50)) - self.assertEqual((2.0, u"+200.0\xa0%"), self._compare_and_render(50, -50)) - self.assertEqual((-0.5, u"\u201150.0\xa0%"), self._compare_and_render(25, 50)) - self.assertEqual((-1.0, u"\u2011100.0\xa0%"), self._compare_and_render(0, 50)) - self.assertEqual((-2.0, u"\u2011200.0\xa0%"), self._compare_and_render(-50, 50)) - self.assertEqual((-0.5, u"\u201150.0\xa0%"), self._compare_and_render(-75, -50)) + self.assertEqual((1.0, "+100.0\xa0%"), self._compare_and_render(100, 50)) + self.assertEqual((0.5, "+50.0\xa0%"), self._compare_and_render(75, 50)) + self.assertEqual((0.5, "+50.0\xa0%"), self._compare_and_render(-25, -50)) + self.assertEqual((1.0, "+100.0\xa0%"), self._compare_and_render(0, -50)) + self.assertEqual((2.0, "+200.0\xa0%"), self._compare_and_render(50, -50)) + self.assertEqual((-0.5, "\u201150.0\xa0%"), self._compare_and_render(25, 50)) + self.assertEqual((-1.0, "\u2011100.0\xa0%"), self._compare_and_render(0, 50)) + self.assertEqual((-2.0, "\u2011200.0\xa0%"), self._compare_and_render(-50, 50)) + self.assertEqual((-0.5, "\u201150.0\xa0%"), self._compare_and_render(-75, -50)) self.assertEqual( - (AccountingNone, u""), self._compare_and_render(50, AccountingNone) + (AccountingNone, ""), self._compare_and_render(50, AccountingNone) ) - self.assertEqual((AccountingNone, u""), self._compare_and_render(50, None)) - self.assertEqual((AccountingNone, u""), self._compare_and_render(50, 50)) - self.assertEqual((0.002, u"+0.2\xa0%"), self._compare_and_render(50.1, 50)) - self.assertEqual((AccountingNone, u""), self._compare_and_render(50.01, 50)) + self.assertEqual((AccountingNone, ""), self._compare_and_render(50, None)) + self.assertEqual((AccountingNone, ""), self._compare_and_render(50, 50)) + self.assertEqual((0.002, "+0.2\xa0%"), self._compare_and_render(50.1, 50)) + self.assertEqual((AccountingNone, ""), self._compare_and_render(50.01, 50)) self.assertEqual( - (-1.0, u"\u2011100.0\xa0%"), self._compare_and_render(AccountingNone, 50) + (-1.0, "\u2011100.0\xa0%"), self._compare_and_render(AccountingNone, 50) + ) + self.assertEqual((-1.0, "\u2011100.0\xa0%"), self._compare_and_render(None, 50)) + self.assertEqual( + (AccountingNone, ""), self._compare_and_render(DataError("#ERR", "."), 1) ) self.assertEqual( - (-1.0, u"\u2011100.0\xa0%"), self._compare_and_render(None, 50) - ) - self.assertEqual( - (AccountingNone, u""), self._compare_and_render(DataError("#ERR", "."), 1) - ) - self.assertEqual( - (AccountingNone, u""), self._compare_and_render(1, DataError("#ERR", ".")) + (AccountingNone, ""), self._compare_and_render(1, DataError("#ERR", ".")) ) def test_compare_num_diff(self): self.assertEqual( - (25, u"+25"), self._compare_and_render(75, 50, TYPE_NUM, CMP_DIFF) + (25, "+25"), self._compare_and_render(75, 50, TYPE_NUM, CMP_DIFF) ) self.assertEqual( - (-25, u"\u201125"), self._compare_and_render(25, 50, TYPE_NUM, CMP_DIFF) + (-25, "\u201125"), self._compare_and_render(25, 50, TYPE_NUM, CMP_DIFF) ) self.style.suffix_inherit = False - self.style.suffix = u"€" + self.style.suffix = "€" self.assertEqual( - (-25, u"\u201125\xa0€"), + (-25, "\u201125\xa0€"), self._compare_and_render(25, 50, TYPE_NUM, CMP_DIFF), ) - self.style.suffix = u"" + self.style.suffix = "" self.assertEqual( - (50.0, u"+50"), + (50.0, "+50"), self._compare_and_render(50, AccountingNone, TYPE_NUM, CMP_DIFF), ) self.assertEqual( - (50.0, u"+50"), self._compare_and_render(50, None, TYPE_NUM, CMP_DIFF) + (50.0, "+50"), self._compare_and_render(50, None, TYPE_NUM, CMP_DIFF) ) self.assertEqual( - (-50.0, u"\u201150"), + (-50.0, "\u201150"), self._compare_and_render(AccountingNone, 50, TYPE_NUM, CMP_DIFF), ) self.assertEqual( - (-50.0, u"\u201150"), self._compare_and_render(None, 50, TYPE_NUM, CMP_DIFF) + (-50.0, "\u201150"), self._compare_and_render(None, 50, TYPE_NUM, CMP_DIFF) ) self.style.dp_inherit = False self.style.dp = 2 self.assertEqual( - (0.1, u"+0.10"), self._compare_and_render(1.1, 1.0, TYPE_NUM, CMP_DIFF) + (0.1, "+0.10"), self._compare_and_render(1.1, 1.0, TYPE_NUM, CMP_DIFF) ) self.assertEqual( - (AccountingNone, u""), + (AccountingNone, ""), self._compare_and_render(1.001, 1.0, TYPE_NUM, CMP_DIFF), ) def test_compare_pct(self): self.assertEqual( - (0.25, u"+25\xa0pp"), self._compare_and_render(0.75, 0.50, TYPE_PCT) + (0.25, "+25\xa0pp"), self._compare_and_render(0.75, 0.50, TYPE_PCT) ) self.assertEqual( - (AccountingNone, u""), self._compare_and_render(0.751, 0.750, TYPE_PCT) + (AccountingNone, ""), self._compare_and_render(0.751, 0.750, TYPE_PCT) ) def test_compare_pct_result_type(self): @@ -271,9 +269,9 @@ class TestRendering(common.TransactionCase): "italic": True, "bold": True, "size": 9, - "font_color": u"#FF0000", - "bg_color": u"#0000FF", - "num_format": u'"p "#,##0.00" s"', + "font_color": "#FF0000", + "bg_color": "#0000FF", + "num_format": '"p "#,##0.00" s"', "indent": 2, }, ) @@ -284,9 +282,9 @@ class TestRendering(common.TransactionCase): "italic": True, "bold": True, "size": 9, - "font_color": u"#FF0000", - "bg_color": u"#0000FF", - "num_format": u'"p "#,##0.00" s"', + "font_color": "#FF0000", + "bg_color": "#0000FF", + "num_format": '"p "#,##0.00" s"', }, ) # percent type ignore prefix and suffix @@ -297,9 +295,9 @@ class TestRendering(common.TransactionCase): "italic": True, "bold": True, "size": 9, - "font_color": u"#FF0000", - "bg_color": u"#0000FF", - "num_format": u"0.00%", + "font_color": "#FF0000", + "bg_color": "#0000FF", + "num_format": "0.00%", }, ) @@ -311,7 +309,7 @@ class TestRendering(common.TransactionCase): "italic": True, "bold": True, "size": 9, - "font_color": u"#FF0000", - "bg_color": u"#0000FF", + "font_color": "#FF0000", + "bg_color": "#0000FF", }, ) diff --git a/mis_builder/tests/test_subreport.py b/mis_builder/tests/test_subreport.py index 4a93214..904435c 100644 --- a/mis_builder/tests/test_subreport.py +++ b/mis_builder/tests/test_subreport.py @@ -13,7 +13,7 @@ from flectra.addons.mis_builder.models.mis_report_subreport import ( class TestMisSubreport(SavepointCase): @classmethod def setUpClass(cls): - super(TestMisSubreport, cls).setUpClass() + super().setUpClass() # create report cls.subreport = cls.env["mis.report"].create(dict(name="test subreport")) cls.subreport_kpi1 = cls.env["mis.report.kpi"].create( diff --git a/mis_builder/views/mis_report.xml b/mis_builder/views/mis_report.xml index 547dea8..3780fd4 100644 --- a/mis_builder/views/mis_report.xml +++ b/mis_builder/views/mis_report.xml @@ -4,7 +4,7 @@ mis.report.view.tree mis.report - + @@ -30,7 +30,7 @@ colspan="2" context="{'default_report_id': id}" > - + @@ -54,7 +54,7 @@ colspan="2" context="{'default_report_id': id}" > - + - + @@ -88,7 +88,7 @@ colspan="2" context="{'default_report_id': id}" > - + mis.report.instance.view.tree mis.report.instance - +