Sync from https://code.launchpad.net/~openerp/openobject-server/7.0