Merge branch 'master' into 'master'

agrego resolve de modal nota pedido See merge request modulos-npm/foca-crear-remito!17

Merge branch 'master' into 'master'
agrego resolve de modal nota pedido See merge request modulos-npm/foca-crear-remito!17
Pablo Marco del Pont
2 parents 73063b851f e919068324
Showing 1 changed file Show diff stats
src/js/controller.js
@@ -87,7 +87,8 @@ angular.module(&#39;focaCrearRemito&#39;) .controller(&#39;remitoController&#39;,
                         ariaLabelledBy: 'Busqueda de Nota de Pedido',
                         templateUrl: 'foca-modal-nota-pedido.html',
                         controller: 'focaModalNotaPedidoController',
-                        size: 'lg'
+                        size: 'lg',
+                        resolve: {usadoPor: 'remito'}
                     }
                 );
                 modalInstance.result.then(
...	...	@@ -87,7 +87,8 @@ angular.module('focaCrearRemito') .controller('remitoController',
87	87	ariaLabelledBy: 'Busqueda de Nota de Pedido',
88	88	templateUrl: 'foca-modal-nota-pedido.html',
89	89	controller: 'focaModalNotaPedidoController',
90		- size: 'lg'
	90	+ size: 'lg',
	91	+ resolve: {usadoPor: 'remito'}
91	92	}
92	93	);
93	94	modalInstance.result.then(