Commit c5be63091ea40a2688eb20b220a5b15ae798c770
Exists in
master
Merge branch 'master' into 'develop'
Master(efernandez) See merge request !68
Showing
1 changed file
Show diff stats
src/views/cobranza.html
| ... | ... | @@ -152,6 +152,7 @@ |
| 152 | 152 | currency: cobranza.moneda.SIMBOLO : 4"></td> |
| 153 | 153 | <td class="text-center col-auto"> |
| 154 | 154 | <button |
| 155 | + ng-disabled="cobranza.id" | |
| 155 | 156 | class="btn btn-outline-light" |
| 156 | 157 | ng-click="editarCobro(cobro)" |
| 157 | 158 | > |
| ... | ... | @@ -249,16 +250,16 @@ |
| 249 | 250 | <div class="col px-0"> |
| 250 | 251 | <div class="d-flex"> |
| 251 | 252 | <div class="col-4 p-1"> |
| 252 | - <span ng-bind="factura.COM" | |
| 253 | + <span ng-bind="factura.numeroFactura" | |
| 253 | 254 | ></span> |
| 254 | 255 | </div> |
| 255 | 256 | <div class="col-4 p-1"> |
| 256 | - <span ng-bind="factura.FEC | date : 'dd/MM/yyyy'"></span> | |
| 257 | + <span ng-bind="factura.FEP | date : 'dd/MM/yyyy'"></span> | |
| 257 | 258 | </div> |
| 258 | 259 | <div class="col-4 p-1"> |
| 259 | 260 | <span |
| 260 | - ng-bind="(factura.IMP / cobranza.COTIZACION) | | |
| 261 | - currency:cobranza.moneda.SIMBOLO : 4"></span> | |
| 261 | + ng-bind="(factura.IPA / cobranza.moneda.cotizacion.VENDEDOR) | | |
| 262 | + currency: cobranza.moneda.SIMBOLO : 4"></span> | |
| 262 | 263 | </div> |
| 263 | 264 | </div> |
| 264 | 265 | </div> |
| ... | ... | @@ -345,20 +346,27 @@ |
| 345 | 346 | <div class="col px-0"> |
| 346 | 347 | <div class="d-flex"> |
| 347 | 348 | <div class="col-4 p-1"> |
| 348 | - <span ng-bind="cobro.tipo" | |
| 349 | + <span ng-bind="cobro.COM" | |
| 349 | 350 | ></span> |
| 350 | 351 | </div> |
| 351 | 352 | <div class="col-4 p-1"> |
| 352 | - <span ng-bind="cobro.fecha | date : 'dd/MM/yyyy'"></span> | |
| 353 | + <span ng-bind="cobro.FEC | date : 'dd/MM/yyyy'"></span> | |
| 353 | 354 | </div> |
| 354 | 355 | <div class="col-4 p-1"> |
| 355 | 356 | <span |
| 356 | - ng-bind="(cobro.importe / cobranza.moneda.cotizacion.VENDEDOR) | | |
| 357 | + ng-bind="(cobro.IMP / cobranza.moneda.cotizacion.VENDEDOR) | | |
| 357 | 358 | currency: cobranza.moneda.SIMBOLO : 4"></span> |
| 358 | 359 | </div> |
| 359 | 360 | </div> |
| 360 | 361 | </div> |
| 361 | - <div class="align-middle p-1"> | |
| 362 | + <div class="col-2 align-middle p-1"> | |
| 363 | + <button | |
| 364 | + ng-disabled="cobranza.id" | |
| 365 | + class="btn btn-outline-light" | |
| 366 | + ng-click="editarCobro(cobro)" | |
| 367 | + > | |
| 368 | + <i class="fa fa-edit"></i> | |
| 369 | + </button> | |
| 362 | 370 | <button |
| 363 | 371 | class="btn btn-outline-light" |
| 364 | 372 | ng-click="quitarCobro(key)" |