diff --git a/commands/balance-sheet b/commands/balance-sheet index bcae9ed..c2d588c 100755 --- a/commands/balance-sheet +++ b/commands/balance-sheet @@ -204,6 +204,7 @@ def get_income(entries, options, date): return rrows def get_debt_payments(entries, options, date): + # FIX: Agafar nomes els pagaments de deute, enlloc de també les addicions de deute start_date, end_date = get_last_month_timestamps(date) debt_payments_query = f"SELECT convert(sum(position), \"EUR\") as position FROM date <= {end_date} WHERE account ~ 'Liabilities:' AND date >= {start_date}" mortgage_payments_query = f"SELECT convert(sum(position), \"EUR\") as position FROM date <= {end_date} WHERE account ~ 'Liabilities:Hipoteca:' AND date >= {start_date}" diff --git a/ledger/transactions/2025/01.beancount b/ledger/transactions/2025/01.beancount index f16074a..2778e9a 100644 --- a/ledger/transactions/2025/01.beancount +++ b/ledger/transactions/2025/01.beancount @@ -8,7 +8,7 @@ 2025-01-01 balance Assets:Invest:ETF:XDEQ 70 XDEQ 2025-01-01 balance Assets:Benefits:Edenred:TicketsRestaurant 25.92 EUR 2025-01-01 balance Assets:Benefits:Edenred:TargetaTransport 97 EUR -2025-01-01 balance Assets:Benefits:DZP:PPEZurich 2971.29 EUR +2025-01-01 balance Assets:Benefits:DZP:PPEZurich 3003.57 EUR 2025-01-01 balance Assets:PersonalProperty:VivendaPrincipal 0 EUR 2025-01-01 balance Assets:PersonalProperty:Cotxe 10000 EUR 2025-01-01 balance Assets:PersonalProperty:JoiesArtCollecionables 1250 EUR @@ -35,20 +35,73 @@ Expenses:Parking 100.00 EUR Assets:Liquid:Caixabank:Corrent 2025-01-03 * "Finques Samsó" "Lloguer pis gener 2025" - Expenses:Lloguer 1124.04 EUR + Expenses:Lloguer 594.04 EUR + Equity:LloguerPere 530 EUR + Income:Other:Caixabank:Bizum -530 EUR + Assets:Liquid:Caixabank:Corrent +2025-01-04 * "Pere" "Factures pis Pere" + Equity:FacturesUtilitatsPere 61.50 EUR + Expenses:FacturesUtilitats -61.50 EUR + Income:Other:Caixabank:Bizum -61.50 EUR + Assets:Liquid:Caixabank:Corrent +2025-01-04 * "L'Artista" "Dinar pizza" + Expenses:MenjarFora 52 EUR + Assets:Benefits:Edenred:TicketsRestaurant +2025-01-05 * "Amazon" "Compra coses varies" + Expenses:Altres 56.02 EUR + Assets:Liquid:Caixabank:Corrent +2025-01-06 * "Wellhub" "Quota gimnàs" + Expenses:Gimnàs 35.99 EUR + Assets:Liquid:Caixabank:Corrent +2025-01-07 * "Don Zangano" "Esmorzar" + Expenses:MenjarFora 5.10 EUR + Assets:Benefits:Edenred:TicketsRestaurant +2025-01-07 * "Plusfresc" "Aigua i fruita" + Expenses:Supermercat 2.62 EUR + Assets:Liquid:Caixabank:Corrent +2025-01-07 * "Fucsia" "Dinar" + Expenses:MenjarFora 15.50 EUR + Assets:Benefits:Edenred:TicketsRestaurant +2025-01-07 * "Blät" "Cafè" + Expenses:MenjarFora 1.55 EUR + Assets:Benefits:Edenred:TicketsRestaurant +2025-01-07 * "Plusfresc" "Compra de la setmana" + Expenses:Supermercat 38.13 EUR + Assets:Liquid:Caixabank:Corrent +2025-01-09 * "Forn Enrich" "Pà" + Expenses:Supermercat 2.35 EUR + Assets:Liquid:Caixabank:Corrent +2025-01-09 * "Fazal Chak" "Paper cuina, lavabo, detergent i pizzes" + Expenses:Supermercat 20.09 EUR + Assets:Liquid:Caixabank:Corrent +2025-01-10 * "Renta 4" "Comissió Custodia Oct-Dec 2024 + Comissió Manteniment" + Expenses:R4:Comissions 7.68 EUR + Expenses:R4:Comissions 26.98 EUR + Expenses:R4:Comissions 7.28 EUR + Expenses:R4:Comissions 9 EUR + Expenses:R4:Comissions 1.89 EUR + Assets:Liquid:R4:EUR +2025-01-11 * "Fesmes" "Fustes armari" + Expenses:Llar 63.10 EUR + Assets:Liquid:Caixabank:Corrent +2025-01-11 * "Decathlon" "Tovalloles i proteïna" + Expenses:Gimnàs 68.95 EUR + Assets:Liquid:Caixabank:Corrent +2025-01-11 * "Renta 4" "Transferència per saldo negatiu" + Assets:Liquid:R4:EUR 50.00 EUR Assets:Liquid:Caixabank:Corrent -2025-02-01 balance Assets:Liquid:Caixabank:Corrent 12031.39 EUR -2025-02-01 balance Assets:Liquid:R4:EUR 28.01 EUR +2025-02-01 balance Assets:Liquid:Caixabank:Corrent 11755.64 EUR +2025-02-01 balance Assets:Liquid:R4:EUR 25.18 EUR 2025-02-01 balance Assets:Invest:Fund:Vanguard:EMMK 14.99 VANEMMK 2025-02-01 balance Assets:Invest:Fund:Vanguard:GL 707.25 VANGL 2025-02-01 balance Assets:Invest:Fund:Vanguard:SMCAP 48.28 VANSMCAP 2025-02-01 balance Assets:Invest:ETF:IWVL 141 IWVL 2025-02-01 balance Assets:Invest:Fixed:R4RF 1518.57004 R4RF 2025-02-01 balance Assets:Invest:ETF:XDEQ 70 XDEQ -2025-02-01 balance Assets:Benefits:Edenred:TicketsRestaurant 234.92 EUR +2025-02-01 balance Assets:Benefits:Edenred:TicketsRestaurant 160.77 EUR 2025-02-01 balance Assets:Benefits:Edenred:TargetaTransport 132 EUR -2025-02-01 balance Assets:Benefits:DZP:PPEZurich 2971.29 EUR +2025-02-01 balance Assets:Benefits:DZP:PPEZurich 3003.57 EUR 2025-02-01 balance Assets:PersonalProperty:VivendaPrincipal 0 EUR 2025-02-01 balance Assets:PersonalProperty:Cotxe 10000 EUR 2025-02-01 balance Assets:PersonalProperty:JoiesArtCollecionables 1250 EUR diff --git a/ledger/transactions/index.beancount b/ledger/transactions/index.beancount index e3cd6be..2bcca2e 100644 --- a/ledger/transactions/index.beancount +++ b/ledger/transactions/index.beancount @@ -1 +1,2 @@ -include "2024/*" \ No newline at end of file +include "2024/*" +include "2025/*" \ No newline at end of file