Compare View
Commits (14)
-
Develop See merge request !81
-
Develop See merge request !89
-
Develop See merge request !91
-
Develop See merge request !93
-
Develop See merge request !95
-
Develop See merge request !97
-
Master(mpuebla) See merge request !107
-
Master(mpuebla) See merge request !109
-
Master See merge request !110
-
Develop See merge request !111
Showing
2 changed files
Show diff stats
src/js/controller.js
... | ... | @@ -330,7 +330,7 @@ angular.module('focaCrearRemito').controller('remitoController', |
330 | 330 | cuitCliente: $scope.remito.cliente.CUIT, |
331 | 331 | total: $scope.getTotal() * $scope.remito.cotizacion.VENDEDOR, |
332 | 332 | numeroNotaPedido: $scope.remito.numeroNotaPedido, |
333 | - idVendedor: $scope.remito.vendedor.NUM, | |
333 | + idVendedor: parseInt($scope.remito.cliente.VEN), | |
334 | 334 | idProveedor: $scope.remito.proveedor.COD, |
335 | 335 | idDomicilio: $scope.remito.idDomicilio || $scope.remito.domicilio.id, |
336 | 336 | idCotizacion: $scope.remito.cotizacion.ID, |
... | ... | @@ -427,7 +427,7 @@ angular.module('focaCrearRemito').controller('remitoController', |
427 | 427 | if ($scope.notaPedido.id !== 0) { |
428 | 428 | $scope.idLista = parseInt($scope.notaPedido.idListaPrecio) |
429 | 429 | } |
430 | - if ($scope.remito.idListaPrecio === undefined) { | |
430 | + if ($scope.idLista === undefined) { | |
431 | 431 | focaModalService.alert( |
432 | 432 | 'Primero seleccione una lista de precio y condicion'); |
433 | 433 | return; |
... | ... | @@ -439,7 +439,7 @@ angular.module('focaCrearRemito').controller('remitoController', |
439 | 439 | controller: 'modalBusquedaProductosCtrl', |
440 | 440 | resolve: { |
441 | 441 | parametroProducto: { |
442 | - idLista: $scope.idLista || parseInt($scope.remito.idListaPrecio), | |
442 | + idLista: $scope.idLista, | |
443 | 443 | cotizacion: $scope.remito.cotizacion.VENDEDOR, |
444 | 444 | simbolo: $scope.remito.cotizacion.moneda.SIMBOLO |
445 | 445 | } |
src/views/remito.html
... | ... | @@ -64,7 +64,7 @@ |
64 | 64 | ></td> |
65 | 65 | <td |
66 | 66 | class="col-4" |
67 | - ng-bind="articulo.nombre" | |
67 | + ng-bind="articulo.descripcion" | |
68 | 68 | ></td> |
69 | 69 | <td class="col text-right"> |
70 | 70 | <input |
... | ... | @@ -146,7 +146,7 @@ |
146 | 146 | <td class="col-4 tabla-articulo-descripcion"> |
147 | 147 | <input |
148 | 148 | class="form-control" |
149 | - ng-model="articuloACargar.nombre" | |
149 | + ng-model="articuloACargar.descripcion" | |
150 | 150 | readonly |
151 | 151 | > |
152 | 152 | </td> |