Reporte caja3
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/runtime/application.log
.
git
Merge branch 'master' of https://github.com/cesaenzv/tecnet

Conflicts:
	protected/runtime/application.log

	modified:   css/ui.jqgrid.css
	new file:   js/libs/jquery.json-2.4.js
	modified:   js/modules/orderModule.js
	modified:   protected/controllers/ClienteController.php
	modified:   protected/runtime/application.log
	new file:   protected/runtime/application.log.orig
	modified:   protected/views/layouts/main.php
	modified:   protected/views/orden/create.php
	modified:   protected/views/servicio/admin.php
gitIgnore
Pago Servicio
Save equipo

Modificacion dropdownlist
Save equipo fixed
ajustes
Merge branch 'master' of https://github.com/cesaenzv/tecnet

Conflicts:
	protected/runtime/application.log