Deleting code in Invoice and Shipment, reinstating a method lost in earlier refactor