From e5190c1a4f3e8f9393646b2b427b5a8abed128ec Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Sun, 17 Oct 2021 11:19:20 +0200 Subject: [PATCH 01/26] [RFR] l10n_nl_mis_reports -> mis_template_financial_report --- mis_template_financial_report/README.rst | 93 ++++ mis_template_financial_report/__init__.py | 1 + mis_template_financial_report/__manifest__.py | 21 + .../data/mis_report.xml | 10 + .../data/mis_report_kpi.xml | 103 +++++ .../data/mis_report_style.xml | 31 ++ .../data/mis_report_subreport.xml | 7 + .../models/__init__.py | 1 + .../models/mis_report_instance.py | 81 ++++ .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 1 + .../readme/ROADMAP.rst | 1 + .../readme/USAGE.rst | 3 + .../readme/newsfragments/.gitkeep | 0 .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 434 ++++++++++++++++++ .../src/css/mis_template_financial_report.css | 7 + .../static/src/css/report.css | 11 + .../src/xml/mis_template_financial_report.xml | 22 + .../tests/__init__.py | 1 + .../test_mis_template_financial_report.py | 15 + .../views/templates.xml | 58 +++ 22 files changed, 902 insertions(+) create mode 100644 mis_template_financial_report/README.rst create mode 100644 mis_template_financial_report/__init__.py create mode 100644 mis_template_financial_report/__manifest__.py create mode 100644 mis_template_financial_report/data/mis_report.xml create mode 100644 mis_template_financial_report/data/mis_report_kpi.xml create mode 100644 mis_template_financial_report/data/mis_report_style.xml create mode 100644 mis_template_financial_report/data/mis_report_subreport.xml create mode 100644 mis_template_financial_report/models/__init__.py create mode 100644 mis_template_financial_report/models/mis_report_instance.py create mode 100644 mis_template_financial_report/readme/CONTRIBUTORS.rst create mode 100644 mis_template_financial_report/readme/DESCRIPTION.rst create mode 100644 mis_template_financial_report/readme/ROADMAP.rst create mode 100644 mis_template_financial_report/readme/USAGE.rst create mode 100644 mis_template_financial_report/readme/newsfragments/.gitkeep create mode 100644 mis_template_financial_report/static/description/icon.png create mode 100644 mis_template_financial_report/static/description/index.html create mode 100644 mis_template_financial_report/static/src/css/mis_template_financial_report.css create mode 100644 mis_template_financial_report/static/src/css/report.css create mode 100644 mis_template_financial_report/static/src/xml/mis_template_financial_report.xml create mode 100644 mis_template_financial_report/tests/__init__.py create mode 100644 mis_template_financial_report/tests/test_mis_template_financial_report.py create mode 100644 mis_template_financial_report/views/templates.xml diff --git a/mis_template_financial_report/README.rst b/mis_template_financial_report/README.rst new file mode 100644 index 000000000000..d09e61300d81 --- /dev/null +++ b/mis_template_financial_report/README.rst @@ -0,0 +1,93 @@ +=========================================== +Profit & Loss / Balance sheet MIS templates +=========================================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--financial--reporting--lightgray.png?logo=github + :target: https://github.com/OCA/account-financial-reporting/tree/12.0/mis_template_financial_report + :alt: OCA/account-financial-reporting +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/account-financial-reporting-12-0/account-financial-reporting-12-0-mis_template_financial_report + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/176/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This addon provides MIS builder templates to generate Dutch style Profit&Loss and Balance Sheet reports. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +Select one of the `Profit & Loss` or `Balance Sheet` templates in a new MIS report. + +For details, refer to the `MIS Builder documentation `_ + +Known issues / Roadmap +====================== + +* support horizontal mode for xslx export + +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 +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Hunki Enterprises BV + +Contributors +~~~~~~~~~~~~ + +* Holger Brunn (https://hunki-enterprises.nl) + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +.. |maintainer-hbrunn| image:: https://github.com/hbrunn.png?size=40px + :target: https://github.com/hbrunn + :alt: hbrunn + +Current `maintainer `__: + +|maintainer-hbrunn| + +This module is part of the `OCA/account-financial-reporting `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/mis_template_financial_report/__init__.py b/mis_template_financial_report/__init__.py new file mode 100644 index 000000000000..0650744f6bc6 --- /dev/null +++ b/mis_template_financial_report/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/mis_template_financial_report/__manifest__.py b/mis_template_financial_report/__manifest__.py new file mode 100644 index 000000000000..9bc8601ff2c7 --- /dev/null +++ b/mis_template_financial_report/__manifest__.py @@ -0,0 +1,21 @@ +# Copyright 2020 Hunki Enterprises BV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +{ + "name": "Profit & Loss / Balance sheet MIS templates", + "version": "12.0.1.1.0", + "license": "AGPL-3", + "author": "Hunki Enterprises BV,Odoo Community Association (OCA)", + "website": "https://github.com/OCA/account-financial-reporting", + "category": "Localization", + "depends": ["mis_builder"], + "data": [ + "data/mis_report_style.xml", + "data/mis_report.xml", + "data/mis_report_kpi.xml", + "data/mis_report_subreport.xml", + "views/templates.xml", + ], + "qweb": ["static/src/xml/mis_template_financial_report.xml"], + "maintainers": ["hbrunn"], +} diff --git a/mis_template_financial_report/data/mis_report.xml b/mis_template_financial_report/data/mis_report.xml new file mode 100644 index 000000000000..f1ee88b2954e --- /dev/null +++ b/mis_template_financial_report/data/mis_report.xml @@ -0,0 +1,10 @@ + + + Profit & Loss + + + + Balance Sheet + + + diff --git a/mis_template_financial_report/data/mis_report_kpi.xml b/mis_template_financial_report/data/mis_report_kpi.xml new file mode 100644 index 000000000000..b4d988070139 --- /dev/null +++ b/mis_template_financial_report/data/mis_report_kpi.xml @@ -0,0 +1,103 @@ + + + loss + Loss + balp[('user_type_id', 'in', (ref('account.data_account_type_depreciation').id, ref('account.data_account_type_expenses').id, ref('account.data_account_type_direct_costs').id))][] + true + + + num + diff + sum + 100 + + + + profit + Profit + -balp[('user_type_id', 'in', (ref('account.data_account_type_revenue').id, ref('account.data_account_type_other_income').id, ref('account.data_unaffected_earnings').id))][] + true + + + num + diff + sum + 0 + + + + 3 + pl_to_report + Profit or loss to report + profit - loss + false + + num + diff + none + 101 + + + + 8 + liability_header + Liability + liability + subreport_pl.pl_to_report + false + + num + none + none + 100 + + + + 7 + pl + Profit / Loss + subreport_pl.pl_to_report + false + + num + pct + sum + 102 + + + + 5 + liability + Liabilities + -bale[('user_type_id', 'in', (ref('account.data_account_type_payable').id, ref('account.data_account_type_current_liabilities').id, ref('account.data_account_type_non_current_liabilities').id, ref('account.data_account_type_equity').id))][] + true + + + num + diff + sum + 101 + + + + 4 + assets + Assets + bale[('user_type_id', 'in', (ref('account.data_account_type_receivable').id, ref('account.data_account_type_liquidity').id, ref('account.data_account_type_current_assets').id, ref('account.data_account_type_non_current_assets').id, ref('account.data_account_type_fixed_assets').id))][] + true + + + num + diff + sum + 0 + + + diff --git a/mis_template_financial_report/data/mis_report_style.xml b/mis_template_financial_report/data/mis_report_style.xml new file mode 100644 index 000000000000..3ba409f04f06 --- /dev/null +++ b/mis_template_financial_report/data/mis_report_style.xml @@ -0,0 +1,31 @@ + + + PL/BS default + false + 2 + false + true + + + PL/BS header + false + bold + + + PL/BS double indented details + false + 2 + + + PL/BS indented header + false + bold + false + 1 + + + PL/BS details + false + 1 + + diff --git a/mis_template_financial_report/data/mis_report_subreport.xml b/mis_template_financial_report/data/mis_report_subreport.xml new file mode 100644 index 000000000000..dc84876856d8 --- /dev/null +++ b/mis_template_financial_report/data/mis_report_subreport.xml @@ -0,0 +1,7 @@ + + + + + subreport_pl + + diff --git a/mis_template_financial_report/models/__init__.py b/mis_template_financial_report/models/__init__.py new file mode 100644 index 000000000000..5f14fa3bbba0 --- /dev/null +++ b/mis_template_financial_report/models/__init__.py @@ -0,0 +1 @@ +from . import mis_report_instance diff --git a/mis_template_financial_report/models/mis_report_instance.py b/mis_template_financial_report/models/mis_report_instance.py new file mode 100644 index 000000000000..2c23d4ce2454 --- /dev/null +++ b/mis_template_financial_report/models/mis_report_instance.py @@ -0,0 +1,81 @@ +# Copyright 2020 Hunki Enterprises BV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +import copy +from collections import OrderedDict + +from odoo import api, models + + +class MisReportInstance(models.Model): + _inherit = "mis.report.instance" + + @api.multi + def compute(self): + if not self._is_horizontal(): + return super().compute() + + full_matrix = self._compute_matrix() + + matrices = self._compute_horizontal_matrices(full_matrix) + + result = full_matrix.as_dict() + result["horizontal_matrices"] = [ + extra_matrix.as_dict() for extra_matrix in matrices + ] + + return result + + @api.multi + def _is_horizontal(self): + """Determine if the report template is a horizontal one""" + self.ensure_one() + return set(self.report_id.get_external_id().values()) & { + "mis_template_financial_report.report_bs", + "mis_template_financial_report.report_pl", + } + + @api.multi + def _compute_horizontal_matrices(self, matrix=None): + """Compute the matrix (if not passed) and return the split versions""" + return self._split_matrix( + matrix or self._compute_matrix(), + [ + ( + self.env.ref("mis_template_financial_report.kpi_profit"), + self.env.ref("mis_template_financial_report.kpi_pl_to_report"), + self.env.ref("mis_template_financial_report.kpi_assets"), + ) + ], + ) + + @api.multi + def _split_matrix(self, original_matrix, kpi_defs=None, keep_remaining=True): + """Split a matrix by duplicating it as shallowly as possible and removing + rows according to kpi_defs + + KPIs not listed there will end up together in the last matrix if + `keep_remaining` is set. + + :param kpi_defs: [(kpi_first_matrix1, ...), (kpi_second_matrix1, ...)] + :return: list of KpiMatrix + """ + result = [] + remaining_rows = original_matrix._kpi_rows.copy() + + for kpis in kpi_defs: + matrix = copy.copy(original_matrix) + matrix._kpi_rows = OrderedDict( + [ + (kpi, remaining_rows.pop(kpi)) + for kpi in kpis + if kpi in remaining_rows + ] + ) + result.append(matrix) + + if remaining_rows and keep_remaining: + matrix = copy.copy(original_matrix) + matrix._kpi_rows = remaining_rows + result.append(matrix) + + return result diff --git a/mis_template_financial_report/readme/CONTRIBUTORS.rst b/mis_template_financial_report/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000000..5429cc975318 --- /dev/null +++ b/mis_template_financial_report/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Holger Brunn (https://hunki-enterprises.nl) diff --git a/mis_template_financial_report/readme/DESCRIPTION.rst b/mis_template_financial_report/readme/DESCRIPTION.rst new file mode 100644 index 000000000000..15e8480f7365 --- /dev/null +++ b/mis_template_financial_report/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This addon provides MIS builder templates to generate generic Profit & Loss and Balance Sheet reports. diff --git a/mis_template_financial_report/readme/ROADMAP.rst b/mis_template_financial_report/readme/ROADMAP.rst new file mode 100644 index 000000000000..d5786edd50e5 --- /dev/null +++ b/mis_template_financial_report/readme/ROADMAP.rst @@ -0,0 +1 @@ +* support horizontal mode for xslx export diff --git a/mis_template_financial_report/readme/USAGE.rst b/mis_template_financial_report/readme/USAGE.rst new file mode 100644 index 000000000000..d24a5bbbea9b --- /dev/null +++ b/mis_template_financial_report/readme/USAGE.rst @@ -0,0 +1,3 @@ +Select one of the `Profit & Loss` or `Balance Sheet` templates in a new MIS report. + +For details, refer to the `MIS Builder documentation `_ diff --git a/mis_template_financial_report/readme/newsfragments/.gitkeep b/mis_template_financial_report/readme/newsfragments/.gitkeep new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/mis_template_financial_report/static/description/icon.png b/mis_template_financial_report/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/mis_template_financial_report/static/description/index.html b/mis_template_financial_report/static/description/index.html new file mode 100644 index 000000000000..904d3a375b38 --- /dev/null +++ b/mis_template_financial_report/static/description/index.html @@ -0,0 +1,434 @@ + + + + + + +Dutch MIS Builder templates + + + +
+

Dutch MIS Builder templates

+ + +

Beta License: AGPL-3 OCA/account-financial-reporting Translate me on Weblate Try me on Runbot

+

This addon provides MIS builder templates to generate Dutch style Profit&Loss and Balance Sheet reports.

+

Table of contents

+ +
+

Usage

+

Select one of the Profit & Loss or Balance Sheet templates in a new MIS report.

+

For details, refer to the MIS Builder documentation

+
+
+

Known issues / Roadmap

+
    +
  • support horizontal mode for xslx export
    • +
+
+
+

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 +feedback.

+

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

+
+
+

Credits

+
+

Authors

+
    +
  • Hunki Enterprises BV
    • +
+
+ +
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

Current maintainer:

+

hbrunn

+

This module is part of the OCA/account-financial-reporting project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/mis_template_financial_report/static/src/css/mis_template_financial_report.css b/mis_template_financial_report/static/src/css/mis_template_financial_report.css new file mode 100644 index 000000000000..158cfb0107de --- /dev/null +++ b/mis_template_financial_report/static/src/css/mis_template_financial_report.css @@ -0,0 +1,7 @@ +.oe_mis_builder_content div.mis_builder_horizontal { + display: flex; + width: 100%; +} +.oe_mis_builder_content div.mis_builder_horizontal .table { + width: 50%; +} diff --git a/mis_template_financial_report/static/src/css/report.css b/mis_template_financial_report/static/src/css/report.css new file mode 100644 index 000000000000..376d0ed22481 --- /dev/null +++ b/mis_template_financial_report/static/src/css/report.css @@ -0,0 +1,11 @@ +div.mis_builder_horizontal { + display: table; + width: 100%; +} +div.mis_builder_horizontal > div { + display: table-row; +} +div.mis_builder_horizontal > div > div { + display: table-cell; + padding: 2px; +} diff --git a/mis_template_financial_report/static/src/xml/mis_template_financial_report.xml b/mis_template_financial_report/static/src/xml/mis_template_financial_report.xml new file mode 100644 index 000000000000..31fb0f5cd89d --- /dev/null +++ b/mis_template_financial_report/static/src/xml/mis_template_financial_report.xml @@ -0,0 +1,22 @@ + diff --git a/mis_template_financial_report/tests/__init__.py b/mis_template_financial_report/tests/__init__.py new file mode 100644 index 000000000000..b7acc9700324 --- /dev/null +++ b/mis_template_financial_report/tests/__init__.py @@ -0,0 +1 @@ +from . import test_mis_template_financial_report diff --git a/mis_template_financial_report/tests/test_mis_template_financial_report.py b/mis_template_financial_report/tests/test_mis_template_financial_report.py new file mode 100644 index 000000000000..c6ab48923ca8 --- /dev/null +++ b/mis_template_financial_report/tests/test_mis_template_financial_report.py @@ -0,0 +1,15 @@ +# Copyright 2020 Hunki Enterprises BV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo.addons.mis_builder.tests.test_mis_report_instance import TestMisReportInstance + + +class TestMisTemplateFinancialReport(TestMisReportInstance): + def test_mis_template_financial_report(self): + instance = self.env["mis.report.instance"].create( + { + "name": "Balance Sheet", + "report_id": self.env.ref("mis_template_financial_report.report_bs").id, + } + ) + result_dict = instance.compute() + self.assertEqual(len(result_dict.get("horizontal_matrices", [])), 2) diff --git a/mis_template_financial_report/views/templates.xml b/mis_template_financial_report/views/templates.xml new file mode 100644 index 000000000000..7e341591b33e --- /dev/null +++ b/mis_template_financial_report/views/templates.xml @@ -0,0 +1,58 @@ + + + + + From a3fcb280fad7d8a448d76fe318298827e60f2d30 Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Tue, 19 Oct 2021 10:33:18 +0200 Subject: [PATCH 02/26] [MIG] mis_template_financial_report: Migration to 14.0 --- mis_template_financial_report/README.rst | 17 +++++++++-------- mis_template_financial_report/__manifest__.py | 2 +- .../data/mis_report_kpi.xml | 8 ++++---- .../models/mis_report_instance.py | 6 +----- .../readme/CONTRIBUTORS.rst | 1 + .../readme/USAGE.rst | 2 +- .../static/description/index.html | 19 ++++++++++--------- 7 files changed, 27 insertions(+), 28 deletions(-) diff --git a/mis_template_financial_report/README.rst b/mis_template_financial_report/README.rst index d09e61300d81..13f8fbff574c 100644 --- a/mis_template_financial_report/README.rst +++ b/mis_template_financial_report/README.rst @@ -13,19 +13,19 @@ Profit & Loss / Balance sheet MIS templates .. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 -.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--financial--reporting--lightgray.png?logo=github - :target: https://github.com/OCA/account-financial-reporting/tree/12.0/mis_template_financial_report +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--financial--reporting-lightgray.png?logo=github + :target: https://github.com/OCA/account-financial-reporting/tree/14.0/mis_template_financial_report :alt: OCA/account-financial-reporting .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/account-financial-reporting-12-0/account-financial-reporting-12-0-mis_template_financial_report + :target: https://translation.odoo-community.org/projects/account-financial-reporting-14-0/account-financial-reporting-14-0-mis_template_financial_report :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/176/12.0 + :target: https://runbot.odoo-community.org/runbot/91/14.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| -This addon provides MIS builder templates to generate Dutch style Profit&Loss and Balance Sheet reports. +This addon provides MIS builder templates to generate generic Profit & Loss and Balance Sheet reports. **Table of contents** @@ -37,7 +37,7 @@ Usage Select one of the `Profit & Loss` or `Balance Sheet` templates in a new MIS report. -For details, refer to the `MIS Builder documentation `_ +For details, refer to the `MIS Builder documentation `_ Known issues / Roadmap ====================== @@ -50,7 +50,7 @@ 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 -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -66,6 +66,7 @@ Contributors ~~~~~~~~~~~~ * Holger Brunn (https://hunki-enterprises.nl) +* Stefan Rijnhart (https://opener.amsterdam) Maintainers ~~~~~~~~~~~ @@ -88,6 +89,6 @@ Current `maintainer `__: |maintainer-hbrunn| -This module is part of the `OCA/account-financial-reporting `_ project on GitHub. +This module is part of the `OCA/account-financial-reporting `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/mis_template_financial_report/__manifest__.py b/mis_template_financial_report/__manifest__.py index 9bc8601ff2c7..1ca777b13807 100644 --- a/mis_template_financial_report/__manifest__.py +++ b/mis_template_financial_report/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Profit & Loss / Balance sheet MIS templates", - "version": "12.0.1.1.0", + "version": "14.0.1.0.0", "license": "AGPL-3", "author": "Hunki Enterprises BV,Odoo Community Association (OCA)", "website": "https://github.com/OCA/account-financial-reporting", diff --git a/mis_template_financial_report/data/mis_report_kpi.xml b/mis_template_financial_report/data/mis_report_kpi.xml index b4d988070139..e573c41fb834 100644 --- a/mis_template_financial_report/data/mis_report_kpi.xml +++ b/mis_template_financial_report/data/mis_report_kpi.xml @@ -4,7 +4,7 @@ Loss balp[('user_type_id', 'in', (ref('account.data_account_type_depreciation').id, ref('account.data_account_type_expenses').id, ref('account.data_account_type_direct_costs').id))][] + >balp[('user_type_id', 'in', (ref('account.data_account_type_depreciation').id, ref('account.data_account_type_direct_costs').id, ref('account.data_account_type_expenses').id))][] true @@ -19,7 +19,7 @@ Profit -balp[('user_type_id', 'in', (ref('account.data_account_type_revenue').id, ref('account.data_account_type_other_income').id, ref('account.data_unaffected_earnings').id))][] + >-balp[('user_type_id', 'in', (ref('account.data_account_type_other_income').id, ref('account.data_account_type_revenue').id, ref('account.data_unaffected_earnings').id,))][] true @@ -74,7 +74,7 @@ Liabilities -bale[('user_type_id', 'in', (ref('account.data_account_type_payable').id, ref('account.data_account_type_current_liabilities').id, ref('account.data_account_type_non_current_liabilities').id, ref('account.data_account_type_equity').id))][] + >-bale[('user_type_id', 'in', (ref('account.data_account_type_current_liabilities').id, ref('account.data_account_type_equity').id, ref('account.data_account_type_non_current_liabilities').id, ref('account.data_account_type_payable').id))][] true @@ -90,7 +90,7 @@ Assets bale[('user_type_id', 'in', (ref('account.data_account_type_receivable').id, ref('account.data_account_type_liquidity').id, ref('account.data_account_type_current_assets').id, ref('account.data_account_type_non_current_assets').id, ref('account.data_account_type_fixed_assets').id))][] + >bale[('user_type_id', 'in', (ref('account.data_account_type_credit_card').id, ref('account.data_account_type_prepayments').id, ref('account.data_account_type_current_assets').id, ref('account.data_account_type_fixed_assets').id, ref('account.data_account_type_liquidity').id, ref('account.data_account_type_non_current_assets').id, ref('account.data_account_type_receivable').id))][] true diff --git a/mis_template_financial_report/models/mis_report_instance.py b/mis_template_financial_report/models/mis_report_instance.py index 2c23d4ce2454..eb34a0662a74 100644 --- a/mis_template_financial_report/models/mis_report_instance.py +++ b/mis_template_financial_report/models/mis_report_instance.py @@ -3,13 +3,12 @@ import copy from collections import OrderedDict -from odoo import api, models +from odoo import models class MisReportInstance(models.Model): _inherit = "mis.report.instance" - @api.multi def compute(self): if not self._is_horizontal(): return super().compute() @@ -25,7 +24,6 @@ def compute(self): return result - @api.multi def _is_horizontal(self): """Determine if the report template is a horizontal one""" self.ensure_one() @@ -34,7 +32,6 @@ def _is_horizontal(self): "mis_template_financial_report.report_pl", } - @api.multi def _compute_horizontal_matrices(self, matrix=None): """Compute the matrix (if not passed) and return the split versions""" return self._split_matrix( @@ -48,7 +45,6 @@ def _compute_horizontal_matrices(self, matrix=None): ], ) - @api.multi def _split_matrix(self, original_matrix, kpi_defs=None, keep_remaining=True): """Split a matrix by duplicating it as shallowly as possible and removing rows according to kpi_defs diff --git a/mis_template_financial_report/readme/CONTRIBUTORS.rst b/mis_template_financial_report/readme/CONTRIBUTORS.rst index 5429cc975318..f648949d3343 100644 --- a/mis_template_financial_report/readme/CONTRIBUTORS.rst +++ b/mis_template_financial_report/readme/CONTRIBUTORS.rst @@ -1 +1,2 @@ * Holger Brunn (https://hunki-enterprises.nl) +* Stefan Rijnhart (https://opener.amsterdam) diff --git a/mis_template_financial_report/readme/USAGE.rst b/mis_template_financial_report/readme/USAGE.rst index d24a5bbbea9b..35345bf0fb53 100644 --- a/mis_template_financial_report/readme/USAGE.rst +++ b/mis_template_financial_report/readme/USAGE.rst @@ -1,3 +1,3 @@ Select one of the `Profit & Loss` or `Balance Sheet` templates in a new MIS report. -For details, refer to the `MIS Builder documentation `_ +For details, refer to the `MIS Builder documentation `_ diff --git a/mis_template_financial_report/static/description/index.html b/mis_template_financial_report/static/description/index.html index 904d3a375b38..fe3d054014f4 100644 --- a/mis_template_financial_report/static/description/index.html +++ b/mis_template_financial_report/static/description/index.html @@ -3,8 +3,8 @@ - -Dutch MIS Builder templates + +Profit & Loss / Balance sheet MIS templates -
-

Dutch MIS Builder templates

+
+

Profit & Loss / Balance sheet MIS templates

-

Beta License: AGPL-3 OCA/account-financial-reporting Translate me on Weblate Try me on Runbot

-

This addon provides MIS builder templates to generate Dutch style Profit&Loss and Balance Sheet reports.

+

Beta License: AGPL-3 OCA/account-financial-reporting Translate me on Weblate Try me on Runbot

+

This addon provides MIS builder templates to generate generic Profit & Loss and Balance Sheet reports.

Table of contents

From 47c0b51b1abb51b2772a8f59ff6acacf1e20a286 Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Tue, 19 Oct 2021 10:50:51 +0200 Subject: [PATCH 03/26] [RFR] mis_template_financial_report: make horizontal rendering optional --- mis_template_financial_report/README.rst | 7 ++ mis_template_financial_report/__manifest__.py | 1 + .../i18n/mis_template_financial_report.pot | 89 +++++++++++++++++++ .../models/mis_report_instance.py | 26 +++--- .../readme/CONFIGURE.rst | 3 + .../static/description/index.html | 37 ++++---- .../test_mis_template_financial_report.py | 3 + .../views/mis_report_instance_views.xml | 17 ++++ .../views/templates.xml | 4 +- 9 files changed, 160 insertions(+), 27 deletions(-) create mode 100644 mis_template_financial_report/i18n/mis_template_financial_report.pot create mode 100644 mis_template_financial_report/readme/CONFIGURE.rst create mode 100644 mis_template_financial_report/views/mis_report_instance_views.xml diff --git a/mis_template_financial_report/README.rst b/mis_template_financial_report/README.rst index 13f8fbff574c..7e68b7196c6c 100644 --- a/mis_template_financial_report/README.rst +++ b/mis_template_financial_report/README.rst @@ -32,6 +32,13 @@ This addon provides MIS builder templates to generate generic Profit & Loss and .. contents:: :local: +Configuration +============= + +To render the reports from this module horizontally in two columns on the same +page, check the `Horizontal` checkbox on the `Layout` tab of the report. +This checkbox is only available for reports that support the horizontal mode. + Usage ===== diff --git a/mis_template_financial_report/__manifest__.py b/mis_template_financial_report/__manifest__.py index 1ca777b13807..ebb14a27c84a 100644 --- a/mis_template_financial_report/__manifest__.py +++ b/mis_template_financial_report/__manifest__.py @@ -14,6 +14,7 @@ "data/mis_report.xml", "data/mis_report_kpi.xml", "data/mis_report_subreport.xml", + "views/mis_report_instance_views.xml", "views/templates.xml", ], "qweb": ["static/src/xml/mis_template_financial_report.xml"], diff --git a/mis_template_financial_report/i18n/mis_template_financial_report.pot b/mis_template_financial_report/i18n/mis_template_financial_report.pot new file mode 100644 index 000000000000..a341538974d5 --- /dev/null +++ b/mis_template_financial_report/i18n/mis_template_financial_report.pot @@ -0,0 +1,89 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mis_template_financial_report +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: mis_template_financial_report +#: model:ir.model.fields,field_description:mis_template_financial_report.field_mis_report_instance__allow_horizontal +msgid "Allow Horizontal" +msgstr "" + +#. module: mis_template_financial_report +#: model:mis.report.kpi,description:mis_template_financial_report.kpi_assets +msgid "Assets" +msgstr "" + +#. module: mis_template_financial_report +#: model:mis.report,name:mis_template_financial_report.report_bs +msgid "Balance Sheet" +msgstr "" + +#. module: mis_template_financial_report +#: model:ir.model.fields,field_description:mis_template_financial_report.field_mis_report_instance__display_name +msgid "Display Name" +msgstr "" + +#. module: mis_template_financial_report +#: model:ir.model.fields,field_description:mis_template_financial_report.field_mis_report_instance__horizontal +msgid "Horizontal" +msgstr "" + +#. module: mis_template_financial_report +#: model:ir.model.fields,field_description:mis_template_financial_report.field_mis_report_instance__id +msgid "ID" +msgstr "" + +#. module: mis_template_financial_report +#: model:ir.model.fields,field_description:mis_template_financial_report.field_mis_report_instance____last_update +msgid "Last Modified on" +msgstr "" + +#. module: mis_template_financial_report +#: model:mis.report.kpi,description:mis_template_financial_report.kpi_liability +msgid "Liabilities" +msgstr "" + +#. module: mis_template_financial_report +#: model:mis.report.kpi,description:mis_template_financial_report.kpi_liability_total +msgid "Liability" +msgstr "" + +#. module: mis_template_financial_report +#: model:mis.report.kpi,description:mis_template_financial_report.kpi_loss +msgid "Loss" +msgstr "" + +#. module: mis_template_financial_report +#: model:ir.model,name:mis_template_financial_report.model_mis_report_instance +msgid "MIS Report Instance" +msgstr "" + +#. module: mis_template_financial_report +#: model:mis.report.kpi,description:mis_template_financial_report.kpi_profit +msgid "Profit" +msgstr "" + +#. module: mis_template_financial_report +#: model:mis.report,name:mis_template_financial_report.report_pl +msgid "Profit & Loss" +msgstr "" + +#. module: mis_template_financial_report +#: model:mis.report.kpi,description:mis_template_financial_report.kpi_liability_pl_subreport +msgid "Profit / Loss" +msgstr "" + +#. module: mis_template_financial_report +#: model:mis.report.kpi,description:mis_template_financial_report.kpi_pl_to_report +msgid "Profit or loss to report" +msgstr "" diff --git a/mis_template_financial_report/models/mis_report_instance.py b/mis_template_financial_report/models/mis_report_instance.py index eb34a0662a74..a4a268b89152 100644 --- a/mis_template_financial_report/models/mis_report_instance.py +++ b/mis_template_financial_report/models/mis_report_instance.py @@ -3,14 +3,28 @@ import copy from collections import OrderedDict -from odoo import models +from odoo import api, fields, models class MisReportInstance(models.Model): _inherit = "mis.report.instance" + allow_horizontal = fields.Boolean(compute="_compute_allow_horizontal") + horizontal = fields.Boolean() + + @api.depends("report_id") + def _compute_allow_horizontal(self): + """Indicate that the instance supports horizontal rendering.""" + for instance in self: + instance.allow_horizontal = set( + instance.report_id.get_external_id().values() + ) & { + "mis_template_financial_report.report_bs", + "mis_template_financial_report.report_pl", + } + def compute(self): - if not self._is_horizontal(): + if not self.horizontal: return super().compute() full_matrix = self._compute_matrix() @@ -24,14 +38,6 @@ def compute(self): return result - def _is_horizontal(self): - """Determine if the report template is a horizontal one""" - self.ensure_one() - return set(self.report_id.get_external_id().values()) & { - "mis_template_financial_report.report_bs", - "mis_template_financial_report.report_pl", - } - def _compute_horizontal_matrices(self, matrix=None): """Compute the matrix (if not passed) and return the split versions""" return self._split_matrix( diff --git a/mis_template_financial_report/readme/CONFIGURE.rst b/mis_template_financial_report/readme/CONFIGURE.rst new file mode 100644 index 000000000000..2a870ac34802 --- /dev/null +++ b/mis_template_financial_report/readme/CONFIGURE.rst @@ -0,0 +1,3 @@ +To render the reports from this module horizontally in two columns on the same +page, check the `Horizontal` checkbox on the `Layout` tab of the report. +This checkbox is only available for reports that support the horizontal mode. diff --git a/mis_template_financial_report/static/description/index.html b/mis_template_financial_report/static/description/index.html index fe3d054014f4..8ab0ef84fcaa 100644 --- a/mis_template_financial_report/static/description/index.html +++ b/mis_template_financial_report/static/description/index.html @@ -3,7 +3,7 @@ - + Profit & Loss / Balance sheet MIS templates