Issue #23158:fix populating of supply order type and id