Merge branch 'master' into 'develop'

Master(efernandez) See merge request !103

Merge branch 'master' into 'develop'
Master(efernandez) See merge request !103
Eric Fernandez
2 parents de6c18d28d 1d9e95132e
Showing 1 changed file Show diff stats
src/js/controller.js
@@ -461,13 +461,14 @@ angular.module(&#39;focaCrearNotaPedido&#39;).controller(&#39;notaPedidoCtrl&#39;,
  
             $scope.seleccionarCliente = function () {
                 if (validarNotaRemitada()) {
+
                     var modalInstance = $uibModal.open(
                         {
                             ariaLabelledBy: 'Busqueda de Cliente',
                             templateUrl: 'foca-busqueda-cliente-modal.html',
                             controller: 'focaBusquedaClienteModalController',
                             resolve: {
-                                vendedor: function () { return null; },
+                                vendedor: function () { return { id: $scope.idVendedor} },
                                 cobrador: function () { return null; }
                             },
                             size: 'lg'
...	...	@@ -461,13 +461,14 @@ angular.module('focaCrearNotaPedido').controller('notaPedidoCtrl',
461	461
462	462	$scope.seleccionarCliente = function () {
463	463	if (validarNotaRemitada()) {
	464	+
464	465	var modalInstance = $uibModal.open(
465	466	{
466	467	ariaLabelledBy: 'Busqueda de Cliente',
467	468	templateUrl: 'foca-busqueda-cliente-modal.html',
468	469	controller: 'focaBusquedaClienteModalController',
469	470	resolve: {
470		- vendedor: function () { return null; },
	471	+ vendedor: function () { return { id: $scope.idVendedor} },
471	472	cobrador: function () { return null; }
472	473	},
473	474	size: 'lg'