Added subtotal and vat to invoice panel totals