Merge pull request #5826 from rohitwaghchaure/v7_pos_issue

[Fix]POS and timesheet issues