Modified invoices calculation
Merge branch 'invoices_calc'
Small bugfix to invoices calculation
Merge branch 'invoices_calc'
Merge branch 'invoices_calc_fix'