Fixed the issues on timesheet #12639#