Bug 23354: (follow-up) Ensure 'CASH' payment type is present