fix tasks
fix calendar
Merge branch 'task-992-invoice' into staging
task-992-invoice