diff --git a/commands/balance-sheet b/commands/balance-sheet
index 0c62efd..bcae9ed 100755
--- a/commands/balance-sheet
+++ b/commands/balance-sheet
@@ -5,8 +5,9 @@ from beancount.parser import printer
import argparse
from tabulate import tabulate
from decimal import Decimal
-from beancount.core.amount import Amount, sub, mul
+from beancount.core.amount import Amount, add, sub, mul
from math import floor
+from datetime import datetime, timedelta
class bcolors:
HEADER = '\033[95m'
@@ -22,213 +23,130 @@ class bcolors:
def draw_line():
print('─' * 30)
-def get_sum_invest_funds(balances):
- sum = 0
- for account, balance in balances.items():
- if account.startswith("Assets:Invest:R4:"):
- parts = account.split(":")
- if len(parts) == 5:
- sum = balance if sum == 0 else sum + balance
- result = sum.get_only_position().units
- return Amount(Decimal(round(result.number, 2)), result.currency).to_string()
+def get_last_month_timestamps(date):
+ month = int(date.split("-")[1])
+ year = int(date.split("-")[0])
+ d = datetime(year, month, 1)
+ end_date = d - timedelta(days=1)
+ start_date = f"{end_date.year}-{end_date.month}-01"
+ return start_date, end_date.strftime("%Y-%m-%d")
-def get_sum_stocks(balances):
+def get_sum_balances(balances, account_prefix):
sum = 0
for account, balance in balances.items():
- if account.startswith("Assets:Invest:R4:"):
- parts = account.split(":")
- if len(parts) == 4:
- sum = balance if sum == 0 else sum + balance
- result = sum.get_only_position().units
- return Amount(Decimal(round(result.number, 2)), result.currency).to_string()
-
-def get_total_inversions(balances):
- sum = 0
- for account, balance in balances.items():
- if account.startswith("Assets:Invest:R4:"):
+ if account.startswith(account_prefix):
sum = balance if sum == 0 else sum + balance
- result = sum.get_only_position().units
- return Amount(Decimal(round(result.number, 2)), result.currency)
-
-def get_total_propietats(balances):
- sum = 0
- for account, balance in balances.items():
- if account.startswith("Assets:PersonalProperty:"):
- sum = balance if sum == 0 else sum + balance
- result = sum.get_only_position().units
- return Amount(Decimal(round(result.number, 2)), result.currency).to_string()
-
-def get_total_debt_assets(balances):
- sum = 0
- for account, balance in balances.items():
- if account.startswith("Assets:Debt:"):
- sum = balance if sum == 0 else sum + balance
- if sum != 0 and sum.get_only_position() != None:
- result = sum.get_only_position().units
- return Amount(Decimal(round(result.number, 2)), result.currency).to_string()
- else:
+ if sum == 0 or sum.get_only_position() == None:
return Amount(Decimal(0), "EUR").to_string()
-
-def get_total_benefits(balances):
- sum = 0
- for account, balance in balances.items():
- if account.startswith("Assets:Benefits:"):
- sum = balance if sum == 0 else sum + balance
- if sum != 0 and sum.get_only_position() != None:
- result = sum.get_only_position().units
- return Amount(Decimal(round(result.number, 2)), result.currency).to_string()
- else:
- return Amount(Decimal(0), "EUR").to_string()
-
-def get_total_assets(balances):
- sum = 0
- for account, balance in balances.items():
- if account.startswith("Assets:"):
- sum = balance if sum == 0 else sum + balance
- if sum != 0 and sum.get_only_position() != None:
- result = sum.get_only_position().units
- return Amount(Decimal(round(result.number, 2)), result.currency)
- else:
- return Amount(Decimal(0), "EUR")
-
-def get_total_liabilites(balances):
- sum = 0
- for account, balance in balances.items():
- if account.startswith("Liabilities:"):
- sum = balance if sum == 0 else sum + balance
- if sum != 0 and sum.get_only_position() != None:
- result = sum.get_only_position().units
- return Amount(Decimal(round(result.number, 2) * -1), result.currency)
- else:
- return Amount(Decimal(0), "EUR")
+ result = sum.get_only_position().units
+ return Amount(Decimal(round(result.number, 2)), result.currency).to_string()
def get_net_worth(balances):
- return sub(get_total_assets(balances), get_total_liabilites(balances))
+ total_assets = Amount.from_string(get_sum_balances(balances, "Assets:"))
+ total_liabilities = Amount.from_string(get_sum_balances(balances, "Liabilities:"))
+ return add(total_assets, total_liabilities)
def get_debt_to_assets_ratio(balances, max):
- assets = 0
- liabilities = 0
- for account, balance in balances.items():
- if account.startswith("Assets:"):
- assets = balance if assets == 0 else assets + balance
- elif account.startswith("Liabilities:"):
- liabilities = balance if liabilities == 0 else liabilities + balance
- total_liabilities = Amount(Decimal(0), "EUR") if liabilities.get_only_position() == None else liabilities.get_only_position().units
- total_assets = Amount(Decimal(0), "EUR") if assets.get_only_position() == None else assets.get_only_position().units
+ total_assets = Amount.from_string(get_sum_balances(balances, "Assets:"))
+ total_liabilities = Amount.from_string(get_sum_balances(balances, "Liabilities:"))
result = round(((total_liabilities.number * -1) / total_assets.number) * 100, 2)
return f"{bcolors.FAIL if result >= max else bcolors.OKGREEN}{result} %{bcolors.ENDC}"
-def get_basic_liquidity_ratio(balances, min):
+def get_emergency_fund_ratio(balances, expenses, low, mid):
liquid = 0
- living_expenses = 2000 # TODO: Hardcoded
+ living_expenses = expenses[0].position.get_only_position().units.number
for account, balance in balances.items():
if account.startswith("Assets:Liquid"):
liquid = balance if liquid == 0 else liquid + balance
total_liquid = Amount(Decimal(0), "EUR") if liquid.get_only_position() == None else liquid.get_only_position().units
result = round(total_liquid.number / living_expenses, 2)
- return f"{bcolors.FAIL if result < min else bcolors.OKGREEN}{result}{bcolors.ENDC}"
+ color = bcolors.FAIL if result < low else bcolors.OKGREEN if result > mid else bcolors.WARNING
+ return f"{color}{result}{bcolors.ENDC}"
def get_investment_assets_to_net_worth_ratio(balances, min):
- result = round((get_total_inversions(balances).number / get_net_worth(balances).number) * 100, 2)
+ total_investment = Amount.from_string(get_sum_balances(balances, "Assets:Invest:"))
+ result = round((total_investment.number / get_net_worth(balances).number) * 100, 2)
return f"{bcolors.FAIL if result < min else bcolors.OKGREEN}{result} %{bcolors.ENDC}"
def get_liquid_assets_to_net_worth_ratio(balances, min):
liquid = 0
for account, balance in balances.items():
- if account.startswith("Assets:Liquid"):
+ if account.startswith("Assets:Liquid") or account.startswith("Assets:Invest"):
liquid = balance if liquid == 0 else liquid + balance
total_liquid = Amount(Decimal(0), "EUR") if liquid.get_only_position() == None else liquid.get_only_position().units
result = round((total_liquid.number / get_net_worth(balances).number) * 100, 2)
return f"{bcolors.FAIL if result < min else bcolors.OKGREEN}{result} %{bcolors.ENDC}"
-def get_savings_ratio(balances, min):
- monthly_savings_for_investment = 1200 # TODO: Hardcoded
- gross_monthly_income = 3300 # TODO: Hardcoded
- result = round((monthly_savings_for_investment / gross_monthly_income) * 100, 2)
+def get_savings_ratio(balances, gross_monthly_income, monthly_savings, min):
+ result = round((monthly_savings.number / gross_monthly_income) * 100, 2)
return f"{bcolors.FAIL if result < min else bcolors.OKGREEN}{result} %{bcolors.ENDC}"
-def get_debt_service_ratio(balances, max):
- monthly_debt_repayment = 0 # TODO: Hardcoded
- gross_monthly_income = 3300 # TODO: Hardcoded
- result = round((monthly_debt_repayment / gross_monthly_income) * 100, 2)
+def get_debt_service_ratio(balances, gross_monthly_income, debt_payments, max):
+ result = round((debt_payments.number / gross_monthly_income) * 100, 2)
return f"{bcolors.FAIL if result >= max else bcolors.OKGREEN}{result} %{bcolors.ENDC}"
-def get_non_mortgage_debt_service_ratio(balances, max):
- monthly_mortgage_debt_repayment = 0 # TODO: Hardcoded
- gross_monthly_income = 3300 # TODO: Hardcoded
- result = round((monthly_mortgage_debt_repayment / gross_monthly_income) * 100, 2)
+def get_non_mortgage_debt_service_ratio(balances, gross_monthly_income, mortgage_payments, max):
+ result = round((mortgage_payments.number / gross_monthly_income) * 100, 2)
return f"{bcolors.FAIL if result >= max else bcolors.OKGREEN}{result} %{bcolors.ENDC}"
def get_solvency_ratio(balances, min):
- result = round((get_net_worth(balances).number / get_total_assets(balances).number) * 100, 2)
+ total_assets = Amount.from_string(get_sum_balances(balances, "Assets:"))
+ result = round((get_net_worth(balances).number / total_assets.number) * 100, 2)
return f"{bcolors.FAIL if result < min else bcolors.OKGREEN}{result} %{bcolors.ENDC}"
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
+ total_assets = Amount.from_string(get_sum_balances(balances, "Assets:"))
+ return Amount(round(total_assets.number * Decimal(0.9), 2), total_assets.currency).to_string()
def get_position_as_str(inventory):
position = inventory.get_only_position()
if position is None:
return position
else:
- return position.to_string()
+ return Amount(Decimal(round(position.units.number, 2)), position.units.currency).to_string()
-def print_report(date, balances):
+def print_report(date, balances, expenses, income, debt_payments, mortgage_payments, savings):
print(f"{bcolors.BOLD}Balance Sheet (date={date}){bcolors.ENDC}")
draw_line()
print(f"{bcolors.BOLD}Assets{bcolors.ENDC}")
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(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:Corrent"] + get_estalvi(balances))],
+ ["Corrent", get_sum_balances(balances, "Assets:Liquid:Caixabank:Corrent")],
+ ["Estalvi", get_sum_balances(balances, "Assets:Liquid:Estalvi")],
+ ["Compte d'inversió", get_sum_balances(balances, "Assets:Liquid:R4:EUR")],
+ ["Total líquids", get_sum_balances(balances, "Assets:Liquid:")],
]))
print(f"\t{bcolors.BOLD}Inversions{bcolors.ENDC}")
print(tabulate([
- ["Fons d'inversió", get_sum_invest_funds(balances)],
- ["Accions", get_sum_stocks(balances)],
- ["Renta fixa", Amount(Decimal(0), "EUR").to_string()],
- ["Total inversions", get_total_inversions(balances).to_string()],
+ ["Fons d'inversió", get_sum_balances(balances, "Assets:Invest:Fund:")],
+ ["ETFs", get_sum_balances(balances, "Assets:Invest:ETF:")],
+ ["Accions", get_sum_balances(balances, "Assets:Invest:Stock:")],
+ ["Renta fixa", get_sum_balances(balances, "Assets:Invest:Fixed:")],
+ ["Total inversions", get_sum_balances(balances, "Assets:Invest:")],
]))
print(f"\t{bcolors.BOLD}Propietat personal{bcolors.ENDC}")
print(tabulate([
- ["Vivenda principal", get_position_as_str(balances["Assets:PersonalProperty:VivendaPrincipal"])],
- ["Cotxes", get_position_as_str(balances["Assets:PersonalProperty:Cotxe"])],
- ["Joies, Art, Col·leccionables", get_position_as_str(balances["Assets:PersonalProperty:JoiesArtCollecionables"])],
- ["Metalls preciosos", get_position_as_str(balances["Assets:PersonalProperty:MetallsPreciosos"])],
- ["Altres propietats", get_position_as_str(balances["Assets:PersonalProperty:AltresPropietats"])],
- ["Total propietats", get_total_propietats(balances)],
+ ["Vivenda principal", get_sum_balances(balances, "Assets:PersonalProperty:VivendaPrincipal")],
+ ["Cotxes", get_sum_balances(balances, "Assets:PersonalProperty:Cotxe")],
+ ["Joies, Art, Col·leccionables", get_sum_balances(balances, "Assets:PersonalProperty:JoiesArtCollecionables")],
+ ["Metalls preciosos", get_sum_balances(balances, "Assets:PersonalProperty:MetallsPreciosos")],
+ ["Altres propietats", get_sum_balances(balances, "Assets:PersonalProperty:AltresPropietats")],
+ ["Total propietats", get_sum_balances(balances, "Assets:PersonalProperty:")],
]))
print(f"\t{bcolors.BOLD}Deutes{bcolors.ENDC}")
print(tabulate([
["Deutes per cobrar", get_position_as_str(balances["Assets:Debt:DeutesPerCobrar"])],
- ["Total deutes", get_total_debt_assets(balances)],
+ ["Total deutes", get_sum_balances(balances, "Assets:Debt:")],
]))
print(f"\t{bcolors.BOLD}Beneficis laborals{bcolors.ENDC}")
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"]) if "Assets:Benefits:DZP:PPEZurich" in balances else "-"],
- ["Total beneficis", get_total_benefits(balances)],
+ ["Total beneficis", get_sum_balances(balances, "Assets:Benefits:")],
]))
print(tabulate([
- [f"\t{bcolors.BOLD}Total Assets", get_total_assets(balances).to_string()]
+ [f"\t{bcolors.BOLD}Total Assets", get_sum_balances(balances, "Assets:")]
]))
draw_line()
@@ -243,7 +161,7 @@ def print_report(date, balances):
["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}"],
+ [f"{bcolors.BOLD}Total passius{bcolors.ENDC}", f"{bcolors.BOLD}{get_sum_balances(balances, "Liabilities:")}{bcolors.ENDC}"],
]))
draw_line()
@@ -253,12 +171,12 @@ def print_report(date, balances):
print(f"{bcolors.BOLD}Financial Ratios{bcolors.ENDC}")
print(tabulate([
["Debt-to-Assets Ratio", get_debt_to_assets_ratio(balances, 50), "50 %"],
- ["Basic Liquidity Ratio", get_basic_liquidity_ratio(balances, 6), "6"],
+ ["Emergency Fund", get_emergency_fund_ratio(balances, expenses, 3, 6), "3-6"],
["Investment Assets to Net Worth Ratio", get_investment_assets_to_net_worth_ratio(balances, 50), "50 %"],
["Liquid Assets to Net Worth Ratio", get_liquid_assets_to_net_worth_ratio(balances, 15), "15 %"],
- ["Savings Ratio", get_savings_ratio(balances, 20), "20 %"],
- ["Debt-Service Ratio", get_debt_service_ratio(balances, 35), "35 %"],
- ["Non-Mortgage Debt-Service Ratio", get_non_mortgage_debt_service_ratio(balances, 15), "15 %"],
+ ["Savings Ratio", get_savings_ratio(balances, income, savings, 20), "20 %"],
+ ["Debt-Service Ratio", get_debt_service_ratio(balances, income, debt_payments, 35), "35 %"],
+ ["Non-Mortgage Debt-Service Ratio", get_non_mortgage_debt_service_ratio(balances, income, mortgage_payments, 15), "15 %"],
["Solvency Ratio", get_solvency_ratio(balances, 50), "50 %"]
]))
@@ -271,6 +189,40 @@ def get_balances(entries, options, date):
balances[row.account] = row.position
return balances
+def get_expenses(entries, options, date):
+ start_date, end_date = get_last_month_timestamps(date)
+ expenses_query = f"SELECT convert(sum(position), \"EUR\") as position FROM date <= {end_date} WHERE account ~ 'Expenses:' AND date >= {start_date}"
+ rtypes, rrows = query.run_query(
+ entries, options, expenses_query)
+ return rrows
+
+def get_income(entries, options, date):
+ start_date, end_date = get_last_month_timestamps(date)
+ income_query = f"SELECT convert(sum(position), \"EUR\") as position FROM date <= {end_date} WHERE account ~ '^(Income:Work|Income:Savings|Income:Invest)' AND date >= {start_date}"
+ rtypes, rrows = query.run_query(
+ entries, options, income_query)
+ return rrows
+
+def get_debt_payments(entries, options, date):
+ 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}"
+ rtypes, rrows_debt = query.run_query(
+ entries, options, debt_payments_query)
+ rtypes, rrows_mortgage = query.run_query(
+ entries, options, mortgage_payments_query)
+ debt_payments = rrows_debt[0].position.get_only_position().units if len(rrows_debt) > 0 else Amount(Decimal(0), "EUR")
+ mortgage_payments = rrows_mortgage[0].position.get_only_position().units if len(rrows_mortgage) > 0 else Amount(Decimal(0), "EUR")
+ return debt_payments, mortgage_payments
+
+def get_savings(entries, options, date):
+ start_date, end_date = get_last_month_timestamps(date)
+ savings_query = f"SELECT convert(sum(position), \"EUR\") as position FROM date <= {end_date} WHERE account ~ '^Assets:Invest:' AND date >= {start_date}"
+ rtypes, rrows = query.run_query(
+ entries, options, savings_query)
+ result = rrows[0].position.get_only_position().units if len(rrows) > 0 else Amount(Decimal(0), "EUR")
+ return result
+
def main():
parser = argparse.ArgumentParser(description='Generate balance sheet report')
parser.add_argument('date', metavar='date', type=str, nargs=1,
@@ -286,6 +238,11 @@ def main():
printer.print_errors(errors)
balances = get_balances(entries, options, date)
- print_report(date, balances)
+ expenses = get_expenses(entries, options, date)
+ income = get_income(entries, options, date)
+ gross_monthly_income = income[0].position.get_only_position().units.number * -1
+ debt_payments, mortgage_payments = get_debt_payments(entries, options, date)
+ savings = get_savings(entries, options, date)
+ print_report(date, balances, expenses, gross_monthly_income, debt_payments, mortgage_payments, savings)
main()
\ No newline at end of file
diff --git a/ledger/accounts.beancount b/ledger/accounts.beancount
index b2bfba4..008dec4 100644
--- a/ledger/accounts.beancount
+++ b/ledger/accounts.beancount
@@ -1,19 +1,19 @@
1970-01-01 open Assets:Liquid:Caixabank:Corrent EUR
-1970-01-01 open Assets:Liquid:Caixabank:Estalvi EUR
+1970-01-01 open Assets:Liquid:Estalvi:Caixabank EUR
1970-01-01 open Assets:Liquid:R4:EUR EUR
-1970-01-01 open Assets:Liquid:TradeRepublic:EUR EUR
-1970-01-01 open Assets:Invest:R4:Vanguard:EMMK VANEMMK
-1970-01-01 open Assets:Invest:R4:Amundi:MSCIWRLD AMNDMSCIWRLD
-1970-01-01 open Assets:Invest:R4:BNP:DISTECH BNPDISTECH
-1970-01-01 open Assets:Invest:R4:Fidelity:GLTECH FIGLTECH
-1970-01-01 open Assets:Invest:R4:Amundi:SUSTINC AMNDSUSINC
-1970-01-01 open Assets:Invest:R4:PLTR PLTR
-1970-01-01 open Assets:Invest:R4:MSFT MSFT
-1970-01-01 open Assets:Invest:R4:ETF:IWVL IWVL
-1970-01-01 open Assets:Invest:R4:Vanguard:SMCAP VANSMCAP
-1970-01-01 open Assets:Invest:R4:Vanguard:GL VANGL
-1970-01-01 open Assets:Invest:R4:R4RF R4RF
-1970-01-01 open Assets:Invest:R4:XDEQ XDEQ
+1970-01-01 open Assets:Liquid:Estalvi:TradeRepublic EUR
+1970-01-01 open Assets:Invest:Fund:Vanguard:EMMK VANEMMK
+1970-01-01 open Assets:Invest:Fund:Amundi:MSCIWRLD AMNDMSCIWRLD
+1970-01-01 open Assets:Invest:Fund:BNP:DISTECH BNPDISTECH
+1970-01-01 open Assets:Invest:Fund:Fidelity:GLTECH FIGLTECH
+1970-01-01 open Assets:Invest:Fund:Amundi:SUSTINC AMNDSUSINC
+1970-01-01 open Assets:Invest:Stock:PLTR PLTR
+1970-01-01 open Assets:Invest:Stock:MSFT MSFT
+1970-01-01 open Assets:Invest:ETF:IWVL IWVL
+1970-01-01 open Assets:Invest:Fund:Vanguard:SMCAP VANSMCAP
+1970-01-01 open Assets:Invest:Fund:Vanguard:GL VANGL
+1970-01-01 open Assets:Invest:Fixed:R4RF R4RF
+1970-01-01 open Assets:Invest:ETF:XDEQ XDEQ
1970-01-01 open Assets:Benefits:Edenred:TicketsRestaurant EUR
1970-01-01 open Assets:Benefits:Edenred:TargetaTransport EUR
1970-01-01 open Assets:Benefits:DZP:PPEZurich EUR
diff --git a/ledger/trading/2024/01.beancount b/ledger/trading/2024/01.beancount
index e2ccf5d..6b57a11 100644
--- a/ledger/trading/2024/01.beancount
+++ b/ledger/trading/2024/01.beancount
@@ -1,5 +1,5 @@
;2024-01-02 * "Selling some MSFT"
-; Assets:Invest:R4:MSFT -3 MSFT {} @ 350 USD
+; Assets:Invest:Stock:MSFT -3 MSFT {} @ 350 USD
; Assets:Liquid:R4:EUR 1040.05 EUR {1 USD}
; Expenses:R4:Comissions 9.95 EUR {1 USD}
; Income:Invest:R4:CapitalGains -24.6 EUR {1 USD}
\ No newline at end of file
diff --git a/ledger/transactions/2024/01.beancount b/ledger/transactions/2024/01.beancount
index 4454087..e1da493 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 21995.94 EUR
- Assets:Liquid:Caixabank:Estalvi 12670.71 EUR
+ Assets:Liquid:Estalvi:Caixabank 12670.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:Invest:Fund:Amundi:MSCIWRLD 86.005 AMNDMSCIWRLD {239.89 EUR}
+ Assets:Invest:Fund:Vanguard:EMMK 14.99 VANEMMK {181.3768 EUR}
+ Assets:Invest:Fund:Fidelity:GLTECH 344.47 FIGLTECH {42.50 EUR}
+ Assets:Invest:Fund:Amundi:SUSTINC 11.295 AMNDSUSINC {63.97 EUR}
Assets:Benefits:Edenred:TicketsRestaurant 1.84 EUR
Assets:Benefits:Edenred:TargetaTransport 0 EUR
Assets:PersonalProperty:VivendaPrincipal 0 EUR
@@ -21,21 +21,21 @@
Liabilities:Taxes:IRPF 0 EUR
Equity:Opening-Balances
2023-12-31 * "Balanç inicial USD"
- Assets:Invest:R4:BNP:DISTECH 0.359 BNPDISTECH {2356.0724234 USD}
- Assets:Invest:R4:PLTR 10 PLTR {17.17 USD}
- Assets:Invest:R4:MSFT 4 MSFT {376.04 USD}
+ Assets:Invest:Fund:BNP:DISTECH 0.359 BNPDISTECH {2356.0724234 USD}
+ Assets:Invest:Stock:PLTR 10 PLTR {17.17 USD}
+ Assets:Invest:Stock:MSFT 4 MSFT {376.04 USD}
Equity:Opening-Balances:USD
2024-01-01 balance Assets:Liquid:Caixabank:Corrent 21995.94 EUR
-2024-01-01 balance Assets:Liquid:Caixabank:Estalvi 12670.71 EUR
+2024-01-01 balance Assets:Liquid:Estalvi:Caixabank 12670.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
-2024-01-01 balance Assets:Invest:R4:Amundi:SUSTINC 11.295 AMNDSUSINC
-2024-01-01 balance Assets:Invest:R4:BNP:DISTECH 0.359 BNPDISTECH
-2024-01-01 balance Assets:Invest:R4:PLTR 10 PLTR
-2024-01-01 balance Assets:Invest:R4:MSFT 4 MSFT
+2024-01-01 balance Assets:Invest:Fund:Amundi:MSCIWRLD 86.005 AMNDMSCIWRLD
+2024-01-01 balance Assets:Invest:Fund:Vanguard:EMMK 14.99 VANEMMK
+2024-01-01 balance Assets:Invest:Fund:Fidelity:GLTECH 344.47 FIGLTECH
+2024-01-01 balance Assets:Invest:Fund:Amundi:SUSTINC 11.295 AMNDSUSINC
+2024-01-01 balance Assets:Invest:Fund:BNP:DISTECH 0.359 BNPDISTECH
+2024-01-01 balance Assets:Invest:Stock:PLTR 10 PLTR
+2024-01-01 balance Assets:Invest:Stock:MSFT 4 MSFT
2024-01-01 balance Assets:Benefits:Edenred:TicketsRestaurant 1.84 EUR
2024-01-01 balance Assets:Benefits:Edenred:TargetaTransport 0 EUR
2024-01-01 balance Assets:PersonalProperty:VivendaPrincipal 0 EUR
@@ -62,7 +62,7 @@
Liabilities:Credit:Caixabank:TargetaCredit 315.71 EUR
Assets:Liquid:Caixabank:Corrent
2024-01-01 * "Caixabank" "Estalvi"
- Assets:Liquid:Caixabank:Estalvi 200 EUR
+ Assets:Liquid:Estalvi:Caixabank 200 EUR
Assets:Liquid:Caixabank:Corrent
2024-01-02 * "R4" "Enviament diners"
Assets:Liquid:R4:EUR 1000 EUR
@@ -92,7 +92,7 @@
Expenses:MenjarFora 42.50 EUR
Assets:Benefits:Edenred:TicketsRestaurant
2024-01-04 * "Renta4" "Compra AMUNDI INDEX MSCI WORLD AE (EUR) INC"
- Assets:Invest:R4:Amundi:MSCIWRLD 5.036 AMNDMSCIWRLD {238.260524226 EUR}
+ Assets:Invest:Fund:Amundi:MSCIWRLD 5.036 AMNDMSCIWRLD {238.260524226 EUR}
Assets:Liquid:R4:EUR -1199.88 EUR
2024-01-05 * "TMB" "T-10 Metro Barcelona"
Expenses:Mobilitat 11.35 EUR
@@ -216,12 +216,12 @@
Assets:Liquid:Caixabank:Corrent
2024-01-28 * "Caixabank" "Liquidar compte d'estalvis"
Income:Savings:Caixabank:RentabilitatEstalvis -5.27 EUR
- Assets:Liquid:Caixabank:Estalvi 5.27 EUR
- Assets:Liquid:Caixabank:Estalvi -12875.98 EUR
+ Assets:Liquid:Estalvi:Caixabank 5.27 EUR
+ Assets:Liquid:Estalvi:Caixabank -12875.98 EUR
Expenses:Taxes:IRPF 14.95 EUR
Assets:Liquid:Caixabank:Corrent 12861.03 EUR
2024-01-28 * "TradeRepublic" "Balanç inicial TradeRepublic"
- Assets:Liquid:TradeRepublic:EUR 17000 EUR
+ Assets:Liquid:Estalvi:TradeRepublic 17000 EUR
Assets:Liquid:Caixabank:Corrent
2024-01-29 * "Edenred" "Recarrega targeta transport"
Assets:Benefits:Edenred:TargetaTransport 40 EUR
@@ -250,16 +250,16 @@
Assets:Liquid:Caixabank:Corrent
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:Estalvi:Caixabank 0 EUR
+2024-02-01 balance Assets:Liquid:Estalvi:TradeRepublic 17000 EUR
2024-02-01 balance Assets:Liquid:R4:EUR 1057.20 EUR
-2024-02-01 balance Assets:Invest:R4:Amundi:MSCIWRLD 91.041 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
-2024-02-01 balance Assets:Invest:R4:Amundi:SUSTINC 11.295 AMNDSUSINC
-2024-02-01 balance Assets:Invest:R4:BNP:DISTECH 0.359 BNPDISTECH
-2024-02-01 balance Assets:Invest:R4:PLTR 10 PLTR
-2024-02-01 balance Assets:Invest:R4:MSFT 4 MSFT
+2024-02-01 balance Assets:Invest:Fund:Amundi:MSCIWRLD 91.041 AMNDMSCIWRLD
+2024-02-01 balance Assets:Invest:Fund:Vanguard:EMMK 14.99 VANEMMK
+2024-02-01 balance Assets:Invest:Fund:Fidelity:GLTECH 344.47 FIGLTECH
+2024-02-01 balance Assets:Invest:Fund:Amundi:SUSTINC 11.295 AMNDSUSINC
+2024-02-01 balance Assets:Invest:Fund:BNP:DISTECH 0.359 BNPDISTECH
+2024-02-01 balance Assets:Invest:Stock:PLTR 10 PLTR
+2024-02-01 balance Assets:Invest:Stock:MSFT 4 MSFT
2024-02-01 balance Assets:Benefits:Edenred:TicketsRestaurant 1.48 EUR
2024-02-01 balance Assets:Benefits:Edenred:TargetaTransport 80 EUR
2024-02-01 balance Assets:PersonalProperty:VivendaPrincipal 0 EUR
diff --git a/ledger/transactions/2024/02.beancount b/ledger/transactions/2024/02.beancount
index fd90790..630c41e 100644
--- a/ledger/transactions/2024/02.beancount
+++ b/ledger/transactions/2024/02.beancount
@@ -1,14 +1,14 @@
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:Estalvi:Caixabank 0 EUR
+2024-02-01 balance Assets:Liquid:Estalvi:TradeRepublic 17000 EUR
2024-02-01 balance Assets:Liquid:R4:EUR 1057.20 EUR
-2024-02-01 balance Assets:Invest:R4:Amundi:MSCIWRLD 91.041 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
-2024-02-01 balance Assets:Invest:R4:Amundi:SUSTINC 11.295 AMNDSUSINC
-2024-02-01 balance Assets:Invest:R4:BNP:DISTECH 0.359 BNPDISTECH
-2024-02-01 balance Assets:Invest:R4:PLTR 10 PLTR
-2024-02-01 balance Assets:Invest:R4:MSFT 4 MSFT
+2024-02-01 balance Assets:Invest:Fund:Amundi:MSCIWRLD 91.041 AMNDMSCIWRLD
+2024-02-01 balance Assets:Invest:Fund:Vanguard:EMMK 14.99 VANEMMK
+2024-02-01 balance Assets:Invest:Fund:Fidelity:GLTECH 344.47 FIGLTECH
+2024-02-01 balance Assets:Invest:Fund:Amundi:SUSTINC 11.295 AMNDSUSINC
+2024-02-01 balance Assets:Invest:Fund:BNP:DISTECH 0.359 BNPDISTECH
+2024-02-01 balance Assets:Invest:Stock:PLTR 10 PLTR
+2024-02-01 balance Assets:Invest:Stock:MSFT 4 MSFT
2024-02-01 balance Assets:Benefits:Edenred:TicketsRestaurant 1.48 EUR
2024-02-01 balance Assets:Benefits:Edenred:TargetaTransport 80 EUR
2024-02-01 balance Assets:PersonalProperty:VivendaPrincipal 0 EUR
@@ -26,13 +26,13 @@
Liabilities:Credit:Caixabank:TargetaCredit 370.49 EUR
Assets:Liquid:Caixabank:Corrent
2024-02-01 * "TradeRepublic" "Interessos estalvis"
- Assets:Liquid:TradeRepublic:EUR 3.77 EUR
+ Assets:Liquid:Estalvi:TradeRepublic 3.77 EUR
Income:Savings:TradeRepublic:RentabilitatEstalvis
2024-02-01 * "Edenred" "Recarrega targeta restaurant"
Assets:Benefits:Edenred:TicketsRestaurant 209 EUR
Income:Work:Zurich:TicketsRestaurant
2024-02-01 * "R4" "Compra fons Fidelity Technology"
- Assets:Invest:R4:Fidelity:GLTECH 22.95 FIGLTECH {43.573 EUR}
+ Assets:Invest:Fund: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
@@ -220,7 +220,7 @@
Assets:Liquid:R4:EUR 1000 EUR
Assets:Liquid:Caixabank:Corrent
2024-02-27 * "TradeRepublic" "Enviament diners"
- Assets:Liquid:TradeRepublic:EUR 200 EUR
+ Assets:Liquid:Estalvi:TradeRepublic 200 EUR
Assets:Liquid:Caixabank:Corrent
2024-02-27 * "Plusfresc" "Aigua i fruita"
Expenses:Supermercat 4.42 EUR
@@ -248,16 +248,16 @@
Income:Work:Zurich:TargetaTransport
2024-03-01 balance Assets:Liquid:Caixabank:Corrent 16115.85 EUR
-2024-03-01 balance Assets:Liquid:Caixabank:Estalvi 0 EUR
-2024-03-01 balance Assets:Liquid:TradeRepublic:EUR 17203.77 EUR
+2024-03-01 balance Assets:Liquid:Estalvi:Caixabank 0 EUR
+2024-03-01 balance Assets:Liquid:Estalvi:TradeRepublic 17203.77 EUR
2024-03-01 balance Assets:Liquid:R4:EUR 1062.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
-2024-03-01 balance Assets:Invest:R4:Amundi:SUSTINC 11.295 AMNDSUSINC
-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:Invest:Fund:Amundi:MSCIWRLD 91.041 AMNDMSCIWRLD
+2024-03-01 balance Assets:Invest:Fund:Vanguard:EMMK 14.99 VANEMMK
+2024-03-01 balance Assets:Invest:Fund:Fidelity:GLTECH 367.42 FIGLTECH
+2024-03-01 balance Assets:Invest:Fund:Amundi:SUSTINC 11.295 AMNDSUSINC
+2024-03-01 balance Assets:Invest:Fund:BNP:DISTECH 0.359 BNPDISTECH
+2024-03-01 balance Assets:Invest:Stock:PLTR 10 PLTR
+2024-03-01 balance Assets:Invest:Stock:MSFT 4 MSFT
2024-03-01 balance Assets:Benefits:Edenred:TicketsRestaurant 1.48 EUR
2024-03-01 balance Assets:Benefits:Edenred:TargetaTransport 120 EUR
2024-03-01 balance Assets:Benefits:DZP:PPEZurich 1807.49 EUR
diff --git a/ledger/transactions/2024/03.beancount b/ledger/transactions/2024/03.beancount
index b9bd13e..15ee038 100644
--- a/ledger/transactions/2024/03.beancount
+++ b/ledger/transactions/2024/03.beancount
@@ -1,14 +1,14 @@
2024-03-01 balance Assets:Liquid:Caixabank:Corrent 16115.85 EUR
-2024-03-01 balance Assets:Liquid:Caixabank:Estalvi 0 EUR
-2024-03-01 balance Assets:Liquid:TradeRepublic:EUR 17203.77 EUR
+2024-03-01 balance Assets:Liquid:Estalvi:Caixabank 0 EUR
+2024-03-01 balance Assets:Liquid:Estalvi:TradeRepublic 17203.77 EUR
2024-03-01 balance Assets:Liquid:R4:EUR 1062.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
-2024-03-01 balance Assets:Invest:R4:Amundi:SUSTINC 11.295 AMNDSUSINC
-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:Invest:Fund:Amundi:MSCIWRLD 91.041 AMNDMSCIWRLD
+2024-03-01 balance Assets:Invest:Fund:Vanguard:EMMK 14.99 VANEMMK
+2024-03-01 balance Assets:Invest:Fund:Fidelity:GLTECH 367.42 FIGLTECH
+2024-03-01 balance Assets:Invest:Fund:Amundi:SUSTINC 11.295 AMNDSUSINC
+2024-03-01 balance Assets:Invest:Fund:BNP:DISTECH 0.359 BNPDISTECH
+2024-03-01 balance Assets:Invest:Stock:PLTR 10 PLTR
+2024-03-01 balance Assets:Invest:Stock:MSFT 4 MSFT
2024-03-01 balance Assets:Benefits:Edenred:TicketsRestaurant 1.48 EUR
2024-03-01 balance Assets:Benefits:Edenred:TargetaTransport 120 EUR
2024-03-01 balance Assets:Benefits:DZP:PPEZurich 1807.49 EUR
@@ -24,13 +24,13 @@
Liabilities:Credit:Caixabank:TargetaCredit 236.77 EUR
Assets:Liquid:Caixabank:Corrent
2024-03-01 * "TradeRepublic" "Interessos estalvis"
- Assets:Liquid:TradeRepublic:EUR 54.84 EUR
+ Assets:Liquid:Estalvi:TradeRepublic 54.84 EUR
Income:Savings:TradeRepublic:RentabilitatEstalvis
2024-03-01 * "Edenred" "Recarrega targeta restaurant"
Assets:Benefits:Edenred:TicketsRestaurant 209 EUR
Income:Work:Zurich:TicketsRestaurant
2024-03-01 * "R4" "Compra AMUNDI INDEX MSCI WORLD AE (EUR) INC"
- Assets:Invest:R4:Amundi:MSCIWRLD 3.86339 AMNDMSCIWRLD {258.84 EUR}
+ Assets:Invest:Fund:Amundi:MSCIWRLD 3.86339 AMNDMSCIWRLD {258.84 EUR}
Assets:Liquid:R4:EUR
2024-03-01 * "Just Eat" "Sopar"
Expenses:MenjarFora 19.14 EUR
@@ -199,7 +199,7 @@
Assets:Liquid:R4:EUR 2400 EUR
Assets:Liquid:Caixabank:Corrent
2024-03-26 * "TradeRepublic" "Enviament diners TradeRepublic"
- Assets:Liquid:TradeRepublic:EUR 1600 EUR
+ Assets:Liquid:Estalvi:TradeRepublic 1600 EUR
Assets:Liquid:Caixabank:Corrent
2024-03-27 * "Burger King" "Sopar aeroport"
Expenses:MenjarFora 13.31 EUR
@@ -244,16 +244,16 @@
2024-04-01 balance Assets:Liquid:Caixabank:Corrent 16552.92 EUR
-2024-04-01 balance Assets:Liquid:Caixabank:Estalvi 0 EUR
-2024-04-01 balance Assets:Liquid:TradeRepublic:EUR 18858.61 EUR
+2024-04-01 balance Assets:Liquid:Estalvi:Caixabank 0 EUR
+2024-04-01 balance Assets:Liquid:Estalvi:TradeRepublic 18858.61 EUR
2024-04-01 balance Assets:Liquid:R4:EUR 2463.51 EUR
-2024-04-01 balance Assets:Invest:R4:Amundi:MSCIWRLD 94.90439 AMNDMSCIWRLD
-2024-04-01 balance Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK
-2024-04-01 balance Assets:Invest:R4:Fidelity:GLTECH 367.42 FIGLTECH
-2024-04-01 balance Assets:Invest:R4:Amundi:SUSTINC 11.295 AMNDSUSINC
-2024-04-01 balance Assets:Invest:R4:BNP:DISTECH 0.359 BNPDISTECH
-2024-04-01 balance Assets:Invest:R4:PLTR 10 PLTR
-2024-04-01 balance Assets:Invest:R4:MSFT 4 MSFT
+2024-04-01 balance Assets:Invest:Fund:Amundi:MSCIWRLD 94.90439 AMNDMSCIWRLD
+2024-04-01 balance Assets:Invest:Fund:Vanguard:EMMK 14.99 VANEMMK
+2024-04-01 balance Assets:Invest:Fund:Fidelity:GLTECH 367.42 FIGLTECH
+2024-04-01 balance Assets:Invest:Fund:Amundi:SUSTINC 11.295 AMNDSUSINC
+2024-04-01 balance Assets:Invest:Fund:BNP:DISTECH 0.359 BNPDISTECH
+2024-04-01 balance Assets:Invest:Stock:PLTR 10 PLTR
+2024-04-01 balance Assets:Invest:Stock:MSFT 4 MSFT
2024-04-01 balance Assets:Benefits:Edenred:TicketsRestaurant 13.30 EUR
2024-04-01 balance Assets:Benefits:Edenred:TargetaTransport 125.05 EUR
2024-04-01 balance Assets:Benefits:DZP:PPEZurich 1887.85 EUR
diff --git a/ledger/transactions/2024/04.beancount b/ledger/transactions/2024/04.beancount
index 78bf341..0fe4578 100644
--- a/ledger/transactions/2024/04.beancount
+++ b/ledger/transactions/2024/04.beancount
@@ -1,14 +1,14 @@
2024-04-01 balance Assets:Liquid:Caixabank:Corrent 16552.92 EUR
-2024-04-01 balance Assets:Liquid:Caixabank:Estalvi 0 EUR
-2024-04-01 balance Assets:Liquid:TradeRepublic:EUR 18858.61 EUR
+2024-04-01 balance Assets:Liquid:Estalvi:Caixabank 0 EUR
+2024-04-01 balance Assets:Liquid:Estalvi:TradeRepublic 18858.61 EUR
2024-04-01 balance Assets:Liquid:R4:EUR 2463.51 EUR
-2024-04-01 balance Assets:Invest:R4:Amundi:MSCIWRLD 94.90439 AMNDMSCIWRLD
-2024-04-01 balance Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK
-2024-04-01 balance Assets:Invest:R4:Fidelity:GLTECH 367.42 FIGLTECH
-2024-04-01 balance Assets:Invest:R4:Amundi:SUSTINC 11.295 AMNDSUSINC
-2024-04-01 balance Assets:Invest:R4:BNP:DISTECH 0.359 BNPDISTECH
-2024-04-01 balance Assets:Invest:R4:PLTR 10 PLTR
-2024-04-01 balance Assets:Invest:R4:MSFT 4 MSFT
+2024-04-01 balance Assets:Invest:Fund:Amundi:MSCIWRLD 94.90439 AMNDMSCIWRLD
+2024-04-01 balance Assets:Invest:Fund:Vanguard:EMMK 14.99 VANEMMK
+2024-04-01 balance Assets:Invest:Fund:Fidelity:GLTECH 367.42 FIGLTECH
+2024-04-01 balance Assets:Invest:Fund:Amundi:SUSTINC 11.295 AMNDSUSINC
+2024-04-01 balance Assets:Invest:Fund:BNP:DISTECH 0.359 BNPDISTECH
+2024-04-01 balance Assets:Invest:Stock:PLTR 10 PLTR
+2024-04-01 balance Assets:Invest:Stock:MSFT 4 MSFT
2024-04-01 balance Assets:Benefits:Edenred:TicketsRestaurant 13.30 EUR
2024-04-01 balance Assets:Benefits:Edenred:TargetaTransport 125.05 EUR
2024-04-01 balance Assets:Benefits:DZP:PPEZurich 1887.85 EUR
@@ -24,7 +24,7 @@
Liabilities:Credit:Caixabank:TargetaCredit 253.80 EUR
Assets:Liquid:Caixabank:Corrent
2024-04-01 * "TradeRepublic" "Interessos estalvis"
- Assets:Liquid:TradeRepublic:EUR 60.33 EUR
+ Assets:Liquid:Estalvi:TradeRepublic 60.33 EUR
Income:Savings:TradeRepublic:RentabilitatEstalvis
2024-04-01 * "Edenred" "Recarrega targeta restaurant"
Assets:Benefits:Edenred:TicketsRestaurant 209 EUR
@@ -33,10 +33,10 @@
Expenses:MarcaPersonal 12 EUR
Assets:Liquid:Caixabank:Corrent
2024-04-01 * "R4" "Compra AMUNDI INDEX MSCI WORLD AE (EUR) INC"
- Assets:Invest:R4:Amundi:MSCIWRLD 4.48498 AMNDMSCIWRLD {267.55972156 EUR}
+ Assets:Invest:Fund:Amundi:MSCIWRLD 4.48498 AMNDMSCIWRLD {267.55972156 EUR}
Assets:Liquid:R4:EUR -1200 EUR
2024-04-01 * "R4" "Compra Fidelity Global Technology A (EUR)"
- Assets:Invest:R4:Fidelity:GLTECH 26.2 FIGLTECH {45.8015267176 EUR}
+ Assets:Invest:Fund:Fidelity:GLTECH 26.2 FIGLTECH {45.8015267176 EUR}
Assets:Liquid:R4:EUR -1200 EUR
2024-04-01 * "EsclatOil" "Gasolina"
Expenses:Gasolina 54.74 EUR
@@ -263,7 +263,7 @@
Assets:Liquid:R4:EUR 1000 EUR
Assets:Liquid:Caixabank:Corrent
2024-04-27 * "TradeRepublic" "Transferencia a TradeRepublic"
- Assets:Liquid:TradeRepublic:EUR 400 EUR
+ Assets:Liquid:Estalvi:TradeRepublic 400 EUR
Assets:Liquid:Caixabank:Corrent
2024-04-27 * "Yummy Sushi" "Dinar"
Expenses:MenjarFora 34.30 EUR
@@ -294,22 +294,22 @@
Expenses:R4:Comissions 1.20 EUR
Assets:Liquid:R4:EUR
2024-04-30 * "Renta 4" "COMPRA DE 25 IWVL A 39,47 EUR"
- Assets:Invest:R4:ETF:IWVL 25 IWVL {39.47 EUR}
+ Assets:Invest:ETF:IWVL 25 IWVL {39.47 EUR}
Expenses:R4:Comissions 15 EUR
Assets:Liquid:R4:EUR -1001.75 EUR
2024-05-01 balance Assets:Liquid:Caixabank:Corrent 15382.83 EUR
-2024-05-01 balance Assets:Liquid:Caixabank:Estalvi 0 EUR
-2024-05-01 balance Assets:Liquid:TradeRepublic:EUR 19318.94 EUR
+2024-05-01 balance Assets:Liquid:Estalvi:Caixabank 0 EUR
+2024-05-01 balance Assets:Liquid:Estalvi:TradeRepublic 19318.94 EUR
2024-05-01 balance Assets:Liquid:R4:EUR 53.81 EUR
-2024-05-01 balance Assets:Invest:R4:Amundi:MSCIWRLD 99.38937 AMNDMSCIWRLD
-2024-05-01 balance Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK
-2024-05-01 balance Assets:Invest:R4:Fidelity:GLTECH 393.62 FIGLTECH
-2024-05-01 balance Assets:Invest:R4:Amundi:SUSTINC 11.295 AMNDSUSINC
-2024-05-01 balance Assets:Invest:R4:BNP:DISTECH 0.359 BNPDISTECH
-2024-05-01 balance Assets:Invest:R4:ETF:IWVL 25 IWVL
-2024-05-01 balance Assets:Invest:R4:PLTR 10 PLTR
-2024-05-01 balance Assets:Invest:R4:MSFT 4 MSFT
+2024-05-01 balance Assets:Invest:Fund:Amundi:MSCIWRLD 99.38937 AMNDMSCIWRLD
+2024-05-01 balance Assets:Invest:Fund:Vanguard:EMMK 14.99 VANEMMK
+2024-05-01 balance Assets:Invest:Fund:Fidelity:GLTECH 393.62 FIGLTECH
+2024-05-01 balance Assets:Invest:Fund:Amundi:SUSTINC 11.295 AMNDSUSINC
+2024-05-01 balance Assets:Invest:Fund:BNP:DISTECH 0.359 BNPDISTECH
+2024-05-01 balance Assets:Invest:ETF:IWVL 25 IWVL
+2024-05-01 balance Assets:Invest:Stock:PLTR 10 PLTR
+2024-05-01 balance Assets:Invest:Stock:MSFT 4 MSFT
2024-05-01 balance Assets:Benefits:Edenred:TicketsRestaurant 0.87 EUR
2024-05-01 balance Assets:Benefits:Edenred:TargetaTransport 127.90 EUR
2024-05-01 balance Assets:Benefits:DZP:PPEZurich 1973.68 EUR
diff --git a/ledger/transactions/2024/05.beancount b/ledger/transactions/2024/05.beancount
index fbbbdec..97fd1bd 100644
--- a/ledger/transactions/2024/05.beancount
+++ b/ledger/transactions/2024/05.beancount
@@ -1,15 +1,15 @@
2024-05-01 balance Assets:Liquid:Caixabank:Corrent 15382.83 EUR
-2024-05-01 balance Assets:Liquid:Caixabank:Estalvi 0 EUR
-2024-05-01 balance Assets:Liquid:TradeRepublic:EUR 19318.94 EUR
+2024-05-01 balance Assets:Liquid:Estalvi:Caixabank 0 EUR
+2024-05-01 balance Assets:Liquid:Estalvi:TradeRepublic 19318.94 EUR
2024-05-01 balance Assets:Liquid:R4:EUR 53.81 EUR
-2024-05-01 balance Assets:Invest:R4:Amundi:MSCIWRLD 99.38937 AMNDMSCIWRLD
-2024-05-01 balance Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK
-2024-05-01 balance Assets:Invest:R4:Fidelity:GLTECH 393.62 FIGLTECH
-2024-05-01 balance Assets:Invest:R4:Amundi:SUSTINC 11.295 AMNDSUSINC
-2024-05-01 balance Assets:Invest:R4:BNP:DISTECH 0.359 BNPDISTECH
-2024-05-01 balance Assets:Invest:R4:ETF:IWVL 25 IWVL
-2024-05-01 balance Assets:Invest:R4:PLTR 10 PLTR
-2024-05-01 balance Assets:Invest:R4:MSFT 4 MSFT
+2024-05-01 balance Assets:Invest:Fund:Amundi:MSCIWRLD 99.38937 AMNDMSCIWRLD
+2024-05-01 balance Assets:Invest:Fund:Vanguard:EMMK 14.99 VANEMMK
+2024-05-01 balance Assets:Invest:Fund:Fidelity:GLTECH 393.62 FIGLTECH
+2024-05-01 balance Assets:Invest:Fund:Amundi:SUSTINC 11.295 AMNDSUSINC
+2024-05-01 balance Assets:Invest:Fund:BNP:DISTECH 0.359 BNPDISTECH
+2024-05-01 balance Assets:Invest:ETF:IWVL 25 IWVL
+2024-05-01 balance Assets:Invest:Stock:PLTR 10 PLTR
+2024-05-01 balance Assets:Invest:Stock:MSFT 4 MSFT
2024-05-01 balance Assets:Benefits:Edenred:TicketsRestaurant 0.87 EUR
2024-05-01 balance Assets:Benefits:Edenred:TargetaTransport 127.90 EUR
2024-05-01 balance Assets:Benefits:DZP:PPEZurich 1973.68 EUR
@@ -26,7 +26,7 @@
Assets:Liquid:Caixabank:Corrent
2024-05-01 * "TradeRepublic" "Interessos estalvis"
Income:Savings:TradeRepublic:RentabilitatEstalvis -63.11 EUR
- Assets:Liquid:TradeRepublic:EUR
+ Assets:Liquid:Estalvi:TradeRepublic
2024-05-01 * "Edenred" "Recarrega targeta restaurant"
Income:Work:Zurich:TicketsRestaurant -209 EUR
Assets:Benefits:Edenred:TicketsRestaurant
@@ -62,25 +62,25 @@
Expenses:Altres 4 EUR
Assets:Liquid:Caixabank:Corrent
2024-05-02 * "Renta 4" "Traspàs fons AMUNDI FUNDS GLOBAL D a VANGUARD GB SMALL-CAP IDX"
- Assets:Invest:R4:Amundi:SUSTINC -11.295 AMNDSUSINC {} @ 68.80 EUR
- Assets:Invest:R4:Vanguard:SMCAP 2.41 VANSMCAP {322.6106 EUR}
+ Assets:Invest:Fund:Amundi:SUSTINC -11.295 AMNDSUSINC {} @ 68.80 EUR
+ Assets:Invest:Fund:Vanguard:SMCAP 2.41 VANSMCAP {322.6106 EUR}
Income:Invest:R4:CapitalGains:Untaxable
2024-05-02 * "Renta 4" "Traspàs fons AMUNDI INDEX MSCI WORLD AE (EUR) INC a VANGUARD GLOBAL STOCK INDEX (EUR) ACC"
- Assets:Invest:R4:Amundi:MSCIWRLD -99.38937 AMNDMSCIWRLD {} @ 261.59 EUR
- Assets:Invest:R4:Vanguard:GL 579.12 VANGL {44.8946 EUR}
+ Assets:Invest:Fund:Amundi:MSCIWRLD -99.38937 AMNDMSCIWRLD {} @ 261.59 EUR
+ Assets:Invest:Fund:Vanguard:GL 579.12 VANGL {44.8946 EUR}
Income:Invest:R4:CapitalGains:Untaxable
2024-05-02 * "Renta 4" "Traspàs fons FIDELITY GLOBAL TECHNOLOGY A (EUR) a VANGUARD GB SMALL-CAP IDX i VANGUARD GLOBAL STOCK INDEX (EUR) ACC"
- Assets:Invest:R4:Fidelity:GLTECH -15.13 FIGLTECH {45.8015267176 EUR} @ 45.18 EUR
- Assets:Invest:R4:Fidelity:GLTECH -22.95 FIGLTECH {43.573 EUR} @ 45.18 EUR
- Assets:Invest:R4:Fidelity:GLTECH -214.24 FIGLTECH {42.50 EUR} @ 45.18 EUR
- Assets:Invest:R4:Vanguard:SMCAP 35.34 VANSMCAP {322.6106 EUR}
- Assets:Invest:R4:Fidelity:GLTECH -11.07 FIGLTECH {45.8015267176 EUR} @ 45.18 EUR
- Assets:Invest:R4:Vanguard:GL 11.28 VANGL {44.3318 EUR}
+ Assets:Invest:Fund:Fidelity:GLTECH -15.13 FIGLTECH {45.8015267176 EUR} @ 45.18 EUR
+ Assets:Invest:Fund:Fidelity:GLTECH -22.95 FIGLTECH {43.573 EUR} @ 45.18 EUR
+ Assets:Invest:Fund:Fidelity:GLTECH -214.24 FIGLTECH {42.50 EUR} @ 45.18 EUR
+ Assets:Invest:Fund:Vanguard:SMCAP 35.34 VANSMCAP {322.6106 EUR}
+ Assets:Invest:Fund:Fidelity:GLTECH -11.07 FIGLTECH {45.8015267176 EUR} @ 45.18 EUR
+ Assets:Invest:Fund:Vanguard:GL 11.28 VANGL {44.3318 EUR}
Income:Invest:R4:CapitalGains:Untaxable
2024-05-02 * "Renta 4" "Traspàs fons BNP DISRUPTIVE TECHNOLOGY ACC a VANGUARD GB SMALL-CAP IDX"
- Assets:Invest:R4:BNP:DISTECH -0.359 BNPDISTECH {2356.0724234 USD} @ 2488.39 USD
+ Assets:Invest:Fund:BNP:DISTECH -0.359 BNPDISTECH {2356.0724234 USD} @ 2488.39 USD
Assets:Liquid:R4:EUR 834.623034 EUR {1.07126753807 USD}
- Assets:Invest:R4:Vanguard:SMCAP 2.58 VANSMCAP {323.4973 EUR}
+ Assets:Invest:Fund:Vanguard:SMCAP 2.58 VANSMCAP {323.4973 EUR}
Assets:Liquid:R4:EUR -834.623034 EUR
Income:Invest:R4:CapitalGains:Untaxable -45.06344 EUR {1.07126753807 USD}
2024-05-02 * "Deutsche Zurich Pensiones" "Aportació P.P.E DZP"
@@ -244,14 +244,14 @@
Expenses:Supermercat 3.50 EUR
Assets:Liquid:Caixabank:Corrent
2024-05-30 * "Renta4" "Compra Vanguard Global Stock Index"
- Assets:Invest:R4:Vanguard:GL 21.98 VANGL {45.4884 EUR}
+ Assets:Invest:Fund:Vanguard:GL 21.98 VANGL {45.4884 EUR}
Assets:Liquid:R4:EUR -1000 EUR
Expenses:R4:Comissions
2024-05-31 * "Buscalibre" "Llibre Factor investing"
Expenses:Altres 12.37 EUR
Liabilities:Credit:Caixabank:TargetaCredit
2024-05-31 * "TradeRepublic" "Enviament de diners"
- Assets:Liquid:TradeRepublic:EUR 200 EUR
+ Assets:Liquid:Estalvi:TradeRepublic 200 EUR
Assets:Liquid:Caixabank:Corrent
2024-05-31 * "Yummy Sushi" "Sopar sushi"
Expenses:MenjarFora 34.90 EUR
@@ -261,15 +261,15 @@
Income:Other:Caixabank:Bizum
2024-06-01 balance Assets:Liquid:Caixabank:Corrent 16138.53 EUR
-2024-06-01 balance Assets:Liquid:TradeRepublic:EUR 19582.05 EUR
+2024-06-01 balance Assets:Liquid:Estalvi:TradeRepublic 19582.05 EUR
2024-06-01 balance Assets:Liquid:R4:EUR 53.81 EUR
-2024-06-01 balance Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK
-2024-06-01 balance Assets:Invest:R4:Fidelity:GLTECH 130.23 FIGLTECH
-2024-06-01 balance Assets:Invest:R4:Vanguard:GL 612.38 VANGL
-2024-06-01 balance Assets:Invest:R4:Vanguard:SMCAP 40.33 VANSMCAP
-2024-06-01 balance Assets:Invest:R4:ETF:IWVL 25 IWVL
-2024-06-01 balance Assets:Invest:R4:PLTR 10 PLTR
-2024-06-01 balance Assets:Invest:R4:MSFT 4 MSFT
+2024-06-01 balance Assets:Invest:Fund:Vanguard:EMMK 14.99 VANEMMK
+2024-06-01 balance Assets:Invest:Fund:Fidelity:GLTECH 130.23 FIGLTECH
+2024-06-01 balance Assets:Invest:Fund:Vanguard:GL 612.38 VANGL
+2024-06-01 balance Assets:Invest:Fund:Vanguard:SMCAP 40.33 VANSMCAP
+2024-06-01 balance Assets:Invest:ETF:IWVL 25 IWVL
+2024-06-01 balance Assets:Invest:Stock:PLTR 10 PLTR
+2024-06-01 balance Assets:Invest:Stock:MSFT 4 MSFT
2024-06-01 balance Assets:Benefits:Edenred:TicketsRestaurant 1.16 EUR
2024-06-01 balance Assets:Benefits:Edenred:TargetaTransport 130.40 EUR
2024-06-01 balance Assets:Benefits:DZP:PPEZurich 2186.47 EUR
diff --git a/ledger/transactions/2024/06.beancount b/ledger/transactions/2024/06.beancount
index 663d2a1..2e2e353 100644
--- a/ledger/transactions/2024/06.beancount
+++ b/ledger/transactions/2024/06.beancount
@@ -1,13 +1,13 @@
2024-06-01 balance Assets:Liquid:Caixabank:Corrent 16138.53 EUR
-2024-06-01 balance Assets:Liquid:TradeRepublic:EUR 19582.05 EUR
+2024-06-01 balance Assets:Liquid:Estalvi:TradeRepublic 19582.05 EUR
2024-06-01 balance Assets:Liquid:R4:EUR 53.81 EUR
-2024-06-01 balance Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK
-2024-06-01 balance Assets:Invest:R4:Fidelity:GLTECH 130.23 FIGLTECH
-2024-06-01 balance Assets:Invest:R4:Vanguard:GL 612.38 VANGL
-2024-06-01 balance Assets:Invest:R4:Vanguard:SMCAP 40.33 VANSMCAP
-2024-06-01 balance Assets:Invest:R4:ETF:IWVL 25 IWVL
-2024-06-01 balance Assets:Invest:R4:PLTR 10 PLTR
-2024-06-01 balance Assets:Invest:R4:MSFT 4 MSFT
+2024-06-01 balance Assets:Invest:Fund:Vanguard:EMMK 14.99 VANEMMK
+2024-06-01 balance Assets:Invest:Fund:Fidelity:GLTECH 130.23 FIGLTECH
+2024-06-01 balance Assets:Invest:Fund:Vanguard:GL 612.38 VANGL
+2024-06-01 balance Assets:Invest:Fund:Vanguard:SMCAP 40.33 VANSMCAP
+2024-06-01 balance Assets:Invest:ETF:IWVL 25 IWVL
+2024-06-01 balance Assets:Invest:Stock:PLTR 10 PLTR
+2024-06-01 balance Assets:Invest:Stock:MSFT 4 MSFT
2024-06-01 balance Assets:Benefits:Edenred:TicketsRestaurant 1.16 EUR
2024-06-01 balance Assets:Benefits:Edenred:TargetaTransport 130.40 EUR
2024-06-01 balance Assets:Benefits:DZP:PPEZurich 2186.47 EUR
@@ -24,7 +24,7 @@
Assets:Liquid:Caixabank:Corrent
2024-06-01 * "TradeRepublic" "Pagament interessos estalvis"
Income:Savings:TradeRepublic:RentabilitatEstalvis -66.76 EUR
- Assets:Liquid:TradeRepublic:EUR
+ Assets:Liquid:Estalvi:TradeRepublic
2024-06-01 * "Edenred" "Recarrega targeta restaurant"
Assets:Benefits:Edenred:TicketsRestaurant 209 EUR
Income:Work:Zurich:TicketsRestaurant
@@ -153,7 +153,7 @@
Expenses:Entreteniment 17.99 EUR
Assets:Liquid:Caixabank:Corrent
2024-06-18 * "TradeRepublic" "Moure diners de TradeRepublic a Renta4"
- Assets:Liquid:TradeRepublic:EUR -19648.81 EUR
+ Assets:Liquid:Estalvi:TradeRepublic -19648.81 EUR
Assets:Liquid:Caixabank:Corrent 19648.81 EUR
Assets:Liquid:Caixabank:Corrent -20000 EUR
Assets:Liquid:R4:EUR
@@ -162,7 +162,7 @@
Assets:Liquid:Caixabank:Corrent
2024-06-20 * "Renta4" "Compra Renta4 Renta Fija"
Assets:Liquid:R4:EUR -20000 EUR
- Assets:Invest:R4:R4RF 1339.287538 R4RF {14.933313 EUR}
+ Assets:Invest:Fixed:R4RF 1339.287538 R4RF {14.933313 EUR}
2024-06-21 * "EsclatOil" "Gasolina"
Expenses:Gasolina 30.12 EUR
Assets:Liquid:Caixabank:Corrent
@@ -234,7 +234,7 @@
Expenses:Mobilitat 12.50 EUR
Assets:Benefits:Edenred:TargetaTransport
2024-06-27 * "Renta4" "Compra ETF ISHARES EDGE MSCI WORLD VALUE"
- Assets:Invest:R4:ETF:IWVL 25 IWVL {39.48 EUR}
+ Assets:Invest:ETF:IWVL 25 IWVL {39.48 EUR}
Expenses:R4:Comissions 15 EUR
Assets:Liquid:R4:EUR -1002 EUR
2024-06-27 * "Deutsche Zurich Pensiones" "Aportació P.P.E DZP"
@@ -251,16 +251,16 @@
2024-07-01 balance Assets:Liquid:Caixabank:Corrent 15948.17 EUR
-2024-07-01 balance Assets:Liquid:TradeRepublic:EUR 0 EUR
+2024-07-01 balance Assets:Liquid:Estalvi:TradeRepublic 0 EUR
2024-07-01 balance Assets:Liquid:R4:EUR 53.01 EUR
-2024-07-01 balance Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK
-2024-07-01 balance Assets:Invest:R4:Fidelity:GLTECH 130.23 FIGLTECH
-2024-07-01 balance Assets:Invest:R4:Vanguard:GL 612.38 VANGL
-2024-07-01 balance Assets:Invest:R4:Vanguard:SMCAP 40.33 VANSMCAP
-2024-07-01 balance Assets:Invest:R4:ETF:IWVL 50 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:Invest:R4:R4RF 1339.287538 R4RF
+2024-07-01 balance Assets:Invest:Fund:Vanguard:EMMK 14.99 VANEMMK
+2024-07-01 balance Assets:Invest:Fund:Fidelity:GLTECH 130.23 FIGLTECH
+2024-07-01 balance Assets:Invest:Fund:Vanguard:GL 612.38 VANGL
+2024-07-01 balance Assets:Invest:Fund:Vanguard:SMCAP 40.33 VANSMCAP
+2024-07-01 balance Assets:Invest:ETF:IWVL 50 IWVL
+2024-07-01 balance Assets:Invest:Stock:PLTR 10 PLTR
+2024-07-01 balance Assets:Invest:Stock:MSFT 4 MSFT
+2024-07-01 balance Assets:Invest:Fixed:R4RF 1339.287538 R4RF
2024-07-01 balance Assets:Benefits:Edenred:TicketsRestaurant 18.25 EUR
2024-07-01 balance Assets:Benefits:Edenred:TargetaTransport 105.40 EUR
2024-07-01 balance Assets:Benefits:DZP:PPEZurich 2390.12 EUR
diff --git a/ledger/transactions/2024/07.beancount b/ledger/transactions/2024/07.beancount
index ffb0db8..19bad90 100644
--- a/ledger/transactions/2024/07.beancount
+++ b/ledger/transactions/2024/07.beancount
@@ -1,14 +1,14 @@
2024-07-01 balance Assets:Liquid:Caixabank:Corrent 15948.17 EUR
-2024-07-01 balance Assets:Liquid:TradeRepublic:EUR 0 EUR
+2024-07-01 balance Assets:Liquid:Estalvi:TradeRepublic 0 EUR
2024-07-01 balance Assets:Liquid:R4:EUR 53.01 EUR
-2024-07-01 balance Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK
-2024-07-01 balance Assets:Invest:R4:Fidelity:GLTECH 130.23 FIGLTECH
-2024-07-01 balance Assets:Invest:R4:Vanguard:GL 612.38 VANGL
-2024-07-01 balance Assets:Invest:R4:Vanguard:SMCAP 40.33 VANSMCAP
-2024-07-01 balance Assets:Invest:R4:ETF:IWVL 50 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:Invest:R4:R4RF 1339.287538 R4RF
+2024-07-01 balance Assets:Invest:Fund:Vanguard:EMMK 14.99 VANEMMK
+2024-07-01 balance Assets:Invest:Fund:Fidelity:GLTECH 130.23 FIGLTECH
+2024-07-01 balance Assets:Invest:Fund:Vanguard:GL 612.38 VANGL
+2024-07-01 balance Assets:Invest:Fund:Vanguard:SMCAP 40.33 VANSMCAP
+2024-07-01 balance Assets:Invest:ETF:IWVL 50 IWVL
+2024-07-01 balance Assets:Invest:Stock:PLTR 10 PLTR
+2024-07-01 balance Assets:Invest:Stock:MSFT 4 MSFT
+2024-07-01 balance Assets:Invest:Fixed:R4RF 1339.287538 R4RF
2024-07-01 balance Assets:Benefits:Edenred:TicketsRestaurant 18.25 EUR
2024-07-01 balance Assets:Benefits:Edenred:TargetaTransport 105.40 EUR
2024-07-01 balance Assets:Benefits:DZP:PPEZurich 2390.12 EUR
@@ -28,7 +28,7 @@
Assets:Liquid:Caixabank:Corrent
2024-07-01 * "TradeRepublic" "Pagament interessos estalvis"
Income:Savings:TradeRepublic:RentabilitatEstalvis -30.11 EUR
- Assets:Liquid:TradeRepublic:EUR
+ Assets:Liquid:Estalvi:TradeRepublic
2024-07-01 * "Edenred" "Recarrega targeta restaurant"
Assets:Benefits:Edenred:TicketsRestaurant 209 EUR
Income:Work:Zurich:TicketsRestaurant
@@ -63,7 +63,7 @@
Expenses:Altres 149.75 EUR
Assets:Liquid:Caixabank:Corrent
2024-07-04 * "TradeRepublic" "Enviament de diners"
- Assets:Liquid:TradeRepublic:EUR -30.11 EUR
+ Assets:Liquid:Estalvi:TradeRepublic -30.11 EUR
Assets:Liquid:Caixabank:Corrent 30.11 EUR
2024-07-05 * "Finques Samsó" "Lloguer Juliol"
Expenses:Lloguer 1091.77 EUR
@@ -255,7 +255,7 @@
Assets:Benefits:Edenred:TargetaTransport 40 EUR
Income:Work:Zurich:TargetaTransport
2024-07-30 * "Renta 4" "Compra Renta Fixa"
- Assets:Invest:R4:R4RF 13.33037 R4RF {15.003335 EUR}
+ Assets:Invest:Fixed:R4RF 13.33037 R4RF {15.003335 EUR}
Assets:Liquid:R4:EUR
2024-07-30 * "Deutsche Zurich Pensiones" "Aportació P.P.E DZP"
Assets:Benefits:DZP:PPEZurich 86.65 EUR
@@ -286,16 +286,16 @@
Assets:Benefits:Edenred:TicketsRestaurant
2024-08-01 balance Assets:Liquid:Caixabank:Corrent 15286.12 EUR
-2024-08-01 balance Assets:Liquid:TradeRepublic:EUR 0 EUR
+2024-08-01 balance Assets:Liquid:Estalvi:TradeRepublic 0 EUR
2024-08-01 balance Assets:Liquid:R4:EUR 1022.88 EUR
-2024-08-01 balance Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK
-2024-08-01 balance Assets:Invest:R4:Fidelity:GLTECH 130.23 FIGLTECH
-2024-08-01 balance Assets:Invest:R4:Vanguard:GL 612.38 VANGL
-2024-08-01 balance Assets:Invest:R4:Vanguard:SMCAP 40.33 VANSMCAP
-2024-08-01 balance Assets:Invest:R4:ETF:IWVL 50 IWVL
-2024-08-01 balance Assets:Invest:R4:PLTR 10 PLTR
-2024-08-01 balance Assets:Invest:R4:MSFT 4 MSFT
-2024-08-01 balance Assets:Invest:R4:R4RF 1352.617908 R4RF
+2024-08-01 balance Assets:Invest:Fund:Vanguard:EMMK 14.99 VANEMMK
+2024-08-01 balance Assets:Invest:Fund:Fidelity:GLTECH 130.23 FIGLTECH
+2024-08-01 balance Assets:Invest:Fund:Vanguard:GL 612.38 VANGL
+2024-08-01 balance Assets:Invest:Fund:Vanguard:SMCAP 40.33 VANSMCAP
+2024-08-01 balance Assets:Invest:ETF:IWVL 50 IWVL
+2024-08-01 balance Assets:Invest:Stock:PLTR 10 PLTR
+2024-08-01 balance Assets:Invest:Stock:MSFT 4 MSFT
+2024-08-01 balance Assets:Invest:Fixed:R4RF 1352.617908 R4RF
2024-08-01 balance Assets:Benefits:Edenred:TicketsRestaurant 1.30 EUR
2024-08-01 balance Assets:Benefits:Edenred:TargetaTransport 83.25 EUR
2024-08-01 balance Assets:Benefits:DZP:PPEZurich 2476.77 EUR
diff --git a/ledger/transactions/2024/08.beancount b/ledger/transactions/2024/08.beancount
index 7bb66d4..e45b08c 100644
--- a/ledger/transactions/2024/08.beancount
+++ b/ledger/transactions/2024/08.beancount
@@ -1,14 +1,14 @@
2024-08-01 balance Assets:Liquid:Caixabank:Corrent 15286.12 EUR
-2024-08-01 balance Assets:Liquid:TradeRepublic:EUR 0 EUR
+2024-08-01 balance Assets:Liquid:Estalvi:TradeRepublic 0 EUR
2024-08-01 balance Assets:Liquid:R4:EUR 1022.88 EUR
-2024-08-01 balance Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK
-2024-08-01 balance Assets:Invest:R4:Fidelity:GLTECH 130.23 FIGLTECH
-2024-08-01 balance Assets:Invest:R4:Vanguard:GL 612.38 VANGL
-2024-08-01 balance Assets:Invest:R4:Vanguard:SMCAP 40.33 VANSMCAP
-2024-08-01 balance Assets:Invest:R4:ETF:IWVL 50 IWVL
-2024-08-01 balance Assets:Invest:R4:PLTR 10 PLTR
-2024-08-01 balance Assets:Invest:R4:MSFT 4 MSFT
-2024-08-01 balance Assets:Invest:R4:R4RF 1352.617908 R4RF
+2024-08-01 balance Assets:Invest:Fund:Vanguard:EMMK 14.99 VANEMMK
+2024-08-01 balance Assets:Invest:Fund:Fidelity:GLTECH 130.23 FIGLTECH
+2024-08-01 balance Assets:Invest:Fund:Vanguard:GL 612.38 VANGL
+2024-08-01 balance Assets:Invest:Fund:Vanguard:SMCAP 40.33 VANSMCAP
+2024-08-01 balance Assets:Invest:ETF:IWVL 50 IWVL
+2024-08-01 balance Assets:Invest:Stock:PLTR 10 PLTR
+2024-08-01 balance Assets:Invest:Stock:MSFT 4 MSFT
+2024-08-01 balance Assets:Invest:Fixed:R4RF 1352.617908 R4RF
2024-08-01 balance Assets:Benefits:Edenred:TicketsRestaurant 1.30 EUR
2024-08-01 balance Assets:Benefits:Edenred:TargetaTransport 83.25 EUR
2024-08-01 balance Assets:Benefits:DZP:PPEZurich 2476.77 EUR
@@ -74,7 +74,7 @@
Expenses:Mobilitat 12.15 EUR
Assets:Benefits:Edenred:TargetaTransport
2024-08-05 * "Renta 4" "Compra Renta Fixa"
- Assets:Invest:R4:R4RF 99.935595 R4RF {15.009667 EUR}
+ Assets:Invest:Fixed:R4RF 99.935595 R4RF {15.009667 EUR}
Assets:Liquid:R4:EUR
2024-08-05 * "Finques Samsó" "Lloguer Agost"
Expenses:Lloguer 1124.04 EUR
@@ -127,12 +127,12 @@
Expenses:Supermercat 3.39 EUR
Assets:Liquid:Caixabank:Corrent
2024-08-13 * "Renta 4" "Compra de XDEQ"
- Assets:Invest:R4:XDEQ 40 XDEQ {62.27 EUR}
+ Assets:Invest:ETF:XDEQ 40 XDEQ {62.27 EUR}
Expenses:R4:Comissions 15 EUR
Assets:Liquid:R4:EUR
2024-08-13 * "Renta 4" "Traspàs de Fidelity Global Technology a Vanguard Global Stock Index"
- Assets:Invest:R4:Fidelity:GLTECH -75.12 FIGLTECH {} @ 46.50 EUR
- Assets:Invest:R4:Vanguard:GL 75.94 VANGL {46.0864 EUR}
+ Assets:Invest:Fund:Fidelity:GLTECH -75.12 FIGLTECH {} @ 46.50 EUR
+ Assets:Invest:Fund:Vanguard:GL 75.94 VANGL {46.0864 EUR}
Income:Invest:R4:CapitalGains:Untaxable
2024-08-13 * "Amazon" "Compra de netejador electric i genolleres"
Expenses:Altres 49.67 EUR
@@ -206,8 +206,8 @@
Expenses:Mobilitat 1.55 EUR
Assets:Liquid:Caixabank:Corrent
2024-08-20 * "Renta 4" "Traspàs de Fidelity Global Technology a Vanguard Small Cap"
- Assets:Invest:R4:Fidelity:GLTECH -55.11 FIGLTECH {} @ 47.74 EUR
- Assets:Invest:R4:Vanguard:SMCAP 7.95 VANSMCAP {330.981 EUR}
+ Assets:Invest:Fund:Fidelity:GLTECH -55.11 FIGLTECH {} @ 47.74 EUR
+ Assets:Invest:Fund:Vanguard:SMCAP 7.95 VANSMCAP {330.981 EUR}
Income:Invest:R4:CapitalGains:Untaxable
2024-08-20 * "365" "Esmorzar"
Expenses:MenjarFora 6.80 EUR
@@ -286,7 +286,7 @@
Expenses:Supermercat 23.16 EUR
Assets:Liquid:Caixabank:Corrent
2024-08-29 * "Renta 4" "Compra de Renta Fixa"
- Assets:Invest:R4:R4RF 13.289601 R4RF {15.049361 EUR}
+ Assets:Invest:Fixed:R4RF 13.289601 R4RF {15.049361 EUR}
Assets:Liquid:R4:EUR
2024-08-29 * "Edenred" "Recarrega targeta transport"
Assets:Benefits:Edenred:TargetaTransport 40 EUR
@@ -301,15 +301,15 @@
2024-09-01 balance Assets:Liquid:Caixabank:Corrent 13884.33 EUR
2024-09-01 balance Assets:Liquid:R4:EUR 1017.08 EUR
-2024-09-01 balance Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK
-2024-09-01 balance Assets:Invest:R4:Fidelity:GLTECH 0 FIGLTECH
-2024-09-01 balance Assets:Invest:R4:Vanguard:GL 688.32 VANGL
-2024-09-01 balance Assets:Invest:R4:Vanguard:SMCAP 48.28 VANSMCAP
-2024-09-01 balance Assets:Invest:R4:ETF:IWVL 50 IWVL
-2024-09-01 balance Assets:Invest:R4:PLTR 10 PLTR
-2024-09-01 balance Assets:Invest:R4:MSFT 4 MSFT
-2024-09-01 balance Assets:Invest:R4:R4RF 1465.843104 R4RF
-2024-09-01 balance Assets:Invest:R4:XDEQ 40 XDEQ
+2024-09-01 balance Assets:Invest:Fund:Vanguard:EMMK 14.99 VANEMMK
+2024-09-01 balance Assets:Invest:Fund:Fidelity:GLTECH 0 FIGLTECH
+2024-09-01 balance Assets:Invest:Fund:Vanguard:GL 688.32 VANGL
+2024-09-01 balance Assets:Invest:Fund:Vanguard:SMCAP 48.28 VANSMCAP
+2024-09-01 balance Assets:Invest:ETF:IWVL 50 IWVL
+2024-09-01 balance Assets:Invest:Stock:PLTR 10 PLTR
+2024-09-01 balance Assets:Invest:Stock:MSFT 4 MSFT
+2024-09-01 balance Assets:Invest:Fixed:R4RF 1465.843104 R4RF
+2024-09-01 balance Assets:Invest:ETF:XDEQ 40 XDEQ
2024-09-01 balance Assets:Benefits:Edenred:TicketsRestaurant 1.30 EUR
2024-09-01 balance Assets:Benefits:Edenred:TargetaTransport 108.55 EUR
2024-09-01 balance Assets:Benefits:DZP:PPEZurich 2563.42 EUR
diff --git a/ledger/transactions/2024/09.beancount b/ledger/transactions/2024/09.beancount
index d55ce08..8a01412 100644
--- a/ledger/transactions/2024/09.beancount
+++ b/ledger/transactions/2024/09.beancount
@@ -1,14 +1,14 @@
2024-09-01 balance Assets:Liquid:Caixabank:Corrent 13884.33 EUR
2024-09-01 balance Assets:Liquid:R4:EUR 1017.08 EUR
-2024-09-01 balance Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK
-2024-09-01 balance Assets:Invest:R4:Fidelity:GLTECH 0 FIGLTECH
-2024-09-01 balance Assets:Invest:R4:Vanguard:GL 688.32 VANGL
-2024-09-01 balance Assets:Invest:R4:Vanguard:SMCAP 48.28 VANSMCAP
-2024-09-01 balance Assets:Invest:R4:ETF:IWVL 50 IWVL
-2024-09-01 balance Assets:Invest:R4:PLTR 10 PLTR
-2024-09-01 balance Assets:Invest:R4:MSFT 4 MSFT
-2024-09-01 balance Assets:Invest:R4:R4RF 1465.843104 R4RF
-2024-09-01 balance Assets:Invest:R4:XDEQ 40 XDEQ
+2024-09-01 balance Assets:Invest:Fund:Vanguard:EMMK 14.99 VANEMMK
+2024-09-01 balance Assets:Invest:Fund:Fidelity:GLTECH 0 FIGLTECH
+2024-09-01 balance Assets:Invest:Fund:Vanguard:GL 688.32 VANGL
+2024-09-01 balance Assets:Invest:Fund:Vanguard:SMCAP 48.28 VANSMCAP
+2024-09-01 balance Assets:Invest:ETF:IWVL 50 IWVL
+2024-09-01 balance Assets:Invest:Stock:PLTR 10 PLTR
+2024-09-01 balance Assets:Invest:Stock:MSFT 4 MSFT
+2024-09-01 balance Assets:Invest:Fixed:R4RF 1465.843104 R4RF
+2024-09-01 balance Assets:Invest:ETF:XDEQ 40 XDEQ
2024-09-01 balance Assets:Benefits:Edenred:TicketsRestaurant 1.30 EUR
2024-09-01 balance Assets:Benefits:Edenred:TargetaTransport 108.55 EUR
2024-09-01 balance Assets:Benefits:DZP:PPEZurich 2563.42 EUR
@@ -50,7 +50,7 @@
Expenses:MarcaPersonal 1.32 EUR
Assets:Liquid:Caixabank:Corrent
2024-09-02 * "Renta 4" "Compra de IWVL"
- Assets:Invest:R4:ETF:IWVL 25 IWVL {40.115 EUR}
+ Assets:Invest:ETF:IWVL 25 IWVL {40.115 EUR}
Expenses:R4:Comissions 15 EUR
Assets:Liquid:R4:EUR -1017.88 EUR
2024-09-02 * "EBay" "Portatil Dell i Reposacaps"
@@ -110,12 +110,12 @@
Expenses:Gimnàs 2 EUR
Assets:Liquid:Caixabank:Corrent
2024-09-09 * "Renta 4" "Venta PLTR"
- Assets:Invest:R4:PLTR -10 PLTR {} @ 32.66 USD
+ Assets:Invest:Stock:PLTR -10 PLTR {} @ 32.66 USD
Expenses:R4:Comissions 15.01 EUR @@ 17.53 USD
Assets:Liquid:R4:EUR 272.23 EUR @@ 311.59 USD
Income:Invest:R4:CapitalGains -132.18 EUR @@ 157.42 USD
2024-09-09 * "Renta 4" "Venta MSFT"
- Assets:Invest:R4:MSFT -4 MSFT {} @ 407.43 USD
+ Assets:Invest:Stock:MSFT -4 MSFT {} @ 407.43 USD
Expenses:R4:Comissions 15.05 EUR @@ 17.58 USD
Assets:Liquid:R4:EUR 1452.57 EUR @@ 1625.12 USD
Income:Invest:R4:CapitalGains -125.42 EUR @@ 138.54 USD
@@ -168,7 +168,7 @@
Income:Other:Caixabank:Bizum -17.19 EUR
Assets:Liquid:Caixabank:Corrent 57.15 EUR
2024-09-16 * "Renta 4" "Compra de IWVL"
- Assets:Invest:R4:ETF:IWVL 42 IWVL {39.385 EUR}
+ Assets:Invest:ETF:IWVL 42 IWVL {39.385 EUR}
Expenses:R4:Comissions 15 EUR
Assets:Liquid:R4:EUR -1669.17 EUR
2024-09-17 * "Don Zangano" "Esmorzar"
@@ -291,15 +291,15 @@
2024-10-01 balance Assets:Liquid:Caixabank:Corrent 12714.61 EUR
2024-10-01 balance Assets:Liquid:R4:EUR 1255.96 EUR
-2024-10-01 balance Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK
-2024-10-01 balance Assets:Invest:R4:Fidelity:GLTECH 0 FIGLTECH
-2024-10-01 balance Assets:Invest:R4:Vanguard:GL 688.32 VANGL
-2024-10-01 balance Assets:Invest:R4:Vanguard:SMCAP 48.28 VANSMCAP
-2024-10-01 balance Assets:Invest:R4:ETF:IWVL 117 IWVL
-2024-10-01 balance Assets:Invest:R4:PLTR 0 PLTR
-2024-10-01 balance Assets:Invest:R4:MSFT 0 MSFT
-2024-10-01 balance Assets:Invest:R4:R4RF 1465.843104 R4RF
-2024-10-01 balance Assets:Invest:R4:XDEQ 40 XDEQ
+2024-10-01 balance Assets:Invest:Fund:Vanguard:EMMK 14.99 VANEMMK
+2024-10-01 balance Assets:Invest:Fund:Fidelity:GLTECH 0 FIGLTECH
+2024-10-01 balance Assets:Invest:Fund:Vanguard:GL 688.32 VANGL
+2024-10-01 balance Assets:Invest:Fund:Vanguard:SMCAP 48.28 VANSMCAP
+2024-10-01 balance Assets:Invest:ETF:IWVL 117 IWVL
+2024-10-01 balance Assets:Invest:Stock:PLTR 0 PLTR
+2024-10-01 balance Assets:Invest:Stock:MSFT 0 MSFT
+2024-10-01 balance Assets:Invest:Fixed:R4RF 1465.843104 R4RF
+2024-10-01 balance Assets:Invest:ETF:XDEQ 40 XDEQ
2024-10-01 balance Assets:Benefits:Edenred:TicketsRestaurant 1.20 EUR
2024-10-01 balance Assets:Benefits:Edenred:TargetaTransport 116.30 EUR
2024-10-01 balance Assets:Benefits:DZP:PPEZurich 2650.07 EUR
diff --git a/ledger/transactions/2024/10.beancount b/ledger/transactions/2024/10.beancount
index 225dd8f..a07f710 100644
--- a/ledger/transactions/2024/10.beancount
+++ b/ledger/transactions/2024/10.beancount
@@ -1,14 +1,14 @@
2024-10-01 balance Assets:Liquid:Caixabank:Corrent 12714.61 EUR
2024-10-01 balance Assets:Liquid:R4:EUR 1255.96 EUR
-2024-10-01 balance Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK
-2024-10-01 balance Assets:Invest:R4:Fidelity:GLTECH 0 FIGLTECH
-2024-10-01 balance Assets:Invest:R4:Vanguard:GL 688.32 VANGL
-2024-10-01 balance Assets:Invest:R4:Vanguard:SMCAP 48.28 VANSMCAP
-2024-10-01 balance Assets:Invest:R4:ETF:IWVL 117 IWVL
-2024-10-01 balance Assets:Invest:R4:PLTR 0 PLTR
-2024-10-01 balance Assets:Invest:R4:MSFT 0 MSFT
-2024-10-01 balance Assets:Invest:R4:R4RF 1465.843104 R4RF
-2024-10-01 balance Assets:Invest:R4:XDEQ 40 XDEQ
+2024-10-01 balance Assets:Invest:Fund:Vanguard:EMMK 14.99 VANEMMK
+2024-10-01 balance Assets:Invest:Fund:Fidelity:GLTECH 0 FIGLTECH
+2024-10-01 balance Assets:Invest:Fund:Vanguard:GL 688.32 VANGL
+2024-10-01 balance Assets:Invest:Fund:Vanguard:SMCAP 48.28 VANSMCAP
+2024-10-01 balance Assets:Invest:ETF:IWVL 117 IWVL
+2024-10-01 balance Assets:Invest:Stock:PLTR 0 PLTR
+2024-10-01 balance Assets:Invest:Stock:MSFT 0 MSFT
+2024-10-01 balance Assets:Invest:Fixed:R4RF 1465.843104 R4RF
+2024-10-01 balance Assets:Invest:ETF:XDEQ 40 XDEQ
2024-10-01 balance Assets:Benefits:Edenred:TicketsRestaurant 1.20 EUR
2024-10-01 balance Assets:Benefits:Edenred:TargetaTransport 116.30 EUR
2024-10-01 balance Assets:Benefits:DZP:PPEZurich 2650.07 EUR
@@ -32,10 +32,10 @@
Expenses:Parking 116.04 EUR
Assets:Liquid:Caixabank:Corrent
2024-10-01 * "Renta 4" "COMPRA DE RENTA 4 RENTA FIJA EURO, FI CLASE A"
- Assets:Invest:R4:R4RF 13.236990 R4RF {15.109175 EUR}
+ Assets:Invest:Fixed:R4RF 13.236990 R4RF {15.109175 EUR}
Assets:Liquid:R4:EUR -200 EUR
2024-10-01 * "Renta 4" "COMPRA DE 15 XDEQ"
- Assets:Invest:R4:XDEQ 15 XDEQ {64.78 EUR}
+ Assets:Invest:ETF:XDEQ 15 XDEQ {64.78 EUR}
Expenses:R4:Comissions 15 EUR
Assets:Liquid:R4:EUR -986.70 EUR
2024-10-01 * "Edenred" "Recarrega targeta restaurant"
@@ -272,7 +272,7 @@
Expenses:Supermercat 19 EUR
Assets:Liquid:Caixabank:Corrent
2024-10-30 * "Renta 4" "COMPRA DE RENTA 4 RENTA FIJA EURO, FI CLASE A"
- Assets:Invest:R4:R4RF 13.199559 R4RF {15.152021 EUR}
+ Assets:Invest:Fixed:R4RF 13.199559 R4RF {15.152021 EUR}
Assets:Liquid:R4:EUR -200 EUR
2024-10-31 * "Deutsche Zurich Pensiones" "Aportació P.P.E DZP"
Assets:Benefits:DZP:PPEZurich 86.65 EUR
@@ -283,15 +283,15 @@
2024-11-01 balance Assets:Liquid:Caixabank:Corrent 12463.34 EUR
2024-11-01 balance Assets:Liquid:R4:EUR 1026.91 EUR
-2024-11-01 balance Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK
-2024-11-01 balance Assets:Invest:R4:Fidelity:GLTECH 0 FIGLTECH
-2024-11-01 balance Assets:Invest:R4:Vanguard:GL 688.32 VANGL
-2024-11-01 balance Assets:Invest:R4:Vanguard:SMCAP 48.28 VANSMCAP
-2024-11-01 balance Assets:Invest:R4:ETF:IWVL 117 IWVL
-2024-11-01 balance Assets:Invest:R4:PLTR 0 PLTR
-2024-11-01 balance Assets:Invest:R4:MSFT 0 MSFT
-2024-11-01 balance Assets:Invest:R4:R4RF 1492.279653 R4RF
-2024-11-01 balance Assets:Invest:R4:XDEQ 55 XDEQ
+2024-11-01 balance Assets:Invest:Fund:Vanguard:EMMK 14.99 VANEMMK
+2024-11-01 balance Assets:Invest:Fund:Fidelity:GLTECH 0 FIGLTECH
+2024-11-01 balance Assets:Invest:Fund:Vanguard:GL 688.32 VANGL
+2024-11-01 balance Assets:Invest:Fund:Vanguard:SMCAP 48.28 VANSMCAP
+2024-11-01 balance Assets:Invest:ETF:IWVL 117 IWVL
+2024-11-01 balance Assets:Invest:Stock:PLTR 0 PLTR
+2024-11-01 balance Assets:Invest:Stock:MSFT 0 MSFT
+2024-11-01 balance Assets:Invest:Fixed:R4RF 1492.279653 R4RF
+2024-11-01 balance Assets:Invest:ETF:XDEQ 55 XDEQ
2024-11-01 balance Assets:Benefits:Edenred:TicketsRestaurant 3.74 EUR
2024-11-01 balance Assets:Benefits:Edenred:TargetaTransport 91.65 EUR
2024-11-01 balance Assets:Benefits:DZP:PPEZurich 2736.72 EUR
diff --git a/ledger/transactions/2024/11.beancount b/ledger/transactions/2024/11.beancount
index a2186df..58a1178 100644
--- a/ledger/transactions/2024/11.beancount
+++ b/ledger/transactions/2024/11.beancount
@@ -1,14 +1,14 @@
2024-11-01 balance Assets:Liquid:Caixabank:Corrent 12463.34 EUR
2024-11-01 balance Assets:Liquid:R4:EUR 1026.91 EUR
-2024-11-01 balance Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK
-2024-11-01 balance Assets:Invest:R4:Fidelity:GLTECH 0 FIGLTECH
-2024-11-01 balance Assets:Invest:R4:Vanguard:GL 688.32 VANGL
-2024-11-01 balance Assets:Invest:R4:Vanguard:SMCAP 48.28 VANSMCAP
-2024-11-01 balance Assets:Invest:R4:ETF:IWVL 117 IWVL
-2024-11-01 balance Assets:Invest:R4:PLTR 0 PLTR
-2024-11-01 balance Assets:Invest:R4:MSFT 0 MSFT
-2024-11-01 balance Assets:Invest:R4:R4RF 1492.279653 R4RF
-2024-11-01 balance Assets:Invest:R4:XDEQ 55 XDEQ
+2024-11-01 balance Assets:Invest:Fund:Vanguard:EMMK 14.99 VANEMMK
+2024-11-01 balance Assets:Invest:Fund:Fidelity:GLTECH 0 FIGLTECH
+2024-11-01 balance Assets:Invest:Fund:Vanguard:GL 688.32 VANGL
+2024-11-01 balance Assets:Invest:Fund:Vanguard:SMCAP 48.28 VANSMCAP
+2024-11-01 balance Assets:Invest:ETF:IWVL 117 IWVL
+2024-11-01 balance Assets:Invest:Stock:PLTR 0 PLTR
+2024-11-01 balance Assets:Invest:Stock:MSFT 0 MSFT
+2024-11-01 balance Assets:Invest:Fixed:R4RF 1492.279653 R4RF
+2024-11-01 balance Assets:Invest:ETF:XDEQ 55 XDEQ
2024-11-01 balance Assets:Benefits:Edenred:TicketsRestaurant 3.74 EUR
2024-11-01 balance Assets:Benefits:Edenred:TargetaTransport 91.65 EUR
2024-11-01 balance Assets:Benefits:DZP:PPEZurich 2736.72 EUR
@@ -47,7 +47,7 @@
Expenses:MenjarFora 45.60 EUR
Assets:Benefits:Edenred:TicketsRestaurant
2024-11-04 * "Renta 4" "COMPRA DE 15 XDEQ"
- Assets:Invest:R4:XDEQ 15 XDEQ {65.1 EUR}
+ Assets:Invest:ETF:XDEQ 15 XDEQ {65.1 EUR}
Expenses:R4:Comissions 15 EUR
Assets:Liquid:R4:EUR -991.50 EUR
2024-11-04 * "Creu Roja" "Donatiu DANA València"
@@ -276,7 +276,7 @@
Expenses:Mobilitat 13.92 EUR
Assets:Liquid:Caixabank:Corrent
2024-11-29 * "Renta 4" "Compra de RENTA 4 RENTA FIJA EURO, FI CLASE A"
- Assets:Invest:R4:R4RF 13.161697 R4RF {15.195609 EUR}
+ Assets:Invest:Fixed:R4RF 13.161697 R4RF {15.195609 EUR}
Assets:Liquid:R4:EUR -200 EUR
2024-11-30 * "Quironsalud" "Parking hospital"
Expenses:Mobilitat 1.55 EUR
@@ -296,12 +296,12 @@
2024-12-01 balance Assets:Liquid:Caixabank:Corrent 12580.17 EUR
2024-12-01 balance Assets:Liquid:R4:EUR 1035.41 EUR
-2024-12-01 balance Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK
-2024-12-01 balance Assets:Invest:R4:Vanguard:GL 688.32 VANGL
-2024-12-01 balance Assets:Invest:R4:Vanguard:SMCAP 48.28 VANSMCAP
-2024-12-01 balance Assets:Invest:R4:ETF:IWVL 117 IWVL
-2024-12-01 balance Assets:Invest:R4:R4RF 1505.44135 R4RF
-2024-12-01 balance Assets:Invest:R4:XDEQ 70 XDEQ
+2024-12-01 balance Assets:Invest:Fund:Vanguard:EMMK 14.99 VANEMMK
+2024-12-01 balance Assets:Invest:Fund:Vanguard:GL 688.32 VANGL
+2024-12-01 balance Assets:Invest:Fund:Vanguard:SMCAP 48.28 VANSMCAP
+2024-12-01 balance Assets:Invest:ETF:IWVL 117 IWVL
+2024-12-01 balance Assets:Invest:Fixed:R4RF 1505.44135 R4RF
+2024-12-01 balance Assets:Invest:ETF:XDEQ 70 XDEQ
2024-12-01 balance Assets:Benefits:Edenred:TicketsRestaurant 37.68 EUR
2024-12-01 balance Assets:Benefits:Edenred:TargetaTransport 94.50 EUR
2024-12-01 balance Assets:Benefits:DZP:PPEZurich 2971.29 EUR
diff --git a/ledger/transactions/2024/12.beancount b/ledger/transactions/2024/12.beancount
index 0b7aaa7..7b091d4 100644
--- a/ledger/transactions/2024/12.beancount
+++ b/ledger/transactions/2024/12.beancount
@@ -1,11 +1,11 @@
2024-12-01 balance Assets:Liquid:Caixabank:Corrent 12580.17 EUR
2024-12-01 balance Assets:Liquid:R4:EUR 1035.41 EUR
-2024-12-01 balance Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK
-2024-12-01 balance Assets:Invest:R4:Vanguard:GL 688.32 VANGL
-2024-12-01 balance Assets:Invest:R4:Vanguard:SMCAP 48.28 VANSMCAP
-2024-12-01 balance Assets:Invest:R4:ETF:IWVL 117 IWVL
-2024-12-01 balance Assets:Invest:R4:R4RF 1505.44135 R4RF
-2024-12-01 balance Assets:Invest:R4:XDEQ 70 XDEQ
+2024-12-01 balance Assets:Invest:Fund:Vanguard:EMMK 14.99 VANEMMK
+2024-12-01 balance Assets:Invest:Fund:Vanguard:GL 688.32 VANGL
+2024-12-01 balance Assets:Invest:Fund:Vanguard:SMCAP 48.28 VANSMCAP
+2024-12-01 balance Assets:Invest:ETF:IWVL 117 IWVL
+2024-12-01 balance Assets:Invest:Fixed:R4RF 1505.44135 R4RF
+2024-12-01 balance Assets:Invest:ETF:XDEQ 70 XDEQ
2024-12-01 balance Assets:Benefits:Edenred:TicketsRestaurant 37.68 EUR
2024-12-01 balance Assets:Benefits:Edenred:TargetaTransport 94.50 EUR
2024-12-01 balance Assets:Benefits:DZP:PPEZurich 2971.29 EUR
@@ -40,7 +40,7 @@
Expenses:MarcaPersonal 1.43 EUR
Assets:Liquid:Caixabank:Corrent
2024-12-02 * "Renta 4" "Compra de VANGUARD GLOBAL STOCK INDEX (EUR) ACC"
- Assets:Invest:R4:Vanguard:GL 18.93 VANGL {52.8324 EUR}
+ Assets:Invest:Fund:Vanguard:GL 18.93 VANGL {52.8324 EUR}
Assets:Liquid:R4:EUR -1000 EUR
Income:Invest:R4:CapitalGains
2024-12-03 * "Aigues de Barcelona" "Factura aigua"
@@ -193,12 +193,12 @@
2025-01-01 balance Assets:Liquid:Caixabank:Corrent 11078.39 EUR
2025-01-01 balance Assets:Liquid:R4:EUR 35.41 EUR
-2025-01-01 balance Assets:Invest:R4:Vanguard:EMMK 14.99 VANEMMK
-2025-01-01 balance Assets:Invest:R4:Vanguard:GL 707.25 VANGL
-2025-01-01 balance Assets:Invest:R4:Vanguard:SMCAP 48.28 VANSMCAP
-2025-01-01 balance Assets:Invest:R4:ETF:IWVL 117 IWVL
-2025-01-01 balance Assets:Invest:R4:R4RF 1505.44135 R4RF
-2025-01-01 balance Assets:Invest:R4:XDEQ 70 XDEQ
+2025-01-01 balance Assets:Invest:Fund:Vanguard:EMMK 14.99 VANEMMK
+2025-01-01 balance Assets:Invest:Fund:Vanguard:GL 707.25 VANGL
+2025-01-01 balance Assets:Invest:Fund:Vanguard:SMCAP 48.28 VANSMCAP
+2025-01-01 balance Assets:Invest:ETF:IWVL 117 IWVL
+2025-01-01 balance Assets:Invest:Fixed:R4RF 1505.44135 R4RF
+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 122 EUR
2025-01-01 balance Assets:Benefits:DZP:PPEZurich 2971.29 EUR
diff --git a/reports/balsheet/20231217/balsheet.html b/reports/balsheet/20231217/balsheet.html
index 5960612..51f490c 100644
--- a/reports/balsheet/20231217/balsheet.html
+++ b/reports/balsheet/20231217/balsheet.html
@@ -72,12 +72,12 @@
|
-| Assets:Invest:R4:Amundi:MSCIWRLD |
+Assets:Invest:Fund:Amundi:MSCIWRLD |
20436.50810 |
|
-| Assets:Invest:R4:Amundi:SUSTINC |
+Assets:Invest:Fund:Amundi:SUSTINC |
709.77780 |
|
@@ -87,7 +87,7 @@
|
-| Assets:Invest:R4:BNP:DISTECH |
+Assets:Invest:Fund:BNP:DISTECH |
|
788.20245 USD |
@@ -97,17 +97,17 @@
|
-| Assets:Invest:R4:Fidelity:GLTECH |
+Assets:Invest:Fund:Fidelity:GLTECH |
14143.9382 |
|
-| Assets:Invest:R4:MSFT |
+Assets:Invest:Stock:MSFT |
|
1367.2 USD |
-| Assets:Invest:R4:PLTR |
+Assets:Invest:Stock:PLTR |
|
160.250 USD |
@@ -117,7 +117,7 @@
|
-| Assets:Invest:R4:Vanguard:EMMK |
+Assets:Invest:Fund:Vanguard:EMMK |
2664.81727 |
|
@@ -137,7 +137,7 @@
|
-| Assets:Liquid:Caixabank:Estalvi |
+Assets:Liquid:Estalvi:Caixabank |
12666.49 |
|