Merge branch 'master' into 'develop'

Master See merge request !41

Merge branch 'master' into 'develop'
Master See merge request !41
Eric Fernandez
2 parents 8523e93e7c 0656860a32
Showing 1 changed file Show diff stats
src/js/controller.js
@@ -496,7 +496,8 @@ angular.module(&#39;focaCrearRemito&#39;) .controller(&#39;remitoController&#39;,
                                 templateUrl: 'foca-busqueda-cliente-modal.html',
                                 controller: 'focaBusquedaClienteModalController',
                                 resolve: {
-                                    vendedor: function() { return $scope.remito.vendedor; }
+                                    vendedor: function() { return $scope.remito.vendedor; },
+                                    cobrador: function() { return null; }
                                 },
                                 size: 'lg'
                             }
...	...	@@ -496,7 +496,8 @@ angular.module('focaCrearRemito') .controller('remitoController',
496	496	templateUrl: 'foca-busqueda-cliente-modal.html',
497	497	controller: 'focaBusquedaClienteModalController',
498	498	resolve: {
499		- vendedor: function() { return $scope.remito.vendedor; }
	499	+ vendedor: function() { return $scope.remito.vendedor; },
	500	+ cobrador: function() { return null; }
500	501	},
501	502	size: 'lg'
502	503	}