[MERGE]:lp:~openerp-dev/openobject-addons/trunk-fix-topbar1-tpa