Hello @dsimmerly , as stated in the title : “How to make sure that all shipments are invoiced separately on the Process Shipments form” - on the SO503000 you’ll create separate invoices for the shipments selected. On SO302000 you can invoice the only shipment you opened on the screen. On SO301000 you can invoice the order you opened on the screen, but due to on Prepare Invoice action the invoice created will be opened on the screen - you’ll be able to control it and remove some shipments if you want and invoice these separately. Do you still use 20.1 or 20.2? If yes - then It’s time to upgrade!