Commit ddf14b9dbc591dee576a13586175ae63ac8880b8

Authored by Pablo Marco del Pont
Exists in master and in 1 other branch develop

Merge branch 'master' into 'master'

Master

See merge request modulos-npm/foca-modal-cotizacion!1
... ... @@ -38,7 +38,8 @@
38 38 ariaLabelledBy: 'Busqueda de Precio Condicion',
39 39 templateUrl: 'src/views/modal-cotizacion.html',
40 40 controller: 'focaModalCotizacionController',
41   - size: 'lg'
  41 + size: 'lg',
  42 + resolve: {idMoneda: 1}
42 43 }
43 44 );
44 45  
... ... @@ -24,19 +24,19 @@
24 24 "bootstrap": "^4.1.3",
25 25 "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas.git",
26 26 "font-awesome": "^4.7.0",
27   - "gulp": "3.9.1",
28   - "gulp-angular-templatecache": "2.2.3",
29   - "gulp-clean": "0.4.0",
30   - "gulp-concat": "2.6.1",
  27 + "gulp": "^3.9.1",
  28 + "gulp-angular-templatecache": "^2.2.3",
  29 + "gulp-clean": "^0.4.0",
  30 + "gulp-concat": "^2.6.1",
31 31 "gulp-connect": "^5.6.1",
32   - "gulp-htmlmin": "5.0.1",
  32 + "gulp-htmlmin": "^5.0.1",
33 33 "gulp-jshint": "^2.1.0",
34   - "gulp-rename": "1.4.0",
35   - "gulp-replace": "1.0.0",
36   - "gulp-uglify": "3.0.1",
  34 + "gulp-rename": "^1.4.0",
  35 + "gulp-replace": "^1.0.0",
  36 + "gulp-uglify": "^3.0.1",
37 37 "jquery": "^3.3.1",
38 38 "jshint": "^2.9.6",
39   - "pump": "3.0.0",
  39 + "pump": "^3.0.0",
40 40 "ui-bootstrap4": "^3.0.5"
41 41 }
42 42 }
src/views/modal-cotizacion.html
... ... @@ -7,8 +7,8 @@
7 7 <thead>
8 8 <tr>
9 9 <th>Fecha</th>
10   - <th>Cotización</th>
11   - <th>Vendedor</th>
  10 + <th>Compra</th>
  11 + <th>Venta</th>
12 12 <th></th>
13 13 </tr>
14 14 </thead>