merge lp:~openerp-dev/openobject-addons/trunk-clean-search-project-tpa