Merge pull request #5664 from rohitwaghchaure/v7_fixes

[Fixes] Time sheet fixes