Updated invoice view & generation process