Improve `odoo scaffold` and fix `odoo deploy`