Merge branch 'master' into 'master'

Master See merge request modulos-npm/foca-crear-remito!8

Merge branch 'master' into 'master'
Master See merge request modulos-npm/foca-crear-remito!8
Pablo Marco del Pont
2 parents e202c4bf97 9c5dd63164
Showing 2 changed files Show diff stats
src/js/controller.js
src/views/remito.html
@@ -384,7 +384,12 @@ angular.module(&#39;focaCrearRemito&#39;) .controller(&#39;remitoController&#39;,
                         ariaLabelledBy: 'Busqueda de Proveedor',
                         templateUrl: 'modal-proveedor.html',
                         controller: 'focaModalProveedorCtrl',
-                        size: 'lg'
+                        size: 'lg',
+                        resolve: {
+                            transportista: function() {
+                                return false;
+                            }
+                        }
                     }
                 );
                 modalInstance.result.then(
@@ -12,7 +12,7 @@
                                 >
                                 Nº {{puntoVenta}}-{{comprobante}}
                                 <button
-                                    class="btn btn-xs"
+                                    class="btn btn-xs btn-outline-dark"
                                     type="button"
                                     ng-click="seleccionarRemito()"
                                 >
...	...	@@ -384,7 +384,12 @@ angular.module('focaCrearRemito') .controller('remitoController',
384	384	ariaLabelledBy: 'Busqueda de Proveedor',
385	385	templateUrl: 'modal-proveedor.html',
386	386	controller: 'focaModalProveedorCtrl',
387		- size: 'lg'
	387	+ size: 'lg',
	388	+ resolve: {
	389	+ transportista: function() {
	390	+ return false;
	391	+ }
	392	+ }
388	393	}
389	394	);
390	395	modalInstance.result.then(
...	...	@@ -12,7 +12,7 @@
12	12	>
13	13	Nº {{puntoVenta}}-{{comprobante}}
14	14	<button
15		- class="btn btn-xs"
	15	+ class="btn btn-xs btn-outline-dark"
16	16	type="button"
17	17	ng-click="seleccionarRemito()"
18	18	>