Merge pull request #7770 from rohitwaghchaure/minor_issue_develop

[Fix] Payment entry fields issue, added total billed hours in timesheet