diff --git a/README.md b/README.md index 308c772..01cc1b5 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ Available addons addon | version | summary --- | --- | --- -[mis_builder_budget](mis_builder_budget/) | 3.0.1.0.0| Create budgets for MIS reports +[mis_builder_budget](mis_builder_budget/) | 3.0.1.1.0| Create budgets for MIS reports [mis_builder_demo](mis_builder_demo/) | 3.0.1.0.0| Demo addon for MIS Builder -[mis_builder](mis_builder/) | 3.0.1.0.0| Build 'Management Information System' Reports and Dashboards +[mis_builder](mis_builder/) | 3.0.1.0.1| Build 'Management Information System' Reports and Dashboards diff --git a/mis_builder/README.rst b/mis_builder/README.rst index 5c88150..7d62217 100644 --- a/mis_builder/README.rst +++ b/mis_builder/README.rst @@ -7,7 +7,7 @@ MIS Builder !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:f8989a4fefbc9688a39969027c326e5999fc1eff237716e8dbe5d54550584837 + !! source digest: sha256:b77109780c345283441ae799e88053caf41557f5746ecbd96ff63cb08c081d35 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png diff --git a/mis_builder/__manifest__.py b/mis_builder/__manifest__.py index 82db78b..8e8e996 100644 --- a/mis_builder/__manifest__.py +++ b/mis_builder/__manifest__.py @@ -3,7 +3,7 @@ { "name": "MIS Builder", - "version": "3.0.1.0.0", + "version": "3.0.1.0.1", "category": "Reporting", "summary": """ Build 'Management Information System' Reports and Dashboards diff --git a/mis_builder/models/mis_report_instance.py b/mis_builder/models/mis_report_instance.py index 18a9de2..61fbf28 100644 --- a/mis_builder/models/mis_report_instance.py +++ b/mis_builder/models/mis_report_instance.py @@ -719,7 +719,8 @@ class MisReportInstance(models.Model): ) ) # report-level analytic domain filter - domain.extend(ast.literal_eval(self.analytic_domain)) + if self.analytic_domain: + domain.extend(ast.literal_eval(self.analytic_domain)) # contextual analytic domain filter domain.extend(self.env.context.get("mis_analytic_domain", [])) return domain diff --git a/mis_builder/static/description/index.html b/mis_builder/static/description/index.html index 8a5b50e..ac188f1 100644 --- a/mis_builder/static/description/index.html +++ b/mis_builder/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:f8989a4fefbc9688a39969027c326e5999fc1eff237716e8dbe5d54550584837 +!! source digest: sha256:b77109780c345283441ae799e88053caf41557f5746ecbd96ff63cb08c081d35 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
This module allows you to build Management Information Systems diff --git a/mis_builder_budget/README.rst b/mis_builder_budget/README.rst index 49cd453..51579a3 100644 --- a/mis_builder_budget/README.rst +++ b/mis_builder_budget/README.rst @@ -7,7 +7,7 @@ MIS Builder Budget !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:962fa7862548ebdf141273123f5b54ca059766819b2768117a90a45bed164c94 + !! source digest: sha256:da466f77b5606d5eaa518b43c8b7478dd433bc91f82e18a842a099871c63c578 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png diff --git a/mis_builder_budget/__manifest__.py b/mis_builder_budget/__manifest__.py index ce327a7..65af309 100644 --- a/mis_builder_budget/__manifest__.py +++ b/mis_builder_budget/__manifest__.py @@ -4,7 +4,7 @@ { "name": "MIS Builder Budget", "summary": "Create budgets for MIS reports", - "version": "3.0.1.0.0", + "version": "3.0.1.1.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 16b5357..9c6919c 100644 --- a/mis_builder_budget/i18n/ca.po +++ b/mis_builder_budget/i18n/ca.po @@ -82,6 +82,21 @@ msgstr "Permet la superposició d'elements" msgid "Amount" msgstr "Import" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_distribution +msgid "Analytic Distribution" +msgstr "" + +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_precision +msgid "Analytic Precision" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget__message_attachment_count #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_abstract__message_attachment_count diff --git a/mis_builder_budget/i18n/de.po b/mis_builder_budget/i18n/de.po index 6cf581d..53beb5c 100644 --- a/mis_builder_budget/i18n/de.po +++ b/mis_builder_budget/i18n/de.po @@ -78,6 +78,21 @@ msgstr "" msgid "Amount" msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_distribution +msgid "Analytic Distribution" +msgstr "" + +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_precision +msgid "Analytic Precision" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget__message_attachment_count #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_abstract__message_attachment_count diff --git a/mis_builder_budget/i18n/es.po b/mis_builder_budget/i18n/es.po index 6f2dea4..7789061 100644 --- a/mis_builder_budget/i18n/es.po +++ b/mis_builder_budget/i18n/es.po @@ -89,6 +89,21 @@ msgstr "Permitir el solapamiento de elementos" msgid "Amount" msgstr "Importe" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_distribution +msgid "Analytic Distribution" +msgstr "" + +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_precision +msgid "Analytic Precision" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget__message_attachment_count #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_abstract__message_attachment_count diff --git a/mis_builder_budget/i18n/fr.po b/mis_builder_budget/i18n/fr.po index fbe38e8..4ee51e2 100644 --- a/mis_builder_budget/i18n/fr.po +++ b/mis_builder_budget/i18n/fr.po @@ -87,6 +87,21 @@ msgstr "Autoriser chevauchement de données" msgid "Amount" msgstr "Montant" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_distribution +msgid "Analytic Distribution" +msgstr "" + +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_precision +msgid "Analytic Precision" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget__message_attachment_count #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_abstract__message_attachment_count diff --git a/mis_builder_budget/i18n/hr.po b/mis_builder_budget/i18n/hr.po index 8a2de68..769b826 100644 --- a/mis_builder_budget/i18n/hr.po +++ b/mis_builder_budget/i18n/hr.po @@ -75,6 +75,21 @@ msgstr "" msgid "Amount" msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_distribution +msgid "Analytic Distribution" +msgstr "" + +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_precision +msgid "Analytic Precision" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget__message_attachment_count #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_abstract__message_attachment_count diff --git a/mis_builder_budget/i18n/hr_HR.po b/mis_builder_budget/i18n/hr_HR.po index 738d00b..7e406c2 100644 --- a/mis_builder_budget/i18n/hr_HR.po +++ b/mis_builder_budget/i18n/hr_HR.po @@ -80,6 +80,21 @@ msgstr "" msgid "Amount" msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_distribution +msgid "Analytic Distribution" +msgstr "" + +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_precision +msgid "Analytic Precision" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget__message_attachment_count #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_abstract__message_attachment_count diff --git a/mis_builder_budget/i18n/it.po b/mis_builder_budget/i18n/it.po index c8a0af5..6d0d513 100644 --- a/mis_builder_budget/i18n/it.po +++ b/mis_builder_budget/i18n/it.po @@ -83,6 +83,21 @@ msgstr "Consente sovrapposizione voci" msgid "Amount" msgstr "Valore" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_distribution +msgid "Analytic Distribution" +msgstr "" + +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_precision +msgid "Analytic Precision" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget__message_attachment_count #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_abstract__message_attachment_count diff --git a/mis_builder_budget/i18n/mis_builder_budget.pot b/mis_builder_budget/i18n/mis_builder_budget.pot index 320fa82..eed1d2d 100644 --- a/mis_builder_budget/i18n/mis_builder_budget.pot +++ b/mis_builder_budget/i18n/mis_builder_budget.pot @@ -72,6 +72,21 @@ msgstr "" msgid "Amount" msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_distribution +msgid "Analytic Distribution" +msgstr "" + +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_precision +msgid "Analytic Precision" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget__message_attachment_count #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_abstract__message_attachment_count diff --git a/mis_builder_budget/i18n/nl.po b/mis_builder_budget/i18n/nl.po index 95a288d..9b33ea8 100644 --- a/mis_builder_budget/i18n/nl.po +++ b/mis_builder_budget/i18n/nl.po @@ -78,6 +78,21 @@ msgstr "" msgid "Amount" msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_distribution +msgid "Analytic Distribution" +msgstr "" + +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_precision +msgid "Analytic Precision" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget__message_attachment_count #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_abstract__message_attachment_count diff --git a/mis_builder_budget/i18n/nl_NL.po b/mis_builder_budget/i18n/nl_NL.po index b5eba69..8a78d08 100644 --- a/mis_builder_budget/i18n/nl_NL.po +++ b/mis_builder_budget/i18n/nl_NL.po @@ -81,6 +81,21 @@ msgstr "" msgid "Amount" msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_distribution +msgid "Analytic Distribution" +msgstr "" + +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_precision +msgid "Analytic Precision" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget__message_attachment_count #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_abstract__message_attachment_count diff --git a/mis_builder_budget/i18n/pt.po b/mis_builder_budget/i18n/pt.po index 885a6f7..375c88b 100644 --- a/mis_builder_budget/i18n/pt.po +++ b/mis_builder_budget/i18n/pt.po @@ -78,6 +78,21 @@ msgstr "" msgid "Amount" msgstr "" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_distribution +msgid "Analytic Distribution" +msgstr "" + +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_precision +msgid "Analytic Precision" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget__message_attachment_count #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_abstract__message_attachment_count diff --git a/mis_builder_budget/i18n/pt_BR.po b/mis_builder_budget/i18n/pt_BR.po index a20137e..bcd550c 100644 --- a/mis_builder_budget/i18n/pt_BR.po +++ b/mis_builder_budget/i18n/pt_BR.po @@ -85,6 +85,21 @@ msgstr "Permitir Sobreposição de Itens" msgid "Amount" msgstr "Montante" +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_distribution +msgid "Analytic Distribution" +msgstr "" + +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: mis_builder_budget +#: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_by_account_item__analytic_precision +msgid "Analytic Precision" +msgstr "" + #. module: mis_builder_budget #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget__message_attachment_count #: model:ir.model.fields,field_description:mis_builder_budget.field_mis_budget_abstract__message_attachment_count 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 8e83f65..3e6860e 100644 --- a/mis_builder_budget/models/mis_budget_by_account_item.py +++ b/mis_builder_budget/models/mis_budget_by_account_item.py @@ -5,7 +5,11 @@ from flectra import api, fields, models class MisBudgetByAccountItem(models.Model): - _inherit = ["mis.budget.item.abstract", "prorata.read_group.mixin"] + _inherit = [ + "mis.budget.item.abstract", + "prorata.read_group.mixin", + "analytic.mixin", + ] _name = "mis.budget.by.account.item" _description = "MIS Budget Item (by Account)" _order = "budget_id, date_from, account_id" diff --git a/mis_builder_budget/static/description/index.html b/mis_builder_budget/static/description/index.html index 04ec639..ea3018a 100644 --- a/mis_builder_budget/static/description/index.html +++ b/mis_builder_budget/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:962fa7862548ebdf141273123f5b54ca059766819b2768117a90a45bed164c94 +!! source digest: sha256:da466f77b5606d5eaa518b43c8b7478dd433bc91f82e18a842a099871c63c578 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
Create budgets for MIS reports.
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 7fd1ac9..2e58221 100644 --- a/mis_builder_budget/views/mis_budget_by_account_item.xml +++ b/mis_builder_budget/views/mis_budget_by_account_item.xml @@ -26,6 +26,12 @@