Commit 4ce8665740b26fc8cc053cbb0d22b2ab2cf33721
1 parent
40bff8f951
Exists in
master
edición en Flete
Showing
1 changed file
with
5 additions
and
4 deletions
Show diff stats
src/js/controller.js
| ... | ... | @@ -737,7 +737,6 @@ angular.module('focaCrearRemito') .controller('remitoController', |
| 737 | 737 | } else { |
| 738 | 738 | $scope.$broadcast('removeCabecera', 'Bomba:'); |
| 739 | 739 | $scope.$broadcast('removeCabecera', 'Kilometros:'); |
| 740 | - $scope.remito.fob = false; | |
| 741 | 740 | $scope.remito.bomba = false; |
| 742 | 741 | $scope.remito.kilometros = null; |
| 743 | 742 | } |
| ... | ... | @@ -999,13 +998,15 @@ angular.module('focaCrearRemito') .controller('remitoController', |
| 999 | 998 | ' - ' + remito.proveedor.NOM |
| 1000 | 999 | }); |
| 1001 | 1000 | } |
| 1002 | - if (remito.flete !== undefined) { | |
| 1001 | + | |
| 1002 | + if (remito.flete !== undefined && remito.fob !== undefined) { | |
| 1003 | 1003 | cabeceras.push({ |
| 1004 | 1004 | label: 'Flete:', |
| 1005 | - valor: remito.fob === 1 ? 'FOB' : ( | |
| 1006 | - remito.flete === 1 ? 'Si' : 'No') | |
| 1005 | + valor: remito.fob ? 'FOB' : ( | |
| 1006 | + remito.flete ? 'Si' : 'No') | |
| 1007 | 1007 | }); |
| 1008 | 1008 | } |
| 1009 | + | |
| 1009 | 1010 | if (remito.remitoPlazo) { |
| 1010 | 1011 | cabeceras.push({ |
| 1011 | 1012 | label: 'Precio condicion:', |