cambios factura
Merge branch 'master' of https://github.com/exprezzo/triples

Conflicts:
	portal/temas/default/vistas/facturas/nueva.php
config
Merge branch 'master' of https://github.com/exprezzo/triples

Conflicts:
	core
	portal/config.php
cambios factura