Changed to handling both pro forma and published invoices