Jose Pinto / foca-crear-cobranza

Download as
Browse Code ยป

Commit 8b54e1b554c6cdb07b74e42001c3a8074965e538

Authored by Eric Fernandez
2 parents f4e3fe7269 d1ab5a6941
Exists in master

Merge branch 'master' into 'develop' 

Master

See merge request !65
Showing 2 changed files   Show diff stats
src/js/controller.js
Diff comments   View file @ 8b54e1b
... ... @@ -632,8 +632,8 @@ angular.module('focaCrearCobranza') .controller('cobranzaController',
632 632 );
633 633 modalInstance.result.then(
634 634 function(cotizacion) {
635   - $scope.cobranza.cotizacion.moneda = moneda;
636 635 $scope.cobranza.cotizacion = cotizacion;
  636 + $scope.cobranza.cotizacion.moneda = moneda;
637 637 if (moneda.DETALLE === 'PESOS ARGENTINOS') {
638 638 $scope.$broadcast('removeCabecera', 'Moneda:');
639 639 $scope.$broadcast('removeCabecera', 'Fecha cotizacion:');
src/views/cobranza.html
Diff comments   View file @ 8b54e1b
... ... @@ -87,21 +87,21 @@
87 87 </td>
88 88 <td class="table-celda-total text-right no-border-top">
89 89 <strong>{{(getTotalDeuda() / cobranza.cotizacion.VENDEDOR) |
90   - currency: cobranza.moneda.SIMBOLO}}</strong>
  90 + currency: cobranza.cotizacion.moneda.SIMBOLO}}</strong>
91 91 </td>
92 92 <td class="text-right ml-auto table-celda-total no-border-top">
93 93 <strong>Total Cobrado:</strong>
94 94 </td>
95 95 <td class="table-celda-total text-right no-border-top">
96 96 <strong>{{(getTotalCobrado() / cobranza.cotizacion.VENDEDOR) |
97   - currency: cobranza.moneda.SIMBOLO}}</strong>
  97 + currency: cobranza.cotizacion.moneda.SIMBOLO}}</strong>
98 98 </td>
99 99 <td class="text-right ml-auto table-celda-total no-border-top">
100 100 <strong>DF:</strong>
101 101 </td>
102 102 <td class="table-celda-total text-right no-border-top mr-1">
103 103 <strong>{{((getTotalCobrado() + getTotalDeuda()) /
104   - cobranza.cotizacion.VENDEDOR) | currency: cobranza.moneda.SIMBOLO}}
  104 + cobranza.cotizacion.VENDEDOR) | currency: cobranza.cotizacion.moneda.SIMBOLO}}
105 105 </strong>
106 106 </td>
107 107 </tr>
... ... @@ -191,21 +191,21 @@
191 191 </td>
192 192 <td class="table-celda-total text-right no-border-top">
193 193 <strong>{{(getTotalDeuda() / cobranza.cotizacion.VENDEDOR) |
194   - currency: cobranza.moneda.SIMBOLO}}</strong>
  194 + currency: cobranza.cotizacion.moneda.SIMBOLO}}</strong>
195 195 </td>
196 196 <td class="text-right ml-auto table-celda-total no-border-top">
197 197 <strong>Total Cobrado:</strong>
198 198 </td>
199 199 <td class="table-celda-total text-right no-border-top">
200 200 <strong>{{(getTotalCobrado() / cobranza.cotizacion.VENDEDOR) |
201   - currency: cobranza.moneda.SIMBOLO}}</strong>
  201 + currency: cobranza.cotizacion.moneda.SIMBOLO}}</strong>
202 202 </td>
203 203 <td class="text-right ml-auto table-celda-total no-border-top">
204 204 <strong>DF:</strong>
205 205 </td>
206 206 <td class="table-celda-total text-right no-border-top mr-1">
207 207 <strong>{{((getTotalCobrado() + getTotalDeuda()) /
208   - cobranza.cotizacion.VENDEDOR) | currency: cobranza.moneda.SIMBOLO}}
  208 + cobranza.cotizacion.VENDEDOR) | currency: cobranza.cotizacion.moneda.SIMBOLO}}
209 209 </strong>
210 210 </td>
211 211 </tr>
... ... @@ -435,13 +435,13 @@
435 435 <strong>Diferencia:</strong>
436 436 </td>
437 437 <td class="table-celda-total text-center no-border-top col-4">
438   - <strong>{{(getTotalDeuda() / cobranza.cotizacion.VENDEDOR) | currency: cobranza.moneda.SIMBOLO}}</strong>
  438 + <strong>{{(getTotalDeuda() / cobranza.cotizacion.VENDEDOR) | currency: cobranza.cotizacion.moneda.SIMBOLO}}</strong>
439 439 </td>
440 440 <td class="table-celda-total text-center no-border-top col-4">
441   - <strong>{{(getTotalCobrado() / cobranza.cotizacion.VENDEDOR) | currency: cobranza.moneda.SIMBOLO}}</strong>
  441 + <strong>{{(getTotalCobrado() / cobranza.cotizacion.VENDEDOR) | currency: cobranza.cotizacion.moneda.SIMBOLO}}</strong>
442 442 </td>
443 443 <td class="table-celda-total text-center no-border-top col-4">
444   - <strong>{{((getTotalCobrado() + getTotalDeuda()) / cobranza.cotizacion.VENDEDOR) | currency: cobranza.moneda.SIMBOLO}}</strong>
  444 + <strong>{{((getTotalCobrado() + getTotalDeuda()) / cobranza.cotizacion.VENDEDOR) | currency: cobranza.cotizacion.moneda.SIMBOLO}}</strong>
445 445 </td>
446 446 </tr>
447 447 </table>