diff --git a/report_xml/README.rst b/report_xml/README.rst
index add8db2f8c..6c0e70d1f5 100644
--- a/report_xml/README.rst
+++ b/report_xml/README.rst
@@ -17,13 +17,13 @@ XML Reports
: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/17.0/report_xml
+ :target: https://github.com/OCA/reporting-engine/tree/18.0/report_xml
: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-17-0/reporting-engine-17-0-report_xml
+ :target: https://translation.odoo-community.org/projects/reporting-engine-18-0/reporting-engine-18-0-report_xml
:alt: Translate me on Weblate
.. |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=17.0
+ :target: https://runboat.odoo-community.org/builds?repo=OCA/reporting-engine&target_branch=18.0
:alt: Try me on Runboat
|badge1| |badge2| |badge3| |badge4| |badge5|
@@ -42,9 +42,9 @@ Installation
To install this module, you need to:
-- Install `lxml `__ in Odoo's ``$PYTHONPATH``.
-- Install the repository
- `reporting-engine `__.
+- Install `lxml `__ in Odoo's ``$PYTHONPATH``.
+- Install the repository
+ `reporting-engine `__.
But this module does nothing for the end user by itself, so if you have
it installed it's probably because there is another module that depends
@@ -66,12 +66,12 @@ companies views.
To develop with this module, you need to:
-- Create a module.
-- Make it depend on this one.
-- Follow `instructions to create
- reports `__
- having in mind that the ``report_type`` field in your
- ``ir.actions.report`` record must be ``qweb-xml``.
+- Create a module.
+- Make it depend on this one.
+- Follow `instructions to create
+ reports `__
+ having in mind that the ``report_type`` field in your
+ ``ir.actions.report`` record must be ``qweb-xml``.
In case you want to create a `custom
report `__,
@@ -96,8 +96,8 @@ your XML report online as a web page.
For further information, please visit:
-- https://www.odoo.com/forum/help-1
-- https://github.com/OCA/reporting-engine
+- https://www.odoo.com/forum/help-1
+- https://github.com/OCA/reporting-engine
Bug Tracker
===========
@@ -105,7 +105,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 to smash it by providing a detailed and welcomed
-`feedback `_.
+`feedback `_.
Do not contact contributors directly about support or help with technical issues.
@@ -121,22 +121,22 @@ Authors
Contributors
------------
-- Enric Tobella
+- Enric Tobella
-- `Tecnativa `__:
+- `Tecnativa `__:
- - Jairo Llopis
+ - Jairo Llopis
-- `Avoin.Systems `__:
+- `Avoin.Systems `__:
- - Tatiana Deribina
+ - Tatiana Deribina
-- Iván Antón
+- Iván Antón
Other credits
-------------
-- Icon taken from http://commons.wikimedia.org/wiki/File:Text-xml.svg
+- Icon taken from http://commons.wikimedia.org/wiki/File:Text-xml.svg
Maintainers
-----------
@@ -151,6 +151,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_xml/__manifest__.py b/report_xml/__manifest__.py
index e287279e64..550df3916a 100644
--- a/report_xml/__manifest__.py
+++ b/report_xml/__manifest__.py
@@ -2,7 +2,7 @@
# License AGPL-3.0 or later (https://www.gnuorg/licenses/agpl.html).
{
"name": "XML Reports",
- "version": "17.0.1.0.0",
+ "version": "18.0.1.0.0",
"category": "Reporting",
"website": "https://github.com/OCA/reporting-engine",
"development_status": "Production/Stable",
diff --git a/report_xml/demo/report.xml b/report_xml/demo/report.xml
index f0744bf487..e2c03c1101 100644
--- a/report_xml/demo/report.xml
+++ b/report_xml/demo/report.xml
@@ -1,6 +1,6 @@
-
+
Demo xml report
res.company
qweb-xml
diff --git a/report_xml/static/description/index.html b/report_xml/static/description/index.html
index d56db643e3..ade5c8c1bd 100644
--- a/report_xml/static/description/index.html
+++ b/report_xml/static/description/index.html
@@ -8,10 +8,11 @@
/*
:Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
:Copyright: This stylesheet has been placed in the public domain.
Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet.
@@ -274,7 +275,7 @@
margin-left: 2em ;
margin-right: 2em }
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* line numbers */
pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -300,7 +301,7 @@
span.pre {
white-space: pre }
-span.problematic {
+span.problematic, pre.problematic {
color: red }
span.section-subtitle {
@@ -368,7 +369,7 @@ XML Reports
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:f5a881c0eade552010cfe051f392fb1c7a5d474081f114d52a1f2a21d851096f
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-
+
This module was written to extend the functionality of the reporting
engine to support XML reports and allow modules to generate them by code
or by QWeb templates.
@@ -450,7 +451,7 @@
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 to smash it by providing a detailed and welcomed
-feedback.
+feedback.
Do not contact contributors directly about support or help with technical issues.
@@ -486,11 +487,13 @@
This module is maintained by the OCA.
-
+
+
+
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_xml/static/src/js/report/action_manager_report.esm.js b/report_xml/static/src/js/report/action_manager_report.esm.js
index e83200e012..fc3beae14a 100644
--- a/report_xml/static/src/js/report/action_manager_report.esm.js
+++ b/report_xml/static/src/js/report/action_manager_report.esm.js
@@ -1,9 +1,8 @@
-/** @odoo-module **/
-
import {download} from "@web/core/network/download";
import {registry} from "@web/core/registry";
+import {user} from "@web/core/user";
-function getReportUrl({report_name, context, data}, env) {
+function getReportUrl({report_name, context, data}) {
// Rough copy of action_service.js _getReportUrl method.
let url = `/report/xml/${report_name}`;
const actionContext = context || {};
@@ -15,14 +14,14 @@ function getReportUrl({report_name, context, data}, env) {
if (actionContext.active_ids) {
url += `/${actionContext.active_ids.join(",")}`;
}
- const userContext = encodeURIComponent(JSON.stringify(env.services.user.context));
+ const userContext = encodeURIComponent(JSON.stringify(user.context));
return `${url}?context=${userContext}`;
}
async function triggerDownload(action, {onClose}, env) {
// Rough copy of action_service.js _triggerDownload method.
env.services.ui.block();
- const data = JSON.stringify([getReportUrl(action, env), action.report_type]);
- const context = JSON.stringify(env.services.user.context);
+ const data = JSON.stringify([getReportUrl(action), action.report_type]);
+ const context = JSON.stringify(user.context);
try {
await download({url: "/report/download", data: {data, context}});
} finally {