diff --git a/gulpfile.js b/gulpfile.js
index 42f174a..7a9fbde 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -40,7 +40,7 @@ gulp.task('uglify', ['templates'], function() {
             ]),
             concat('foca-modal-domicilios.js'),
             replace('src/views/', ''),
-            replace("['ui.bootstrap', 'focaDirectivas']", '[]'),
+            replace("['ui.bootstrap', 'focaDirectivas', 'focaModal']", '[]'),
             gulp.dest(paths.tmp),
             rename('foca-modal-domicilios.min.js'),
             uglify(),
diff --git a/package.json b/package.json
index a07d7ea..9ff2f19 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://debo.suite.repo/modulos-npm/foca-modal-domicilio.git"
+    "url": "http://git.focasoftware.com/npm/foca-modal-domicilio.git"
   },
   "author": "Foca Software",
   "license": "ISC",
diff --git a/src/js/controller.js b/src/js/controller.js
index 45abd39..1d157b6 100644
--- a/src/js/controller.js
+++ b/src/js/controller.js
@@ -35,6 +35,7 @@ angular.module('focaModalDomicilio')
                 $scope.filteredDomicilios = [];
                 $scope.currentPageDomicilios = [];
                 $scope.selectedDomicilio = -1;
+                $scope.focused = 1;
                 var puntosDescarga = [];
                 
                 //METODOS
@@ -141,6 +142,18 @@ angular.module('focaModalDomicilio')
                             dato: $scope.domicilio.provincia
                         });
                     }
+                    if($scope.domicilio.latitud) {
+                        $scope.domicilio.valores.push({
+                            ID_ADAC_1: 23,
+                            dato: $scope.domicilio.latitud
+                        });
+                    }
+                    if($scope.domicilio.longitud) {
+                        $scope.domicilio.valores.push({
+                            ID_ADAC_1: 24,
+                            dato: $scope.domicilio.longitud
+                        });
+                    }
                     //domicilios de entrega corresponden al 1
                     focaModalDomicilioService
                         .obtenerUltimoPorNivelPadre(1)
@@ -182,6 +195,39 @@ angular.module('focaModalDomicilio')
                     });
                 };
 
+                $scope.localizarDomicilio = function(localizar) {
+                    var direccion = null;
+                    if(localizar) {
+                        direccion = {
+                            calle: $scope.domicilio.calle,
+                            numero: $scope.domicilio.numeroCalle,
+                            localidad: $scope.domicilio.localidad,
+                            provincia: $scope.domicilio.provincia
+                        };
+                    }
+                    var modalInstance = $uibModal.open(
+                        {
+                            ariaLabelledBy: 'Buscar domicilio',
+                            templateUrl: 'modal-localizar.html',
+                            controller: 'focaModalLocalizarController',
+                            size: 'lg',
+                            resolve: {
+                                direccion: direccion
+                            }
+                        }
+                    );
+                    modalInstance.result.then(function(res) {
+                        $scope.domicilio.latitud = res.latitud;
+                        $scope.domicilio.longitud = res.longitud;
+                    }, function() {
+                        //TODO: función llamada cuando cancela el modal
+                    });
+                };
+
+                $scope.next = function(key) {
+                    if(key === 13) $scope.focused++;
+                };
+
                 function calcularPages(paginaActual) {
                     var paginas = [];
                     paginas.push(paginaActual);
diff --git a/src/views/modal-domicilio.html b/src/views/modal-domicilio.html
index 801e2a7..08a3151 100644
--- a/src/views/modal-domicilio.html
+++ b/src/views/modal-domicilio.html
@@ -115,6 +115,14 @@
         </table>
     </div>
     <form name="formDomicilio" ng-show="ingreso">
+        <input 
+            type="hidden" 
+            ng-model="domicilio.latitud"
+            ng-required="true">
+        <input 
+            type="hidden" 
+            ng-model="domicilio.longitud"
+            ng-required="true">
         <div class="row">
             <div class="col-4">
                 <label>Tipo</label>
@@ -134,6 +142,9 @@
                     ng-model="domicilio.titulo"
                     placeholder="Ingrese título"
                     ng-required="true"
+                    ng-keypress="next($event.keyCode)"
+                    ng-focus="focused = 1"
+                    foca-focus="focused == 1"
                     teclado-virtual
                 />
             </div>
@@ -145,6 +156,10 @@
                     ng-model="domicilio.calle"
                     placeholder="Ingrese calle"
                     ng-required="true"
+                    ng-keypress="next($event.keyCode)"
+                    ng-focus="focused = 2"
+                    foca-focus="focused == 2"
+                    teclado-virtual
                 />
             </div>
             <div class="col-3">
@@ -155,6 +170,9 @@
                     ng-model="domicilio.numeroCalle"
                     placeholder="Ingrese Numero"
                     ng-required="true"
+                    ng-keypress="next($event.keyCode)"
+                    ng-focus="focused = 3"
+                    foca-focus="focused == 3"
                     teclado-virtual
                 />
             </div>
@@ -166,6 +184,9 @@
                     ng-model="domicilio.localidad"
                     placeholder="Ingrese localidad"
                     ng-required="true"
+                    ng-keypress="next($event.keyCode)"
+                    ng-focus="focused = 4"
+                    foca-focus="focused == 4"
                     teclado-virtual
                 />
             </div>
@@ -177,9 +198,26 @@
                     ng-model="domicilio.provincia"
                     placeholder="Ingrese provincia"
                     ng-required="true"
+                    ng-keypress="next($event.keyCode)"
+                    ng-focus="focused = 5"
+                    foca-focus="focused == 5"
+                    teclado-virtual
                 />
             </div>
         </div>
+        <div class="row mt-3">
+            <div class="col-12">
+                <button 
+                    type="button"
+                    class="btn btn-primary float-right ml-3"
+                    ng-click="localizarDomicilio()">Buscar</button>
+                <button 
+                    type="button"
+                    class="btn btn-primary float-right"
+                    ng-disabled="!domicilio.calle || !domicilio.numeroCalle || !domicilio.localidad || !domicilio.provincia"
+                    ng-click="localizarDomicilio(true)">Localizar</button>
+            </div>
+        </div>
     </form>
 </div>
 <div class="modal-footer">