Fixed bug where invoices weren't applying discounts. Also added net charges field on invoices with discounts to clarify the difference between total charges and total minus discount.