[MERGE] forward port branch saas-12 up to 476cb5a0

addons/account/data/invoice_action_data.xml

addons/account/models/account_bank_statement.py

addons/account/models/account_invoice.py

addons/auth_oauth/controllers/main.py

addons/crm/wizard/base_partner_merge.py

addons/crm/wizard/base_partner_merge_views.xml

addons/l10n_be_intrastat/wizard/xml_decl.py

addons/mrp/models/mrp_bom.py

addons/mrp/models/mrp_production.py

addons/mrp/models/mrp_unbuild.py

addons/mrp/models/procurement.py

addons/mrp/models/stock_move.py

addons/mrp/report/mrp_bom_cost_report.py

addons/mrp/report/mrp_bom_cost_report_templates.xml

addons/mrp/report/mrp_report_views_main.xml

addons/mrp/views/mrp_bom_views.xml

addons/mrp/views/mrp_message_views.xml

addons/mrp/views/mrp_production_views.xml

addons/mrp/views/mrp_unbuild_views.xml

addons/mrp/views/product_views.xml