Invoice generation #31