JD Wetherspoon has partially settled its dispute with Heineken following a falling-out over a supply issue in Ireland.