Merge pull request #5846 from rohitwaghchaure/timesheet_patch_issue

[Fix] Timesheet patch