diff --git a/src/js/controller.js b/src/js/controller.js
index 21be31f..4307cc1 100644
--- a/src/js/controller.js
+++ b/src/js/controller.js
@@ -138,6 +138,7 @@ angular.module('focaAbmVendedorCobrador')
             $timeout, $uibModal, $location, focaModalService) {
 
             $scope.now = new Date();
+            $scope.focused = 0;
             $scope.vendedorCobrador = {
                 CodVen: 0,
                 ES_COBRADOR: false,
@@ -151,18 +152,30 @@ angular.module('focaAbmVendedorCobrador')
                     NOMBRE: ''
                 }
             };
+            $scope.options = [
+                {
+                    label: 'Vendedor',
+                    value: null
+                },
+                {
+                    label: 'Cobrador',
+                    value: true
+                }
+            ];
             //SETEO BOTONERA LATERAL
             $timeout(function() {
                 focaBotoneraLateralService.showSalir(false);
                 focaBotoneraLateralService.showPausar(true);
-                focaBotoneraLateralService.showCancelar(true);
+                focaBotoneraLateralService.showCancelar(false);
                 focaBotoneraLateralService.showGuardar(true, $scope.guardar);
+                focaBotoneraLateralService.addCustomButton('Salir', $scope.cancelar);
             });
 
             focaAbmVendedorCobradorService
                 .getVendedorCobradorById($routeParams.id)
                 .then(function(res) {
                     if(res.data){
+                        console.log(res.data);
                         $scope.vendedorCobrador = res.data;
                         delete $scope.vendedorCobrador.FCVEN;
                         delete $scope.vendedorCobrador.FEC;
@@ -236,10 +249,21 @@ angular.module('focaAbmVendedorCobrador')
                     );
                     modalInstance.result.then(function(localidad) {
                         $scope.vendedorCobrador.localidad = localidad;
+                        $timeout(function() {
+                            $scope.focused = 6;
+                        });
                     }, function() {
                         //TODO: función llamada cuando cancela el modal
                     });
                 }
             };
+
+            $scope.cancelar = function() {
+                $location.path('/vendedor-cobrador');
+            };
+
+            $scope.next = function(key) {
+                if(key === 13) $scope.focused++;
+            };
         }
     ]);
diff --git a/src/views/foca-abm-vendedor-cobrador-item.html b/src/views/foca-abm-vendedor-cobrador-item.html
index a31fb5c..897e8ec 100644
--- a/src/views/foca-abm-vendedor-cobrador-item.html
+++ b/src/views/foca-abm-vendedor-cobrador-item.html
@@ -9,17 +9,18 @@
     <div class="col-12 col-md-10 p-0 mt-4 border border-white rounded">
         <form name="formVendedorCobrador" class="px-3" autocomplete="off">
             <div class="row mt-3">
-                    <div class="form-group d-flex mb-2 col-md-6">
-                        <label class="col-form-label col-md-4">Código</label>
-                        <div class="input-group col-md-8 pl-0">
-                            <input
-                                class="form-control form-control-sm"
-                                type="text"
-                                ng-value="vendedorCobrador.CodVen | rellenarDigitos: 4: 0"
-                                readonly
-                            />
-                        </div>
+                <div class="form-group d-flex mb-2 col-md-6">
+                    <label class="col-form-label col-md-4">Tipo</label>
+                    <div class="col-md-8 pl-0">
+                        <select 
+                            class="form-control form-control-sm"
+                            ng-model="vendedorCobrador.ES_COBRADOR"
+                            ng-options="option.value as option.label for option in options"
+                            foca-focus="focused == 0"
+                            ng-focus="focused = 0">
+                        </select>
                     </div>
+                </div>
                 <div class="form-group d-flex mb-2 col-md-6">
                     <label class="col-form-label col-md-4">Nombre</label>
                     <div class="input-group col-md-8 pl-0">
@@ -28,9 +29,11 @@
                             type="text"
                             teclado-virtual
                             ng-model="vendedorCobrador.NomVen"
-                            ng-focus="focused = 3"
+                            foca-focus="focused == 1"
+                            ng-focus="focused = 1"
                             ng-keypress="next($event.keyCode)"
                             autocomplete="off"
+                            uppercase-only
                         />
                     </div>
                 </div>
@@ -43,9 +46,11 @@
                             teclado-virtual
                             ng-model="vendedorCobrador.DomVen"
                             ng-required="true"
-                            ng-focus="focused = 1"
+                            foca-focus="focused == 2"
+                            ng-focus="focused = 2"
                             ng-keypress="next($event.keyCode)"
                             autocomplete="off"
+                            uppercase-only
                         />
                     </div>
                 </div>
@@ -54,13 +59,15 @@
                     <div class="input-group col-md-8 pl-0">
                         <input
                             class="form-control form-control-sm"
-                            type="text"
+                            type="number"
                             teclado-virtual
                             ng-model="vendedorCobrador.CPoVen"
                             ng-required="true"
-                            ng-focus="focused = 1"
+                            foca-focus="focused == 3"
+                            ng-focus="focused = 3"
                             ng-keypress="next($event.keyCode)"
                             autocomplete="off"
+                            string-to-number
                         />
                     </div>
                 </div>
@@ -73,8 +80,8 @@
                             ng-model="vendedorCobrador.provincia.NOMBRE"
                             ng-keypress="seleccionarProvincia($event.keyCode)"
                             ng-required="true"
-                            ng-focus="focus(8)"
-                            foca-focus="focused == 8"
+                            foca-focus="focused == 4"
+                            ng-focus="focused = 4"
                             teclado-virtual
                         />
                         <div class="input-group-append">
@@ -98,8 +105,8 @@
                             ng-model="vendedorCobrador.localidad.NOMBRE"
                             ng-keypress="seleccionarLocalidad($event.keyCode)"
                             ng-required="true"
-                            ng-focus="focus(8)"
-                            foca-focus="focused == 8"
+                            foca-focus="focused == 5"
+                            ng-focus="focused = 5"
                             teclado-virtual
                             autocomplete="off"
                         />
@@ -120,13 +127,15 @@
                     <div class="input-group col-md-8 pl-0">
                         <input
                             class="form-control form-control-sm"
-                            type="text"
+                            type="number"
                             teclado-virtual
                             ng-model="vendedorCobrador.TelVen"
                             ng-required="true"
-                            ng-focus="focused = 1"
+                            foca-focus="focused == 6"
+                            ng-focus="focused = 6"
                             ng-keypress="next($event.keyCode)"
                             autocomplete="off"
+                            string-to-number
                         />
                     </div>
                 </div>
@@ -135,13 +144,15 @@
                     <div class="input-group col-md-8 pl-0">
                         <input
                             class="form-control form-control-sm"
-                            type="text"
+                            type="number"
                             teclado-virtual
                             ng-model="vendedorCobrador.DNI"
                             ng-required="true"
-                            ng-focus="focused = 1"
+                            foca-focus="focused == 7"
+                            ng-focus="focused = 7"
                             ng-keypress="next($event.keyCode)"
                             autocomplete="off"
+                            string-to-number
                         />
                     </div>
                 </div>
@@ -154,7 +165,8 @@
                             teclado-virtual
                             ng-model="vendedorCobrador.ClaVen"
                             ng-required="true"
-                            ng-focus="focused = 4"
+                            foca-focus="focused == 8"
+                            ng-focus="focused = 8"
                             ng-keypress="next($event.keyCode)"
                             autocomplete="off"
                         />
@@ -169,7 +181,8 @@
                             teclado-virtual
                             ng-model="vendedorCobrador.ClaVen2"
                             ng-required="true"
-                            ng-focus="focused = 2"
+                            foca-focus="focused == 9"
+                            ng-focus="focused = 9"
                             ng-keypress="next($event.keyCode)"
                             autocomplete="off"
                         />
@@ -180,28 +193,18 @@
                     <div class="input-group col-md-8 pl-0">
                         <input
                             class="form-control form-control-sm"
-                            type="text"
+                            type="number"
                             teclado-virtual
                             ng-model="vendedorCobrador.ComVen"
                             ng-required="true"
-                            ng-focus="focused = 2"
+                            foca-focus="focused == 10"
+                            ng-focus="focused = 10"
                             ng-keypress="next($event.keyCode)"
                             autocomplete="off"
+                            string-to-number
                         />
                     </div>
                 </div>
-                <div class="form-group d-flex mb-2 col-md-6">
-                    <div class="custom-control custom-checkbox ml-auto">
-                        <input 
-                            type="checkbox"
-                            class="custom-control-input"
-                            id="checkCobrador"
-                            ng-model="vendedorCobrador.ES_COBRADOR">
-                        <label 
-                            class="custom-control-label"
-                            for="checkCobrador">¿Es cobrador?</label>
-                    </div>
-                </div>
             </div>
         </form>
     </div>