fix dependencias
Merge branch 'dev' into siim
Merge branch 'siim' of https://github.com/gthinklabs/odoo into siim