Better integration with the rest of the code. Task-2831082 closes odoo/odoo#90726 Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>