Remove hard coded stock types
Merge branch 'develop' into KwaMoja-Medical