diff --git a/index.html b/index.html
index eb4dd2d..fe87cf8 100644
--- a/index.html
+++ b/index.html
@@ -14,6 +14,8 @@
         <script src="node_modules/angular-route/angular-route.min.js"></script>
         <script src="node_modules/ui-bootstrap4/dist/ui-bootstrap-tpls.js"></script>
         <script src="node_modules/foca-modal/dist/foca-modal.min.js"></script>
+        <script src="node_modules/foca-directivas/dist/foca-directivas.min.js"></script>
+
         
         <!-- BUILD -->
         <script src="src/js/app.js"></script>
diff --git a/package.json b/package.json
index 53e4ec1..e9584b6 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,7 @@
         "angular": "^1.7.5",
         "angular-route": "^1.7.5",
         "bootstrap": "^4.1.3",
+        "foca-directivas": "git+http://git.focasoftware.com/npm/foca-directivas.git",
         "foca-modal": "git+http://git.focasoftware.com/npm/foca-modal.git",
         "font-awesome": "^4.7.0",
         "gulp": "^3.9.1",
diff --git a/src/js/controller.js b/src/js/controller.js
index c8236de..d9380b9 100644
--- a/src/js/controller.js
+++ b/src/js/controller.js
@@ -1,18 +1,15 @@
 angular.module('focaAbmChofer')
     .controller('focaAbmChoferesController', [
-        '$scope', 'focaAbmChoferService', '$location',
+        '$scope', 'focaAbmChoferService', '$location', '$uibModal',
         'focaModalService', 'focaBotoneraLateralService', '$timeout',
-        function($scope, focaAbmChoferService, $location, focaModalService,
+        function($scope, focaAbmChoferService, $location, $uibModal, focaModalService,
             focaBotoneraLateralService, $timeout) {
 
+            $scope.now = new Date();
             $scope.filters = '';
             $scope.choferes = [];
-            $scope.choferesFiltrados = [];
-
-            focaAbmChoferService.getChoferes().then(function(datos) {
-                $scope.choferes = datos.data;
-                $scope.choferesFiltrados = $scope.choferes;
-            });
+            $scope.botonera = ['Transportista'];
+            $scope.focused = 1;
 
             //SETEO BOTONERA LATERAL
             $timeout(function() {
@@ -22,8 +19,12 @@ angular.module('focaAbmChofer')
                 focaBotoneraLateralService.showGuardar(false);
             });
 
+            if(focaAbmChoferService.transportistaSeleccionado.COD) {
+                elegirTransportista(focaAbmChoferService.transportistaSeleccionado);
+            }
+
             $scope.editar = function(id) {
-                $location.path('/chofer/' + id);
+                $location.path('/chofer/' + id + '/' + $scope.idTransportista);
             };
 
             $scope.solicitarConfirmacion = function(chofer) {
@@ -35,8 +36,46 @@ angular.module('focaAbmChofer')
                         }
                     });
             };
-            
 
+            $scope.seleccionarTransportista = function() {
+                var modalInstance = $uibModal.open(
+                    {
+                        ariaLabelledBy: 'Busqueda de Transportista',
+                        templateUrl: 'modal-proveedor.html',
+                        controller: 'focaModalProveedorCtrl',
+                        size: 'lg',
+                        resolve: {
+                            transportista: function() {
+                                return true;
+                            }
+                        }
+                    }
+                );
+                modalInstance.result.then(
+                    function(transportista) {
+                        elegirTransportista(transportista);
+                        focaAbmChoferService.transportistaSeleccionado = transportista;
+                    }, function() {}
+                );
+            };
+
+            function elegirTransportista(transportista) {
+                buscar(transportista.COD);
+                var codigo = ('00000' + transportista.COD).slice(-5);
+                $scope.idTransportista = transportista.COD;
+                $timeout(function() {
+                    $scope.$broadcast('addCabecera', {
+                        label: 'Transportista:',
+                        valor: codigo + ' - ' + transportista.NOM
+                    });
+                });
+            }
+
+            function buscar(id) {
+                focaAbmChoferService.getChoferPorTransportista(id).then(function(res) {
+                    $scope.choferes = res.data;
+                });
+            }
         }
     ])
     .controller('focaAbmChoferController', [
@@ -44,9 +83,13 @@ angular.module('focaAbmChofer')
         '$location', 'focaBotoneraLateralService', '$timeout',
         function($scope, focaAbmChoferService, $routeParams,
             $location, focaBotoneraLateralService, $timeout) {
-
+            $scope.nuevo = $routeParams.id === '0';
             $scope.chofer = {};
             $scope.transportistas = [];
+            $scope.now = new Date();
+            $scope.next = function(key) {
+                if (key === 13) $scope.focused++;
+            };
 
             //SETEO BOTONERA LATERAL
             $timeout(function() {
@@ -56,8 +99,29 @@ angular.module('focaAbmChofer')
                 focaBotoneraLateralService.showGuardar(true, $scope.guardar);
             });
 
+            if($scope.nuevo) {
+                focaAbmChoferService
+                    .getTransportistaPorId($routeParams.idTransportista)
+                    .then(function(res) {
+                        var codigo = ('00000' + res.data.COD).slice(-5);
+                        $scope.chofer.idTransportista = res.data.COD;
+                        $scope.chofer.transportista = res.data;
+                        $scope.$broadcast('addCabecera', {
+                            label: 'Transportista:',
+                            valor: codigo + ' - ' + res.data.NOM
+                        });
+                    });
+            }
+
             focaAbmChoferService.getChofer($routeParams.id).then(function(res) {
-                if(res.data) $scope.chofer = res.data;
+                if(res.data) {
+                    var codigo = ('00000' + res.data.transportista.COD).slice(-5);
+                    $scope.chofer = res.data;
+                    $scope.$broadcast('addCabecera', {
+                        label: 'Transportista:',
+                        valor: codigo + ' - ' + res.data.transportista.NOM
+                    });
+                }
             });
 
             focaAbmChoferService.getTransportistas().then(function(res) {
@@ -69,12 +133,11 @@ angular.module('focaAbmChofer')
             };
 
             $scope.guardar = function() {
-                $scope.chofer.idTransportista = $scope.chofer.transportista.COD;
+                $scope.chofer.idTransportista = $routeParams.idTransportista;
                 delete $scope.chofer.transportista;
                 focaAbmChoferService.guardarChofer($scope.chofer).then(function() {
                     $location.path('/chofer');
                 });
             };
-
         }
     ]);
diff --git a/src/js/route.js b/src/js/route.js
index 244143a..526f243 100644
--- a/src/js/route.js
+++ b/src/js/route.js
@@ -11,7 +11,7 @@ angular.module('focaAbmChofer')
     .config([
         '$routeProvider',
         function($routeProvider) {
-            $routeProvider.when('/chofer/:id', {
+            $routeProvider.when('/chofer/:id/:idTransportista', {
                 controller: 'focaAbmChoferController',
                 templateUrl: 'src/views/foca-abm-choferes-item.html'
             });
diff --git a/src/js/service.js b/src/js/service.js
index 655c3d1..0affb73 100644
--- a/src/js/service.js
+++ b/src/js/service.js
@@ -7,14 +7,21 @@ angular.module('focaAbmChofer')
             getChofer: function(id) {
                 return $http.get(API_ENDPOINT.URL + '/chofer/' + id);
             },
+            getChoferPorTransportista: function(id) {
+                return $http.get(API_ENDPOINT.URL + '/chofer/transportista/' + id);
+            },
             guardarChofer: function(chofer) {
                 return $http.post(API_ENDPOINT.URL + '/chofer', {chofer: chofer});
             },
             getTransportistas: function() {
                 return $http.get(API_ENDPOINT.URL + '/transportista');
             },
+            getTransportistaPorId: function(id) {
+                return $http.get(API_ENDPOINT.URL + '/transportista/' + id);
+            },
             deleteChofer: function(id) {
                 return $http.delete(API_ENDPOINT.URL + '/chofer/' + id);
-            }
+            },
+            transportistaSeleccionado: {}
         };
     }]);
diff --git a/src/views/foca-abm-choferes-item.html b/src/views/foca-abm-choferes-item.html
index 779489b..5dd7f03 100644
--- a/src/views/foca-abm-choferes-item.html
+++ b/src/views/foca-abm-choferes-item.html
@@ -1,49 +1,69 @@
-<h4 class="pt-4">Chofer</h4>
-<form name="formChofer">
-    <input type="hidden" name="id" ng-model="chofer.id" />
-    <div class="form-group row">
-        <label class="offset-sm-1 col-sm-2 col-form-label">Transportista</label>
-        <div class="col-sm-4">
-            <select class="form-control" ng-model="chofer.transportista"
-                ng-options="transportista as transportista.NOM for transportista in transportistas"
-            >
-            </select>
-        </div>
-    </div>
-    <div class="form-group row">
-        <label class="offset-sm-1 col-sm-2 col-form-label">Nombre</label>
-        <div class="col-sm-4">
-            <input
-                class="form-control"
-                type="text"
-                teclado-virtual
-                ng-model="chofer.nombre"
-                ng-required="true"
-            />
+<div class="row">
+    <foca-cabecera-facturador 
+    titulo="'Chofer'"
+    fecha="now"
+    class="mb-0 col-lg-12"
+    ></foca-cabecera-facturador>
+</div>
+<div class="row">
+    <form name="formChofer" class="col-md-12">
+        <input type="hidden" name="id" ng-model="chofer.id" />
+        <div class="form-group row">
+            <label class="offset-sm-1 col-sm-2 col-form-label">Transportista</label>
+            <div class="col-sm-4">
+                <input
+                    class="form-control"
+                    type="text"
+                    teclado-virtual
+                    ng-model="chofer.transportista.NOM"
+                    readonly
+                />
+            </div>
         </div>
-    </div>
-    <div class="form-group row">
-            <label class="offset-sm-1 col-sm-2 col-form-label">DNI</label>
+        <div class="form-group row">
+            <label class="offset-sm-1 col-sm-2 col-form-label">Nombre</label>
             <div class="col-sm-4">
                 <input
                     class="form-control"
                     type="text"
                     teclado-virtual
-                    ng-model="chofer.dni"
+                    ng-model="chofer.nombre"
                     ng-required="true"
+                    ng-keypress="next($event.keyCode)"
+                    foca-focus="focused == 1"
+                    ng-focus="focused = 1"
                 />
             </div>
         </div>
-    <div class="form-group row">
-        <label class="offset-sm-1 col-sm-2 col-form-label">Teléfono</label>
-        <div class="col-sm-4">
-            <input
-                class="form-control"
-                type="text"
-                teclado-virtual
-                ng-model="chofer.telefono"
-                ng-required="true"
-            />
+        <div class="form-group row">
+                <label class="offset-sm-1 col-sm-2 col-form-label">DNI</label>
+                <div class="col-sm-4">
+                    <input
+                        class="form-control"
+                        type="number"
+                        teclado-virtual
+                        ng-model="chofer.dni"
+                        ng-required="true"
+                        ng-keypress="next($event.keyCode)"
+                        foca-focus="focused == 2"
+                        ng-focus="focused = 2"
+                    />
+                </div>
+            </div>
+        <div class="form-group row">
+            <label class="offset-sm-1 col-sm-2 col-form-label">Teléfono</label>
+            <div class="col-sm-4">
+                <input
+                    class="form-control"
+                    type="text"
+                    teclado-virtual
+                    ng-model="chofer.telefono"
+                    ng-required="true"
+                    ng-keypress="next($event.keyCode)"
+                    foca-focus="focused == 3"
+                    ng-focus="focused = 3"
+                />
+            </div>
         </div>
-    </div>
-</form>
+    </form>
+</div>
diff --git a/src/views/foca-abm-choferes-listado.html b/src/views/foca-abm-choferes-listado.html
index 6179c83..9a2e5b7 100644
--- a/src/views/foca-abm-choferes-listado.html
+++ b/src/views/foca-abm-choferes-listado.html
@@ -1,37 +1,30 @@
 <div class="row">
-    <div class="col-12 col-md-10 pt-4 pr-4 pl-4">
-        <h4 class="mb-4">Choferes</h4>
-        <div class="form-group input-group">
-            <input
-                type="text"
-                class="form-control form-control-sm"
-                id="search"
-                placeholder="Búsqueda"
-                ng-model="filters"
-                teclado-virtual
-                ng-keypress="busquedaPress($event.keyCode)"
-            />
-            <div class="input-group-append">
-                <button
-                    ladda="searchLoading"
-                    class="btn btn-outline-secondary"
-                    type="button"
-                    ng-click="busquedaPress(13)"
-                >
-                    <i class="fa fa-search" aria-hidden="true"></i>
-                </button>
+    <foca-cabecera-facturador 
+    titulo="'Choferes'"
+    fecha="now"
+    class="mb-0 col-lg-12"
+    ></foca-cabecera-facturador>
+</div>
+<div class="row">
+    <div class="col-12 col-md-10 p-0 mt-4 border border-white rounded">
+        <div class="row px-5 py-2 botonera-secundaria">
+            <div class="col-12">
+                <foca-botonera-facturador botones="botonera" extra="5" class="row"></foca-botonera-facturador>
             </div>
         </div>
-        <table class="table table-sm table-striped table-dark mb-0">
+        <table class="table table-default table-hover table-sm table-abm table-striped mb-0">
             <thead>
                 <tr>
                     <th>Código</th>
                     <th>Nombre</th>
                     <th>DNI</th>
                     <th>Teléfono</th>
-                    <th>Transportista</th>
                     <th class="text-center">
-                        <button class="btn btn-default boton-accion" ng-click="editar(0)">
+                        <button
+                            ng-disabled="!idTransportista"
+                            title="Agregar"
+                            class="btn btn-outline-debo boton-accion"
+                            ng-click="editar(0)">
                             <i class="fa fa-plus"></i>
                         </button>
                     </th>
@@ -43,16 +36,17 @@
                     <td ng-bind="chofer.nombre"></td>
                     <td ng-bind="chofer.dni"></td>
                     <td ng-bind="chofer.telefono"></td>
-                    <td ng-bind="chofer.transportista.NOM || 'No tiene'"></td>
                     <td class="text-center">
                         <button
-                            class="btn btn-default boton-accion"
+                            class="btn btn-outline-dark boton-accion"
+                            title="Editar"
                             ng-click="editar(chofer.id)"
                         >
                             <i class="fa fa-pencil"></i>
                         </button>
                         <button
-                            class="btn btn-default boton-accion"
+                            class="btn btn-outline-dark boton-accion"
+                            title="Eliminar"
                             ng-click="solicitarConfirmacion(chofer)"
                         >
                             <i class="fa fa-trash"></i>
@@ -61,7 +55,5 @@
                 </tr>
             </body>
         </table>
-       
     </div>
-
 </div>