diff --git a/commands/cash-flow-statement b/commands/cash-flow-statement index 5540d32..a751512 100755 --- a/commands/cash-flow-statement +++ b/commands/cash-flow-statement @@ -66,9 +66,9 @@ def get_total_outflows(expenses, total_investments): return total_investments def get_total_investments(investments): - sum = 0 + sum = Amount(Decimal(0), "EUR") for inv in investments: - sum = inv.cost_position if sum == 0 else sum + inv.cost_position + sum = inv.cost_position if sum == Amount(Decimal(0), "EUR") else add(sum, inv.cost_position) if sum != 0 and sum != None: return Amount(Decimal(round(sum.number, 2)), sum.currency) else: diff --git a/ledger/accounts.beancount b/ledger/accounts.beancount index 24923e1..c31520a 100644 --- a/ledger/accounts.beancount +++ b/ledger/accounts.beancount @@ -45,6 +45,7 @@ 1970-01-01 open Expenses:Lloguer EUR 1970-01-01 open Expenses:LloguerHimanshu EUR 1970-01-01 open Expenses:FacturesUtilitats EUR +1970-01-01 open Expenses:FacturesUtilitatsHimanshu EUR 1970-01-01 open Expenses:Internet EUR 1970-01-01 open Expenses:Gasolina EUR 1970-01-01 open Expenses:MantenimentCotxe EUR diff --git a/ledger/transactions/2024/01.beancount b/ledger/transactions/2024/01.beancount index 3ec3b9a..4454087 100644 --- a/ledger/transactions/2024/01.beancount +++ b/ledger/transactions/2024/01.beancount @@ -237,6 +237,7 @@ Assets:Liquid:Caixabank:Corrent 2024-01-31 * "Fontaner" "Reparació tuberies cuina" Expenses:Llar 50 EUR + Income:Other:Caixabank:Transferencia -25 EUR Assets:Liquid:Caixabank:Corrent 2024-01-31 * "Plusfresc" "Compra de la setmana" Expenses:Supermercat 58.14 EUR @@ -248,7 +249,7 @@ Expenses:Supermercat 16.61 EUR Assets:Liquid:Caixabank:Corrent -2024-02-01 balance Assets:Liquid:Caixabank:Corrent 16984.41 EUR +2024-02-01 balance Assets:Liquid:Caixabank:Corrent 17009.41 EUR 2024-02-01 balance Assets:Liquid:Caixabank:Estalvi 0 EUR 2024-02-01 balance Assets:Liquid:TradeRepublic:EUR 17000 EUR 2024-02-01 balance Assets:Liquid:R4:EUR 1057.20 EUR diff --git a/ledger/transactions/2024/02.beancount b/ledger/transactions/2024/02.beancount index f1e890e..8086782 100644 --- a/ledger/transactions/2024/02.beancount +++ b/ledger/transactions/2024/02.beancount @@ -1,4 +1,4 @@ -2024-02-01 balance Assets:Liquid:Caixabank:Corrent 16984.41 EUR +2024-02-01 balance Assets:Liquid:Caixabank:Corrent 17009.41 EUR 2024-02-01 balance Assets:Liquid:Caixabank:Estalvi 0 EUR 2024-02-01 balance Assets:Liquid:TradeRepublic:EUR 17000 EUR 2024-02-01 balance Assets:Liquid:R4:EUR 1057.20 EUR @@ -34,11 +34,102 @@ 2024-02-01 * "R4" "Compra fons Fidelity Technology" Assets:Invest:R4:Fidelity:GLTECH 22.95 FIGLTECH {43.573 EUR} Assets:Liquid:R4:EUR -1000 EUR +2024-02-01 * "R4" "Dividend Amundi D" + Income:Invest:R4:Dividends -6.35 EUR + Expenses:Taxes:BeneficisDividends 1.21 EUR + Assets:Liquid:R4:EUR +2024-02-01 * "Alting" "Lloguer Parking" + Expenses:Parking 122.09 EUR + Assets:Liquid:Caixabank:Corrent +2024-02-01 * "Movistar" "Internet" + Expenses:Internet 50 EUR + Assets:Liquid:Caixabank:Corrent +2024-02-02 * "AWS EMEA" "Factura AWS" + Expenses:MarcaPersonal 1.69 EUR + Assets:Liquid:Caixabank:Corrent +2024-02-02 * "Hotel del Lago" "Hotel Puigcerdà" + Expenses:Vacances 155 EUR + Liabilities:Credit:Caixabank:TargetaCredit +2024-02-02 * "Massimo Dutti" "Mitjons" + Expenses:Roba 19.90 EUR + Assets:Liquid:Caixabank:Corrent +2024-02-02 * "Chalito" "Sopar La Maquinista" + Expenses:MenjarFora 48.70 EUR + Assets:Benefits:Edenred:TicketsRestaurant +2024-02-02 * "Beltran Alimentacion" "Aigues" + Expenses:Supermercat 4.50 EUR + Assets:Liquid:Caixabank:Corrent +2024-02-03 * "Ryanair" "Vols febrer" + Expenses:Mobilitat 32.06 EUR + Expenses:Mobilitat 15.58 EUR + Liabilities:Credit:Caixabank:TargetaCredit +2024-02-04 * "Pizzeria Fabian" "Sopar Puigcerdà" + Expenses:MenjarFora 61.30 EUR + Assets:Benefits:Edenred:TicketsRestaurant +2024-02-04 * "Xocolaters Pirineus" "Esmorzar Puigcerdà" + Expenses:MenjarFora 10.60 EUR + Assets:Benefits:Edenred:TicketsRestaurant +2024-02-04 * "Restaurante Asiatico Puigcerdà" "Dinar Puigcerdà" + Expenses:MenjarFora 45.80 EUR + Assets:Benefits:Edenred:TicketsRestaurant +2024-02-04 * "Balmes Multicines" "Pelicula Argylle" + Expenses:Entreteniment 19 EUR + Assets:Liquid:Caixabank:Corrent +2024-02-05 * "Finques Samsó" "Lloguer Febrer" #lloguer + Assets:Liquid:Caixabank:Corrent -1091.77 EUR + Expenses:Lloguer 591.77 EUR + Income:Other:Caixabank:Transferencia -500 EUR + Assets:Liquid:Caixabank:Corrent 500 EUR + Expenses:LloguerHimanshu 500 EUR +2024-02-05 * "Mercadona" "Gelat Laura" + Expenses:Supermercat 7.40 EUR + Assets:Liquid:Caixabank:Corrent +2024-02-06 * "Don Zangano" "Esmorzar" + Expenses:MenjarFora 5.50 EUR + Assets:Benefits:Edenred:TicketsRestaurant +2024-02-06 * "Plusfresc" "Aigua i fruita" + Expenses:Supermercat 2.62 EUR + Assets:Liquid:Caixabank:Corrent +2024-02-06 * "Yi Duo" "Dinar" + Expenses:MenjarFora 16.45 EUR + Assets:Benefits:Edenred:TicketsRestaurant +2024-02-06 * "Plusfresc" "Compra de la setmana" + Expenses:Supermercat 59.93 EUR + Assets:Liquid:Caixabank:Corrent +2024-02-07 * "Goiko" "Sopar" + Expenses:MenjarFora 47.50 EUR + Assets:Liquid:Caixabank:Corrent +2024-02-07 * "Metro Barcelona" "T-10 Metro Barcelona" + Expenses:Mobilitat 12.15 EUR + Assets:Liquid:Caixabank:Corrent +2024-02-08 * "Aigues de Barcelona" "Factura aigua" + Expenses:FacturesUtilitats 6.93 EUR + Expenses:FacturesUtilitatsHimanshu 6.93 EUR + Income:Other:Caixabank:Transferencia -7 EUR + Assets:Liquid:Caixabank:Corrent -6.86 EUR +2024-02-08 * "Repsol" "Gasolina" + Expenses:Gasolina 20 EUR + Assets:Liquid:Caixabank:Corrent +2024-02-09 * "Samsara" "Sopar sushi" + Expenses:MenjarFora 47.40 EUR + Assets:Liquid:Caixabank:Corrent +2024-02-09 * "City Arms" "Mojito" + Expenses:Entreteniment 12.50 EUR + Assets:Liquid:Caixabank:Corrent +2024-02-10 * "Can Salvi" "Compra mama" + Expenses:Altres 34 EUR + Income:Other:Caixabank:Bizum +2024-02-10 * "EsclatOil" "Gasolina" + Expenses:Gasolina 50 EUR + Assets:Liquid:Caixabank:Corrent +2024-02-10 * "Viena" "Dinar Olot" + Expenses:MenjarFora 26.25 EUR + Assets:Liquid:Caixabank:Corrent -2024-03-01 balance Assets:Liquid:Caixabank:Corrent 16553.98 EUR +2024-03-01 balance Assets:Liquid:Caixabank:Corrent 15477.42 EUR 2024-03-01 balance Assets:Liquid:Caixabank:Estalvi 0 EUR 2024-03-01 balance Assets:Liquid:TradeRepublic:EUR 17003.77 EUR -2024-03-01 balance Assets:Liquid:R4:EUR 57.20 EUR +2024-03-01 balance Assets:Liquid:R4:EUR 62.34 EUR 2024-03-01 balance Assets:Invest:R4:Amundi:MSCIWRLD 91.041 AMNDMSCIWRLD 2024-03-01 balance Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK 2024-03-01 balance Assets:Invest:R4:Fidelity:GLTECH 367.42 FIGLTECH @@ -46,7 +137,7 @@ 2024-03-01 balance Assets:Invest:R4:BNP:DISTECH 0.359 BNPDISTECH 2024-03-01 balance Assets:Invest:R4:PLTR 10 PLTR 2024-03-01 balance Assets:Invest:R4:MSFT 4 MSFT -2024-03-01 balance Assets:Benefits:Edenred:TicketsRestaurant 210.48 EUR +2024-03-01 balance Assets:Benefits:Edenred:TicketsRestaurant 22.13 EUR 2024-03-01 balance Assets:Benefits:Edenred:TargetaTransport 80 EUR 2024-03-01 balance Assets:PersonalProperty:VivendaPrincipal 0 EUR 2024-03-01 balance Assets:PersonalProperty:Cotxe 10000 EUR @@ -54,4 +145,4 @@ 2024-03-01 balance Assets:PersonalProperty:MetallsPreciosos 0 EUR 2024-03-01 balance Assets:PersonalProperty:AltresPropietats 0 EUR 2024-03-01 balance Assets:Debt:DeutesPerCobrar 0 EUR -2024-03-01 balance Liabilities:Credit:Caixabank:TargetaCredit 0 EUR \ No newline at end of file +2024-03-01 balance Liabilities:Credit:Caixabank:TargetaCredit -202.64 EUR \ No newline at end of file diff --git a/reports/income/20231217/income.html b/reports/income/20231217/income.html deleted file mode 100644 index 83fe5fc..0000000 --- a/reports/income/20231217/income.html +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - -
- -
-

Income

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
AccountEUROther
Income
Income:Work
Income:Work:Zurich
Income:Work:Zurich:Gimnas-508.80
Income:Work:Zurich:SeguroMedic-414.60
Income:Work:Zurich:TarjetaTransport-40.000
Income:Work:Zurich:TicketsRestaurant-209.000
-1172.400
- -
- -
-
- -
-

Expenses

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
AccountEUROther
Expenses
Expenses:Altres
Expenses:AmazonPrime
Expenses:CarnetJove
Expenses:Educació
Expenses:Entreteniment
Expenses:FacturesUtilitats
Expenses:Gasolina
Expenses:Gimnàs508.80
Expenses:Insurance
Expenses:Insurance:Cotxe
Expenses:Internet
Expenses:Lloguer
Expenses:MantenimentCotxe
Expenses:MarcaPersonal
Expenses:Medic414.60
Expenses:MenjarFora
Expenses:Mobilitat
Expenses:NintendoOnline
Expenses:Parking
Expenses:Perruqueria
Expenses:Roba
Expenses:Supermercat
Expenses:Taxes
Expenses:Taxes:ImpostCirculacio
Expenses:Vacances
923.40
- -
- -
- - - -