odoo/odoo#159586

Created by fw-bot

label

odoo-dev:17.0-16.0-replace_directive_expression-CLaurelB-4tsZ-fw

head

78d2c21665d63ea3f18a21476bca6624c4823729

target

17.0

merged

1 month ago by Sales, Antoine Vandevenne (anv)

forward-port of

odoo/odoo#158728 DETACHED (conflicts: ('7506d6f26fe4b0460c3ae0c3c8d001c11aedeab9', 'CONFLICT (modify/delete): addons/payment/views/payment_templates.xml deleted in HEAD and modified in 7506d6f26fe4 ([FIX] Payment: prevent error in rendering payment icon list with PIL incompatible icon image formats). Version 7506d6f26fe4 ([FIX] Payment: prevent error in rendering payment icon list with PIL incompatible icon image formats) of addons/payment/views/payment_templates.xml left in tree.\n', '22:06:03.252671 git.c:463 trace: built-in: git cherry-pick 7506d6f26fe4b0460c3ae0c3c8d001c11aedeab9\nerror: could not apply 7506d6f26fe4... [FIX] Payment: prevent error in rendering payment icon list with PIL incompatible icon image formats\nhint: After resolving the conflicts, mark them with\nhint: "git add/rm <pathspec>", then run\nhint: "git cherry-pick --continue".\nhint: You can instead skip this commit with "git cherry-pick --skip".\nhint: To abort and get back to the state before "git cherry-pick",\nhint: run "git cherry-pick --abort".\n----------\nstatus:\n', ['7506d6f26fe4b0460c3ae0c3c8d001c11aedeab9']) ('7506d6f26fe4b0460c3ae0c3c8d001c11aedeab9', 'CONFLICT (modify/delete): addons/payment/views/payment_templates.xml deleted in HEAD and modified in 7506d6f26fe4 ([FIX] Payment: prevent error in rendering payment icon list with PIL incompatible icon image formats). Version 7506d6f26fe4 ([FIX] Payment: prevent error in rendering payment icon list with PIL incompatible icon image formats) of addons/payment/views/payment_templates.xml left in tree.\n', '22:06:03.252671 git.c:463 trace: built-in: git cherry-pick 7506d6f26fe4b0460c3ae0c3c8d001c11aedeab9\nerror: could not apply 7506d6f26fe4... [FIX] Payment: prevent error in rendering payment icon list with PIL incompatible icon image formats\nhint: After resolving the conflicts, mark them with\nhint: "git add/rm <pathspec>", then run\nhint: "git cherry-pick --continue".\nhint: You can instead skip this commit with "git cherry-pick --skip".\nhint: To abort and get back to the state before "git cherry-pick",\nhint: run "git cherry-pick --abort".\n----------\nstatus:\n', ['7506d6f26fe4b0460c3ae0c3c8d001c11aedeab9']))

[FW][FIX] Payment: prevent error in rendering payment icon list with PIL incompatible icon image formats

Description of the issue/feature this PR addresses:

Replace the use of 't-esc' with 't-field' for the payment icon image in the icons list template. The latter, for an image field, provides two options for rendering the payment icon image: use the PIL library to obtain the image when given the option 'qweb_img_raw_data', or use a URL. The former only considers the first option, allowing only image formats compatible with the PIL library.

Current behavior before PR:

Only image formats compatible with the PIL library can be used for the payment icons.

Desired behavior after PR is merged:

Other formats including the ones compatible with the PIL library can be used for the payment icons.

---
I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Forward-Port-Of: odoo/odoo#159522
Forward-Port-Of: odoo/odoo#158728