From 925dda1fe1be314232fec2a87679adbe5e2c6c96 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Fri, 3 Jan 2025 23:30:33 +0100 Subject: [PATCH] [IMP] report_xlsx_helper: pre-commit fixes --- report_xlsx_helper/README.rst | 10 ++--- .../report/report_xlsx_abstract.py | 42 +++++++++---------- .../static/description/index.html | 17 ++++---- 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/report_xlsx_helper/README.rst b/report_xlsx_helper/README.rst index 301355a79..d12541d34 100644 --- a/report_xlsx_helper/README.rst +++ b/report_xlsx_helper/README.rst @@ -17,13 +17,13 @@ Report xlsx helpers :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_xlsx_helper + :target: https://github.com/OCA/reporting-engine/tree/18.0/report_xlsx_helper :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_xlsx_helper + :target: https://translation.odoo-community.org/projects/reporting-engine-18-0/reporting-engine-18-0-report_xlsx_helper :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| @@ -84,7 +84,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. @@ -122,6 +122,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_xlsx_helper/report/report_xlsx_abstract.py b/report_xlsx_helper/report/report_xlsx_abstract.py index 273dafad0..f9e8b6352 100644 --- a/report_xlsx_helper/report/report_xlsx_abstract.py +++ b/report_xlsx_helper/report/report_xlsx_abstract.py @@ -348,10 +348,10 @@ class ReportXlsxAbstract(models.AbstractModel): FORMATS["format_theader_yellow_amount_conditional_left"] = workbook.add_format( dict(theader_yellow, num_format=num_format_conditional, align="left") ) - FORMATS[ - "format_theader_yellow_amount_conditional_center" - ] = workbook.add_format( - dict(theader_yellow, num_format=num_format_conditional, align="center") + FORMATS["format_theader_yellow_amount_conditional_center"] = ( + workbook.add_format( + dict(theader_yellow, num_format=num_format_conditional, align="center") + ) ) FORMATS["format_theader_yellow_amount_conditional_right"] = workbook.add_format( dict(theader_yellow, num_format=num_format_conditional, align="right") @@ -368,15 +368,15 @@ class ReportXlsxAbstract(models.AbstractModel): FORMATS["format_theader_yellow_percent_conditional_left"] = workbook.add_format( dict(theader_yellow, num_format=pct_format_conditional, align="left") ) - FORMATS[ - "format_theader_yellow_percent_conditional_center" - ] = workbook.add_format( - dict(theader_yellow, num_format=pct_format_conditional, align="center") + FORMATS["format_theader_yellow_percent_conditional_center"] = ( + workbook.add_format( + dict(theader_yellow, num_format=pct_format_conditional, align="center") + ) ) - FORMATS[ - "format_theader_yellow_percent_conditional_right" - ] = workbook.add_format( - dict(theader_yellow, num_format=pct_format_conditional, align="right") + FORMATS["format_theader_yellow_percent_conditional_right"] = ( + workbook.add_format( + dict(theader_yellow, num_format=pct_format_conditional, align="right") + ) ) FORMATS["format_theader_yellow_integer_left"] = workbook.add_format( dict(theader_yellow, num_format=int_format, align="left") @@ -390,15 +390,15 @@ class ReportXlsxAbstract(models.AbstractModel): FORMATS["format_theader_yellow_integer_conditional_left"] = workbook.add_format( dict(theader_yellow, num_format=int_format_conditional, align="left") ) - FORMATS[ - "format_theader_yellow_integer_conditional_center" - ] = workbook.add_format( - dict(theader_yellow, num_format=int_format_conditional, align="center") + FORMATS["format_theader_yellow_integer_conditional_center"] = ( + workbook.add_format( + dict(theader_yellow, num_format=int_format_conditional, align="center") + ) ) - FORMATS[ - "format_theader_yellow_integer_conditional_right" - ] = workbook.add_format( - dict(theader_yellow, num_format=int_format_conditional, align="right") + FORMATS["format_theader_yellow_integer_conditional_right"] = ( + workbook.add_format( + dict(theader_yellow, num_format=int_format_conditional, align="right") + ) ) FORMATS["format_theader_blue_left"] = workbook.add_format(theader_blue) @@ -735,7 +735,7 @@ class ReportXlsxAbstract(models.AbstractModel): args = args_pos + args_data ws.merge_range(*args) else: - ws_method = getattr(ws, "write_%s" % cell_type) + ws_method = getattr(ws, f"write_{cell_type}") args = args_pos + args_data ws_method(*args) pos += colspan diff --git a/report_xlsx_helper/static/description/index.html b/report_xlsx_helper/static/description/index.html index fc3cf4d2a..d40b1ba76 100644 --- a/report_xlsx_helper/static/description/index.html +++ b/report_xlsx_helper/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 @@ pre.literal-block, pre.doctest-block, pre.math, pre.code { 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.option { span.pre { white-space: pre } -span.problematic { +span.problematic, pre.problematic { color: red } span.section-subtitle { @@ -368,7 +369,7 @@ ul.auto-toc { !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! source digest: sha256:df481003a65f02d5bf2edcc90f4238033b81c3fa5120209c2e36e25b1cdabb77 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Mature License: AGPL-3 OCA/reporting-engine Translate me on Weblate Try me on Runboat

+

Mature License: AGPL-3 OCA/reporting-engine Translate me on Weblate Try me on Runboat

This module provides a set of tools to facilitate the creation of excel reports with format xlsx.

Table of contents

@@ -427,7 +428,7 @@ module from http://app

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.

@@ -453,11 +454,13 @@ If you spotted it first, help us to smash it by providing a detailed and welcome

Maintainers

This module is maintained by the OCA.

-Odoo Community Association + +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.

-

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.