ajout stocks et type
Merge branch 'matdev' into dev