From f6e01d6b532f7cf7edec30a3f7334c04c789e138 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 31 Oct 2023 10:05:09 +0100 Subject: [PATCH] [FIX] l10n_sa_edi: markup usage `''.join` would strip the `Markup` out, so the markup would appear literally in the result instead of being interpreted as HTML. Also switch to using dict-style formatting, it's a touch clearer (and shorter) for this case, since `e` is already a dict (hopefully). closes odoo/odoo#140496 X-original-commit: 4d88e1df4deb5f1aab23ca117f6b6261babec3f7 Signed-off-by: Xavier Morel (xmo) --- addons/l10n_sa_edi/models/account_journal.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/l10n_sa_edi/models/account_journal.py b/addons/l10n_sa_edi/models/account_journal.py index aeac7ae31f4..499b0d665b6 100644 --- a/addons/l10n_sa_edi/models/account_journal.py +++ b/addons/l10n_sa_edi/models/account_journal.py @@ -324,10 +324,10 @@ class AccountJournal(models.Model): if result.get('error'): raise UserError(Markup("

%s %s

") % (_("Could not complete Compliance Checks for the following file:"), fname)) if result['validationResults']['status'] == 'WARNING': - warnings = "".join(Markup("
  • %s: %s
    • ") % (e['code'], e['message']) for e in result['validationResults']['warningMessages']) + warnings = Markup().join(Markup("
  • %(code)s: %(message)s
    • ") % e for e in result['validationResults']['warningMessages']) self.l10n_sa_csr_errors = Markup("

    ") % (_("Warnings:"), warnings) elif result['validationResults']['status'] != 'PASS': - errors = "".join(Markup("
  • %s: %s
    • ") % (e['code'], e['message']) for e in result['validationResults']['errorMessages']) + errors = Markup().join(Markup("
  • %(code)s: %(message)s
    • ") % e for e in result['validationResults']['errorMessages']) raise UserError(Markup("

    %s %s %s

    ") % (_("Could not complete Compliance Checks for the following file:"), fname, Markup("

    ") % (_("Errors:"), errors))) self.l10n_sa_compliance_checks_passed = True