SELECT DISTINCT TO_CHAR(SH.SHIPPED_DATE , 'DD-MON-RRRR') SHIPPED_DATE , SH.SHIPMENT_HEADER_ID , SH.SHIPMENT_NUM , TO_CHAR(SH.EXPECTED_RECEIPT_DATE , 'DD-MON-RRRR') EXPECTED_RECEIPT_DATE , SL.FROM_ORGANIZATION_ID , OOD.ORGANIZATION_NAME , SL.TO_ORGANIZATION_ID , 'ORGANIZATION' TYPE FROM RCV_SHIPMENT_HEADERS SH , RCV_SHIPMENT_LINES SL , ORG_ORGANIZATION_DEFINITIONS OOD , MTL_SUPPLY MS WHERE SH.SHIPMENT_NUM IS NOT NULL AND SH.RECEIPT_SOURCE_CODE IN ('INVENTORY' , 'INTERNAL ORDER') AND SH.SHIPMENT_HEADER_ID + 0 = SL.SHIPMENT_HEADER_ID AND SL.FROM_ORGANIZATION_ID = OOD.ORGANIZATION_ID(+) AND MS.TO_ORGANIZATION_ID = SL.TO_ORGANIZATION_ID AND MS.SHIPMENT_HEADER_ID = SH.SHIPMENT_HEADER_ID AND MS.SUPPLY_TYPE_CODE = 'SHIPMENT' AND SH.SHIPMENT_NUM IS NOT NULL AND SH.SHIPPED_DATE IS NOT NULL UNION ALL SELECT DISTINCT TO_CHAR(SH.SHIPPED_DATE , 'DD-MON-YYYY') SHIPPED_DATE , SH.SHIPMENT_HEADER_ID , SH.SHIPMENT_NUM , TO_CHAR(SH.EXPECTED_RECEIPT_DATE , 'DD-MON-RRRR') EXPECTED_RECEIPT_DATE , SH.VENDOR_ID FROM_ORGANIZATION_ID , POV.VENDOR_NAME ORGANIZATION_NAME , TO_NUMBER(NULL) , 'VENDOR' TYPE FROM RCV_SHIPMENT_HEADERS SH , RCV_SHIPMENT_LINES SL , PO_VENDORS POV WHERE SH.SHIPMENT_NUM IS NOT NULL AND SH.RECEIPT_SOURCE_CODE = 'VENDOR' AND SL.SHIPMENT_LINE_STATUS_CODE <> 'CANCELLED' AND SH.SHIPMENT_HEADER_ID = SL.SHIPMENT_HEADER_ID AND SH.VENDOR_ID = POV.VENDOR_ID (+) AND SH.SHIPPED_DATE IS NOT NULL