From 41c635fd330d1221286cc79e549d2063e526fa36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roger=20Oriol=20P=C3=A9rez?= Date: Sat, 8 Jun 2024 13:10:44 +0200 Subject: [PATCH] 8 juny 2024 --- commands/balance-sheet | 20 ++++++-- ledger/transactions/2024/06.beancount | 73 ++++++++++++++++++++++++--- 2 files changed, 84 insertions(+), 9 deletions(-) diff --git a/commands/balance-sheet b/commands/balance-sheet index abe836a..cc1defe 100755 --- a/commands/balance-sheet +++ b/commands/balance-sheet @@ -167,6 +167,20 @@ def get_max_leveraged_investment(balances): assets = get_total_assets(balances) return Amount(round(assets.number * Decimal(0.9), 2), assets.currency).to_string() +def get_estalvi(balances): + accounts = [ + "Assets:Liquid:Caixabank:Estalvi", + "Assets:Liquid:TradeRepublic:EUR" + ] + total = 0 + for account in accounts: + if account in balances: + if total == 0: + total = balances[account] + else: + total = total + balances[account] + return total + def get_position_as_str(inventory): position = inventory.get_only_position() if position is None: @@ -181,9 +195,9 @@ def print_report(date, balances): print(f"\t{bcolors.BOLD}Liquids{bcolors.ENDC}") print(tabulate([ ["Corrent", get_position_as_str(balances["Assets:Liquid:Caixabank:Corrent"])], - ["Estalvi", get_position_as_str(balances["Assets:Liquid:Caixabank:Estalvi"] + balances["Assets:Liquid:TradeRepublic:EUR"])], + ["Estalvi", get_position_as_str(get_estalvi(balances))], ["Compte d'inversió", get_position_as_str(balances["Assets:Liquid:R4:EUR"])], - ["Total líquids", get_position_as_str(balances["Assets:Liquid:R4:EUR"] + balances["Assets:Liquid:Caixabank:Estalvi"] + balances["Assets:Liquid:Caixabank:Corrent"] + balances["Assets:Liquid:TradeRepublic:EUR"])], + ["Total líquids", get_position_as_str(balances["Assets:Liquid:R4:EUR"] + balances["Assets:Liquid:Caixabank:Corrent"] + get_estalvi(balances))], ])) print(f"\t{bcolors.BOLD}Inversions{bcolors.ENDC}") print(tabulate([ @@ -210,7 +224,7 @@ def print_report(date, balances): print(tabulate([ ["Tickets Restaurant", get_position_as_str(balances["Assets:Benefits:Edenred:TicketsRestaurant"])], ["Targeta Transport", get_position_as_str(balances["Assets:Benefits:Edenred:TargetaTransport"])], - ["Pla Pensions Empleados Zurich", get_position_as_str(balances["Assets:Benefits:DZP:PPEZurich"])], + ["Pla Pensions Empleados Zurich", get_position_as_str(balances["Assets:Benefits:DZP:PPEZurich"]) if "Assets:Benefits:DZP:PPEZurich" in balances else "-"], ["Total beneficis", get_total_benefits(balances)], ])) print(tabulate([ diff --git a/ledger/transactions/2024/06.beancount b/ledger/transactions/2024/06.beancount index 988231b..86df4f7 100644 --- a/ledger/transactions/2024/06.beancount +++ b/ledger/transactions/2024/06.beancount @@ -23,14 +23,75 @@ Liabilities:Credit:Caixabank:TargetaCredit 921.37 EUR Assets:Liquid:Caixabank:Corrent 2024-06-01 * "Edenred" "Recarrega targeta restaurant" - Assets:Benefits:Edenred:TicketsRestaurant 209 EUR + Assets:Benefits:Edenred:TicketsRestaurant 209 EUR Income:Work:Zurich:TicketsRestaurant 2024-06-01 * "Marc" "Transferencia Marc Lloguer" - Equity:DeutesPerCobrar 500 EUR - Expenses:Caixabank:Comissions 15 EUR + Equity:DeutesPerCobrar 500 EUR + Expenses:Caixabank:Comissions 15 EUR + Assets:Liquid:Caixabank:Corrent +2024-06-01 * "Amazon" "Camiseta regal marc" + Expenses:Altres 16.49 EUR + Assets:Liquid:Caixabank:Corrent +2024-06-02 * "AWS" "Factura AWS" + Expenses:MarcaPersonal 1.93 EUR + Assets:Liquid:Caixabank:Corrent +2024-06-03 * "O2" "Factura Internet" + Expenses:Internet 50 EUR + Assets:Liquid:Caixabank:Corrent +2024-06-03 * "Alting" "Lloguer Parking" + Expenses:Parking 116.04 EUR + Assets:Liquid:Caixabank:Corrent +2024-06-03 * "Aigues de Barcelona" "Factura aigua" + Expenses:FacturesUtilitats 31.17 EUR + Expenses:FacturesUtilitatsHimanshu 31 EUR + Income:Other:Caixabank:Transferencia -31 EUR + Assets:Liquid:Caixabank:Corrent +2024-06-03 * "Amazon" "Mòbil Pixel 8 (1r pagament)" + Expenses:Altres 149.75 EUR + Assets:Liquid:Caixabank:Corrent +2024-06-03 * "Amazon" "Pack 6 calçotets" + Expenses:Roba 36.95 EUR + Assets:Liquid:Caixabank:Corrent +2024-06-03 * "Massimo Dutti" "Pantalons lli + camiseta" + Expenses:Roba 99.90 EUR + Liabilities:Credit:Caixabank:TargetaCredit +2024-06-03 * "Cafeteria San Vicente" "Berenar" + Expenses:MenjarFora 26.30 EUR + Assets:Liquid:Caixabank:Corrent +2024-06-04 * "Finques Samsó" "Lloguer pis juny" + Expenses:Lloguer 591.77 EUR + Expenses:LloguerHimanshu 500 EUR + Income:Other:Caixabank:Transferencia -500 EUR + Assets:Liquid:Caixabank:Corrent +2024-06-04 * "McDonalds" "Dinar estació de Sants" + Expenses:MenjarFora 10.46 EUR + Assets:Benefits:Edenred:TicketsRestaurant +2024-06-04 * "Hotel Melia Avenida America" "Estancia Madrid AWS Summit" + Expenses:Altres 196 EUR + Assets:Liquid:Caixabank:Corrent +2024-06-04 * "Familia la Hambre" "Bermut per Madrid" + Expenses:MenjarFora 10 EUR + Assets:Liquid:Caixabank:Corrent +2024-06-04 * "Veneta Gelato Italiano" "Gelat per Madrid" + Expenses:MenjarFora 4 EUR + Assets:Benefits:Edenred:TicketsRestaurant +2024-06-05 * "Brief Atocha" "Cocacola a Atocha" + Expenses:Supermercat 3.65 EUR + Assets:Benefits:Edenred:TicketsRestaurant +2024-06-06 * "El Fornet" "Cafè All-Hands" + Expenses:MenjarFora 1.90 EUR + Assets:Benefits:Edenred:TicketsRestaurant +2024-06-06 * "Plusfresc" "Compra de la setmana" + Expenses:Supermercat 10.86 EUR + Assets:Liquid:Caixabank:Corrent +2024-06-07 * "Google Store" "Carregador Pixel 8" + Expenses:Altres 29 EUR + Assets:Liquid:Caixabank:Corrent +2024-06-08 * "Club Basquet Santa Eugenia de Berga" "Cocacola" + Expenses:MenjarFora 2.50 EUR Assets:Liquid:Caixabank:Corrent -2024-07-01 balance Assets:Liquid:Caixabank:Corrent 14702.16 EUR +2024-07-01 balance Assets:Liquid:Caixabank:Corrent 13433.40 EUR 2024-07-01 balance Assets:Liquid:TradeRepublic:EUR 19582.05 EUR 2024-07-01 balance Assets:Liquid:R4:EUR 53.81 EUR 2024-07-01 balance Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK @@ -40,7 +101,7 @@ 2024-07-01 balance Assets:Invest:R4:ETF:IWVL 25 IWVL 2024-07-01 balance Assets:Invest:R4:PLTR 10 PLTR 2024-07-01 balance Assets:Invest:R4:MSFT 4 MSFT -2024-07-01 balance Assets:Benefits:Edenred:TicketsRestaurant 210.16 EUR +2024-07-01 balance Assets:Benefits:Edenred:TicketsRestaurant 190.15 EUR 2024-07-01 balance Assets:Benefits:Edenred:TargetaTransport 130.40 EUR 2024-07-01 balance Assets:Benefits:DZP:PPEZurich 1973.68 EUR 2024-07-01 balance Assets:PersonalProperty:VivendaPrincipal 0 EUR @@ -49,4 +110,4 @@ 2024-07-01 balance Assets:PersonalProperty:MetallsPreciosos 0 EUR 2024-07-01 balance Assets:PersonalProperty:AltresPropietats 0 EUR 2024-07-01 balance Assets:Debt:DeutesPerCobrar 0 EUR -2024-07-01 balance Liabilities:Credit:Caixabank:TargetaCredit -12.37 EUR \ No newline at end of file +2024-07-01 balance Liabilities:Credit:Caixabank:TargetaCredit -112.27 EUR \ No newline at end of file