diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e6cec5..e7b99e9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,9 +23,10 @@ test_all_modules: entrypoint: ["/bin/sh", "-c"] script: - apt-get install -y p7zip-full - - apt-get install -y expect-dev - su - flectra -c "mkdir ~/others" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/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" @@ -62,7 +63,7 @@ test_all_modules: - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_all - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_all - su - flectra -c "/opt/flectra/flectra-bin - --addons-path ${CI_PROJECT_DIR},~/others/account-closing,~/others/account-invoicing,~/others/account-payment,~/others/bank-payment,~/others/brand,~/others/community-data-files,~/others/connector,~/others/edi,~/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/edi,~/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 @@ -86,9 +87,10 @@ test_module_mis_builder_budget: entrypoint: ["/bin/sh", "-c"] script: - apt-get install -y p7zip-full - - apt install -y expect-dev - su - flectra -c "mkdir ~/others" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/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" @@ -125,7 +127,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-closing,~/others/account-invoicing,~/others/account-payment,~/others/bank-payment,~/others/brand,~/others/community-data-files,~/others/connector,~/others/edi,~/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/edi,~/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 @@ -144,9 +146,10 @@ test_module_mis_builder: entrypoint: ["/bin/sh", "-c"] script: - apt-get install -y p7zip-full - - apt install -y expect-dev - su - flectra -c "mkdir ~/others" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/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" @@ -183,7 +186,7 @@ test_module_mis_builder: - 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-closing,~/others/account-invoicing,~/others/account-payment,~/others/bank-payment,~/others/brand,~/others/community-data-files,~/others/connector,~/others/edi,~/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/edi,~/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 @@ -202,9 +205,10 @@ test_module_mis_builder_demo: entrypoint: ["/bin/sh", "-c"] script: - apt-get install -y p7zip-full - - apt install -y expect-dev - su - flectra -c "mkdir ~/others" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/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" @@ -241,7 +245,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-closing,~/others/account-invoicing,~/others/account-payment,~/others/bank-payment,~/others/brand,~/others/community-data-files,~/others/connector,~/others/edi,~/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/edi,~/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 diff --git a/README.md b/README.md index f7bcbfd..6683d95 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ Available addons addon | version | summary --- | --- | --- -[mis_builder_budget](mis_builder_budget/) | 2.0.3.5.1| Create budgets for MIS reports -[mis_builder](mis_builder/) | 2.0.3.6.7| Build 'Management Information System' Reports and Dashboards +[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_demo](mis_builder_demo/) | 2.0.3.1.3| Demo addon for MIS Builder diff --git a/mis_builder/COPYRIGHT b/mis_builder/COPYRIGHT index 9da0237..20a9299 100644 --- a/mis_builder/COPYRIGHT +++ b/mis_builder/COPYRIGHT @@ -13,6 +13,7 @@ Most of the files are Copyright 2019 ACSONE SA/NV () Copyright 2020 ACSONE SA/NV Copyright 2020 ACSONE SA/NV () + Copyright 2020 CorporateHub (https://corporatehub.eu) Copyright 2018 Flectra Community Many files also contain contributions from third diff --git a/mis_builder/README.rst b/mis_builder/README.rst index e60fe33..5413279 100644 --- a/mis_builder/README.rst +++ b/mis_builder/README.rst @@ -97,7 +97,35 @@ be found on GitHub. Changelog ========= +14.0.4.0.0 (2022-01-08) +~~~~~~~~~~~~~~~~~~~~~~~ + +**Features** + +- Remove various field size limits. (`#332 `_) + + +**Bugfixes** + +- Support for the Odoo 13+ multi-company model. In multi-company mode, several allowed + companies can be declared on MIS Report instances, and the report operates on the + intersection of report companies and companies selected in the user context. (`#327 `_) +- The ``get_additional_query_filter`` argument of ``evaluate()`` is now propagated + correctly. (`#375 `_) +- Use the ``parent_state`` field of ``account.move.line`` to filter entries in ``posted`` + and ``draft`` state only. Before, when reporting in draft mode, all entries were used + (i.e. there was no filter), and that started including the cancelled entries/invoices in + Odoo 13.+. + + This change also contains a **breaking change** in the internal API. For quite a while + the ``target_move argument`` of AEP and other methods was not used by MIS Builder itself + and was kept for backward compatibility. To avoid rippling effects of the necessary + change to use ``parent_state``, we now remove this argument. (`#377 `_) + + 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. @@ -570,6 +598,9 @@ Contributors * Arnaud Pineux * Ernesto Tejeda * Pedro M. Baeza +* `CorporateHub `__ + + * Alexey Pelykh Maintainers ~~~~~~~~~~~ diff --git a/mis_builder/__manifest__.py b/mis_builder/__manifest__.py index d720d3b..9a3f71f 100644 --- a/mis_builder/__manifest__.py +++ b/mis_builder/__manifest__.py @@ -3,7 +3,7 @@ { "name": "MIS Builder", - "version": "2.0.3.6.7", + "version": "2.0.4.0.0", "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 d113c45..96fbeeb 100644 --- a/mis_builder/i18n/ca.po +++ b/mis_builder/i18n/ca.po @@ -292,6 +292,16 @@ msgstr "Tots els assentaments assentats" msgid "Allowed Cmpcol" msgstr "" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids +msgid "Allowed companies" +msgstr "" + +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id +msgid "Allowed company" +msgstr "" + #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_kpi_data__amount msgid "Amount" @@ -411,10 +421,8 @@ 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 children companies to be searched for data." +msgid "Check if you wish to specify several companies to be searched for data." msgstr "" -"Comprovi si desitja especificar companyies filles per a buscar-hi dades." #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_style_view_form @@ -465,21 +473,11 @@ msgstr "Columnes a sumar" msgid "Columns {} and {} are not comparable" msgstr "Les columnes {} i {} no són comparables" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids -msgid "Companies" -msgstr "Companyies" - #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__query_company_ids msgid "Companies for which data will be searched." msgstr "Companyies per a les que es buscaran dades." -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id -msgid "Company" -msgstr "Companyia" - #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_cmpcol_to_id msgid "Compare" @@ -685,6 +683,11 @@ msgstr "" msgid "Duration" msgstr "Durada" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids +msgid "Effective companies" +msgstr "" + #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "Enter expression here, for example balp[70%]. See also help tab." @@ -1389,11 +1392,6 @@ msgstr "Imprimeix" msgid "Queries" msgstr "Consultes" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids -msgid "Query Company" -msgstr "Companyia de la consulta" - #. module: mis_builder #: code:addons/mis_builder/models/mis_report.py:0 #, fuzzy, python-format @@ -1716,6 +1714,12 @@ msgstr "Per (calculat)" msgid "Unexpected accumulation method %s for %s." msgstr "Mètode d'acumulació %s no esperat per a %s." +#. module: mis_builder +#: code:addons/mis_builder/models/mis_report.py:0 +#, python-format +msgid "Unexpected value %s for target_move." +msgstr "" + #. module: mis_builder #: code:addons/mis_builder/models/prorata_read_group_mixin.py:0 #, python-format @@ -1837,6 +1841,20 @@ msgstr "extra-súper-gran" msgid "xx-small" msgstr "extra-súper-petita" +#~ msgid "" +#~ "Check if you wish to specify children companies to be searched for data." +#~ msgstr "" +#~ "Comprovi si desitja especificar companyies filles per a buscar-hi dades." + +#~ msgid "Companies" +#~ msgstr "Companyies" + +#~ msgid "Company" +#~ msgstr "Companyia" + +#~ msgid "Query Company" +#~ msgstr "Companyia de la consulta" + #~ msgid "" #~ "AccountingNone: a null value that behaves as 0 in arithmetic " #~ "operations." diff --git a/mis_builder/i18n/de.po b/mis_builder/i18n/de.po index 6417ae9..b16cf26 100644 --- a/mis_builder/i18n/de.po +++ b/mis_builder/i18n/de.po @@ -277,6 +277,16 @@ msgstr "" msgid "Allowed Cmpcol" msgstr "" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids +msgid "Allowed companies" +msgstr "" + +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id +msgid "Allowed company" +msgstr "" + #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_kpi_data__amount msgid "Amount" @@ -394,8 +404,7 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__multi_company -msgid "" -"Check if you wish to specify children companies to be searched for data." +msgid "Check if you wish to specify several companies to be searched for data." msgstr "" #. module: mis_builder @@ -447,21 +456,11 @@ msgstr "" msgid "Columns {} and {} are not comparable" msgstr "" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids -msgid "Companies" -msgstr "" - #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__query_company_ids msgid "Companies for which data will be searched." msgstr "" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id -msgid "Company" -msgstr "" - #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_cmpcol_to_id msgid "Compare" @@ -659,6 +658,11 @@ msgstr "" msgid "Duration" msgstr "" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids +msgid "Effective companies" +msgstr "" + #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "Enter expression here, for example balp[70%]. See also help tab." @@ -1339,11 +1343,6 @@ msgstr "" msgid "Queries" msgstr "" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids -msgid "Query Company" -msgstr "" - #. module: mis_builder #: code:addons/mis_builder/models/mis_report.py:0 #, python-format @@ -1658,6 +1657,12 @@ msgstr "" msgid "Unexpected accumulation method %s for %s." msgstr "" +#. module: mis_builder +#: code:addons/mis_builder/models/mis_report.py:0 +#, python-format +msgid "Unexpected value %s for target_move." +msgstr "" + #. module: mis_builder #: code:addons/mis_builder/models/prorata_read_group_mixin.py:0 #, python-format diff --git a/mis_builder/i18n/el.po b/mis_builder/i18n/el.po index f341dc4..6ea1168 100644 --- a/mis_builder/i18n/el.po +++ b/mis_builder/i18n/el.po @@ -273,6 +273,16 @@ msgstr "" msgid "Allowed Cmpcol" msgstr "" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids +msgid "Allowed companies" +msgstr "" + +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id +msgid "Allowed company" +msgstr "" + #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_kpi_data__amount msgid "Amount" @@ -390,8 +400,7 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__multi_company -msgid "" -"Check if you wish to specify children companies to be searched for data." +msgid "Check if you wish to specify several companies to be searched for data." msgstr "" #. module: mis_builder @@ -443,21 +452,11 @@ msgstr "" msgid "Columns {} and {} are not comparable" msgstr "" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids -msgid "Companies" -msgstr "" - #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__query_company_ids msgid "Companies for which data will be searched." msgstr "" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id -msgid "Company" -msgstr "" - #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_cmpcol_to_id msgid "Compare" @@ -655,6 +654,11 @@ msgstr "" msgid "Duration" msgstr "" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids +msgid "Effective companies" +msgstr "" + #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "Enter expression here, for example balp[70%]. See also help tab." @@ -1335,11 +1339,6 @@ msgstr "" msgid "Queries" msgstr "" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids -msgid "Query Company" -msgstr "" - #. module: mis_builder #: code:addons/mis_builder/models/mis_report.py:0 #, python-format @@ -1654,6 +1653,12 @@ msgstr "" msgid "Unexpected accumulation method %s for %s." msgstr "" +#. module: mis_builder +#: code:addons/mis_builder/models/mis_report.py:0 +#, python-format +msgid "Unexpected value %s for target_move." +msgstr "" + #. module: mis_builder #: code:addons/mis_builder/models/prorata_read_group_mixin.py:0 #, python-format diff --git a/mis_builder/i18n/el_GR.po b/mis_builder/i18n/el_GR.po index bc39319..d7c7857 100644 --- a/mis_builder/i18n/el_GR.po +++ b/mis_builder/i18n/el_GR.po @@ -273,6 +273,16 @@ msgstr "" msgid "Allowed Cmpcol" msgstr "" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids +msgid "Allowed companies" +msgstr "" + +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id +msgid "Allowed company" +msgstr "" + #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_kpi_data__amount msgid "Amount" @@ -390,8 +400,7 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__multi_company -msgid "" -"Check if you wish to specify children companies to be searched for data." +msgid "Check if you wish to specify several companies to be searched for data." msgstr "" #. module: mis_builder @@ -443,21 +452,11 @@ msgstr "" msgid "Columns {} and {} are not comparable" msgstr "" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids -msgid "Companies" -msgstr "" - #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__query_company_ids msgid "Companies for which data will be searched." msgstr "" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id -msgid "Company" -msgstr "" - #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_cmpcol_to_id msgid "Compare" @@ -655,6 +654,11 @@ msgstr "" msgid "Duration" msgstr "" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids +msgid "Effective companies" +msgstr "" + #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "Enter expression here, for example balp[70%]. See also help tab." @@ -1335,11 +1339,6 @@ msgstr "" msgid "Queries" msgstr "" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids -msgid "Query Company" -msgstr "" - #. module: mis_builder #: code:addons/mis_builder/models/mis_report.py:0 #, python-format @@ -1654,6 +1653,12 @@ msgstr "" msgid "Unexpected accumulation method %s for %s." msgstr "" +#. module: mis_builder +#: code:addons/mis_builder/models/mis_report.py:0 +#, python-format +msgid "Unexpected value %s for target_move." +msgstr "" + #. module: mis_builder #: code:addons/mis_builder/models/prorata_read_group_mixin.py:0 #, python-format diff --git a/mis_builder/i18n/es.po b/mis_builder/i18n/es.po index 61dd1cc..69735ec 100644 --- a/mis_builder/i18n/es.po +++ b/mis_builder/i18n/es.po @@ -294,6 +294,16 @@ msgstr "Todos los asientos asentados" msgid "Allowed Cmpcol" msgstr "" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids +msgid "Allowed companies" +msgstr "" + +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id +msgid "Allowed company" +msgstr "" + #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_kpi_data__amount msgid "Amount" @@ -413,10 +423,8 @@ msgstr "Cancelar" #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__multi_company -msgid "" -"Check if you wish to specify children companies to be searched for data." +msgid "Check if you wish to specify several companies to be searched for data." msgstr "" -"Compruebe si desea especificar compañías hijas para buscar datos en ellas." #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_style_view_form @@ -467,21 +475,11 @@ msgstr "Columnas a sumar" msgid "Columns {} and {} are not comparable" msgstr "Las columnas {} and {} no son comparables" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids -msgid "Companies" -msgstr "Compañías" - #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__query_company_ids msgid "Companies for which data will be searched." msgstr "Compañías para las que se buscarán datos." -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id -msgid "Company" -msgstr "Compañía" - #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_cmpcol_to_id msgid "Compare" @@ -688,6 +686,11 @@ msgstr "" msgid "Duration" msgstr "Duración" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids +msgid "Effective companies" +msgstr "" + #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "Enter expression here, for example balp[70%]. See also help tab." @@ -1386,11 +1389,6 @@ msgstr "Imprimir" msgid "Queries" msgstr "Consultas" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids -msgid "Query Company" -msgstr "Compañía de la consulta" - #. module: mis_builder #: code:addons/mis_builder/models/mis_report.py:0 #, python-format @@ -1713,6 +1711,12 @@ msgstr "Para (calculado)" msgid "Unexpected accumulation method %s for %s." msgstr "Método de acumulación %s no esperado para %s." +#. module: mis_builder +#: code:addons/mis_builder/models/mis_report.py:0 +#, python-format +msgid "Unexpected value %s for target_move." +msgstr "" + #. module: mis_builder #: code:addons/mis_builder/models/prorata_read_group_mixin.py:0 #, python-format @@ -1834,6 +1838,20 @@ msgstr "extra-súper-grande" msgid "xx-small" msgstr "extra-súper-pequeña" +#~ msgid "" +#~ "Check if you wish to specify children companies to be searched for data." +#~ msgstr "" +#~ "Compruebe si desea especificar compañías hijas para buscar datos en ellas." + +#~ msgid "Companies" +#~ msgstr "Compañías" + +#~ msgid "Company" +#~ msgstr "Compañía" + +#~ msgid "Query Company" +#~ msgstr "Compañía de la consulta" + #~ msgid "" #~ "AccountingNone: a null value that behaves as 0 in arithmetic " #~ "operations." diff --git a/mis_builder/i18n/fr.po b/mis_builder/i18n/fr.po index b189ed6..483e965 100644 --- a/mis_builder/i18n/fr.po +++ b/mis_builder/i18n/fr.po @@ -288,6 +288,16 @@ msgstr "Écritures comptabilisées seulement" msgid "Allowed Cmpcol" msgstr "" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids +msgid "Allowed companies" +msgstr "" + +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id +msgid "Allowed company" +msgstr "" + #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_kpi_data__amount msgid "Amount" @@ -407,11 +417,8 @@ msgstr "Annuler" #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__multi_company -msgid "" -"Check if you wish to specify children companies to be searched for data." +msgid "Check if you wish to specify several companies to be searched for data." msgstr "" -"Vérifiez si vous souhaitez spécifier des sociétés enfants dont les données " -"seront recherchées." #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_style_view_form @@ -462,21 +469,11 @@ msgstr "Colonnes à additionner" msgid "Columns {} and {} are not comparable" msgstr "Les colonnes {} et {} ne sont pas comparables" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids -msgid "Companies" -msgstr "Sociétés" - #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__query_company_ids msgid "Companies for which data will be searched." msgstr "Sociétés pour lesquelles les données seront recherchées." -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id -msgid "Company" -msgstr "Société" - #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_cmpcol_to_id msgid "Compare" @@ -682,6 +679,11 @@ msgstr "" msgid "Duration" msgstr "Durée" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids +msgid "Effective companies" +msgstr "" + #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "Enter expression here, for example balp[70%]. See also help tab." @@ -1377,11 +1379,6 @@ msgstr "Imprimer" msgid "Queries" msgstr "Requêtes" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids -msgid "Query Company" -msgstr "Société de la requête" - #. module: mis_builder #: code:addons/mis_builder/models/mis_report.py:0 #, fuzzy, python-format @@ -1709,6 +1706,12 @@ msgstr "" msgid "Unexpected accumulation method %s for %s." msgstr "Méthode d'accumulation inattendue %s pour %s." +#. module: mis_builder +#: code:addons/mis_builder/models/mis_report.py:0 +#, python-format +msgid "Unexpected value %s for target_move." +msgstr "" + #. module: mis_builder #: code:addons/mis_builder/models/prorata_read_group_mixin.py:0 #, python-format @@ -1830,6 +1833,21 @@ msgstr "xx-grand" msgid "xx-small" msgstr "xx-petit" +#~ msgid "" +#~ "Check if you wish to specify children companies to be searched for data." +#~ msgstr "" +#~ "Vérifiez si vous souhaitez spécifier des sociétés enfants dont les " +#~ "données seront recherchées." + +#~ msgid "Companies" +#~ msgstr "Sociétés" + +#~ msgid "Company" +#~ msgstr "Société" + +#~ msgid "Query Company" +#~ msgstr "Société de la requête" + #~ msgid "" #~ "AccountingNone: a null value that behaves as 0 in arithmetic " #~ "operations." diff --git a/mis_builder/i18n/hr.po b/mis_builder/i18n/hr.po index c487840..b4aacef 100644 --- a/mis_builder/i18n/hr.po +++ b/mis_builder/i18n/hr.po @@ -285,6 +285,16 @@ msgstr "Sve proknjižene stavke" msgid "Allowed Cmpcol" msgstr "" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids +msgid "Allowed companies" +msgstr "" + +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id +msgid "Allowed company" +msgstr "" + #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_kpi_data__amount msgid "Amount" @@ -404,8 +414,7 @@ msgstr "Otkaži" #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__multi_company -msgid "" -"Check if you wish to specify children companies to be searched for data." +msgid "Check if you wish to specify several companies to be searched for data." msgstr "" #. module: mis_builder @@ -457,21 +466,11 @@ msgstr "" msgid "Columns {} and {} are not comparable" msgstr "" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids -msgid "Companies" -msgstr "" - #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__query_company_ids msgid "Companies for which data will be searched." msgstr "" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id -msgid "Company" -msgstr "Tvrtka" - #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_cmpcol_to_id msgid "Compare" @@ -669,6 +668,11 @@ msgstr "" msgid "Duration" msgstr "" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids +msgid "Effective companies" +msgstr "" + #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "Enter expression here, for example balp[70%]. See also help tab." @@ -1349,11 +1353,6 @@ msgstr "" msgid "Queries" msgstr "" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids -msgid "Query Company" -msgstr "" - #. module: mis_builder #: code:addons/mis_builder/models/mis_report.py:0 #, python-format @@ -1668,6 +1667,12 @@ msgstr "" msgid "Unexpected accumulation method %s for %s." msgstr "" +#. module: mis_builder +#: code:addons/mis_builder/models/mis_report.py:0 +#, python-format +msgid "Unexpected value %s for target_move." +msgstr "" + #. module: mis_builder #: code:addons/mis_builder/models/prorata_read_group_mixin.py:0 #, python-format @@ -1789,6 +1794,9 @@ msgstr "" msgid "xx-small" msgstr "" +#~ msgid "Company" +#~ msgstr "Tvrtka" + #~ msgid "" #~ "AccountingNone: a null value that behaves as 0 in arithmetic " #~ "operations." diff --git a/mis_builder/i18n/it.po b/mis_builder/i18n/it.po index a753323..ce8cdf1 100644 --- a/mis_builder/i18n/it.po +++ b/mis_builder/i18n/it.po @@ -276,6 +276,16 @@ msgstr "Tutte le registrazioni confermate" msgid "Allowed Cmpcol" msgstr "" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids +msgid "Allowed companies" +msgstr "" + +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id +msgid "Allowed company" +msgstr "" + #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_kpi_data__amount msgid "Amount" @@ -393,10 +403,8 @@ msgstr "Annulla" #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__multi_company -msgid "" -"Check if you wish to specify children companies to be searched for data." +msgid "Check if you wish to specify several companies to be searched for data." msgstr "" -"Spuntare se si desidera specificare le aziende figlie da ricercare per dati." #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_style_view_form @@ -447,21 +455,11 @@ msgstr "Colonne da sommare" msgid "Columns {} and {} are not comparable" msgstr "Le colonne {} e {} non sono confrontabili" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids -msgid "Companies" -msgstr "Aziende" - #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__query_company_ids msgid "Companies for which data will be searched." msgstr "Società dalla quali i dati verranno ricercati." -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id -msgid "Company" -msgstr "Azienda" - #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_cmpcol_to_id msgid "Compare" @@ -665,6 +663,11 @@ msgstr "" msgid "Duration" msgstr "Durata" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids +msgid "Effective companies" +msgstr "" + #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "Enter expression here, for example balp[70%]. See also help tab." @@ -1347,11 +1350,6 @@ msgstr "Stampa" msgid "Queries" msgstr "Domande" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids -msgid "Query Company" -msgstr "" - #. module: mis_builder #: code:addons/mis_builder/models/mis_report.py:0 #, python-format @@ -1672,6 +1670,12 @@ msgstr "A (calcolato)" msgid "Unexpected accumulation method %s for %s." msgstr "Metodo di accumulo imprevisto %s for %s." +#. module: mis_builder +#: code:addons/mis_builder/models/mis_report.py:0 +#, python-format +msgid "Unexpected value %s for target_move." +msgstr "" + #. module: mis_builder #: code:addons/mis_builder/models/prorata_read_group_mixin.py:0 #, python-format @@ -1792,3 +1796,15 @@ msgstr "" #: model:ir.model.fields.selection,name:mis_builder.selection__mis_report_style__font_size__xx-small msgid "xx-small" msgstr "" + +#~ msgid "" +#~ "Check if you wish to specify children companies to be searched for data." +#~ msgstr "" +#~ "Spuntare se si desidera specificare le aziende figlie da ricercare per " +#~ "dati." + +#~ msgid "Companies" +#~ msgstr "Aziende" + +#~ msgid "Company" +#~ msgstr "Azienda" diff --git a/mis_builder/i18n/mis_builder.pot b/mis_builder/i18n/mis_builder.pot index c0848ad..9e8eaa8 100644 --- a/mis_builder/i18n/mis_builder.pot +++ b/mis_builder/i18n/mis_builder.pot @@ -252,6 +252,16 @@ msgstr "" msgid "Allowed Cmpcol" msgstr "" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids +msgid "Allowed companies" +msgstr "" + +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id +msgid "Allowed company" +msgstr "" + #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_kpi_data__amount msgid "Amount" @@ -371,7 +381,7 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__multi_company msgid "" -"Check if you wish to specify children companies to be searched for data." +"Check if you wish to specify several companies to be searched for data." msgstr "" #. module: mis_builder @@ -423,21 +433,11 @@ msgstr "" msgid "Columns {} and {} are not comparable" msgstr "" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids -msgid "Companies" -msgstr "" - #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__query_company_ids msgid "Companies for which data will be searched." msgstr "" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id -msgid "Company" -msgstr "" - #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_cmpcol_to_id msgid "Compare" @@ -631,6 +631,11 @@ msgstr "" msgid "Duration" msgstr "" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids +msgid "Effective companies" +msgstr "" + #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "Enter expression here, for example balp[70%]. See also help tab." @@ -1311,11 +1316,6 @@ msgstr "" msgid "Queries" msgstr "" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids -msgid "Query Company" -msgstr "" - #. module: mis_builder #: code:addons/mis_builder/models/mis_report.py:0 #, python-format @@ -1627,6 +1627,12 @@ msgstr "" msgid "Unexpected accumulation method %s for %s." msgstr "" +#. module: mis_builder +#: code:addons/mis_builder/models/mis_report.py:0 +#, python-format +msgid "Unexpected value %s for target_move." +msgstr "" + #. module: mis_builder #: code:addons/mis_builder/models/prorata_read_group_mixin.py:0 #, python-format diff --git a/mis_builder/i18n/nl.po b/mis_builder/i18n/nl.po index 6e743bf..b52b22d 100644 --- a/mis_builder/i18n/nl.po +++ b/mis_builder/i18n/nl.po @@ -288,6 +288,16 @@ msgstr "Alle Geboekte Regels" msgid "Allowed Cmpcol" msgstr "" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids +msgid "Allowed companies" +msgstr "" + +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id +msgid "Allowed company" +msgstr "" + #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_kpi_data__amount msgid "Amount" @@ -407,11 +417,8 @@ msgstr "Annuleer" #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__multi_company -msgid "" -"Check if you wish to specify children companies to be searched for data." +msgid "Check if you wish to specify several companies to be searched for data." msgstr "" -"Controleer of u dochterbedrijven wilt selecteren waarvan de data moet worden " -"meegenomen." #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_style_view_form @@ -462,21 +469,11 @@ msgstr "Op te sommen kolommen" msgid "Columns {} and {} are not comparable" msgstr "Kolommen {} en {} zijn niet vergelijkbaar" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids -msgid "Companies" -msgstr "Bedrijven" - #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__query_company_ids msgid "Companies for which data will be searched." msgstr "Bedrijven waarvoor de data wordt doorzocht." -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id -msgid "Company" -msgstr "Bedrijf" - #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_cmpcol_to_id msgid "Compare" @@ -684,6 +681,11 @@ msgstr "" msgid "Duration" msgstr "Duur" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids +msgid "Effective companies" +msgstr "" + #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "Enter expression here, for example balp[70%]. See also help tab." @@ -1381,11 +1383,6 @@ msgstr "Print" msgid "Queries" msgstr "Queries" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids -msgid "Query Company" -msgstr "Query Bedrijf" - #. module: mis_builder #: code:addons/mis_builder/models/mis_report.py:0 #, fuzzy, python-format @@ -1710,6 +1707,12 @@ msgstr "" msgid "Unexpected accumulation method %s for %s." msgstr "Onverwachte accumulatiemethode %s voor %s." +#. module: mis_builder +#: code:addons/mis_builder/models/mis_report.py:0 +#, python-format +msgid "Unexpected value %s for target_move." +msgstr "" + #. module: mis_builder #: code:addons/mis_builder/models/prorata_read_group_mixin.py:0 #, python-format @@ -1831,6 +1834,21 @@ msgstr "XXL" msgid "xx-small" msgstr "XXS" +#~ msgid "" +#~ "Check if you wish to specify children companies to be searched for data." +#~ msgstr "" +#~ "Controleer of u dochterbedrijven wilt selecteren waarvan de data moet " +#~ "worden meegenomen." + +#~ msgid "Companies" +#~ msgstr "Bedrijven" + +#~ msgid "Company" +#~ msgstr "Bedrijf" + +#~ msgid "Query Company" +#~ msgstr "Query Bedrijf" + #~ msgid "" #~ "AccountingNone: a null value that behaves as 0 in arithmetic " #~ "operations." diff --git a/mis_builder/i18n/nl_NL.po b/mis_builder/i18n/nl_NL.po index 1e78a7c..cd05165 100644 --- a/mis_builder/i18n/nl_NL.po +++ b/mis_builder/i18n/nl_NL.po @@ -291,6 +291,16 @@ msgstr "Alle Geboekte Regels" msgid "Allowed Cmpcol" msgstr "" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids +msgid "Allowed companies" +msgstr "" + +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id +msgid "Allowed company" +msgstr "" + #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_kpi_data__amount msgid "Amount" @@ -410,11 +420,8 @@ msgstr "Annuleer" #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__multi_company -msgid "" -"Check if you wish to specify children companies to be searched for data." +msgid "Check if you wish to specify several companies to be searched for data." msgstr "" -"Controleer of u dochterbedrijven wilt selecteren waarvan de data moet worden " -"meegenomen." #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_style_view_form @@ -465,21 +472,11 @@ msgstr "Op te sommen kolommen" msgid "Columns {} and {} are not comparable" msgstr "Kolommen {} en {} zijn niet vergelijkbaar" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids -msgid "Companies" -msgstr "Bedrijven" - #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__query_company_ids msgid "Companies for which data will be searched." msgstr "Bedrijven waarvoor de data wordt doorzocht." -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id -msgid "Company" -msgstr "Bedrijf" - #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_cmpcol_to_id msgid "Compare" @@ -687,6 +684,11 @@ msgstr "" msgid "Duration" msgstr "Duur" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids +msgid "Effective companies" +msgstr "" + #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "Enter expression here, for example balp[70%]. See also help tab." @@ -1384,11 +1386,6 @@ msgstr "Afdrukken" msgid "Queries" msgstr "Query's" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids -msgid "Query Company" -msgstr "Query Bedrijf" - #. module: mis_builder #: code:addons/mis_builder/models/mis_report.py:0 #, fuzzy, python-format @@ -1713,6 +1710,12 @@ msgstr "" msgid "Unexpected accumulation method %s for %s." msgstr "Onverwachte accumulatiemethode %s voor %s." +#. module: mis_builder +#: code:addons/mis_builder/models/mis_report.py:0 +#, python-format +msgid "Unexpected value %s for target_move." +msgstr "" + #. module: mis_builder #: code:addons/mis_builder/models/prorata_read_group_mixin.py:0 #, python-format @@ -1834,6 +1837,21 @@ msgstr "XXL" msgid "xx-small" msgstr "XXS" +#~ msgid "" +#~ "Check if you wish to specify children companies to be searched for data." +#~ msgstr "" +#~ "Controleer of u dochterbedrijven wilt selecteren waarvan de data moet " +#~ "worden meegenomen." + +#~ msgid "Companies" +#~ msgstr "Bedrijven" + +#~ msgid "Company" +#~ msgstr "Bedrijf" + +#~ msgid "Query Company" +#~ msgstr "Query Bedrijf" + #~ msgid "" #~ "AccountingNone: a null value that behaves as 0 in arithmetic " #~ "operations." diff --git a/mis_builder/i18n/pt.po b/mis_builder/i18n/pt.po index f0269d3..a2f85ba 100644 --- a/mis_builder/i18n/pt.po +++ b/mis_builder/i18n/pt.po @@ -277,6 +277,16 @@ msgstr "Todos os lançamentos publicados" msgid "Allowed Cmpcol" msgstr "" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids +msgid "Allowed companies" +msgstr "" + +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id +msgid "Allowed company" +msgstr "" + #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_kpi_data__amount msgid "Amount" @@ -394,8 +404,7 @@ msgstr "Cancelar" #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__multi_company -msgid "" -"Check if you wish to specify children companies to be searched for data." +msgid "Check if you wish to specify several companies to be searched for data." msgstr "" #. module: mis_builder @@ -447,21 +456,11 @@ msgstr "" msgid "Columns {} and {} are not comparable" msgstr "" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids -msgid "Companies" -msgstr "" - #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__query_company_ids msgid "Companies for which data will be searched." msgstr "" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id -msgid "Company" -msgstr "Empresa" - #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_cmpcol_to_id msgid "Compare" @@ -659,6 +658,11 @@ msgstr "" msgid "Duration" msgstr "" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids +msgid "Effective companies" +msgstr "" + #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "Enter expression here, for example balp[70%]. See also help tab." @@ -1339,11 +1343,6 @@ msgstr "" msgid "Queries" msgstr "" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids -msgid "Query Company" -msgstr "" - #. module: mis_builder #: code:addons/mis_builder/models/mis_report.py:0 #, python-format @@ -1658,6 +1657,12 @@ msgstr "" msgid "Unexpected accumulation method %s for %s." msgstr "" +#. module: mis_builder +#: code:addons/mis_builder/models/mis_report.py:0 +#, python-format +msgid "Unexpected value %s for target_move." +msgstr "" + #. module: mis_builder #: code:addons/mis_builder/models/prorata_read_group_mixin.py:0 #, python-format @@ -1778,3 +1783,6 @@ msgstr "" #: model:ir.model.fields.selection,name:mis_builder.selection__mis_report_style__font_size__xx-small msgid "xx-small" msgstr "" + +#~ msgid "Company" +#~ msgstr "Empresa" diff --git a/mis_builder/i18n/pt_BR.po b/mis_builder/i18n/pt_BR.po index c254d05..8ff211b 100644 --- a/mis_builder/i18n/pt_BR.po +++ b/mis_builder/i18n/pt_BR.po @@ -289,6 +289,16 @@ msgstr "Todas as Entradas Postadas" msgid "Allowed Cmpcol" msgstr "" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids +msgid "Allowed companies" +msgstr "" + +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id +msgid "Allowed company" +msgstr "" + #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_kpi_data__amount msgid "Amount" @@ -408,11 +418,8 @@ msgstr "Cancelar" #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__multi_company -msgid "" -"Check if you wish to specify children companies to be searched for data." +msgid "Check if you wish to specify several companies to be searched for data." msgstr "" -"Verifique se deseja especificar empresas filhas para serem pesquisadas por " -"dados." #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_style_view_form @@ -463,21 +470,11 @@ msgstr "Colunas para somar" msgid "Columns {} and {} are not comparable" msgstr "Colunas {} e {} não são comparáveis" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids -msgid "Companies" -msgstr "Empresas" - #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__query_company_ids msgid "Companies for which data will be searched." msgstr "Empresas para as quais os dados serão pesquisados." -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id -msgid "Company" -msgstr "Empresa" - #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_cmpcol_to_id msgid "Compare" @@ -682,6 +679,11 @@ msgstr "" msgid "Duration" msgstr "Duração" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids +msgid "Effective companies" +msgstr "" + #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "Enter expression here, for example balp[70%]. See also help tab." @@ -1376,11 +1378,6 @@ msgstr "Imprimir" msgid "Queries" msgstr "Consultas" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids -msgid "Query Company" -msgstr "Empresa de Consulta" - #. module: mis_builder #: code:addons/mis_builder/models/mis_report.py:0 #, fuzzy, python-format @@ -1703,6 +1700,12 @@ msgstr "Para (computado)" msgid "Unexpected accumulation method %s for %s." msgstr "Método de acumulação %s não esperado para %s." +#. module: mis_builder +#: code:addons/mis_builder/models/mis_report.py:0 +#, python-format +msgid "Unexpected value %s for target_move." +msgstr "" + #. module: mis_builder #: code:addons/mis_builder/models/prorata_read_group_mixin.py:0 #, python-format @@ -1824,6 +1827,21 @@ msgstr "grandíssimo" msgid "xx-small" msgstr "Pequeníssimo" +#~ msgid "" +#~ "Check if you wish to specify children companies to be searched for data." +#~ msgstr "" +#~ "Verifique se deseja especificar empresas filhas para serem pesquisadas " +#~ "por dados." + +#~ msgid "Companies" +#~ msgstr "Empresas" + +#~ msgid "Company" +#~ msgstr "Empresa" + +#~ msgid "Query Company" +#~ msgstr "Empresa de Consulta" + #~ msgid "" #~ "AccountingNone: a null value that behaves as 0 in arithmetic " #~ "operations." diff --git a/mis_builder/i18n/sv.po b/mis_builder/i18n/sv.po index 826f629..d1e38cf 100644 --- a/mis_builder/i18n/sv.po +++ b/mis_builder/i18n/sv.po @@ -29,9 +29,11 @@ msgid "" "\n" " balp[('user_type_id', '=',\n" " ref('account.\n" -" data_account_type_receivable').id)][]\n" +" data_account_type_receivable')." +"id)][]\n" " \n" -" : variation of the balance of all receivable\n" +" : variation of the balance of " +"all receivable\n" " accounts over the period." msgstr "" @@ -39,10 +41,13 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "" "\n" -" balp[][('tax_line_id.tag_ids', '=',\n" -" ref('l10n_be.tax_tag_56').id)]\n" +" balp[][('tax_line_id." +"tag_ids', '=',\n" +" ref('l10n_be.tax_tag_56')." +"id)]\n" " \n" -" : balance of move lines related to tax grid\n" +" : balance of move lines related " +"to tax grid\n" " 56." msgstr "" @@ -50,10 +55,12 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "" "\n" -" debp[55%][('journal_id.code', '=',\n" +" debp[55%][('journal_id." +"code', '=',\n" " 'BNK1')]\n" " \n" -" : sum of all debits on accounts 55 and\n" +" : sum of all debits on accounts " +"55 and\n" " journal BNK1 during the period." msgstr "" @@ -61,7 +68,8 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "" "AccountingNone\n" -" : a null value that behaves as 0 in\n" +" : a null value that behaves as 0 " +"in\n" " arithmetic operations." msgstr "" @@ -69,7 +77,8 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "" "bal, crd, deb, pbal, nbal\n" -" : balance, debit, credit, positive balance,\n" +" : balance, debit, credit, " +"positive balance,\n" " negative balance." msgstr "" @@ -77,15 +86,18 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "" "bal[70]\n" -" : variation of the balance of account 70\n" -" over the period (it is the same as balp[70]." +" : variation of the balance of " +"account 70\n" +" over the period (it is the same " +"as balp[70]." msgstr "" #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "" "bale[1%]\n" -" : balance of accounts starting with 1 at end\n" +" : balance of accounts starting " +"with 1 at end\n" " of period." msgstr "" @@ -93,15 +105,18 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "" "bali[70,60]\n" -" : initial balance of accounts 70 and 60." +" : initial balance of accounts 70 " +"and 60." msgstr "" #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "" "balu[]\n" -" : (u for unallocated) is a special\n" -" expression that shows the unallocated\n" +" : (u for unallocated) is a " +"special\n" +" expression that shows the " +"unallocated\n" " profit/loss of previous\n" " fiscal years." msgstr "" @@ -110,7 +125,8 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "" "crdp[40%]\n" -" : sum of all credits on accounts starting\n" +" : sum of all credits on accounts " +"starting\n" " with 40 during the period." msgstr "" @@ -118,7 +134,8 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "" "date_from, date_to\n" -" : beginning and end date of the period." +" : beginning and end date of the " +"period." msgstr "" #. module: mis_builder @@ -132,7 +149,8 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "" "p, i, e\n" -" : respectively variation over the period,\n" +" : respectively variation over " +"the period,\n" " initial balance, ending balance" msgstr "" @@ -140,7 +158,8 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "" "pbale[55%]\n" -" : sum of all ending balances of accounts\n" +" : sum of all ending balances of " +"accounts\n" " starting with 55 whose\n" " ending balance is positive." msgstr "" @@ -149,22 +168,23 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "" "sum, min, max, len, avg\n" -" : behave as expected, very similar to the\n" +" : behave as expected, very " +"similar to the\n" " python builtins." msgstr "" #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance_period__source_aml_model_id msgid "" -"A 'move line like' model, ie having at least debit, credit, date, account_id" -" and company_id fields." +"A 'move line like' model, ie having at least debit, credit, date, account_id " +"and company_id fields." msgstr "" #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report__move_lines_source msgid "" -"A 'move line like' model, ie having at least debit, credit, date, account_id" -" and company_id fields. This model is the data source for column Actuals." +"A 'move line like' model, ie having at least debit, credit, date, account_id " +"and company_id fields. This model is the data source for column Actuals." msgstr "" #. module: mis_builder @@ -187,9 +207,8 @@ msgstr "" #: code:addons/mis_builder/models/mis_report_instance.py:0 #, python-format msgid "" -"Actual (alternative) models used in columns must have the same account model" -" in the Account field and must be the same defined in the report template: " -"%s" +"Actual (alternative) models used in columns must have the same account model " +"in the Account field and must be the same defined in the report template: %s" msgstr "" #. module: mis_builder @@ -206,7 +225,8 @@ msgstr "" #: model:ir.model.fields,help:mis_builder.field_mis_report_instance_period__source msgid "" "Actuals: current data, from accounting and other queries.\n" -"Actuals (alternative): current data from an alternative source (eg a database view providing look-alike account move lines).\n" +"Actuals (alternative): current data from an alternative source (eg a " +"database view providing look-alike account move lines).\n" "Sum columns: summation (+/-) of other columns.\n" "Compare to column: compare to other column.\n" msgstr "" @@ -255,6 +275,16 @@ msgstr "Alla bokförda poster" msgid "Allowed Cmpcol" msgstr "" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids +msgid "Allowed companies" +msgstr "" + +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id +msgid "Allowed company" +msgstr "" + #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_kpi_data__amount msgid "Amount" @@ -263,8 +293,8 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_kpi__style_expression msgid "" -"An expression that returns a style depending on the KPI value. Such style is" -" applied on top of the row style." +"An expression that returns a style depending on the KPI value. Such style is " +"applied on top of the row style." msgstr "" #. module: mis_builder @@ -327,7 +357,6 @@ msgstr "" #. module: mis_builder #: code:addons/mis_builder/models/mis_report.py:0 -#: code:addons/mis_builder/models/mis_report.py:0 #: model:ir.model.fields.selection,name:mis_builder.selection__mis_report_kpi__accumulation_method__avg #: model:ir.model.fields.selection,name:mis_builder.selection__mis_report_query__aggregate__avg #, python-format @@ -373,8 +402,7 @@ msgstr "" #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__multi_company -msgid "" -"Check if you wish to specify children companies to be searched for data." +msgid "Check if you wish to specify several companies to be searched for data." msgstr "" #. module: mis_builder @@ -426,21 +454,11 @@ msgstr "" msgid "Columns {} and {} are not comparable" msgstr "" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_ids -msgid "Companies" -msgstr "" - #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_instance__query_company_ids msgid "Companies for which data will be searched." msgstr "" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__company_id -msgid "Company" -msgstr "Bolag" - #. module: mis_builder #: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance_period__source_cmpcol_to_id msgid "Compare" @@ -558,8 +576,12 @@ msgstr "Beskrivning" #. module: mis_builder #: model:ir.model.fields,help:mis_builder.field_mis_report_kpi__accumulation_method msgid "" -"Determines how values of this kpi spanning over a time period are transformed to match the reporting period. Sum: values of shorter period are added, values of longest or partially overlapping periods are adjusted pro-rata temporis.\n" -"Average: values of included period are averaged with a pro-rata temporis weight." +"Determines how values of this kpi spanning over a time period are " +"transformed to match the reporting period. Sum: values of shorter period are " +"added, values of longest or partially overlapping periods are adjusted pro-" +"rata temporis.\n" +"Average: values of included period are averaged with a pro-rata temporis " +"weight." msgstr "" #. module: mis_builder @@ -634,6 +656,11 @@ msgstr "" msgid "Duration" msgstr "" +#. module: mis_builder +#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids +msgid "Effective companies" +msgstr "" + #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "Enter expression here, for example balp[70%]. See also help tab." @@ -676,7 +703,8 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "" "Expressions can involve other KPI, sub KPI and\n" -" query results by name (eg kpi1 + kpi2,\n" +" query results by name (eg kpi1 + " +"kpi2,\n" " kpi2.subkpi1, query1.field1)." msgstr "" @@ -895,7 +923,8 @@ msgid "" "This can be fixed by either:\n" "\t- Changing the KPI value to a tuple of length {}\n" "or\n" -"\t- Changing the KPI to `multi` mode and giving an explicit value for each sub-KPI." +"\t- Changing the KPI to `multi` mode and giving an explicit value for each " +"sub-KPI." msgstr "" #. module: mis_builder @@ -1201,7 +1230,6 @@ msgstr "" #. module: mis_builder #: code:addons/mis_builder/models/mis_report.py:0 -#: code:addons/mis_builder/models/mis_report.py:0 #: model:ir.model.fields.selection,name:mis_builder.selection__mis_report_kpi__accumulation_method__none #: model:ir.model.fields.selection,name:mis_builder.selection__mis_report_kpi__compare_method__none #, python-format @@ -1248,7 +1276,6 @@ msgstr "" #. module: mis_builder #: code:addons/mis_builder/models/mis_report.py:0 -#: code:addons/mis_builder/models/mis_report.py:0 #: model:ir.model.fields.selection,name:mis_builder.selection__mis_report_kpi__compare_method__pct #: model:ir.model.fields.selection,name:mis_builder.selection__mis_report_kpi__type__pct #, python-format @@ -1314,11 +1341,6 @@ msgstr "Skriv ut" msgid "Queries" msgstr "" -#. module: mis_builder -#: model:ir.model.fields,field_description:mis_builder.field_mis_report_instance__query_company_ids -msgid "Query Company" -msgstr "" - #. module: mis_builder #: code:addons/mis_builder/models/mis_report.py:0 #, python-format @@ -1532,7 +1554,6 @@ msgstr "" #. module: mis_builder #: code:addons/mis_builder/models/mis_report.py:0 -#: code:addons/mis_builder/models/mis_report.py:0 #: model:ir.model.fields.selection,name:mis_builder.selection__mis_report_kpi__accumulation_method__sum #: model:ir.model.fields.selection,name:mis_builder.selection__mis_report_query__aggregate__sum #, python-format @@ -1588,7 +1609,8 @@ msgstr "" msgid "" "The\n" " account selector\n" -" is a like expression on the account code (eg\n" +" is a like expression on the " +"account code (eg\n" " 70%, etc)." msgstr "" @@ -1597,16 +1619,19 @@ msgstr "" msgid "" "The\n" " journal items domain\n" -" is an Odoo domain filter on journal items." +" is an Odoo domain filter on " +"journal items." msgstr "" #. module: mis_builder #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form msgid "" "The following special elements are recognized in\n" -" the expressions to compute accounting data:\n" +" the expressions to compute " +"accounting data:\n" " \n" -" {bal|crd|deb|pbal|nbal}{pieu}[account\n" +" {bal|crd|deb|pbal|nbal}{pieu}" +"[account\n" " selector][journal items domain]\n" " \n" " ." @@ -1630,6 +1655,12 @@ msgstr "" msgid "Unexpected accumulation method %s for %s." msgstr "" +#. module: mis_builder +#: code:addons/mis_builder/models/mis_report.py:0 +#, python-format +msgid "Unexpected value %s for target_move." +msgstr "" + #. module: mis_builder #: code:addons/mis_builder/models/prorata_read_group_mixin.py:0 #, python-format @@ -1750,3 +1781,6 @@ msgstr "" #: model:ir.model.fields.selection,name:mis_builder.selection__mis_report_style__font_size__xx-small msgid "xx-small" msgstr "" + +#~ msgid "Company" +#~ msgstr "Bolag" diff --git a/mis_builder/models/aep.py b/mis_builder/models/aep.py index 83995f4..9eb07d8 100644 --- a/mis_builder/models/aep.py +++ b/mis_builder/models/aep.py @@ -22,7 +22,7 @@ _DOMAIN_START_RE = re.compile(r"\(|(['\"])[!&|]\1") def _is_domain(s): - """ Test if a string looks like an Flectra domain """ + """Test if a string looks like an Flectra domain""" return _DOMAIN_START_RE.match(s) @@ -189,7 +189,7 @@ class AccountingExpressionProcessor(object): self._map_account_ids[key].add(acc_domain) def done_parsing(self): - """ Replace account domains by account ids in map """ + """Replace account domains by account ids in map""" for key, acc_domains in self._map_account_ids.items(): all_account_ids = set() for acc_domain in acc_domains: @@ -217,9 +217,7 @@ class AccountingExpressionProcessor(object): account_ids.update(self._account_ids_by_acc_domain[acc_domain]) return account_ids - def get_aml_domain_for_expr( - self, expr, date_from, date_to, target_move, account_id=None - ): + def get_aml_domain_for_expr(self, expr, date_from, date_to, account_id=None): """Get a domain on account.move.line for an expression. Prerequisite: done_parsing() must have been invoked. @@ -248,14 +246,14 @@ class AccountingExpressionProcessor(object): aml_domains.append(expression.normalize_domain(aml_domain)) if mode not in date_domain_by_mode: date_domain_by_mode[mode] = self.get_aml_domain_for_dates( - date_from, date_to, mode, target_move + date_from, date_to, mode ) assert aml_domains # TODO we could do this for more precision: # AND(OR(aml_domains[mode]), date_domain[mode]) for each mode return expression.OR(aml_domains) + expression.OR(date_domain_by_mode.values()) - def get_aml_domain_for_dates(self, date_from, date_to, mode, target_move): + def get_aml_domain_for_dates(self, date_from, date_to, mode): if mode == self.MODE_VARIATION: domain = [("date", ">=", date_from), ("date", "<=", date_to)] elif mode in (self.MODE_INITIAL, self.MODE_END): @@ -288,8 +286,6 @@ class AccountingExpressionProcessor(object): ("date", "<", fields.Date.to_string(fy_date_from)), ("account_id.user_type_id.include_initial_balance", "=", False), ] - if target_move == "posted": - domain.append(("move_id.state", "=", "posted")) return expression.normalize_domain(domain) def _get_company_rates(self, date): @@ -308,7 +304,6 @@ class AccountingExpressionProcessor(object): self, date_from, date_to, - target_move="posted", additional_move_line_filter=None, aml_model=None, ): @@ -335,7 +330,7 @@ class AccountingExpressionProcessor(object): continue if mode not in domain_by_mode: domain_by_mode[mode] = self.get_aml_domain_for_dates( - date_from, date_to, mode, target_move + date_from, date_to, mode ) domain = list(domain) + domain_by_mode[mode] domain.append(("account_id", "in", self._map_account_ids[key])) @@ -472,7 +467,7 @@ class AccountingExpressionProcessor(object): yield account_id, [self._ACC_RE.sub(f, expr) for expr in exprs] @classmethod - def _get_balances(cls, mode, companies, date_from, date_to, target_move="posted"): + def _get_balances(cls, mode, companies, date_from, date_to): expr = "deb{mode}[], crd{mode}[]".format(mode=mode) aep = AccountingExpressionProcessor(companies) # disable smart_end to have the data at once, instead @@ -480,11 +475,11 @@ class AccountingExpressionProcessor(object): aep.smart_end = False aep.parse_expr(expr) aep.done_parsing() - aep.do_queries(date_from, date_to, target_move) + aep.do_queries(date_from, date_to) return aep._data[((), mode)] @classmethod - def get_balances_initial(cls, companies, date, target_move="posted"): + def get_balances_initial(cls, companies, date): """A convenience method to obtain the initial balances of all accounts at a given date. @@ -492,14 +487,13 @@ class AccountingExpressionProcessor(object): :param companies: :param date: - :param target_move: if 'posted', consider only posted moves Returns a dictionary: {account_id, (debit, credit)} """ - return cls._get_balances(cls.MODE_INITIAL, companies, date, date, target_move) + return cls._get_balances(cls.MODE_INITIAL, companies, date, date) @classmethod - def get_balances_end(cls, companies, date, target_move="posted"): + def get_balances_end(cls, companies, date): """A convenience method to obtain the ending balances of all accounts at a given date. @@ -507,43 +501,34 @@ class AccountingExpressionProcessor(object): :param companies: :param date: - :param target_move: if 'posted', consider only posted moves Returns a dictionary: {account_id, (debit, credit)} """ - return cls._get_balances(cls.MODE_END, companies, date, date, target_move) + return cls._get_balances(cls.MODE_END, companies, date, date) @classmethod - def get_balances_variation( - cls, companies, date_from, date_to, target_move="posted" - ): + def get_balances_variation(cls, companies, date_from, date_to): """A convenience method to obtain the variation of the balances of all accounts over a period. :param companies: :param date: - :param target_move: if 'posted', consider only posted moves Returns a dictionary: {account_id, (debit, credit)} """ - return cls._get_balances( - cls.MODE_VARIATION, companies, date_from, date_to, target_move - ) + return cls._get_balances(cls.MODE_VARIATION, companies, date_from, date_to) @classmethod - def get_unallocated_pl(cls, companies, date, target_move="posted"): + def get_unallocated_pl(cls, companies, date): """A convenience method to obtain the unallocated profit/loss of the previous fiscal years at a given date. :param companies: :param date: - :param target_move: if 'posted', consider only posted moves Returns a tuple (debit, credit) """ # TODO shoud we include here the accounts of type "unaffected" # or leave that to the caller? - bals = cls._get_balances( - cls.MODE_UNALLOCATED, companies, date, date, target_move - ) + bals = cls._get_balances(cls.MODE_UNALLOCATED, companies, date, date) return tuple(map(sum, zip(*bals.values()))) diff --git a/mis_builder/models/expression_evaluator.py b/mis_builder/models/expression_evaluator.py index a98ac4e..94ff403 100644 --- a/mis_builder/models/expression_evaluator.py +++ b/mis_builder/models/expression_evaluator.py @@ -15,14 +15,12 @@ class ExpressionEvaluator(object): aep, date_from, date_to, - target_move=None, additional_move_line_filter=None, aml_model=None, ): self.aep = aep self.date_from = date_from self.date_to = date_to - self.target_move = target_move self.additional_move_line_filter = additional_move_line_filter self.aml_model = aml_model self._aep_queries_done = False @@ -32,7 +30,6 @@ class ExpressionEvaluator(object): self.aep.do_queries( self.date_from, self.date_to, - self.target_move, self.additional_move_line_filter, self.aml_model, ) diff --git a/mis_builder/models/mis_report.py b/mis_builder/models/mis_report.py index 2a7109a..423d6ee 100644 --- a/mis_builder/models/mis_report.py +++ b/mis_builder/models/mis_report.py @@ -1,4 +1,5 @@ # Copyright 2014 ACSONE SA/NV () +# Copyright 2020 CorporateHub (https://corporatehub.eu) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). import datetime @@ -13,7 +14,12 @@ import pytz from flectra import _, api, fields, models from flectra.exceptions import UserError, ValidationError from flectra.models import expression as osv_expression -from flectra.tools.safe_eval import safe_eval +from flectra.tools.safe_eval import ( + datetime as safe_datetime, + dateutil as safe_dateutil, + safe_eval, + time as safe_time, +) from .accounting_none import AccountingNone from .aep import AccountingExpressionProcessor as AEP @@ -72,7 +78,7 @@ class MisReportKpi(models.Model): _name = "mis.report.kpi" _description = "MIS Report KPI" - name = fields.Char(size=32, required=True, string="Name") + name = fields.Char(required=True, string="Name") description = fields.Char(required=True, string="Description", translate=True) multi = fields.Boolean() expression = fields.Char( @@ -210,7 +216,7 @@ class MisReportKpi(models.Model): @api.onchange("description") def _onchange_description(self): - """ construct name from description """ + """construct name from description""" if self.description and not self.name: self.name = _python_var(self.description) @@ -257,7 +263,7 @@ class MisReportSubkpi(models.Model): report_id = fields.Many2one( comodel_name="mis.report", required=True, ondelete="cascade" ) - name = fields.Char(size=32, required=True, string="Name") + name = fields.Char(required=True, string="Name") description = fields.Char(required=True, string="Description", translate=True) expression_ids = fields.One2many("mis.report.kpi.expression", "subkpi_id") @@ -273,7 +279,7 @@ class MisReportSubkpi(models.Model): @api.onchange("description") def _onchange_description(self): - """ construct name from description """ + """construct name from description""" if self.description and not self.name: self.name = _python_var(self.description) @@ -368,7 +374,7 @@ class MisReportQuery(models.Model): field_names = [field.name for field in record.field_ids] record.field_names = ", ".join(field_names) - name = fields.Char(size=32, required=True, string="Name") + name = fields.Char(required=True, string="Name") model_id = fields.Many2one( "ir.model", required=True, string="Model", ondelete="cascade" ) @@ -583,9 +589,9 @@ class MisReport(models.Model): model = self.env[query.model_id.model] eval_context = { "env": self.env, - "time": time, - "datetime": datetime, - "dateutil": dateutil, + "time": safe_time, + "datetime": safe_datetime, + "dateutil": safe_dateutil, # deprecated "uid": self.env.uid, "context": self.env.context, @@ -791,7 +797,6 @@ class MisReport(models.Model): aep, date_from, date_to, - target_move, subkpis_filter=None, get_additional_move_line_filter=None, get_additional_query_filter=None, @@ -807,7 +812,6 @@ class MisReport(models.Model): aep, date_from, date_to, - target_move, get_additional_move_line_filter() if get_additional_move_line_filter else None, @@ -901,7 +905,7 @@ class MisReport(models.Model): ) def get_kpis_by_account_id(self, company): - """ Return { account_id: set(kpi) } """ + """Return { account_id: set(kpi) }""" aep = self._prepare_aep(company) res = defaultdict(set) for kpi in self.kpi_ids: @@ -913,6 +917,31 @@ class MisReport(models.Model): res[account_id].add(kpi) return res + @api.model + def _supports_target_move_filter(self, aml_model_name): + return "parent_state" in self.env[aml_model_name]._fields + + @api.model + def _get_target_move_domain(self, target_move, aml_model_name): + """ + Obtain a domain to apply on a move-line-like model, to get posted + entries or return all of them (always excluding cancelled entries). + + :param: target_move: all|posted + :param: aml_model_name: an optional move-line-like model name + (defaults to accaount.move.line) + """ + if not self._supports_target_move_filter(aml_model_name): + return [] + + if target_move == "posted": + return [("parent_state", "=", "posted")] + elif target_move == "all": + # all (in Flectra 13+, there is also the cancel state that we must ignore) + return [("parent_state", "in", ("posted", "draft"))] + else: + raise UserError(_("Unexpected value %s for target_move.") % (target_move,)) + def evaluate( self, aep, @@ -931,7 +960,7 @@ class MisReport(models.Model): :param date_from, date_to: the starting and ending date :param target_move: all|posted :param aml_model: the name of a model that is compatible with - account.move.line + account.move.line (default: account.move.line) :param subkpis_filter: a list of subkpis to include in the evaluation (if empty, use all subkpis) :param get_additional_move_line_filter: a bound method that takes @@ -947,17 +976,21 @@ class MisReport(models.Model): these should be ignored as they might be removed in the future. """ + additional_move_line_filter = self._get_target_move_domain( + target_move, aml_model or "account.move.line" + ) + if get_additional_move_line_filter: + additional_move_line_filter.extend(get_additional_move_line_filter()) expression_evaluator = ExpressionEvaluator( aep, date_from, date_to, - target_move, - get_additional_move_line_filter() - if get_additional_move_line_filter - else None, + additional_move_line_filter, aml_model, ) - return self._evaluate(expression_evaluator, subkpis_filter) + return self._evaluate( + expression_evaluator, subkpis_filter, get_additional_query_filter + ) def _evaluate( self, diff --git a/mis_builder/models/mis_report_instance.py b/mis_builder/models/mis_report_instance.py index 8ba21ff..3a1847d 100644 --- a/mis_builder/models/mis_report_instance.py +++ b/mis_builder/models/mis_report_instance.py @@ -1,4 +1,5 @@ # Copyright 2014 ACSONE SA/NV () +# Copyright 2020 CorporateHub (https://corporatehub.eu) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). import datetime @@ -174,7 +175,7 @@ class MisReportInstancePeriod(models.Model): _name = "mis.report.instance.period" _description = "MIS Report Instance Period" - name = fields.Char(size=32, required=True, string="Label", translate=True) + name = fields.Char(required=True, string="Label", translate=True) mode = fields.Selection( [ (MODE_FIX, "Fixed dates"), @@ -411,11 +412,13 @@ class MisReportInstancePeriod(models.Model): compatible with account.move.line.""" self.ensure_one() domain = self._get_filter_domain_from_context() - if ( - self._get_aml_model_name() == "account.move.line" - and self.report_instance_id.target_move == "posted" - ): - domain.extend([("move_id.state", "=", "posted")]) + aml_model_name = self._get_aml_model_name() + if aml_model_name: + domain.extend( + self.report_id._get_target_move_domain( + self.report_instance_id.target_move, aml_model_name + ) + ) if self.analytic_account_id: domain.append(("analytic_account_id", "=", self.analytic_account_id.id)) if self.analytic_group_id: @@ -527,22 +530,22 @@ class MisReportInstance(models.Model): ) company_id = fields.Many2one( comodel_name="res.company", - string="Company", + string="Allowed company", default=lambda self: self.env.company, - required=True, + required=False, ) multi_company = fields.Boolean( string="Multiple companies", - help="Check if you wish to specify " - "children companies to be searched for data.", + help="Check if you wish to specify several companies to be searched for data.", default=False, ) company_ids = fields.Many2many( comodel_name="res.company", - string="Companies", + string="Allowed companies", help="Select companies for which data will be searched.", ) query_company_ids = fields.Many2many( + string="Effective companies", comodel_name="res.company", compute="_compute_query_company_ids", help="Companies for which data will be searched.", @@ -578,22 +581,36 @@ class MisReportInstance(models.Model): ) hide_analytic_filters = fields.Boolean(default=True) - @api.onchange("company_id", "multi_company") + @api.onchange("multi_company") def _onchange_company(self): - if self.company_id and self.multi_company: - self.company_ids = self.env["res.company"].search( - [("id", "child_of", self.company_id.id)] - ) + if self.multi_company: + self.company_ids |= self.company_id + self.company_id = False else: + prev = self.company_ids.ids + company = False + if self.env.company.id in prev: + company = self.env.company + else: + for c_id in prev: + if c_id in self.env.companies.ids: + company = self.env["res.company"].browse(c_id) + break + + self.company_id = company self.company_ids = False @api.depends("multi_company", "company_id", "company_ids") + @api.depends_context("allowed_company_ids") def _compute_query_company_ids(self): for rec in self: if rec.multi_company: - rec.query_company_ids = rec.company_ids or rec.company_id + if not rec.company_ids: + rec.query_company_ids = self.env.companies + else: + rec.query_company_ids = rec.company_ids & self.env.companies else: - rec.query_company_ids = rec.company_id + rec.query_company_ids = rec.company_id or self.env.company @api.model def get_filter_descriptions_from_context(self): @@ -776,7 +793,6 @@ class MisReportInstance(models.Model): aep, period.date_from, period.date_to, - None, # target_move now part of additional_move_line_filter period._get_additional_move_line_filter(), period._get_aml_model_name(), ) @@ -870,7 +886,6 @@ class MisReportInstance(models.Model): expr, period.date_from, period.date_to, - None, # target_move now part of additional_move_line_filter account_id, ) domain.extend(period._get_additional_move_line_filter()) diff --git a/mis_builder/models/mis_report_style.py b/mis_builder/models/mis_report_style.py index 6fac240..a486cf7 100644 --- a/mis_builder/models/mis_report_style.py +++ b/mis_builder/models/mis_report_style.py @@ -1,5 +1,6 @@ # Copyright 2016 Therp BV () # Copyright 2016 ACSONE SA/NV () +# Copyright 2020 CorporateHub (https://corporatehub.eu) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). import sys @@ -111,9 +112,9 @@ class MisReportKpiStyle(models.Model): indent_level = fields.Integer() # number format prefix_inherit = fields.Boolean(default=True) - prefix = fields.Char(size=16, string="Prefix") + prefix = fields.Char(string="Prefix") suffix_inherit = fields.Boolean(default=True) - suffix = fields.Char(size=16, string="Suffix") + suffix = fields.Char(string="Suffix") dp_inherit = fields.Boolean(default=True) dp = fields.Integer(string="Rounding", default=0) divider_inherit = fields.Boolean(default=True) diff --git a/mis_builder/security/mis_builder_security.xml b/mis_builder/security/mis_builder_security.xml index f755665..cf4d64b 100644 --- a/mis_builder/security/mis_builder_security.xml +++ b/mis_builder/security/mis_builder_security.xml @@ -4,7 +4,8 @@ Mis Report Instance multi company - ['|',('company_id','=',False),('company_id','in',company_ids)] + ['|',('company_id','=',False),('company_id','in',company_ids), '|', + ('company_ids', '=', False), ('company_ids', 'in', company_ids)] diff --git a/mis_builder/static/description/index.html b/mis_builder/static/description/index.html index 9d39660..b8c0cc2 100644 --- a/mis_builder/static/description/index.html +++ b/mis_builder/static/description/index.html @@ -376,49 +376,51 @@ 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:

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

Usage

+

Usage

To configure this module, you need to:

  • Go to Accounting > Configuration > MIS Reporting > MIS Report Templates where @@ -454,7 +456,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 @@ -463,29 +465,57 @@ 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

-

14.0.3.6.7 (2021-06-02) -Bugfixes

+

Changelog

+
+

14.0.4.0.0 (2022-01-08)

+

Features

+
    +
  • Remove various field size limits. (#332)
    • +
+

Bugfixes

+
    +

  • Support for the Odoo 13+ multi-company model. In multi-company mode, several allowed +companies can be declared on MIS Report instances, and the report operates on the +intersection of report companies and companies selected in the user context. (#327)

    +
    • +

  • The get_additional_query_filter argument of evaluate() is now propagated +correctly. (#375)

    +
    • +

  • Use the parent_state field of account.move.line to filter entries in posted +and draft state only. Before, when reporting in draft mode, all entries were used +(i.e. there was no filter), and that started including the cancelled entries/invoices in +Odoo 13.+.

    +

    This change also contains a breaking change in the internal API. For quite a while +the target_move argument of AEP and other methods was not used by MIS Builder itself +and was kept for backward compatibility. To avoid rippling effects of the necessary +change to use parent_state, we now remove this argument. (#377)

    +
    • +
+
+
+

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. This happened because the field domain was searching in a NewId context, thus not finding a correct period. 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)

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 @@ -493,8 +523,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. @@ -504,8 +534,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 @@ -517,23 +547,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. @@ -548,12 +578,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’ @@ -583,8 +613,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)
    • @@ -602,8 +632,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 @@ -643,8 +673,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 @@ -655,16 +685,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)
    • @@ -678,13 +708,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 @@ -721,24 +751,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. @@ -782,7 +812,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
    • @@ -794,23 +824,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.

@@ -857,8 +887,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 @@ -896,15 +926,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/__init__.py b/mis_builder/tests/__init__.py index 1174376..4263953 100644 --- a/mis_builder/tests/__init__.py +++ b/mis_builder/tests/__init__.py @@ -13,4 +13,5 @@ from . import test_mis_safe_eval from . import test_period_dates from . import test_render from . import test_simple_array +from . import test_target_move from . import test_utc_midnight diff --git a/mis_builder/tests/test_aep.py b/mis_builder/tests/test_aep.py index add3b06..9d5e167 100644 --- a/mis_builder/tests/test_aep.py +++ b/mis_builder/tests/test_aep.py @@ -132,7 +132,6 @@ class TestAEP(common.TransactionCase): self.aep.do_queries( date_from=fields.Date.to_string(date_from), date_to=fields.Date.to_string(date_to), - target_move="posted", ) def _eval(self, expr): @@ -264,9 +263,7 @@ class TestAEP(common.TransactionCase): self.assertEqual(end, {self.account_ar.id: 900, self.account_in.id: -800}) def test_aep_convenience_methods(self): - initial = AEP.get_balances_initial( - self.company, time.strftime("%Y") + "-03-01", "posted" - ) + initial = AEP.get_balances_initial(self.company, time.strftime("%Y") + "-03-01") self.assertEqual( initial, {self.account_ar.id: (400, 0), self.account_in.id: (0, 300)} ) @@ -274,19 +271,16 @@ class TestAEP(common.TransactionCase): self.company, time.strftime("%Y") + "-03-01", time.strftime("%Y") + "-03-31", - "posted", ) self.assertEqual( variation, {self.account_ar.id: (500, 0), self.account_in.id: (0, 500)} ) - end = AEP.get_balances_end( - self.company, time.strftime("%Y") + "-03-31", "posted" - ) + end = AEP.get_balances_end(self.company, time.strftime("%Y") + "-03-31") self.assertEqual( end, {self.account_ar.id: (900, 0), self.account_in.id: (0, 800)} ) unallocated = AEP.get_unallocated_pl( - self.company, time.strftime("%Y") + "-03-15", "posted" + self.company, time.strftime("%Y") + "-03-15" ) self.assertEqual(unallocated, (0, 100)) @@ -300,9 +294,7 @@ class TestAEP(common.TransactionCase): debit_acc=self.account_in, credit_acc=self.account_ar, ) - initial = AEP.get_balances_initial( - self.company, time.strftime("%Y") + "-01-01", "posted" - ) + initial = AEP.get_balances_initial(self.company, time.strftime("%Y") + "-01-01") self.assertEqual(initial, {self.account_ar.id: (100.00, 100.01)}) # make initial balance at Jan 1st equal to 0.001 self._create_move( @@ -311,9 +303,7 @@ class TestAEP(common.TransactionCase): debit_acc=self.account_ar, credit_acc=self.account_in, ) - initial = AEP.get_balances_initial( - self.company, time.strftime("%Y") + "-01-01", "posted" - ) + initial = AEP.get_balances_initial(self.company, time.strftime("%Y") + "-01-01") # epsilon initial balances is reported as empty self.assertEqual(initial, {}) @@ -332,24 +322,18 @@ class TestAEP(common.TransactionCase): def test_get_aml_domain_for_expr(self): self.aep.done_parsing() expr = "balp[700IN]" - domain = self.aep.get_aml_domain_for_expr( - expr, "2017-01-01", "2017-03-31", target_move="posted" - ) + domain = self.aep.get_aml_domain_for_expr(expr, "2017-01-01", "2017-03-31") self.assertEqual( domain, [ ("account_id", "in", (self.account_in.id,)), "&", - "&", ("date", ">=", "2017-01-01"), ("date", "<=", "2017-03-31"), - ("move_id.state", "=", "posted"), ], ) expr = "debi[700IN] - crdi[400AR]" - domain = self.aep.get_aml_domain_for_expr( - expr, "2017-02-01", "2017-03-31", target_move="draft" - ) + domain = self.aep.get_aml_domain_for_expr(expr, "2017-02-01", "2017-03-31") self.assertEqual( domain, [ diff --git a/mis_builder/tests/test_mis_report_instance.py b/mis_builder/tests/test_mis_report_instance.py index 2c8a4a1..c991128 100644 --- a/mis_builder/tests/test_mis_report_instance.py +++ b/mis_builder/tests/test_mis_report_instance.py @@ -494,6 +494,32 @@ class TestMisReportInstance(common.HttpCase): r = self.env["mis.report.kpi.expression"].name_search("k4") self.assertEqual([i[1] for i in r], ["kpi 4 (k4)"]) + def test_query_company_ids(self): + # sanity check single company mode + assert not self.report_instance.multi_company + assert self.report_instance.company_id + assert self.report_instance.query_company_ids == self.report_instance.company_id + # create a second company + c1 = self.report_instance.company_id + c2 = self.env["res.company"].create( + dict( + name="company 2", + ) + ) + self.report_instance.write(dict(multi_company=True, company_id=False)) + 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 + # In a user context where there is only one company, ensure + # query_company_ids only has one company too. + assert ( + self.report_instance.with_context( + allowed_company_ids=(c1.id,) + ).query_company_ids + == c1 + ) + def test_multi_company_onchange(self): # not multi company self.assertTrue(self.report_instance.company_id) @@ -506,25 +532,22 @@ class TestMisReportInstance(common.HttpCase): self.env["res.company"].create( dict(name="company 2", parent_id=self.report_instance.company_id.id) ) - companies = self.env["res.company"].search( - [("id", "child_of", self.report_instance.company_id.id)] - ) self.report_instance.multi_company = True # multi company, company_ids not set - self.assertEqual( - self.report_instance.query_company_ids[0], self.report_instance.company_id - ) + self.assertEqual(self.report_instance.query_company_ids, self.env.companies) # set company_ids + previous_company = self.report_instance.company_id self.report_instance._onchange_company() + self.assertFalse(self.report_instance.company_id) self.assertTrue(self.report_instance.multi_company) - self.assertEqual(self.report_instance.company_ids, companies) - self.assertEqual(self.report_instance.query_company_ids, companies) + self.assertEqual(self.report_instance.company_ids, previous_company) + self.assertEqual(self.report_instance.query_company_ids, previous_company) # reset single company mode self.report_instance.multi_company = False + self.report_instance._onchange_company() self.assertEqual( self.report_instance.query_company_ids[0], self.report_instance.company_id ) - self.report_instance._onchange_company() self.assertFalse(self.report_instance.company_ids) def test_mis_report_analytic_filters(self): diff --git a/mis_builder/tests/test_multi_company_aep.py b/mis_builder/tests/test_multi_company_aep.py index 39c7969..e5cd0e0 100644 --- a/mis_builder/tests/test_multi_company_aep.py +++ b/mis_builder/tests/test_multi_company_aep.py @@ -139,7 +139,6 @@ class TestMultiCompanyAEP(common.TransactionCase): aep.do_queries( date_from=fields.Date.to_string(date_from), date_to=fields.Date.to_string(date_to), - target_move="posted", ) return aep diff --git a/mis_builder/tests/test_target_move.py b/mis_builder/tests/test_target_move.py new file mode 100644 index 0000000..cd2e18e --- /dev/null +++ b/mis_builder/tests/test_target_move.py @@ -0,0 +1,36 @@ +# Copyright 2016 ACSONE SA/NV () +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +import flectra.tests.common as common + + +class TestMisReportInstance(common.TransactionCase): + def test_supports_target_move_filter(self): + self.assertTrue( + self.env["mis.report"]._supports_target_move_filter("account.move.line") + ) + + def test_supports_target_move_filter_no_parent_state(self): + self.assertFalse( + self.env["mis.report"]._supports_target_move_filter("account.move") + ) + + def test_target_move_domain_posted(self): + self.assertEqual( + self.env["mis.report"]._get_target_move_domain( + "posted", "account.move.line" + ), + [("parent_state", "=", "posted")], + ) + + def test_target_move_domain_all(self): + self.assertEqual( + self.env["mis.report"]._get_target_move_domain("all", "account.move.line"), + [("parent_state", "in", ("posted", "draft"))], + ) + + def test_target_move_domain_no_parent_state(self): + """Test get_target_move_domain on a model that has no parent_state.""" + self.assertEqual( + self.env["mis.report"]._get_target_move_domain("all", "account.move"), [] + ) diff --git a/mis_builder/views/mis_report_instance.xml b/mis_builder/views/mis_report_instance.xml index 18f6063..a54a602 100644 --- a/mis_builder/views/mis_report_instance.xml +++ b/mis_builder/views/mis_report_instance.xml @@ -161,20 +161,25 @@ + ) +# Copyright 2020 CorporateHub (https://corporatehub.eu) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from lxml import etree @@ -10,7 +11,7 @@ class AddMisReportInstanceDashboard(models.TransientModel): _name = "add.mis.report.instance.dashboard.wizard" _description = "MIS Report Add to Dashboard Wizard" - name = fields.Char("Name", size=32, required=True) + name = fields.Char("Name", required=True) dashboard_id = fields.Many2one( "ir.actions.act_window", diff --git a/mis_builder_budget/README.rst b/mis_builder_budget/README.rst index fff0712..b7430ae 100644 --- a/mis_builder_budget/README.rst +++ b/mis_builder_budget/README.rst @@ -85,6 +85,20 @@ be found on GitHub. Changelog ========= +14.0.4.0.0 (2022-01-08) +~~~~~~~~~~~~~~~~~~~~~~~ + +**Features** + +- A label field has been added to MIS Budget by Account items. When overlap between budget + items is allowed this allows creating a budget with several contributions for a given + account. (`#382 `_) +- The balance field on MIS Budget by Account items is now writeable. This allows for + easier data entry and import. (`#383 `_) +- MIS Budget by Account can now be configured to allow budget items with overlapping + dates. Each overlapping item contributes to the budget of the corresponding period. (`#384 `_) + + 14.0.3.5.1 (2021-04-06) ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/mis_builder_budget/__manifest__.py b/mis_builder_budget/__manifest__.py index edc7f6e..4e77152 100644 --- a/mis_builder_budget/__manifest__.py +++ b/mis_builder_budget/__manifest__.py @@ -5,7 +5,7 @@ "name": "MIS Builder Budget", "summary": """ Create budgets for MIS reports""", - "version": "2.0.3.5.1", + "version": "2.0.4.0.0", "license": "AGPL-3", "author": "ACSONE SA/NV, " "Odoo Community Association (OCA)", "website": "https://gitlab.com/flectra-community/mis-builder", diff --git a/mis_builder_budget/i18n/ca.po b/mis_builder_budget/i18n/ca.po index e122c68..3a34e92 100644 --- a/mis_builder_budget/i18n/ca.po +++ b/mis_builder_budget/i18n/ca.po @@ -68,6 +68,11 @@ msgstr "" "Suma columnes: suma (+/-) d'altres columnes.\n" "Compara amb columna: compara amb una altra columna.\n" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account__allow_items_overlap +msgid "Allow Items Overlap" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__amount msgid "Amount" @@ -235,6 +240,10 @@ msgstr "Descripció" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__display_name #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__display_name #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression__display_name msgid "Display Name" msgstr "Nom mostrat" @@ -289,6 +298,10 @@ msgstr "Des del" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__id #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__id #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression__id msgid "ID" msgstr "ID" @@ -302,6 +315,11 @@ msgstr "ID" msgid "If checked, new messages require your attention." msgstr "Si es marca, els missatges nous requereixen la vostra atenció." +#. module: mis_builder_budget +#: model:ir.model.fields,help:mis_builder_budget.field_mis_budget_by_account__allow_items_overlap +msgid "If checked, overlap between budget items is allowed" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,help:mis_builder_budget.field_mis_budget__message_has_error #: model:ir.model.fields,help:mis_builder_budget.field_mis_budget__message_has_sms_error @@ -335,6 +353,11 @@ msgstr "KPI" msgid "KPI Sequence" msgstr "Seqüència de KPI" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__name +msgid "Label" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_abstract____last_update @@ -342,6 +365,10 @@ msgstr "Seqüència de KPI" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression____last_update msgid "Last Modified on" msgstr "Última modificació el" diff --git a/mis_builder_budget/i18n/de.po b/mis_builder_budget/i18n/de.po index 0111b99..4f61ea7 100644 --- a/mis_builder_budget/i18n/de.po +++ b/mis_builder_budget/i18n/de.po @@ -64,6 +64,11 @@ msgid "" "Compare to column: compare to other column.\n" msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account__allow_items_overlap +msgid "Allow Items Overlap" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__amount msgid "Amount" @@ -231,6 +236,10 @@ msgstr "" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__display_name #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__display_name #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression__display_name msgid "Display Name" msgstr "" @@ -285,6 +294,10 @@ msgstr "" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__id #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__id #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression__id msgid "ID" msgstr "" @@ -298,6 +311,11 @@ msgstr "" msgid "If checked, new messages require your attention." msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,help:mis_builder_budget.field_mis_budget_by_account__allow_items_overlap +msgid "If checked, overlap between budget items is allowed" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,help:mis_builder_budget.field_mis_budget__message_has_error #: model:ir.model.fields,help:mis_builder_budget.field_mis_budget__message_has_sms_error @@ -331,6 +349,11 @@ msgstr "" msgid "KPI Sequence" msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__name +msgid "Label" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_abstract____last_update @@ -338,6 +361,10 @@ msgstr "" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression____last_update msgid "Last Modified on" msgstr "" diff --git a/mis_builder_budget/i18n/es.po b/mis_builder_budget/i18n/es.po index 95ebaa0..9d3e475 100644 --- a/mis_builder_budget/i18n/es.po +++ b/mis_builder_budget/i18n/es.po @@ -71,6 +71,11 @@ msgstr "" "Columnas de suma: suma (+/-) de otras columnas.\n" "Comparar con columna: comparar con otra columna.\n" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account__allow_items_overlap +msgid "Allow Items Overlap" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__amount msgid "Amount" @@ -238,6 +243,10 @@ msgstr "Descripción" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__display_name #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__display_name #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression__display_name msgid "Display Name" msgstr "Nombre mostrado" @@ -294,6 +303,10 @@ msgstr "Desde" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__id #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__id #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression__id msgid "ID" msgstr "ID" @@ -307,6 +320,11 @@ msgstr "ID" msgid "If checked, new messages require your attention." msgstr "Si está marcado, los nuevos mensajes requieren su atención." +#. module: mis_builder_budget +#: model:ir.model.fields,help:mis_builder_budget.field_mis_budget_by_account__allow_items_overlap +msgid "If checked, overlap between budget items is allowed" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,help:mis_builder_budget.field_mis_budget__message_has_error #: model:ir.model.fields,help:mis_builder_budget.field_mis_budget__message_has_sms_error @@ -340,6 +358,11 @@ msgstr "KPI" msgid "KPI Sequence" msgstr "KPI de Secuencia" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__name +msgid "Label" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_abstract____last_update @@ -347,6 +370,10 @@ msgstr "KPI de Secuencia" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression____last_update msgid "Last Modified on" msgstr "Última modificación en" diff --git a/mis_builder_budget/i18n/fr.po b/mis_builder_budget/i18n/fr.po index c886b73..1813a1a 100644 --- a/mis_builder_budget/i18n/fr.po +++ b/mis_builder_budget/i18n/fr.po @@ -66,6 +66,11 @@ msgid "" "Compare to column: compare to other column.\n" msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account__allow_items_overlap +msgid "Allow Items Overlap" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__amount msgid "Amount" @@ -237,6 +242,10 @@ msgstr "Description" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__display_name #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__display_name #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression__display_name msgid "Display Name" msgstr "Nom affiché" @@ -291,6 +300,10 @@ msgstr "De" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__id #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__id #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression__id msgid "ID" msgstr "ID" @@ -304,6 +317,11 @@ msgstr "ID" msgid "If checked, new messages require your attention." msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,help:mis_builder_budget.field_mis_budget_by_account__allow_items_overlap +msgid "If checked, overlap between budget items is allowed" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,help:mis_builder_budget.field_mis_budget__message_has_error #: model:ir.model.fields,help:mis_builder_budget.field_mis_budget__message_has_sms_error @@ -337,6 +355,11 @@ msgstr "KPI" msgid "KPI Sequence" msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__name +msgid "Label" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_abstract____last_update @@ -344,6 +367,10 @@ msgstr "" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression____last_update msgid "Last Modified on" msgstr "Dernière modification le" diff --git a/mis_builder_budget/i18n/hr.po b/mis_builder_budget/i18n/hr.po index e115944..26b0684 100644 --- a/mis_builder_budget/i18n/hr.po +++ b/mis_builder_budget/i18n/hr.po @@ -61,6 +61,11 @@ msgid "" "Compare to column: compare to other column.\n" msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account__allow_items_overlap +msgid "Allow Items Overlap" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__amount msgid "Amount" @@ -228,6 +233,10 @@ msgstr "" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__display_name #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__display_name #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression__display_name msgid "Display Name" msgstr "" @@ -282,6 +291,10 @@ msgstr "" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__id #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__id #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression__id msgid "ID" msgstr "" @@ -295,6 +308,11 @@ msgstr "" msgid "If checked, new messages require your attention." msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,help:mis_builder_budget.field_mis_budget_by_account__allow_items_overlap +msgid "If checked, overlap between budget items is allowed" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,help:mis_builder_budget.field_mis_budget__message_has_error #: model:ir.model.fields,help:mis_builder_budget.field_mis_budget__message_has_sms_error @@ -328,6 +346,11 @@ msgstr "" msgid "KPI Sequence" msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__name +msgid "Label" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_abstract____last_update @@ -335,6 +358,10 @@ msgstr "" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression____last_update msgid "Last Modified on" msgstr "" diff --git a/mis_builder_budget/i18n/hr_HR.po b/mis_builder_budget/i18n/hr_HR.po index 5aea75b..d6f6e58 100644 --- a/mis_builder_budget/i18n/hr_HR.po +++ b/mis_builder_budget/i18n/hr_HR.po @@ -66,6 +66,11 @@ msgid "" "Compare to column: compare to other column.\n" msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account__allow_items_overlap +msgid "Allow Items Overlap" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__amount msgid "Amount" @@ -235,6 +240,10 @@ msgstr "" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__display_name #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__display_name #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression__display_name msgid "Display Name" msgstr "Naziv " @@ -289,6 +298,10 @@ msgstr "" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__id #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__id #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression__id msgid "ID" msgstr "ID" @@ -302,6 +315,11 @@ msgstr "ID" msgid "If checked, new messages require your attention." msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,help:mis_builder_budget.field_mis_budget_by_account__allow_items_overlap +msgid "If checked, overlap between budget items is allowed" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,help:mis_builder_budget.field_mis_budget__message_has_error #: model:ir.model.fields,help:mis_builder_budget.field_mis_budget__message_has_sms_error @@ -335,6 +353,11 @@ msgstr "" msgid "KPI Sequence" msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__name +msgid "Label" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_abstract____last_update @@ -342,6 +365,10 @@ msgstr "" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression____last_update msgid "Last Modified on" msgstr "" diff --git a/mis_builder_budget/i18n/it.po b/mis_builder_budget/i18n/it.po index 4e61e2b..4fb034c 100644 --- a/mis_builder_budget/i18n/it.po +++ b/mis_builder_budget/i18n/it.po @@ -54,11 +54,17 @@ msgstr "" #: model:ir.model.fields,help:mis_builder_budget.field_mis_report_instance_period__source msgid "" "Actuals: current data, from accounting and other queries.\n" -"Actuals (alternative): current data from an alternative source (eg a database view providing look-alike account move lines).\n" +"Actuals (alternative): current data from an alternative source (eg a " +"database view providing look-alike account move lines).\n" "Sum columns: summation (+/-) of other columns.\n" "Compare to column: compare to other column.\n" msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account__allow_items_overlap +msgid "Allow Items Overlap" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__amount msgid "Amount" @@ -301,6 +307,11 @@ msgstr "" msgid "If checked, new messages require your attention." msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,help:mis_builder_budget.field_mis_budget_by_account__allow_items_overlap +msgid "If checked, overlap between budget items is allowed" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,help:mis_builder_budget.field_mis_budget__message_has_error #: model:ir.model.fields,help:mis_builder_budget.field_mis_budget__message_has_sms_error @@ -334,6 +345,11 @@ msgstr "" msgid "KPI Sequence" msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__name +msgid "Label" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_abstract____last_update diff --git a/mis_builder_budget/i18n/mis_builder_budget.pot b/mis_builder_budget/i18n/mis_builder_budget.pot index d024be3..2be4a66 100644 --- a/mis_builder_budget/i18n/mis_builder_budget.pot +++ b/mis_builder_budget/i18n/mis_builder_budget.pot @@ -58,6 +58,11 @@ msgid "" "Compare to column: compare to other column.\n" msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account__allow_items_overlap +msgid "Allow Items Overlap" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__amount msgid "Amount" @@ -300,6 +305,11 @@ msgstr "" msgid "If checked, new messages require your attention." msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,help:mis_builder_budget.field_mis_budget_by_account__allow_items_overlap +msgid "If checked, overlap between budget items is allowed" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,help:mis_builder_budget.field_mis_budget__message_has_error #: model:ir.model.fields,help:mis_builder_budget.field_mis_budget__message_has_sms_error @@ -333,6 +343,11 @@ msgstr "" msgid "KPI Sequence" msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__name +msgid "Label" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_abstract____last_update diff --git a/mis_builder_budget/i18n/nl.po b/mis_builder_budget/i18n/nl.po index 19a45b0..67777a8 100644 --- a/mis_builder_budget/i18n/nl.po +++ b/mis_builder_budget/i18n/nl.po @@ -64,6 +64,11 @@ msgid "" "Compare to column: compare to other column.\n" msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account__allow_items_overlap +msgid "Allow Items Overlap" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__amount msgid "Amount" @@ -233,6 +238,10 @@ msgstr "Omschrijving" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__display_name #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__display_name #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression__display_name msgid "Display Name" msgstr "Weergavenaam" @@ -287,6 +296,10 @@ msgstr "Van" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__id #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__id #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression__id msgid "ID" msgstr "ID" @@ -300,6 +313,11 @@ msgstr "ID" msgid "If checked, new messages require your attention." msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,help:mis_builder_budget.field_mis_budget_by_account__allow_items_overlap +msgid "If checked, overlap between budget items is allowed" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,help:mis_builder_budget.field_mis_budget__message_has_error #: model:ir.model.fields,help:mis_builder_budget.field_mis_budget__message_has_sms_error @@ -333,6 +351,11 @@ msgstr "KPI" msgid "KPI Sequence" msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__name +msgid "Label" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_abstract____last_update @@ -340,6 +363,10 @@ msgstr "" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression____last_update msgid "Last Modified on" msgstr "Voor het laatst aangepast op" diff --git a/mis_builder_budget/i18n/nl_NL.po b/mis_builder_budget/i18n/nl_NL.po index 9aaa50a..c68005c 100644 --- a/mis_builder_budget/i18n/nl_NL.po +++ b/mis_builder_budget/i18n/nl_NL.po @@ -67,6 +67,11 @@ msgid "" "Compare to column: compare to other column.\n" msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account__allow_items_overlap +msgid "Allow Items Overlap" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__amount msgid "Amount" @@ -240,6 +245,10 @@ msgstr "Omschrijving" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__display_name #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__display_name #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression__display_name msgid "Display Name" msgstr "Weergavenaam" @@ -294,6 +303,10 @@ msgstr "Van" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__id #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__id #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression__id msgid "ID" msgstr "ID" @@ -307,6 +320,11 @@ msgstr "ID" msgid "If checked, new messages require your attention." msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,help:mis_builder_budget.field_mis_budget_by_account__allow_items_overlap +msgid "If checked, overlap between budget items is allowed" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,help:mis_builder_budget.field_mis_budget__message_has_error #: model:ir.model.fields,help:mis_builder_budget.field_mis_budget__message_has_sms_error @@ -340,6 +358,11 @@ msgstr "KPI" msgid "KPI Sequence" msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__name +msgid "Label" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_abstract____last_update @@ -347,6 +370,10 @@ msgstr "" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression____last_update msgid "Last Modified on" msgstr "Voor het laatst aangepast op" diff --git a/mis_builder_budget/i18n/pt.po b/mis_builder_budget/i18n/pt.po index 771cb5e..63ca3a4 100644 --- a/mis_builder_budget/i18n/pt.po +++ b/mis_builder_budget/i18n/pt.po @@ -64,6 +64,11 @@ msgid "" "Compare to column: compare to other column.\n" msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account__allow_items_overlap +msgid "Allow Items Overlap" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__amount msgid "Amount" @@ -233,6 +238,10 @@ msgstr "" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__display_name #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__display_name #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression__display_name msgid "Display Name" msgstr "Nome a exibir" @@ -287,6 +296,10 @@ msgstr "" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__id #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__id #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression__id msgid "ID" msgstr "ID" @@ -300,6 +313,11 @@ msgstr "ID" msgid "If checked, new messages require your attention." msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,help:mis_builder_budget.field_mis_budget_by_account__allow_items_overlap +msgid "If checked, overlap between budget items is allowed" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,help:mis_builder_budget.field_mis_budget__message_has_error #: model:ir.model.fields,help:mis_builder_budget.field_mis_budget__message_has_sms_error @@ -333,6 +351,11 @@ msgstr "" msgid "KPI Sequence" msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__name +msgid "Label" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_abstract____last_update @@ -340,6 +363,10 @@ msgstr "" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression____last_update msgid "Last Modified on" msgstr "Última Modificação em" diff --git a/mis_builder_budget/i18n/pt_BR.po b/mis_builder_budget/i18n/pt_BR.po index 374a760..a88c7f2 100644 --- a/mis_builder_budget/i18n/pt_BR.po +++ b/mis_builder_budget/i18n/pt_BR.po @@ -69,6 +69,11 @@ msgstr "" "Soma colunas: somatório (+/-) de outras colunas.\n" "Comparar à coluna: comparar com outra coluna.\n" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account__allow_items_overlap +msgid "Allow Items Overlap" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__amount msgid "Amount" @@ -239,6 +244,10 @@ msgstr "Descrição" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__display_name #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__display_name #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi__display_name +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression__display_name msgid "Display Name" msgstr "Nome de Exibição" @@ -293,6 +302,10 @@ msgstr "De" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__id #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item__id #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi__id +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression__id msgid "ID" msgstr "ID" @@ -306,6 +319,11 @@ msgstr "ID" msgid "If checked, new messages require your attention." msgstr "Se selecionado, novas mensagens exigirão sua atenção." +#. module: mis_builder_budget +#: model:ir.model.fields,help:mis_builder_budget.field_mis_budget_by_account__allow_items_overlap +msgid "If checked, overlap between budget items is allowed" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,help:mis_builder_budget.field_mis_budget__message_has_error #: model:ir.model.fields,help:mis_builder_budget.field_mis_budget__message_has_sms_error @@ -339,6 +357,11 @@ msgstr "KPI" msgid "KPI Sequence" msgstr "Sequência KPI" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__name +msgid "Label" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_abstract____last_update @@ -346,6 +369,10 @@ msgstr "Sequência KPI" #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item____last_update #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_item_abstract____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_instance_period____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi____last_update +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_report_kpi_expression____last_update msgid "Last Modified on" msgstr "Última Modificação em" diff --git a/mis_builder_budget/models/mis_budget_by_account.py b/mis_builder_budget/models/mis_budget_by_account.py index c0fb090..169bef6 100644 --- a/mis_builder_budget/models/mis_budget_by_account.py +++ b/mis_builder_budget/models/mis_budget_by_account.py @@ -14,3 +14,6 @@ class MisBudgetByAccount(models.Model): comodel_name="mis.budget.by.account.item", inverse_name="budget_id", copy=True ) company_id = fields.Many2one(required=True) + allow_items_overlap = fields.Boolean( + help="If checked, overlap between budget items is allowed" + ) diff --git a/mis_builder_budget/models/mis_budget_by_account_item.py b/mis_builder_budget/models/mis_budget_by_account_item.py index b14a219..3d7f895 100644 --- a/mis_builder_budget/models/mis_budget_by_account_item.py +++ b/mis_builder_budget/models/mis_budget_by_account_item.py @@ -11,11 +11,15 @@ class MisBudgetByAccountItem(models.Model): _description = "MIS Budget Item (by Account)" _order = "budget_id, date_from, account_id" + name = fields.Char(string="Label") budget_id = fields.Many2one(comodel_name="mis.budget.by.account") debit = fields.Monetary(default=0.0, currency_field="company_currency_id") credit = fields.Monetary(default=0.0, currency_field="company_currency_id") balance = fields.Monetary( - compute="_compute_balance", store=True, currency_field="company_currency_id" + compute="_compute_balance", + inverse="_inverse_balance", + store=True, + currency_field="company_currency_id", ) company_id = fields.Many2one( "res.company", @@ -60,6 +64,12 @@ class MisBudgetByAccountItem(models.Model): def _prepare_overlap_domain(self): """Prepare a domain to check for overlapping budget items.""" + if self.budget_id.allow_items_overlap: + # Trick mis.budget.abstract._check_dates into never seeing + # overlapping budget items. This "hack" is necessary because, for now, + # overlapping budget items is only possible for budget by account items + # and kpi budget items. + return [("id", "=", 0)] domain = super(MisBudgetByAccountItem, self)._prepare_overlap_domain() domain.extend([("account_id", "=", self.account_id.id)]) return domain @@ -75,3 +85,12 @@ class MisBudgetByAccountItem(models.Model): ) def _check_dates(self): super(MisBudgetByAccountItem, self)._check_dates() + + def _inverse_balance(self): + for rec in self: + if rec.balance < 0: + rec.credit = -rec.balance + rec.debit = 0 + else: + rec.credit = 0 + rec.debit = rec.balance diff --git a/mis_builder_budget/models/mis_report_instance.py b/mis_builder_budget/models/mis_report_instance.py index af9bb64..e0612b5 100644 --- a/mis_builder_budget/models/mis_report_instance.py +++ b/mis_builder_budget/models/mis_report_instance.py @@ -16,7 +16,6 @@ class MisBudgetAwareExpressionEvaluator(ExpressionEvaluator): aep=None, date_from=date_from, date_to=date_to, - target_move=None, additional_move_line_filter=additional_move_line_filter, aml_model=None, ) diff --git a/mis_builder_budget/models/mis_report_instance_period.py b/mis_builder_budget/models/mis_report_instance_period.py index 22d1fc1..502cec3 100644 --- a/mis_builder_budget/models/mis_report_instance_period.py +++ b/mis_builder_budget/models/mis_report_instance_period.py @@ -54,7 +54,7 @@ class MisReportInstancePeriod(models.Model): [(field_name, {'value': value, 'operator': operator})] This default filter is the same as the one set by - _get_additional_move_line_filter on mis.report.instance, so + _get_additional_move_line_filter on mis.report.instance.period, so a budget.item is expected to have the same analytic fields as a move line. diff --git a/mis_builder_budget/static/description/index.html b/mis_builder_budget/static/description/index.html index 56ec6f4..f1dfa65 100644 --- a/mis_builder_budget/static/description/index.html +++ b/mis_builder_budget/static/description/index.html @@ -377,32 +377,33 @@ show the budgeted values for each KPI, adjusted for the period of the column.

Table of contents

-

Usage

+

Usage

There are two ways to use this module: create budgets by KPI or budgets by GL accounts. Currently, the two methods cannot be combined in the same budget.

Budget by KPIs

@@ -431,22 +432,35 @@ to the reporting period when displayed. Columns can be compared by adding a column of type “comparison” or “sum”.

-

Known issues / Roadmap

+

Known issues / Roadmap

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

-

Changelog

+

Changelog

-

14.0.3.5.1 (2021-04-06)

+

14.0.4.0.0 (2022-01-08)

+

Features

+
    +
  • A label field has been added to MIS Budget by Account items. When overlap between budget +items is allowed this allows creating a budget with several contributions for a given +account. (#382)
    • +
  • The balance field on MIS Budget by Account items is now writeable. This allows for +easier data entry and import. (#383)
    • +
  • MIS Budget by Account can now be configured to allow budget items with overlapping +dates. Each overlapping item contributes to the budget of the corresponding period. (#384)
    • +
+
+
+

14.0.3.5.1 (2021-04-06)

Bugfixes

  • Fix incorrect budget by account multi company security rules. (#347)
-
-

13.0.3.5.0 (2020-03-28)

+
+

13.0.3.5.0 (2020-03-28)

Features

  • Budget by GL account: allow budgeting by GL account in addition to the @@ -455,12 +469,12 @@ date, and when reporting a pro-rata temporis adjustment is made to match the reporting period. (#259)
-
-

13.0.3.4.0 (2020-01-??)

+
+

13.0.3.4.0 (2020-01-??)

Migration to odoo 13.0.

-
-

12.0.3.4.0 (2019-10-26)

+
+

12.0.3.4.0 (2019-10-26)

Bugfixes

  • Consider analytic tags too when detecting overlapping budget items. @@ -468,48 +482,48 @@ Previously only analytic account was considered, and this overlap detection mechanism was overlooked when analytic tags were added to budget items. (#241)
-
-

11.0.3.3.0 (2019-01-13)

+
+

11.0.3.3.0 (2019-01-13)

Features

  • Support analytic filters. (#15)
-
-

11.0.3.2.1 (2018-06-30)

+
+

11.0.3.2.1 (2018-06-30)

  • [IMP] Support analytic tags in budget items (#100)
-
-

11.0.3.2.0 (2018-05-02)

+
+

11.0.3.2.0 (2018-05-02)

  • [FIX] #NAME error in out-of-order computation of non budgetable items in budget columns (#68)
-
-

11.0.3.1.1 (2018-02-04)

+
+

11.0.3.1.1 (2018-02-04)

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

-
-

10.0.3.1.0 (2017-11-14)

+
+

10.0.3.1.0 (2017-11-14)

New features:

  • [ADD] multi-company record rule for MIS Budgets (#27)
-
-

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 @@ -517,15 +531,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_budget/tests/test_mis_budget_by_account.py b/mis_builder_budget/tests/test_mis_budget_by_account.py index 9fde72b..b39dccd 100644 --- a/mis_builder_budget/tests/test_mis_budget_by_account.py +++ b/mis_builder_budget/tests/test_mis_budget_by_account.py @@ -126,3 +126,11 @@ class TestMisBudgetByAccount(SavepointCase): self.assertEqual(self.budget.state, "cancelled") self.budget.action_draft() self.assertEqual(self.budget.state, "draft") + + def test_budget_item_balance(self): + item = self.budget.item_ids[0] + item.balance = 100 + self.assertEqual(item.debit, 100) + item.balance = -100 + self.assertEqual(item.debit, 0) + self.assertEqual(item.credit, 100) diff --git a/mis_builder_budget/views/mis_budget_by_account.xml b/mis_builder_budget/views/mis_budget_by_account.xml index 701a5e3..7432327 100644 --- a/mis_builder_budget/views/mis_budget_by_account.xml +++ b/mis_builder_budget/views/mis_budget_by_account.xml @@ -48,6 +48,7 @@ +

diff --git a/mis_builder_budget/views/mis_budget_by_account_item.xml b/mis_builder_budget/views/mis_budget_by_account_item.xml index 7328fbe..5b30bcc 100644 --- a/mis_builder_budget/views/mis_budget_by_account_item.xml +++ b/mis_builder_budget/views/mis_budget_by_account_item.xml @@ -24,12 +24,14 @@ + +