Now you can either generate Invoice from Sales Order or from Shipment.
Open the shipment, click Invoice button, choose one option from the drop-down list to generate the invoice.