Shock fitting in conical supersonic full potential flows with entropy effects