Odoo bug fixing by Zahid Mehmood