ingadhoc/website#276

Created by fw-bot-adhoc

label

adhoc-dev:17.0-16.0-t-36874-lef-AlRH-fw

head

93eddd963f36849eb57ec6c3f950fb7dfec974f3

target

17.0

merged

hace 8 meses by matiasperalta1

forward-port of

ingadhoc/website#274 DETACHED (conflicts: ('3783bbba1918f2dfd1d65f54bce90d16ed901b85', 'Auto-merging website_sale_ux/__manifest__.py\nCONFLICT (content): Merge conflict in website_sale_ux/__manifest__.py\n', '15:08:31.418413 git.c:444 trace: built-in: git cherry-pick 3783bbba1918f2dfd1d65f54bce90d16ed901b85\nerror: could not apply 3783bbb... [IMP] website_sale_ux: the name of the "pay now" button is changed\nhint: after resolving the conflicts, mark the corrected paths\nhint: with \'git add <paths>\' or \'git rm <paths>\'\nhint: and commit the result with \'git commit\'\n----------\nstatus:\n', ['3783bbba1918f2dfd1d65f54bce90d16ed901b85']) ('3783bbba1918f2dfd1d65f54bce90d16ed901b85', 'Auto-merging website_sale_ux/__manifest__.py\nCONFLICT (content): Merge conflict in website_sale_ux/__manifest__.py\n', '15:08:31.418413 git.c:444 trace: built-in: git cherry-pick 3783bbba1918f2dfd1d65f54bce90d16ed901b85\nerror: could not apply 3783bbb... [IMP] website_sale_ux: the name of the "pay now" button is changed\nhint: after resolving the conflicts, mark the corrected paths\nhint: with \'git add <paths>\' or \'git rm <paths>\'\nhint: and commit the result with \'git commit\'\n----------\nstatus:\n', ['3783bbba1918f2dfd1d65f54bce90d16ed901b85']))

[FW][IMP] website_sale_ux: the name of the "pay now" button is changed

Forward-Port-Of: ingadhoc/website#274