[MERGE] forward port of branch saas-4 up to 0a1e4a05

addons/account/account_invoice.py

addons/account/edi/invoice_action_data.xml

addons/account/report/account_invoice_report_view.xml

addons/account/wizard/account_fiscalyear_close.py

addons/account_analytic_plans/account_analytic_plans.py

addons/account_anglo_saxon/invoice.py

addons/account_voucher/account_voucher.py

addons/analytic/analytic.py

addons/calendar/calendar.py

addons/calendar/calendar_view.xml

addons/crm/base_partner_merge.py

addons/crm_claim/crm_claim_view.xml

addons/email_template/email_template.py

addons/l10n_be/account_financial_report.xml

addons/mail/mail_followers.py

addons/mail/static/src/xml/mail.xml

addons/payment_paypal/controllers/main.py

addons/point_of_sale/point_of_sale_view.xml

addons/point_of_sale/static/src/xml/pos.xml

addons/portal_claim/__init__.py