diff --git a/NEWS.rst b/NEWS.rst index ce2e110feb9e72185afcab309a727fca197feb7e_TkVXUy5yc3Q=..a1a7bf16e7d6a563fe9b68f354084ec03918b703_TkVXUy5yc3Q= 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -2,6 +2,11 @@ Changelog ========= +18.0.1.4.0 +---------- + +Compatibility with changes in converter 18.0.4.0.0. + 18.0.1.3.0 ---------- diff --git a/__manifest__.py b/__manifest__.py index ce2e110feb9e72185afcab309a727fca197feb7e_X19tYW5pZmVzdF9fLnB5..a1a7bf16e7d6a563fe9b68f354084ec03918b703_X19tYW5pZmVzdF9fLnB5 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -1,7 +1,7 @@ ############################################################################## # # Redner Odoo module -# Copyright © 2016, 2023, 2024 XCG Consulting <https://xcg-consulting.fr> +# Copyright © 2016, 2023-2025 XCG Consulting <https://xcg-consulting.fr> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -21,7 +21,7 @@ { "name": "Redner", "license": "AGPL-3", - "version": "18.0.1.3.0", + "version": "18.0.1.4.0", "category": "Reporting", "author": "XCG Consulting", "website": "https://orbeet.io/", diff --git a/models/redner_substitution.py b/models/redner_substitution.py index ce2e110feb9e72185afcab309a727fca197feb7e_bW9kZWxzL3JlZG5lcl9zdWJzdGl0dXRpb24ucHk=..a1a7bf16e7d6a563fe9b68f354084ec03918b703_bW9kZWxzL3JlZG5lcl9zdWJzdGl0dXRpb24ucHk= 100644 --- a/models/redner_substitution.py +++ b/models/redner_substitution.py @@ -1,7 +1,7 @@ ############################################################################## # # Redner Odoo module -# Copyright © 2016 XCG Consulting <https://xcg-consulting.fr> +# Copyright © 2016, 2025 XCG Consulting <https://xcg-consulting.fr> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ############################################################################## from odoo import _, api, fields, models # type: ignore[import-untyped] -from odoo.addons import converter # type: ignore[import-untyped] +from odoo.addons import converter from odoo.exceptions import ValidationError # type: ignore[import-untyped] from ..converter import ImageDataURL, ImageFile @@ -186,4 +186,4 @@ raise ValidationError(_("invalid converter type: %s") % sub.converter) d[sub.keyword.rsplit(".", 2)[-1]] = conv - return converter.Model("", d) + return converter.Model(d) diff --git a/pyproject.toml b/pyproject.toml index ce2e110feb9e72185afcab309a727fca197feb7e_cHlwcm9qZWN0LnRvbWw=..a1a7bf16e7d6a563fe9b68f354084ec03918b703_cHlwcm9qZWN0LnRvbWw= 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,7 +18,7 @@ ] dependencies = [ "odoo==18.0.*", - "odoo-addon-converter >=18.0.1,<18.0.4", + "odoo-addon-converter >=18.0.4,<18.0.5", "requests_unixsocket", ] diff --git a/tests/test_ir_actions_report.py b/tests/test_ir_actions_report.py index ce2e110feb9e72185afcab309a727fca197feb7e_dGVzdHMvdGVzdF9pcl9hY3Rpb25zX3JlcG9ydC5weQ==..a1a7bf16e7d6a563fe9b68f354084ec03918b703_dGVzdHMvdGVzdF9pcl9hY3Rpb25zX3JlcG9ydC5weQ== 100644 --- a/tests/test_ir_actions_report.py +++ b/tests/test_ir_actions_report.py @@ -76,7 +76,7 @@ "https://test-redner-url/api/v1/render", json={ "accept": "text/html", - "data": [{"__type__": "", "login": "demo"}], + "data": [{"login": "demo"}], "template": { "account": "test-account", "name": "test-redner-id", diff --git a/tests/test_mail_template.py b/tests/test_mail_template.py index ce2e110feb9e72185afcab309a727fca197feb7e_dGVzdHMvdGVzdF9tYWlsX3RlbXBsYXRlLnB5..a1a7bf16e7d6a563fe9b68f354084ec03918b703_dGVzdHMvdGVzdF9tYWlsX3RlbXBsYXRlLnB5 100644 --- a/tests/test_mail_template.py +++ b/tests/test_mail_template.py @@ -73,7 +73,7 @@ "https://test-redner-url/api/v1/render", json={ "accept": "text/html", - "data": [{"__type__": "", "login": "demo"}], + "data": [{"login": "demo"}], "template": { "account": "test-account", "name": "test-redner-id",