Merge branches 'David' and 'Edgar' of https://github.com/Edgarciarod/InventarioMarcosYCuadors
Ya casi está 2.2
Merge branches 'David' and 'Edgar'
Merge branches 'David' and 'Edgar' of https://github.com/Edgarciarod/InventarioMarcosYCuadors into Edgar
Finalizado reporte de costeo