Corrección de errores varias
Corrección de errores varios
Merge remote-tracking branch 'origin/TerminalsUI1.2' into TerminalsUI1.2

Conflicts:
	factory/invoice.js
Merge remote-tracking branch 'origin/TerminalsUI1.2' into TerminalsUI1.2

Conflicts:
	factory/invoice.js