A row between French retailer E.Leclerc and dairy giant Lactalis over prices has ended after almost a year.