ingadhoc/website#377

Created by fw-bot-adhoc

label

adhoc-dev:18.0-16.0-t-48361-cem-3eGx-fw

head

0ef4d2a6b9374ce194bc9a973c9120df7ffdfe12

target

18.0

merged

hace 2 semanas by Juan Ignacio Rivero

forward-port of

ingadhoc/website#374 DETACHED (conflicts: ('dde74803fd8a06642928a71489273ab05c2a7e9a', 'Auto-merging website_sale_advanced_tracking/views/templates.xml\nAuto-merging website_sale_advanced_tracking/__manifest__.py\nCONFLICT (content): Merge conflict in website_sale_advanced_tracking/__manifest__.py\nAuto-merging google_tag_manager_advanced_tracking/static/src/js/website_sale_tracking.js\n', "16:21:09.757197 git.c:444 trace: built-in: git cherry-pick dde74803fd8a06642928a71489273ab05c2a7e9a\nerror: could not apply dde7480... [BF]website_sale_advanced_tracking:fix purchase event\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", ['dde74803fd8a06642928a71489273ab05c2a7e9a']) ('dde74803fd8a06642928a71489273ab05c2a7e9a', 'Auto-merging website_sale_advanced_tracking/views/templates.xml\nAuto-merging website_sale_advanced_tracking/__manifest__.py\nCONFLICT (content): Merge conflict in website_sale_advanced_tracking/__manifest__.py\nAuto-merging google_tag_manager_advanced_tracking/static/src/js/website_sale_tracking.js\n', "16:21:09.757197 git.c:444 trace: built-in: git cherry-pick dde74803fd8a06642928a71489273ab05c2a7e9a\nerror: could not apply dde7480... [BF]website_sale_advanced_tracking:fix purchase event\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", ['dde74803fd8a06642928a71489273ab05c2a7e9a']))

[FW][BF]website_sale_advanced_tracking:fix purchase event

Forward-Port-Of: ingadhoc/website#375
Forward-Port-Of: ingadhoc/website#374