This should have been a fixup of 37eb0dfbb54db1c062276cd8c172bf8dac9e557b but we needed to freeze 🤷♂️ closes odoo/odoo#77344 closes odoo/odoo#77876 Related: odoo/enterprise#21425 Related: odoo/enterprise#21467 Signed-off-by: Quentin De Paoli (qdp) <qdp@openerp.com> Signed-off-by: William André (wan) <wan@odoo.com>