Almacenes/skuswithstock
merge conflicts
Merge branch 'master' of https://github.com/baicunko/TallerIntegracion3
Merge branch 'master' of https://github.com/baicunko/TallerIntegracion3