Merge branch 'master' into 'develop'

Master(mpuebla) See merge request !125

Merge branch 'master' into 'develop'
Master(mpuebla) See merge request !125
Eric Fernandez
2 parents 222ec085c8 e5a3090526
Showing 1 changed file Show diff stats
src/js/controller.js
@@ -531,8 +531,13 @@ angular.module(&#39;focaCrearRemito&#39;).controller(&#39;remitoController&#39;,
                         templateUrl: 'foca-busqueda-cliente-modal.html',
                         controller: 'focaBusquedaClienteModalController',
                         resolve: {
-                            vendedor: function () { return null; },
-                            cobrador: function () { return null; }
+                            parametros: function () {
+                                return {
+                                    vendedor: $scope.idVendedor,
+                                    cobrador: null,
+                                    searchText: $scope.cliente ? $scope.cliente.nom : ''
+                                };
+                            },
                         },
                         size: 'lg'
                     }
...	...	@@ -531,8 +531,13 @@ angular.module('focaCrearRemito').controller('remitoController',
531	531	templateUrl: 'foca-busqueda-cliente-modal.html',
532	532	controller: 'focaBusquedaClienteModalController',
533	533	resolve: {
534		- vendedor: function () { return null; },
535		- cobrador: function () { return null; }
	534	+ parametros: function () {
	535	+ return {
	536	+ vendedor: $scope.idVendedor,
	537	+ cobrador: null,
	538	+ searchText: $scope.cliente ? $scope.cliente.nom : ''
	539	+ };
	540	+ },
536	541	},
537	542	size: 'lg'
538	543	}