Merge branch 'master' into 'master'

Master See merge request !38

Merge branch 'master' into 'master'
Master See merge request !38
Eric Fernandez
2 parents aa7ebd8636 786f76cb78
Showing 1 changed file Show diff stats
src/js/controller.js
@@ -306,13 +306,15 @@ angular.module(&#39;focaCrearCobranza&#39;) .controller(&#39;cobranzaController&#39;,
             };
  
             $scope.seleccionarCliente = function() {
-
                 var modalInstance = $uibModal.open(
                     {
                         ariaLabelledBy: 'Busqueda de Cliente',
                         templateUrl: 'foca-busqueda-cliente-modal.html',
                         controller: 'focaBusquedaClienteModalController',
-                        size: 'lg'
+                        size: 'lg',
+                        resolve: {
+                            vendedor: function(){ return null; }
+                        }
                     }
                 );
                 modalInstance.result.then(
...	...	@@ -306,13 +306,15 @@ angular.module('focaCrearCobranza') .controller('cobranzaController',
306	306	};
307	307
308	308	$scope.seleccionarCliente = function() {
309		-
310	309	var modalInstance = $uibModal.open(
311	310	{
312	311	ariaLabelledBy: 'Busqueda de Cliente',
313	312	templateUrl: 'foca-busqueda-cliente-modal.html',
314	313	controller: 'focaBusquedaClienteModalController',
315		- size: 'lg'
	314	+ size: 'lg',
	315	+ resolve: {
	316	+ vendedor: function(){ return null; }
	317	+ }
316	318	}
317	319	);
318	320	modalInstance.result.then(