Commit d6f09a877df6aa4a798b2b65c2277ecc79666c0b
Exists in
master
and in
1 other branch
Merge remote-tracking branch 'upstream/develop'
Showing
2 changed files
Show diff stats
src/js/controller.js
| ... | ... | @@ -282,7 +282,7 @@ angular.module('focaCrearNotaPedido').controller('notaPedidoCtrl', |
| 282 | 282 | codigo: producto.codigo, |
| 283 | 283 | sector: producto.sector, |
| 284 | 284 | sectorCodigo: producto.sector + '-' + producto.codigo, |
| 285 | - descripcion: producto.descripcion, | |
| 285 | + descripcion: producto.descripcionLarga, | |
| 286 | 286 | item: $scope.notaPedido.articulosNotaPedido.length + 1, |
| 287 | 287 | nombre: producto.descripcion, |
| 288 | 288 | precio: parseFloat(producto.precio.toFixed(4)), |
src/views/nota-pedido.html
| ... | ... | @@ -64,7 +64,7 @@ |
| 64 | 64 | ></td> |
| 65 | 65 | <td |
| 66 | 66 | class="col-4" |
| 67 | - ng-bind="articulo.descripcion" | |
| 67 | + ng-bind="articulo.nombre" | |
| 68 | 68 | ></td> |
| 69 | 69 | <td class="col text-right"> |
| 70 | 70 | <input |
| ... | ... | @@ -121,7 +121,7 @@ |
| 121 | 121 | <button |
| 122 | 122 | ng-show="articulo.editCantidad || articulo.editPrecio" |
| 123 | 123 | class="btn btn-outline-light" |
| 124 | - ng-click="editarArticulo(13, articulo)" | |
| 124 | + ng-click="editarArticulo(13, articulo, tmpCantidad, tmpPrecio)" | |
| 125 | 125 | > |
| 126 | 126 | <i class="fa fa-save"></i> |
| 127 | 127 | </button> |
| ... | ... | @@ -150,7 +150,7 @@ |
| 150 | 150 | <td class="col-4 tabla-articulo-descripcion"> |
| 151 | 151 | <input |
| 152 | 152 | class="form-control" |
| 153 | - ng-model="articuloACargar.descripcion" | |
| 153 | + ng-model="articuloACargar.nombre" | |
| 154 | 154 | readonly |
| 155 | 155 | > |
| 156 | 156 | </td> |
| ... | ... | @@ -263,7 +263,7 @@ |
| 263 | 263 | ></span> |
| 264 | 264 | </div> |
| 265 | 265 | <div class="col-8 px-1"> |
| 266 | - <span ng-bind="articulo.descripcion"></span> | |
| 266 | + <span ng-bind="articulo.nombre"></span> | |
| 267 | 267 | </div> |
| 268 | 268 | </div> |
| 269 | 269 | <div class="d-flex"> |
| ... | ... | @@ -286,7 +286,7 @@ |
| 286 | 286 | min="1" |
| 287 | 287 | step="0.001" |
| 288 | 288 | foca-focus="articulo.editCantidad" |
| 289 | - ng-keypress="editarArticulo($event.keyCode, articulo)" | |
| 289 | + ng-keypress="editarArticulo($event.keyCode, articulo, tmpCantidad, tmpPrecio)" | |
| 290 | 290 | ng-focus="selectFocus($event)" |
| 291 | 291 | > |
| 292 | 292 | </div> |
| ... | ... | @@ -330,7 +330,7 @@ |
| 330 | 330 | ></span> |
| 331 | 331 | </div> |
| 332 | 332 | <div class="col-8 px-1"> |
| 333 | - <span ng-bind="articuloACargar.descripcion"></span> | |
| 333 | + <span ng-bind="articuloACargar.nombre"></span> | |
| 334 | 334 | </div> |
| 335 | 335 | </div> |
| 336 | 336 | <div class="d-flex"> |