24 Commits

Author SHA1 Message Date
459a95bf12 Merge branch 'develop' into release 2022-04-18 22:42:05 -04:00
06071884c7 FIX: Negative numbers in cuenta ui, and update_consolidar command route 2022-04-18 22:41:25 -04:00
ca8229abee Merge branch 'develop' into release 2022-04-18 22:15:15 -04:00
6c4e51bfff Merge branch 'develop' into release 2022-04-02 23:59:14 -03:00
81ff87d355 Merge branch 'develop' into release 2022-04-02 23:47:11 -03:00
899e9f6070 Merge branch 'develop' into release 2022-03-25 18:04:25 -03:00
0bd54fa8a4 Merge branch 'develop' into release 2022-03-25 16:37:09 -03:00
f6285d6970 Merge branch 'develop' into release 2022-03-25 16:22:02 -03:00
5f4f5d1501 Merge branch 'develop' into release 2022-03-25 16:19:08 -03:00
0e7d7200b6 Merge branch 'develop' into release 2022-03-25 15:49:42 -03:00
d0d123e12e Merge branch 'develop' into release 2022-03-18 17:50:36 -03:00
71975ec6d9 Merge branch 'develop' into release 2022-01-07 01:13:22 -03:00
f36399c1f4 Formatting and Fixes 2022-01-07 00:24:45 -03:00
1d62a0c04e Fixes 2022-01-06 15:20:37 -03:00
a2a90497ae Python updates 2022-01-05 21:11:16 -03:00
925388df92 Edit transacciones, refresh, sort cuentas 2022-01-05 16:02:40 -03:00
2126d30ee7 Merge branch 'develop' into release 2021-12-23 01:09:50 -03:00
73df98dca5 Merge branch 'develop' into release 2021-12-23 00:47:47 -03:00
f9bbbfd920 Fixes for uploaded files 2021-12-23 00:10:06 -03:00
aacda4d1e4 Fix 2021-12-22 23:24:19 -03:00
f99b984f6c Fix 2021-12-22 23:12:25 -03:00
4bc1e4ae4d Upload and manage files 2021-12-22 01:39:09 -03:00
79c7d5ad63 Fixes 2021-12-20 23:30:13 -03:00
6b03d62ce0 Merge branch 'develop' into release 2021-12-20 22:54:14 -03:00
3 changed files with 5 additions and 2 deletions

View File

@ -0,0 +1,4 @@
<?php
use Contabilidad\Common\Command\UpdateConsolidar;
$app->add(new UpdateConsolidar($app->getContainer()->get(\Psr\Http\Client\ClientInterface::class), 'update_consolidar'));

View File

@ -47,7 +47,7 @@ class Transaccion {
).append( ).append(
$('<td></td>').attr('class', 'right aligned').html((this.isIncrement()) ? '' : format_call({value: this.valor.valor, format, format_array})) $('<td></td>').attr('class', 'right aligned').html((this.isIncrement()) ? '' : format_call({value: this.valor.valor, format, format_array}))
).append( ).append(
$('<td></td>').attr('class', 'right aligned').html((this.isIncrement()) ? format_call({value: this.valor.valor, format, format_array}) : '') $('<td></td>').attr('class', 'right aligned').html((this.isIncrement()) ? format_call({value: -this.valor.valor, format, format_array}) : '')
).append( ).append(
$('<td></td>').attr('class', 'right aligned').html(format_call({value: saldo, format_array, format})) $('<td></td>').attr('class', 'right aligned').html(format_call({value: saldo, format_array, format}))
).append( ).append(
@ -134,7 +134,6 @@ const transacciones = {
sendGet(_urls.api + '/cuenta/' + this.cuenta_id + '/categoria').then((resp) => { sendGet(_urls.api + '/cuenta/' + this.cuenta_id + '/categoria').then((resp) => {
this.cuenta.categoria = resp.categoria this.cuenta.categoria = resp.categoria
}).then(() => { }).then(() => {
//this.saldo = this.cuenta.saldo
$('#cuenta').html(this.cuenta.nombre + ' (' + this.cuenta.categoria.nombre + ')').append( $('#cuenta').html(this.cuenta.nombre + ' (' + this.cuenta.categoria.nombre + ')').append(
$('<i></i>').attr('class', 'square full icon').css('color', '#' + this.cuenta.tipo.color) $('<i></i>').attr('class', 'square full icon').css('color', '#' + this.cuenta.tipo.color)
) )