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

[fw-bot-adhoc]

Forward-Port-Of: ingadhoc/website#287

[roboadhoc]

Pull request status dashboard.

[fw-bot-adhoc]

@lef-adhoc @lav-adhoc cherrypicking of pull request ingadhoc/website#287 failed.

stdout:

CONFLICT (add/add): Merge conflict in website_sale_cancel_quotations/i18n/es.po
Auto-merging website_sale_cancel_quotations/i18n/es.po
Auto-merging website_sale_cancel_quotations/__manifest__.py
CONFLICT (content): Merge conflict in website_sale_cancel_quotations/__manifest__.py

stderr:

18:40:01.461793 git.c:444               trace: built-in: git cherry-pick b1305f75f36fe1271118c99432693bbbc6ba65bb
error: could not apply b1305f7... [IMP] website_sale_cancel_quotations: configuration location is changed
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

[lef-adhoc]

@roboadhoc r+