[MERGE]:lp:~openerp-dev/openobject-addons/trunk-hr_timesheet_invoice-topbar-tpa