[MERGE] forward port branch 12.0 up to 4870251f

addons/delivery/models/stock_picking.py

addons/delivery/wizard/choose_delivery_package.py

addons/google_calendar/models/google_calendar.py

addons/google_spreadsheet/models/google_drive.py

addons/mail/models/mail_mail.py

addons/mail/static/src/js/composers/basic_composer.js

addons/mrp/models/mrp_workorder.py

addons/payment/views/payment_templates.xml

addons/project/views/project_portal_templates.xml

addons/sale/models/sale.py

addons/snailmail/models/ir_actions_report.py

addons/stock/data/stock_data.xml

addons/stock/models/stock_quant.py

addons/uom/models/uom_uom.py

addons/uom/tests/test_uom.py

addons/web/static/src/scss/layout_boxed.scss

addons/website/models/website.py

addons/website_sale/static/src/js/website_sale_options.js

addons/website_sale_wishlist/models/product_wishlist.py

odoo/addons/test_new_api/__manifest__.py