[MERGE] forward port branch 11.0 up to 36d96e01

addons/account/models/account_bank_statement.py

addons/account/models/account_invoice.py

addons/account/static/src/xml/account_payment.xml

addons/account/tests/test_account_customer_invoice.py

addons/l10n_fr/data/account_chart_template_data.xml

addons/mail/models/mail_thread.py

addons/mail/static/src/js/activity.js

addons/mass_mailing/models/__init__.py

addons/mass_mailing/models/mail_template.py

addons/mass_mailing/models/mass_mailing.py

addons/mass_mailing/tests/__init__.py

addons/mass_mailing/tests/test_mass_mailing_shortener.py

addons/mrp/models/mrp_production.py

addons/mrp/models/mrp_unbuild.py

addons/mrp/views/mrp_unbuild_views.xml

addons/point_of_sale/static/src/js/models.js

addons/point_of_sale/static/src/js/screens.js

addons/stock/models/stock_scrap.py

addons/stock/tests/test_move.py

addons/stock/views/stock_picking_views.xml