Modifications to invoice.py to clean up reports