fix
Merge branch 'ArcNexus' of https://github.com/arcnexus/RedFoX.git into ArcNexus
fix
fix
edición líneas e inventario
acululados
Merge branch 'ArcNexus'

Conflicts:
	Almacen/articulo.cpp