Stock Status and other fixing
Merge branch 'dev' into EtatStock
Stock Status and others fixing
Fixing conflit
Fixing
Merge pull request #126 from lomamech/EtatStock

Etat stock
Merging with Dev