Merge remote-tracking branch 'odoo/14.0' into 14.0

addons/account_edi/models/account_edi_format.py

addons/account_edi_ubl_cii/models/account_edi_common.py

addons/bus/models/bus.py

addons/calendar/models/calendar_event.py

addons/http_routing/models/ir_http.py

addons/l10n_account_edi_ubl_cii_tests/tests/common.py

addons/link_tracker/models/mail_render_mixin.py

addons/pos_mercury/models/pos_mercury_transaction.py

addons/stock/i18n/stock.pot

addons/stock/models/product.py

addons/web/controllers/main.py

addons/website/controllers/main.py

addons/website/i18n/website.pot

addons/website/static/src/js/editor/snippets.editor.js

addons/website/static/src/js/editor/snippets.options.js

addons/website/static/src/snippets/s_google_map/000.js

addons/website/static/src/xml/website.editor.xml

odoo/addons/base/models/ir_actions_report.py

odoo/addons/base/models/qweb.py

odoo/http.py