[IMP] Improve lock management
Merge branch 'test' of https://github.com/Smile-SA/odoo_addons into test