Issue #24194:fully incorporate invoice document type