zafe / LogiservStudio

🏭 🚛 🎋 Sistema de Gestión para el Transporte de Caña de Azúcar

0 stars 5 forks source link

Merge branch 'master' of https://github.com/zafe/LogiservStudio #23

Closed isamed92 closed 6 years ago

isamed92 commented 6 years ago

Conflicts:

src/application/repository/info/ArticuloRepository.java

src/application/repository/info/CategoriaArticuloReporsitory.java

src/application/repository/info/DetalleCompraRepository.java

src/application/repository/info/FacturaCompraRepository.java

src/application/repository/info/ProveedorRepository.java