Merge pull request #7051 from rohitwaghchaure/v7_timesheet_cleanup

cleanup timesheet and fix sales invoice total timesheet billing amount