[MERGE] forward port of branch saas-3 up to 81a902a

diff --cc addons/account/account_invoice.py
Simple merge

diff --cc addons/account/report/account_invoice_report_view.xml
Simple merge

diff --cc addons/analytic/analytic.py
Simple merge

diff --cc addons/calendar/calendar.py
Simple merge

diff --cc addons/email_template/email_template.py
Simple merge

diff --cc addons/mail/mail_followers.py
Simple merge

diff --cc addons/point_of_sale/point_of_sale_view.xml
Simple merge

diff --cc addons/point_of_sale/static/src/xml/pos.xml
Simple merge

diff --cc addons/web_kanban/static/src/js/kanban.js
Simple merge

diff --cc addons/website_quote/models/order.py
Simple merge

diff --cc addons/website_sale/models/website.py
Simple merge

diff --cc openerp/tools/yaml_import.py
Simple merge