Merge branch 'master' into 'develop'

Master See merge request !53

Merge branch 'master' into 'develop'
Master See merge request !53
Eric Fernandez
2 parents ee02aca22f 01aedd2808
Showing 1 changed file Show diff stats
src/js/controller.js
@@ -395,7 +395,8 @@ angular.module(&#39;focaCrearNotaPedido&#39;) .controller(&#39;notaPedidoCtrl&#39;,
                                 templateUrl: 'foca-busqueda-cliente-modal.html',
                                 controller: 'focaBusquedaClienteModalController',
                                 resolve: {
-                                    vendedor: function() { return $scope.notaPedido.vendedor; }
+                                    vendedor: function() { return $scope.notaPedido.vendedor; },
+                                    cobrador: function() { return null; }
                                 },
                                 size: 'lg'
                             }
...	...	@@ -395,7 +395,8 @@ angular.module('focaCrearNotaPedido') .controller('notaPedidoCtrl',
395	395	templateUrl: 'foca-busqueda-cliente-modal.html',
396	396	controller: 'focaBusquedaClienteModalController',
397	397	resolve: {
398		- vendedor: function() { return $scope.notaPedido.vendedor; }
	398	+ vendedor: function() { return $scope.notaPedido.vendedor; },
	399	+ cobrador: function() { return null; }
399	400	},
400	401	size: 'lg'
401	402	}