Upcoming invoice fix
Merge branch 'hotfix/upcoming_invoice'