Commit 09e52868f27d931d377df5883193bf29b950fd22
1 parent
e5e28ec469
Exists in
master
Arreglo git
Showing
1 changed file
with
0 additions
and
21 deletions
Show diff stats
src/js/controller.js
| ... | ... | @@ -741,30 +741,9 @@ angular.module('focaCrearNotaPedido') .controller('notaPedidoCtrl', |
| 741 | 741 | $scope.notaPedido.articulosNotaPedido = articulosTablaTemp; |
| 742 | 742 | $scope.notaPedido.cotizacion = cotizacion; |
| 743 | 743 | $scope.notaPedido.cotizacion.moneda = moneda; |
| 744 | -<<<<<<< HEAD | |
| 745 | 744 | actualizarCabeceraMoneda(cotizacion); |
| 746 | -======= | |
| 747 | - if (moneda.DETALLE === 'PESOS ARGENTINOS') { | |
| 748 | - $scope.$broadcast('removeCabecera', 'Moneda:'); | |
| 749 | - $scope.$broadcast('removeCabecera', 'Fecha cotizacion:'); | |
| 750 | - $scope.$broadcast('removeCabecera', 'Cotizacion:'); | |
| 751 | - } else { | |
| 752 | - $scope.$broadcast('addCabecera', { | |
| 753 | - label: 'Moneda:', | |
| 754 | - valor: moneda.DETALLE | |
| 755 | - }); | |
| 756 | - $scope.$broadcast('addCabecera', { | |
| 757 | - label: 'Fecha cotizacion:', | |
| 758 | - valor: $filter('date')(cotizacion.FECHA, 'dd/MM/yyyy') | |
| 759 | - }); | |
| 760 | - $scope.$broadcast('addCabecera', { | |
| 761 | - label: 'Cotizacion:', | |
| 762 | - valor: $filter('number')(cotizacion.VENDEDOR, '2') | |
| 763 | - }); | |
| 764 | - } | |
| 765 | 745 | |
| 766 | 746 | $filter('filter')($scope.botonera, { label: 'Moneda'})[0].checked = true; |
| 767 | ->>>>>>> develop | |
| 768 | 747 | }, function() { |
| 769 | 748 | |
| 770 | 749 | } |