From bd9f0a12b23797dcd656eba78f63b68aa3b5c7db Mon Sep 17 00:00:00 2001 From: David Ramia Date: Wed, 26 Oct 2022 21:53:47 +0200 Subject: [PATCH] [MIG] report_qweb_parameter: Migration to 16.0 --- report_qweb_parameter/README.rst | 23 +++++----- report_qweb_parameter/__manifest__.py | 2 +- .../demo/test_report_field_length.xml | 13 ++++++ report_qweb_parameter/i18n/ca.po | 2 + report_qweb_parameter/i18n/es.po | 2 + report_qweb_parameter/i18n/fr.po | 2 + report_qweb_parameter/i18n/it.po | 2 + report_qweb_parameter/i18n/pt.po | 2 + .../i18n/report_qweb_parameter.pot | 4 +- report_qweb_parameter/models/ir_qweb.py | 27 ++++++++++-- .../static/description/index.html | 42 ++++++++++--------- .../tests/test_report_qweb_parameter.py | 15 +++---- 12 files changed, 93 insertions(+), 43 deletions(-) diff --git a/report_qweb_parameter/README.rst b/report_qweb_parameter/README.rst index 561eb8664..899c56f9e 100644 --- a/report_qweb_parameter/README.rst +++ b/report_qweb_parameter/README.rst @@ -2,10 +2,13 @@ Report QWeb Parameter ===================== -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:6e50557d8d49cab3485b6aa968d1dbc2a8d55f1fd8cdc34b3b269db65edf9693 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status @@ -14,16 +17,16 @@ Report QWeb Parameter :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Freporting--engine-lightgray.png?logo=github - :target: https://github.com/OCA/reporting-engine/tree/15.0/report_qweb_parameter + :target: https://github.com/OCA/reporting-engine/tree/16.0/report_qweb_parameter :alt: OCA/reporting-engine .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/reporting-engine-15-0/reporting-engine-15-0-report_qweb_parameter + :target: https://translation.odoo-community.org/projects/reporting-engine-16-0/reporting-engine-16-0-report_qweb_parameter :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/143/15.0 - :alt: Try me on Runbot +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/reporting-engine&target_branch=16.0 + :alt: Try me on Runboat -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| This module allows you to add new parameters on QWeb reports. Currently, we have defined a field maximum on a report and a validation of @@ -50,8 +53,8 @@ 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 `_. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -87,6 +90,6 @@ 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. -This module is part of the `OCA/reporting-engine `_ project on GitHub. +This module is part of the `OCA/reporting-engine `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/report_qweb_parameter/__manifest__.py b/report_qweb_parameter/__manifest__.py index 0b57c29d8..f12365bf7 100644 --- a/report_qweb_parameter/__manifest__.py +++ b/report_qweb_parameter/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Report QWeb Parameter", - "version": "15.0.1.0.0", + "version": "16.0.1.0.0", "license": "AGPL-3", "summary": """ Add new parameters for qweb templates in order to reduce field length diff --git a/report_qweb_parameter/demo/test_report_field_length.xml b/report_qweb_parameter/demo/test_report_field_length.xml index f76b10ae9..d786acce7 100644 --- a/report_qweb_parameter/demo/test_report_field_length.xml +++ b/report_qweb_parameter/demo/test_report_field_length.xml @@ -34,6 +34,19 @@ t-raw="docs[0].company_registry" t-if="docs[0].company_registry" /> +
  • +
  • diff --git a/report_qweb_parameter/i18n/ca.po b/report_qweb_parameter/i18n/ca.po index f549b17fe..a11690293 100644 --- a/report_qweb_parameter/i18n/ca.po +++ b/report_qweb_parameter/i18n/ca.po @@ -22,12 +22,14 @@ msgid "Length Report" msgstr "Longitud de l'informe" #. module: report_qweb_parameter +#. odoo-python #: code:addons/report_qweb_parameter/models/ir_qweb.py:0 #, python-format msgid "Length cannot be less than %s" msgstr "La longitut no pot ser menor que %s" #. module: report_qweb_parameter +#. odoo-python #: code:addons/report_qweb_parameter/models/ir_qweb.py:0 #, python-format msgid "Length cannot be more than %s" diff --git a/report_qweb_parameter/i18n/es.po b/report_qweb_parameter/i18n/es.po index 7cc1952b8..060c57c72 100644 --- a/report_qweb_parameter/i18n/es.po +++ b/report_qweb_parameter/i18n/es.po @@ -23,12 +23,14 @@ msgid "Length Report" msgstr "Longitud del informe" #. module: report_qweb_parameter +#. odoo-python #: code:addons/report_qweb_parameter/models/ir_qweb.py:0 #, python-format msgid "Length cannot be less than %s" msgstr "La longitud no puede ser menor a %s" #. module: report_qweb_parameter +#. odoo-python #: code:addons/report_qweb_parameter/models/ir_qweb.py:0 #, python-format msgid "Length cannot be more than %s" diff --git a/report_qweb_parameter/i18n/fr.po b/report_qweb_parameter/i18n/fr.po index 5cc910830..3ae4e0222 100644 --- a/report_qweb_parameter/i18n/fr.po +++ b/report_qweb_parameter/i18n/fr.po @@ -24,12 +24,14 @@ msgid "Length Report" msgstr "Longueur du rapport " #. module: report_qweb_parameter +#. odoo-python #: code:addons/report_qweb_parameter/models/ir_qweb.py:0 #, python-format msgid "Length cannot be less than %s" msgstr "La longueur du rapport ne peut pas être inférieure à %s" #. module: report_qweb_parameter +#. odoo-python #: code:addons/report_qweb_parameter/models/ir_qweb.py:0 #, python-format msgid "Length cannot be more than %s" diff --git a/report_qweb_parameter/i18n/it.po b/report_qweb_parameter/i18n/it.po index 868bc8c17..451cb2d32 100644 --- a/report_qweb_parameter/i18n/it.po +++ b/report_qweb_parameter/i18n/it.po @@ -22,12 +22,14 @@ msgid "Length Report" msgstr "Lunghezza Report" #. module: report_qweb_parameter +#. odoo-python #: code:addons/report_qweb_parameter/models/ir_qweb.py:0 #, python-format msgid "Length cannot be less than %s" msgstr "La lunghezza non può essere meno di %s" #. module: report_qweb_parameter +#. odoo-python #: code:addons/report_qweb_parameter/models/ir_qweb.py:0 #, python-format msgid "Length cannot be more than %s" diff --git a/report_qweb_parameter/i18n/pt.po b/report_qweb_parameter/i18n/pt.po index 0be7522a2..8456f83da 100644 --- a/report_qweb_parameter/i18n/pt.po +++ b/report_qweb_parameter/i18n/pt.po @@ -22,12 +22,14 @@ msgid "Length Report" msgstr "Relatório de Comprimento" #. module: report_qweb_parameter +#. odoo-python #: code:addons/report_qweb_parameter/models/ir_qweb.py:0 #, python-format msgid "Length cannot be less than %s" msgstr "Comprimento não pode ser superior a %s" #. module: report_qweb_parameter +#. odoo-python #: code:addons/report_qweb_parameter/models/ir_qweb.py:0 #, python-format msgid "Length cannot be more than %s" diff --git a/report_qweb_parameter/i18n/report_qweb_parameter.pot b/report_qweb_parameter/i18n/report_qweb_parameter.pot index bc9d5c911..171f1623d 100644 --- a/report_qweb_parameter/i18n/report_qweb_parameter.pot +++ b/report_qweb_parameter/i18n/report_qweb_parameter.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 15.0\n" +"Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -19,12 +19,14 @@ msgid "Length Report" msgstr "" #. module: report_qweb_parameter +#. odoo-python #: code:addons/report_qweb_parameter/models/ir_qweb.py:0 #, python-format msgid "Length cannot be less than %s" msgstr "" #. module: report_qweb_parameter +#. odoo-python #: code:addons/report_qweb_parameter/models/ir_qweb.py:0 #, python-format msgid "Length cannot be more than %s" diff --git a/report_qweb_parameter/models/ir_qweb.py b/report_qweb_parameter/models/ir_qweb.py index 348ac97b2..b763d3183 100644 --- a/report_qweb_parameter/models/ir_qweb.py +++ b/report_qweb_parameter/models/ir_qweb.py @@ -16,7 +16,7 @@ class IrQWeb(models.AbstractModel): raise ValidationError(_("Length cannot be more than %s") % str(max_length)) return value - def _compile_directive_esc(self, el, options, indent): + def _compile_directive_esc(self, el, compile_context, level): min_value = el.attrib.pop("t-minlength", False) max_value = el.attrib.pop("t-maxlength", False) if min_value or max_value: @@ -32,9 +32,28 @@ class IrQWeb(models.AbstractModel): if "t-length" in el.attrib: tlength = el.attrib.pop("t-length") el.attrib["t-esc"] = "(" + el.attrib["t-esc"] + ")[:" + tlength + "]" - return super()._compile_directive_esc(el, options, indent) + return super()._compile_directive_esc(el, compile_context, level) - def _compile_directive_raw(self, el, options, indent): + def _compile_directive_out(self, el, compile_context, level): + min_value = el.attrib.pop("t-minlength", False) + max_value = el.attrib.pop("t-maxlength", False) + if min_value or max_value: + el.attrib["t-out"] = ( + 'docs.env["ir.qweb"].check_length(' + + el.attrib["t-out"] + + ", " + + (min_value or "False") + + ", " + + (max_value or "False") + + ")" + ) + if "t-length" in el.attrib: + tlength = el.attrib.pop("t-length") + el.attrib["t-out"] = el.attrib["t-out"] + "[:" + tlength + "]" + return super()._compile_directive_out(el, compile_context, level) + + def _compile_directive_raw(self, el, compile_context, level): + # TODO: t-raw is deprecated, can it be removed? min_value = el.attrib.pop("t-minlength", False) max_value = el.attrib.pop("t-maxlength", False) if min_value or max_value: @@ -50,4 +69,4 @@ class IrQWeb(models.AbstractModel): if "t-length" in el.attrib: tlength = el.attrib.pop("t-length") el.attrib["t-raw"] = el.attrib["t-raw"] + "[:" + tlength + "]" - return super()._compile_directive_raw(el, options, indent) + return super()._compile_directive_raw(el, compile_context, level) diff --git a/report_qweb_parameter/static/description/index.html b/report_qweb_parameter/static/description/index.html index 1cc8d45e8..c5c8f37ce 100644 --- a/report_qweb_parameter/static/description/index.html +++ b/report_qweb_parameter/static/description/index.html @@ -1,20 +1,20 @@ - + - + Report QWeb Parameter