ingadhoc/website#318

Created by fw-bot-adhoc

label

adhoc-dev:17.0-16.0-t-36049-lef-Sla2-fw

head

33d1c1d9a33ad7f206a6814354d719aa1fe85823

target

17.0

merged

hace 2 meses by Franco Leyes

forward-port of

ingadhoc/website#287 DETACHED (conflicts: ('b1305f75f36fe1271118c99432693bbbc6ba65bb', 'CONFLICT (add/add): Merge conflict in website_sale_cancel_quotations/i18n/es.po\nAuto-merging website_sale_cancel_quotations/i18n/es.po\nAuto-merging website_sale_cancel_quotations/__manifest__.py\nCONFLICT (content): Merge conflict in website_sale_cancel_quotations/__manifest__.py\n', "18:40:01.461793 git.c:444 trace: built-in: git cherry-pick b1305f75f36fe1271118c99432693bbbc6ba65bb\nerror: could not apply b1305f7... [IMP] website_sale_cancel_quotations: configuration location 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", ['b1305f75f36fe1271118c99432693bbbc6ba65bb']) ('b1305f75f36fe1271118c99432693bbbc6ba65bb', 'CONFLICT (add/add): Merge conflict in website_sale_cancel_quotations/i18n/es.po\nAuto-merging website_sale_cancel_quotations/i18n/es.po\nAuto-merging website_sale_cancel_quotations/__manifest__.py\nCONFLICT (content): Merge conflict in website_sale_cancel_quotations/__manifest__.py\n', "18:40:01.461793 git.c:444 trace: built-in: git cherry-pick b1305f75f36fe1271118c99432693bbbc6ba65bb\nerror: could not apply b1305f7... [IMP] website_sale_cancel_quotations: configuration location 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", ['b1305f75f36fe1271118c99432693bbbc6ba65bb']))

[FW][IMP] website_sale_cancel_quotations: configuration location is changed

Forward-Port-Of: ingadhoc/website#287