Upadate my Code with latest code from Odoo Master