ingadhoc/website#375

Created by fw-bot-adhoc

label

adhoc-dev:17.0-16.0-t-48361-cem-e9OC-fw

head

dde74803fd8a06642928a71489273ab05c2a7e9a

target

17.0

merged

hace 2 semanas by Juan Ignacio Rivero

forward-port of

ingadhoc/website#374 DETACHED (conflicts: ('eaf6c3ee78d264c761f915484dbc909f59b62dba', '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\nCONFLICT (content): Merge conflict in google_tag_manager_advanced_tracking/static/src/js/website_sale_tracking.js\n', "12:12:00.790252 git.c:444 trace: built-in: git cherry-pick eaf6c3ee78d264c761f915484dbc909f59b62dba\nerror: could not apply eaf6c3e... [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", ['eaf6c3ee78d264c761f915484dbc909f59b62dba']) ('eaf6c3ee78d264c761f915484dbc909f59b62dba', '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\nCONFLICT (content): Merge conflict in google_tag_manager_advanced_tracking/static/src/js/website_sale_tracking.js\n', "12:12:00.790252 git.c:444 trace: built-in: git cherry-pick eaf6c3ee78d264c761f915484dbc909f59b62dba\nerror: could not apply eaf6c3e... [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", ['eaf6c3ee78d264c761f915484dbc909f59b62dba']))

[FW][BF]website_sale_advanced_tracking:fix purchase event

Forward-Port-Of: ingadhoc/website#374