Change PaymentMethod from String to Enum. Move Payments list from Invoice to GenericInvoice