[MERGE] + improve hr_timesheet