Coca Cola Enterprises' full range of drinks is returning to French supermarket chain Casino's stores after a pricing spat which has lasted more than two months.