Modify stock when buying or returning items
Merge branch 'master' into Thomas
Show expected date