diff --git a/mis_template_financial_report/README.rst b/mis_template_financial_report/README.rst index d09e6130..13f8fbff 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 9bc8601f..1ca777b1 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 b4d98807..e573c41f 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 2c23d4ce..eb34a066 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 @@ class MisReportInstance(models.Model): return result - @api.multi def _is_horizontal(self): """Determine if the report template is a horizontal one""" self.ensure_one() @@ -34,7 +32,6 @@ class MisReportInstance(models.Model): "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 @@ class MisReportInstance(models.Model): ], ) - @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 5429cc97..f648949d 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 d24a5bbb..35345bf0 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 904d3a37..fe3d0540 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