cotizacion1

cotzacion
arreglos

arreglos de la parte de virgilio y mas xD
Merge remote-tracking branch 'origin/Diseño'

Conflicts:
	application/views/catalogosv/js/funtion.php
	application/views/catalogosv/js/script.php
	application/views/cotizacion/crearCotizacion.php
cotizacion m ejorada

cotizacion mejorada xd
Merge branch 'master' of https://github.com/byronpenna/radiostereo
Merge remote-tracking branch 'origin/InertarDatos'