From dd83b4625ef47e4ab0f24f176ba9e34526d82bb5 Mon Sep 17 00:00:00 2001 From: Roger Oriol Date: Mon, 1 Jan 2024 21:01:10 +0100 Subject: [PATCH] begin 2024 --- commands/balance-sheet | 6 +++-- ledger/accounts.beancount | 1 + ledger/trading/prices.beancount | 6 ++--- ledger/transactions/2024/01.beancount | 39 +++++++++++++++------------ 4 files changed, 30 insertions(+), 22 deletions(-) diff --git a/commands/balance-sheet b/commands/balance-sheet index 6df6c6e..def72f1 100755 --- a/commands/balance-sheet +++ b/commands/balance-sheet @@ -225,8 +225,10 @@ def print_report(date, balances): ["Factures impagades", get_position_as_str(balances["Liabilities:Factures:FacturesPendents"])], ["Préstecs personals", Amount(Decimal(0), "EUR").to_string()], ["Impostos no pagats", get_position_as_str(balances["Liabilities:Taxes:IRPF"])], - ["Altres passius", Amount(Decimal(0), "EUR").to_string()], - ["Total passius", get_total_liabilites(balances).to_string()], + ["Altres passius", Amount(Decimal(0), "EUR").to_string()] + ])) + print(tabulate([ + [f"{bcolors.BOLD}Total passius{bcolors.ENDC}", f"{bcolors.BOLD}{get_total_liabilites(balances).to_string()}{bcolors.ENDC}"], ])) draw_line() diff --git a/ledger/accounts.beancount b/ledger/accounts.beancount index 4fa1d3f..fc40a12 100644 --- a/ledger/accounts.beancount +++ b/ledger/accounts.beancount @@ -60,6 +60,7 @@ 1970-01-01 open Expenses:MarcaPersonal EUR 1970-01-01 open Expenses:MenjarFora EUR 1970-01-01 open Expenses:Entreteniment EUR +1970-01-01 open Expenses:Llar EUR 1970-01-01 open Expenses:Altres EUR 1970-01-01 open Equity:Opening-Balances EUR diff --git a/ledger/trading/prices.beancount b/ledger/trading/prices.beancount index e249c9b..3f7ae6e 100644 --- a/ledger/trading/prices.beancount +++ b/ledger/trading/prices.beancount @@ -1,8 +1,8 @@ -2023-12-31 price USD 0.93 EUR +2023-12-31 price USD 0.905 EUR 2023-12-31 price AMNDMSCIWRLD 237.62 EUR 2023-12-31 price VANEMMK 177.773 EUR 2023-12-31 price FIGLTECH 41.06 EUR 2023-12-31 price AMNDSUSINC 62.84 EUR 2023-12-31 price BNPDISTECH 2195.55 USD -2023-12-31 price PLTR 16.025 USD -2023-12-31 price MSFT 341.8 USD \ No newline at end of file +2023-12-31 price PLTR 15.533 USD +2023-12-31 price MSFT 340.2775 USD \ No newline at end of file diff --git a/ledger/transactions/2024/01.beancount b/ledger/transactions/2024/01.beancount index d795645..4fd3960 100644 --- a/ledger/transactions/2024/01.beancount +++ b/ledger/transactions/2024/01.beancount @@ -1,11 +1,11 @@ 2023-12-31 * "Balanç inicial EUR" - Assets:Liquid:Caixabank:Corrent 18903.80 EUR - Assets:Liquid:Caixabank:Estalvi 12666.49 EUR - Assets:Liquid:R4:EUR 44.04 EUR - Assets:Invest:R4:Amundi:MSCIWRLD 86.005 AMNDMSCIWRLD {237.62 EUR} - Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK {177.773 EUR} - Assets:Invest:R4:Fidelity:GLTECH 344.47 FIGLTECH {41.06 EUR} - Assets:Invest:R4:Amundi:SUSTINC 11.295 AMNDSUSINC {62.84 EUR} + Assets:Liquid:Caixabank:Corrent 21795.94 EUR + Assets:Liquid:Caixabank:Estalvi 12870.71 EUR + Assets:Liquid:R4:EUR 279.27 EUR + Assets:Invest:R4:Amundi:MSCIWRLD 86.005 AMNDMSCIWRLD {239.89 EUR} + Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK {181.3768 EUR} + Assets:Invest:R4:Fidelity:GLTECH 344.47 FIGLTECH {42.50 EUR} + Assets:Invest:R4:Amundi:SUSTINC 11.295 AMNDSUSINC {63.97 EUR} Assets:Benefits:Edenred:TicketsRestaurant 0 EUR Assets:Benefits:Edenred:TargetaTransport 0 EUR Assets:PersonalProperty:VivendaPrincipal 0 EUR @@ -16,19 +16,19 @@ Assets:Debt:DeutesPerCobrar 0 EUR Liabilities:Hipoteca:VivendaPrincipal 0 EUR Liabilities:Credit:Caixabank:TargetaCredit 0 EUR - Liabilities:Credit:Caixabank:TargetaCredit 0 EUR + Liabilities:Credit:Caixabank:TargetaCredit -414.7 EUR Liabilities:Factures:FacturesPendents 0 EUR Liabilities:Taxes:IRPF 0 EUR Equity:Opening-Balances 2023-12-31 * "Balanç inicial USD" - Assets:Invest:R4:BNP:DISTECH 0.359 BNPDISTECH {2195.55 USD} - Assets:Invest:R4:PLTR 10 PLTR {16.025 USD} - Assets:Invest:R4:MSFT 4 MSFT {341.8 USD} + Assets:Invest:R4:BNP:DISTECH 0.359 BNPDISTECH {2369.49 USD} + Assets:Invest:R4:PLTR 10 PLTR {15.533 USD} + Assets:Invest:R4:MSFT 4 MSFT {340.2775 USD} Equity:Opening-Balances:USD -2024-01-01 balance Assets:Liquid:Caixabank:Corrent 18903.80 EUR -2024-01-01 balance Assets:Liquid:Caixabank:Estalvi 12666.49 EUR -2024-01-01 balance Assets:Liquid:R4:EUR 44.04 EUR +2024-01-01 balance Assets:Liquid:Caixabank:Corrent 21795.94 EUR +2024-01-01 balance Assets:Liquid:Caixabank:Estalvi 12870.71 EUR +2024-01-01 balance Assets:Liquid:R4:EUR 279.27 EUR 2024-01-01 balance Assets:Invest:R4:Amundi:MSCIWRLD 86.005 AMNDMSCIWRLD 2024-01-01 balance Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK 2024-01-01 balance Assets:Invest:R4:Fidelity:GLTECH 344.47 FIGLTECH @@ -44,6 +44,7 @@ 2024-01-01 balance Assets:PersonalProperty:MetallsPreciosos 0 EUR 2024-01-01 balance Assets:PersonalProperty:AltresPropietats 0 EUR 2024-01-01 balance Assets:Debt:DeutesPerCobrar 0 EUR +2024-01-01 balance Liabilities:Credit:Caixabank:TargetaCredit -414.7 EUR 2024-01-01 * "Zurich" "Cuota gimnàs Andjoy" Expenses:Gimnàs 508.80 EUR @@ -57,10 +58,13 @@ 2024-01-01 * "Zurich" "Targeta Restaurant" Assets:Benefits:Edenred:TicketsRestaurant 209 EUR Income:Work:Zurich:TicketsRestaurant +2024-01-01 * "Caixabank" "Pagament targeta de crèdit" + Liabilities:Credit:Caixabank:TargetaCredit 315.71 EUR + Assets:Liquid:Caixabank:Corrent -2024-02-01 balance Assets:Liquid:Caixabank:Corrent 18903.80 EUR -2024-02-01 balance Assets:Liquid:Caixabank:Estalvi 12666.49 EUR -2024-02-01 balance Assets:Liquid:R4:EUR 44.04 EUR +2024-02-01 balance Assets:Liquid:Caixabank:Corrent 21480.23 EUR +2024-02-01 balance Assets:Liquid:Caixabank:Estalvi 12870.71 EUR +2024-02-01 balance Assets:Liquid:R4:EUR 279.27 EUR 2024-02-01 balance Assets:Invest:R4:Amundi:MSCIWRLD 86.005 AMNDMSCIWRLD 2024-02-01 balance Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK 2024-02-01 balance Assets:Invest:R4:Fidelity:GLTECH 344.47 FIGLTECH @@ -76,3 +80,4 @@ 2024-02-01 balance Assets:PersonalProperty:MetallsPreciosos 0 EUR 2024-02-01 balance Assets:PersonalProperty:AltresPropietats 0 EUR 2024-02-01 balance Assets:Debt:DeutesPerCobrar 0 EUR +2024-02-01 balance Liabilities:Credit:Caixabank:TargetaCredit -98.99 EUR