[MERGE] forward port of branch 8.0 up to aabbdc73

addons/delivery/sale.py

addons/event/email_template.xml

addons/hw_escpos/controllers/main.py

addons/hw_escpos/escpos/exceptions.py

addons/hw_escpos/escpos/printer.py

addons/hw_proxy/controllers/main.py

addons/l10n_sa/__openerp__.py

addons/mail/security/ir.model.access.csv

addons/membership/membership.py

addons/payment/models/payment_acquirer.py

addons/payment_ogone/models/ogone.py

addons/stock_account/wizard/stock_valuation_history.py

addons/web/controllers/main.py

addons/web/static/test/fulltest.html

addons/website/controllers/main.py

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

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

addons/website_membership/controllers/main.py

addons/website_sale/controllers/main.py

doc/_extensions/odoo/__init__.py