Merge pull request #323

fix(locale): get_format doesn't override number formatting if use_l10n is None
2026-02-25 17:04:51 +01:00 · 2025-08-10 12:24:37 -03:00 · 2025-08-10 12:23:41 -03:00 · 2025-08-09 10:17:41 +00:00 · 2025-08-09 06:57:32 +00:00 · 2025-08-09 03:55:59 -03:00
24 changed files with 518 additions and 207 deletions
--- a/app/apps/accounts/migrations/0016_account_untracked_by.py
+++ b/app/apps/accounts/migrations/0016_account_untracked_by.py
@@ -0,0 +1,20 @@
+# Generated by Django 5.2.4 on 2025-08-09 05:52
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0015_alter_account_owner_alter_account_shared_with_and_more'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='account',
+            name='untracked_by',
+            field=models.ManyToManyField(blank=True, related_name='untracked_accounts', to=settings.AUTH_USER_MODEL),
+        ),
+    ]
--- a/app/apps/accounts/models.py
+++ b/app/apps/accounts/models.py
@@ -1,11 +1,11 @@
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db import models
-from django.db.models import Q
 from django.utils.translation import gettext_lazy as _

-from apps.transactions.models import Transaction
+from apps.common.middleware.thread_local import get_current_user
 from apps.common.models import SharedObject, SharedObjectManager
+from apps.transactions.models import Transaction


 class AccountGroup(SharedObject):
@@ -62,6 +62,11 @@ class Account(SharedObject):
        verbose_name=_("Archived"),
        help_text=_("Archived accounts don't show up nor count towards your net worth"),
    )
+    untracked_by = models.ManyToManyField(
+        settings.AUTH_USER_MODEL,
+        blank=True,
+        related_name="untracked_accounts",
+    )

    objects = SharedObjectManager()
    all_objects = models.Manager()  # Unfiltered manager
@@ -75,6 +80,10 @@ class Account(SharedObject):
    def __str__(self):
        return self.name

+    def is_untracked_by(self):
+        user = get_current_user()
+        return self.untracked_by.filter(pk=user.pk).exists()
+
    def clean(self):
        super().clean()
        if self.exchange_currency == self.currency:
--- a/app/apps/accounts/urls.py
+++ b/app/apps/accounts/urls.py
@@ -31,6 +31,11 @@ urlpatterns = [
        views.account_take_ownership,
        name="account_take_ownership",
    ),
+    path(
+        "account/<int:pk>/toggle-untracked/",
+        views.account_toggle_untracked,
+        name="account_toggle_untracked",
+    ),
    path("account-groups/", views.account_groups_index, name="account_groups_index"),
    path("account-groups/list/", views.account_groups_list, name="account_groups_list"),
    path("account-groups/add/", views.account_group_add, name="account_group_add"),
--- a/app/apps/accounts/views/accounts.py
+++ b/app/apps/accounts/views/accounts.py
@@ -155,6 +155,26 @@ def account_delete(request, pk):
    )


+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def account_toggle_untracked(request, pk):
+    account = get_object_or_404(Account, id=pk)
+    if account.is_untracked_by():
+        account.untracked_by.remove(request.user)
+        messages.success(request, _("Account is now tracked"))
+    else:
+        account.untracked_by.add(request.user)
+        messages.success(request, _("Account is now untracked"))
+
+    return HttpResponse(
+        status=204,
+        headers={
+            "HX-Trigger": "updated",
+        },
+    )
+
+
@only_htmx
@login_required
@require_http_methods(["GET"])
--- a/app/apps/common/functions/format.py
+++ b/app/apps/common/functions/format.py
@@ -5,7 +5,12 @@ from django.utils.formats import get_format as original_get_format
 def get_format(format_type=None, lang=None, use_l10n=None):
    user = get_current_user()

-    if user and user.is_authenticated and hasattr(user, "settings") and use_l10n:
+    if (
+        user
+        and user.is_authenticated
+        and hasattr(user, "settings")
+        and use_l10n is not False
+    ):
        user_settings = user.settings
        if format_type == "THOUSAND_SEPARATOR":
            number_format = getattr(user_settings, "number_format", None)
--- a/app/apps/common/widgets/decimal.py
+++ b/app/apps/common/widgets/decimal.py
@@ -35,8 +35,7 @@ class ArbitraryDecimalDisplayNumberInput(forms.TextInput):
        self.attrs.update(
            {
                "x-data": "",
-                "x-mask:dynamic": f"$money($input, '{get_format('DECIMAL_SEPARATOR')}', "
-                f"'{get_format('THOUSAND_SEPARATOR')}', '30')",
+                "x-mask:dynamic": f"$money($input, '{get_format('DECIMAL_SEPARATOR')}', '{get_format('THOUSAND_SEPARATOR')}', '30')",
                "x-on:keyup": "$el.dispatchEvent(new Event('input'))",
            }
        )
--- a/app/apps/insights/utils/transactions.py
+++ b/app/apps/insights/utils/transactions.py
@@ -13,7 +13,9 @@ from apps.insights.forms import (
 )


-def get_transactions(request, include_unpaid=True, include_silent=False):
+def get_transactions(
+    request, include_unpaid=True, include_silent=False, include_untracked_accounts=False
+):
    transactions = Transaction.objects.all()

    filter_type = request.GET.get("type", None)
@@ -95,4 +97,9 @@ def get_transactions(request, include_unpaid=True, include_silent=False):
            Q(Q(category__mute=True) & ~Q(category=None)) | Q(mute=True)
        )

+    if not include_untracked_accounts:
+        transactions = transactions.exclude(
+            account__in=request.user.untracked_accounts.all()
+        )
+
    return transactions
--- a/app/apps/insights/views.py
+++ b/app/apps/insights/views.py
@@ -74,7 +74,7 @@ def index(request):
 def sankey_by_account(request):
    # Get filtered transactions

-    transactions = get_transactions(request)
+    transactions = get_transactions(request, include_untracked_accounts=True)

    # Generate Sankey data
    sankey_data = generate_sankey_data_by_account(transactions)
@@ -239,10 +239,14 @@ def late_transactions(request):
@login_required
@require_http_methods(["GET"])
 def emergency_fund(request):
-    transactions_currency_queryset = Transaction.objects.filter(
-        is_paid=True, account__is_archived=False, account__is_asset=False
-    ).order_by(
-        "account__currency__name",
+    transactions_currency_queryset = (
+        Transaction.objects.filter(
+            is_paid=True, account__is_archived=False, account__is_asset=False
+        )
+        .exclude(account__in=request.user.untracked_accounts.all())
+        .order_by(
+            "account__currency__name",
+        )
    )
    currency_net_worth = calculate_currency_totals(
        transactions_queryset=transactions_currency_queryset, ignore_empty=False
@@ -262,6 +266,7 @@ def emergency_fund(request):
            category__mute=False,
            mute=False,
        )
+        .exclude(account__in=request.user.untracked_accounts.all())
        .values("reference_date", "account__currency")
        .annotate(monthly_total=Sum("amount"))
    )
--- a/app/apps/monthly_overview/views.py
+++ b/app/apps/monthly_overview/views.py
@@ -107,9 +107,15 @@ def transactions_list(request, month: int, year: int):
@require_http_methods(["GET"])
 def monthly_summary(request, month: int, year: int):
    # Base queryset with all required filters
-    base_queryset = Transaction.objects.filter(
-        reference_date__year=year, reference_date__month=month, account__is_asset=False
-    ).exclude(Q(Q(category__mute=True) & ~Q(category=None)) | Q(mute=True))
+    base_queryset = (
+        Transaction.objects.filter(
+            reference_date__year=year,
+            reference_date__month=month,
+            account__is_asset=False,
+        )
+        .exclude(Q(Q(category__mute=True) & ~Q(category=None)) | Q(mute=True))
+        .exclude(account__in=request.user.untracked_accounts.all())
+    )

    data = calculate_currency_totals(base_queryset, ignore_empty=True)
    percentages = calculate_percentage_distribution(data)
@@ -165,10 +171,14 @@ def monthly_account_summary(request, month: int, year: int):
@require_http_methods(["GET"])
 def monthly_currency_summary(request, month: int, year: int):
    # Base queryset with all required filters
-    base_queryset = Transaction.objects.filter(
-        reference_date__year=year,
-        reference_date__month=month,
-    ).exclude(Q(Q(category__mute=True) & ~Q(category=None)) | Q(mute=True))
+    base_queryset = (
+        Transaction.objects.filter(
+            reference_date__year=year,
+            reference_date__month=month,
+        )
+        .exclude(Q(Q(category__mute=True) & ~Q(category=None)) | Q(mute=True))
+        .exclude(account__in=request.user.untracked_accounts.all())
+    )

    currency_data = calculate_currency_totals(base_queryset.all(), ignore_empty=True)
    currency_percentages = calculate_percentage_distribution(currency_data)
--- a/app/apps/net_worth/views.py
+++ b/app/apps/net_worth/views.py
@@ -27,10 +27,12 @@ def net_worth(request):
        view_type = request.session.get("networth_view_type", "current")

    if view_type == "current":
-        transactions_currency_queryset = Transaction.objects.filter(
-            is_paid=True, account__is_archived=False
-        ).order_by(
-            "account__currency__name",
+        transactions_currency_queryset = (
+            Transaction.objects.filter(is_paid=True, account__is_archived=False)
+            .order_by(
+                "account__currency__name",
+            )
+            .exclude(account__in=request.user.untracked_accounts.all())
        )
        transactions_account_queryset = Transaction.objects.filter(
            is_paid=True, account__is_archived=False
@@ -39,10 +41,12 @@ def net_worth(request):
            "account__name",
        )
    else:
-        transactions_currency_queryset = Transaction.objects.filter(
-            account__is_archived=False
-        ).order_by(
-            "account__currency__name",
+        transactions_currency_queryset = (
+            Transaction.objects.filter(account__is_archived=False)
+            .order_by(
+                "account__currency__name",
+            )
+            .exclude(account__in=request.user.untracked_accounts.all())
        )
        transactions_account_queryset = Transaction.objects.filter(
            account__is_archived=False
--- a/app/apps/transactions/views/transactions.py
+++ b/app/apps/transactions/views/transactions.py
@@ -589,7 +589,10 @@ def transaction_all_currency_summary(request):

    f = TransactionsFilter(request.GET, queryset=transactions)

-    currency_data = calculate_currency_totals(f.qs.all(), ignore_empty=True)
+    currency_data = calculate_currency_totals(
+        f.qs.exclude(account__in=request.user.untracked_accounts.all()),
+        ignore_empty=True,
+    )
    currency_percentages = calculate_percentage_distribution(currency_data)

    context = {
--- a/app/apps/yearly_overview/views.py
+++ b/app/apps/yearly_overview/views.py
@@ -95,6 +95,7 @@ def yearly_overview_by_currency(request, year: int):
    transactions = (
        Transaction.objects.filter(**filter_params)
        .exclude(Q(Q(category__mute=True) & ~Q(category=None)) | Q(mute=True))
+        .exclude(account__in=request.user.untracked_accounts.all())
        .order_by("account__currency__name")
    )

--- a/app/locale/de/LC_MESSAGES/django.po
+++ b/app/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-08-08 02:41+0000\n"
+"POT-Creation-Date: 2025-08-09 06:57+0000\n"
 "PO-Revision-Date: 2025-07-22 06:17+0000\n"
 "Last-Translator: seraphblade2010 <marc.butenhoff@web.de>\n"
 "Language-Team: German <https://translations.herculino.com/projects/wygiwyh/"
@@ -171,7 +171,7 @@ msgid "Archived accounts don't show up nor count towards your net worth"
 msgstr ""
 "Archivierte Konten werden weder angezeigt, noch zum Nettovermögen gezählt"

-#: apps/accounts/models.py:70 apps/rules/forms.py:166 apps/rules/forms.py:179
+#: apps/accounts/models.py:75 apps/rules/forms.py:166 apps/rules/forms.py:179
 #: apps/rules/models.py:30 apps/rules/models.py:242
 #: apps/transactions/forms.py:62 apps/transactions/forms.py:276
 #: apps/transactions/forms.py:659 apps/transactions/forms.py:920
@@ -185,7 +185,7 @@ msgstr ""
 msgid "Account"
 msgstr "Konto"

-#: apps/accounts/models.py:71 apps/export_app/forms.py:20
+#: apps/accounts/models.py:76 apps/export_app/forms.py:20
 #: apps/export_app/forms.py:132 apps/transactions/filters.py:53
 #: templates/accounts/fragments/list.html:5
 #: templates/accounts/pages/index.html:4 templates/includes/navbar.html:117
@@ -197,7 +197,7 @@ msgstr "Konto"
 msgid "Accounts"
 msgstr "Konten"

-#: apps/accounts/models.py:84
+#: apps/accounts/models.py:93
 msgid "Exchange currency cannot be the same as the account's main currency."
 msgstr ""
 "Die Umrechnungs-Währung darf nicht mit der Haupt-Währung des Kontos "
@@ -235,7 +235,7 @@ msgid "Account Group deleted successfully"
 msgstr "Kontengruppe erfolgreich gelöscht"

 #: apps/accounts/views/account_groups.py:135
-#: apps/accounts/views/accounts.py:169 apps/dca/views.py:129
+#: apps/accounts/views/accounts.py:189 apps/dca/views.py:129
 #: apps/rules/views.py:187 apps/transactions/views/categories.py:192
 #: apps/transactions/views/entities.py:154 apps/transactions/views/tags.py:154
 msgid "Ownership taken successfully"
@@ -260,6 +260,14 @@ msgstr "Konto erfolgreich aktualisiert"
 msgid "Account deleted successfully"
 msgstr "Konto erfolgreich gelöscht"

+#: apps/accounts/views/accounts.py:165
+msgid "Account is now tracked"
+msgstr ""
+
+#: apps/accounts/views/accounts.py:168
+msgid "Account is now untracked"
+msgstr ""
+
 #: apps/accounts/views/balance.py:77
 msgid "Balance reconciliation"
 msgstr "Saldenaktualisierung"
@@ -924,7 +932,7 @@ msgstr "Aktion der Transaktions-Regel bearbeiten"
 msgid "Update or create transaction actions"
 msgstr "Aktualisierung oder Erstellung von Transaktions-Aktionen"

-#: apps/export_app/forms.py:185 templates/cotton/transaction/item.html:176
+#: apps/export_app/forms.py:185 templates/cotton/transaction/item.html:186
 #: templates/cotton/ui/deleted_transactions_action_bar.html:47
 #: templates/export_app/fragments/restore.html:5
 #: templates/export_app/pages/index.html:24
@@ -2005,7 +2013,7 @@ msgstr "Bearbeiten"
 #: templates/accounts/fragments/list.html:48
 #: templates/categories/fragments/table.html:36
 #: templates/cotton/transaction/item.html:136
-#: templates/cotton/transaction/item.html:182
+#: templates/cotton/transaction/item.html:192
 #: templates/cotton/ui/deleted_transactions_action_bar.html:55
 #: templates/cotton/ui/transactions_action_bar.html:90
 #: templates/currencies/fragments/list.html:44
@@ -2032,7 +2040,7 @@ msgstr "Löschen"
 #: templates/accounts/fragments/list.html:52
 #: templates/categories/fragments/table.html:41
 #: templates/cotton/transaction/item.html:140
-#: templates/cotton/transaction/item.html:186
+#: templates/cotton/transaction/item.html:196
 #: templates/cotton/ui/deleted_transactions_action_bar.html:57
 #: templates/cotton/ui/transactions_action_bar.html:92
 #: templates/currencies/fragments/list.html:48
@@ -2062,7 +2070,7 @@ msgstr "Bist du sicher?"
 #: templates/accounts/fragments/list.html:53
 #: templates/categories/fragments/table.html:42
 #: templates/cotton/transaction/item.html:141
-#: templates/cotton/transaction/item.html:187
+#: templates/cotton/transaction/item.html:197
 #: templates/cotton/ui/deleted_transactions_action_bar.html:58
 #: templates/cotton/ui/transactions_action_bar.html:93
 #: templates/currencies/fragments/list.html:49
@@ -2084,7 +2092,7 @@ msgstr "Dies kann nicht rückgängig gemacht werden!"
 #: templates/accounts/fragments/list.html:54
 #: templates/categories/fragments/table.html:43
 #: templates/cotton/transaction/item.html:142
-#: templates/cotton/transaction/item.html:188
+#: templates/cotton/transaction/item.html:198
 #: templates/currencies/fragments/list.html:50
 #: templates/dca/fragments/strategy/details.html:82
 #: templates/dca/fragments/strategy/list.html:50
@@ -2165,7 +2173,15 @@ msgstr "Konto bearbeiten"
 msgid "Is Asset"
 msgstr "Ist Vermögenswert"

-#: templates/accounts/fragments/list.html:87
+#: templates/accounts/fragments/list.html:78
+msgid "Track"
+msgstr ""
+
+#: templates/accounts/fragments/list.html:78
+msgid "Untrack"
+msgstr ""
+
+#: templates/accounts/fragments/list.html:98
 msgid "No accounts"
 msgstr "Keine Konten"

@@ -2247,35 +2263,42 @@ msgid "Select"
 msgstr "Auswahl"

 #: templates/cotton/transaction/item.html:154
-#: templates/cotton/transaction/item.html:160
+#: templates/cotton/transaction/item.html:164
+#: templates/cotton/transaction/item.html:170
 msgid "Show on summaries"
 msgstr "Anzeigen auf Zusammenfassungen"

 #: templates/cotton/transaction/item.html:155
+#, fuzzy
+#| msgid "Controlled by category"
+msgid "Controlled by account"
+msgstr "Gesteuert durch Kategorie"
+
+#: templates/cotton/transaction/item.html:165
 msgid "Controlled by category"
 msgstr "Gesteuert durch Kategorie"

-#: templates/cotton/transaction/item.html:162
+#: templates/cotton/transaction/item.html:172
 msgid "Hide from summaries"
 msgstr "Verstecken bei Zusammenfassungen"

-#: templates/cotton/transaction/item.html:164
+#: templates/cotton/transaction/item.html:174
 msgid "Add as quick transaction"
 msgstr "Als schnelle Transaktion hinzufügen"

-#: templates/cotton/transaction/item.html:166
+#: templates/cotton/transaction/item.html:176
 msgid "Move to previous month"
 msgstr ""

-#: templates/cotton/transaction/item.html:167
+#: templates/cotton/transaction/item.html:177
 msgid "Move to next month"
 msgstr ""

-#: templates/cotton/transaction/item.html:168
+#: templates/cotton/transaction/item.html:178
 msgid "Move to today"
 msgstr ""

-#: templates/cotton/transaction/item.html:170
+#: templates/cotton/transaction/item.html:180
 #: templates/cotton/ui/transactions_action_bar.html:82
 msgid "Duplicate"
 msgstr "Duplikat"
--- a/app/locale/en/LC_MESSAGES/django.po
+++ b/app/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-08-08 02:41+0000\n"
+"POT-Creation-Date: 2025-08-09 06:57+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -167,7 +167,7 @@ msgstr ""
 msgid "Archived accounts don't show up nor count towards your net worth"
 msgstr ""

-#: apps/accounts/models.py:70 apps/rules/forms.py:166 apps/rules/forms.py:179
+#: apps/accounts/models.py:75 apps/rules/forms.py:166 apps/rules/forms.py:179
 #: apps/rules/models.py:30 apps/rules/models.py:242
 #: apps/transactions/forms.py:62 apps/transactions/forms.py:276
 #: apps/transactions/forms.py:659 apps/transactions/forms.py:920
@@ -181,7 +181,7 @@ msgstr ""
 msgid "Account"
 msgstr ""

-#: apps/accounts/models.py:71 apps/export_app/forms.py:20
+#: apps/accounts/models.py:76 apps/export_app/forms.py:20
 #: apps/export_app/forms.py:132 apps/transactions/filters.py:53
 #: templates/accounts/fragments/list.html:5
 #: templates/accounts/pages/index.html:4 templates/includes/navbar.html:117
@@ -193,7 +193,7 @@ msgstr ""
 msgid "Accounts"
 msgstr ""

-#: apps/accounts/models.py:84
+#: apps/accounts/models.py:93
 msgid "Exchange currency cannot be the same as the account's main currency."
 msgstr ""

@@ -229,7 +229,7 @@ msgid "Account Group deleted successfully"
 msgstr ""

 #: apps/accounts/views/account_groups.py:135
-#: apps/accounts/views/accounts.py:169 apps/dca/views.py:129
+#: apps/accounts/views/accounts.py:189 apps/dca/views.py:129
 #: apps/rules/views.py:187 apps/transactions/views/categories.py:192
 #: apps/transactions/views/entities.py:154 apps/transactions/views/tags.py:154
 msgid "Ownership taken successfully"
@@ -254,6 +254,14 @@ msgstr ""
 msgid "Account deleted successfully"
 msgstr ""

+#: apps/accounts/views/accounts.py:165
+msgid "Account is now tracked"
+msgstr ""
+
+#: apps/accounts/views/accounts.py:168
+msgid "Account is now untracked"
+msgstr ""
+
 #: apps/accounts/views/balance.py:77
 msgid "Balance reconciliation"
 msgstr ""
@@ -900,7 +908,7 @@ msgstr ""
 msgid "Update or create transaction actions"
 msgstr ""

-#: apps/export_app/forms.py:185 templates/cotton/transaction/item.html:176
+#: apps/export_app/forms.py:185 templates/cotton/transaction/item.html:186
 #: templates/cotton/ui/deleted_transactions_action_bar.html:47
 #: templates/export_app/fragments/restore.html:5
 #: templates/export_app/pages/index.html:24
@@ -1954,7 +1962,7 @@ msgstr ""
 #: templates/accounts/fragments/list.html:48
 #: templates/categories/fragments/table.html:36
 #: templates/cotton/transaction/item.html:136
-#: templates/cotton/transaction/item.html:182
+#: templates/cotton/transaction/item.html:192
 #: templates/cotton/ui/deleted_transactions_action_bar.html:55
 #: templates/cotton/ui/transactions_action_bar.html:90
 #: templates/currencies/fragments/list.html:44
@@ -1981,7 +1989,7 @@ msgstr ""
 #: templates/accounts/fragments/list.html:52
 #: templates/categories/fragments/table.html:41
 #: templates/cotton/transaction/item.html:140
-#: templates/cotton/transaction/item.html:186
+#: templates/cotton/transaction/item.html:196
 #: templates/cotton/ui/deleted_transactions_action_bar.html:57
 #: templates/cotton/ui/transactions_action_bar.html:92
 #: templates/currencies/fragments/list.html:48
@@ -2011,7 +2019,7 @@ msgstr ""
 #: templates/accounts/fragments/list.html:53
 #: templates/categories/fragments/table.html:42
 #: templates/cotton/transaction/item.html:141
-#: templates/cotton/transaction/item.html:187
+#: templates/cotton/transaction/item.html:197
 #: templates/cotton/ui/deleted_transactions_action_bar.html:58
 #: templates/cotton/ui/transactions_action_bar.html:93
 #: templates/currencies/fragments/list.html:49
@@ -2033,7 +2041,7 @@ msgstr ""
 #: templates/accounts/fragments/list.html:54
 #: templates/categories/fragments/table.html:43
 #: templates/cotton/transaction/item.html:142
-#: templates/cotton/transaction/item.html:188
+#: templates/cotton/transaction/item.html:198
 #: templates/currencies/fragments/list.html:50
 #: templates/dca/fragments/strategy/details.html:82
 #: templates/dca/fragments/strategy/list.html:50
@@ -2114,7 +2122,15 @@ msgstr ""
 msgid "Is Asset"
 msgstr ""

-#: templates/accounts/fragments/list.html:87
+#: templates/accounts/fragments/list.html:78
+msgid "Track"
+msgstr ""
+
+#: templates/accounts/fragments/list.html:78
+msgid "Untrack"
+msgstr ""
+
+#: templates/accounts/fragments/list.html:98
 msgid "No accounts"
 msgstr ""

@@ -2196,35 +2212,40 @@ msgid "Select"
 msgstr ""

 #: templates/cotton/transaction/item.html:154
-#: templates/cotton/transaction/item.html:160
+#: templates/cotton/transaction/item.html:164
+#: templates/cotton/transaction/item.html:170
 msgid "Show on summaries"
 msgstr ""

 #: templates/cotton/transaction/item.html:155
+msgid "Controlled by account"
+msgstr ""
+
+#: templates/cotton/transaction/item.html:165
 msgid "Controlled by category"
 msgstr ""

-#: templates/cotton/transaction/item.html:162
+#: templates/cotton/transaction/item.html:172
 msgid "Hide from summaries"
 msgstr ""

-#: templates/cotton/transaction/item.html:164
+#: templates/cotton/transaction/item.html:174
 msgid "Add as quick transaction"
 msgstr ""

-#: templates/cotton/transaction/item.html:166
+#: templates/cotton/transaction/item.html:176
 msgid "Move to previous month"
 msgstr ""

-#: templates/cotton/transaction/item.html:167
+#: templates/cotton/transaction/item.html:177
 msgid "Move to next month"
 msgstr ""

-#: templates/cotton/transaction/item.html:168
+#: templates/cotton/transaction/item.html:178
 msgid "Move to today"
 msgstr ""

-#: templates/cotton/transaction/item.html:170
+#: templates/cotton/transaction/item.html:180
 #: templates/cotton/ui/transactions_action_bar.html:82
 msgid "Duplicate"
 msgstr ""
--- a/app/locale/es/LC_MESSAGES/django.po
+++ b/app/locale/es/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-08-08 02:41+0000\n"
+"POT-Creation-Date: 2025-08-09 06:57+0000\n"
 "PO-Revision-Date: 2025-07-21 18:17+0000\n"
 "Last-Translator: afermar <adrian.fm@protonmail.com>\n"
 "Language-Team: Spanish <https://translations.herculino.com/projects/wygiwyh/"
@@ -169,7 +169,7 @@ msgstr "Archivado"
 msgid "Archived accounts don't show up nor count towards your net worth"
 msgstr "Las cuentas archivadas no aparecen ni cuentan para su patrimonio neto"

-#: apps/accounts/models.py:70 apps/rules/forms.py:166 apps/rules/forms.py:179
+#: apps/accounts/models.py:75 apps/rules/forms.py:166 apps/rules/forms.py:179
 #: apps/rules/models.py:30 apps/rules/models.py:242
 #: apps/transactions/forms.py:62 apps/transactions/forms.py:276
 #: apps/transactions/forms.py:659 apps/transactions/forms.py:920
@@ -183,7 +183,7 @@ msgstr "Las cuentas archivadas no aparecen ni cuentan para su patrimonio neto"
 msgid "Account"
 msgstr "Cuenta"

-#: apps/accounts/models.py:71 apps/export_app/forms.py:20
+#: apps/accounts/models.py:76 apps/export_app/forms.py:20
 #: apps/export_app/forms.py:132 apps/transactions/filters.py:53
 #: templates/accounts/fragments/list.html:5
 #: templates/accounts/pages/index.html:4 templates/includes/navbar.html:117
@@ -195,7 +195,7 @@ msgstr "Cuenta"
 msgid "Accounts"
 msgstr "Cuentas"

-#: apps/accounts/models.py:84
+#: apps/accounts/models.py:93
 msgid "Exchange currency cannot be the same as the account's main currency."
 msgstr ""
 "La moneda de cambio no puede ser la misma que la moneda principal de la "
@@ -233,7 +233,7 @@ msgid "Account Group deleted successfully"
 msgstr "Grupo de Cuenta eliminado exitosamente"

 #: apps/accounts/views/account_groups.py:135
-#: apps/accounts/views/accounts.py:169 apps/dca/views.py:129
+#: apps/accounts/views/accounts.py:189 apps/dca/views.py:129
 #: apps/rules/views.py:187 apps/transactions/views/categories.py:192
 #: apps/transactions/views/entities.py:154 apps/transactions/views/tags.py:154
 msgid "Ownership taken successfully"
@@ -258,6 +258,14 @@ msgstr "Cuenta actualizada exitosamente"
 msgid "Account deleted successfully"
 msgstr "Cuenta borrada exitosamente"

+#: apps/accounts/views/accounts.py:165
+msgid "Account is now tracked"
+msgstr ""
+
+#: apps/accounts/views/accounts.py:168
+msgid "Account is now untracked"
+msgstr ""
+
 #: apps/accounts/views/balance.py:77
 msgid "Balance reconciliation"
 msgstr "Conciliación de saldos"
@@ -997,7 +1005,7 @@ msgstr "Edit transaction action"
 msgid "Update or create transaction actions"
 msgstr "Update or create transaction actions"

-#: apps/export_app/forms.py:185 templates/cotton/transaction/item.html:176
+#: apps/export_app/forms.py:185 templates/cotton/transaction/item.html:186
 #: templates/cotton/ui/deleted_transactions_action_bar.html:47
 #: templates/export_app/fragments/restore.html:5
 #: templates/export_app/pages/index.html:24
@@ -2261,7 +2269,7 @@ msgstr "Edit"
 #: templates/accounts/fragments/list.html:48
 #: templates/categories/fragments/table.html:36
 #: templates/cotton/transaction/item.html:136
-#: templates/cotton/transaction/item.html:182
+#: templates/cotton/transaction/item.html:192
 #: templates/cotton/ui/deleted_transactions_action_bar.html:55
 #: templates/cotton/ui/transactions_action_bar.html:90
 #: templates/currencies/fragments/list.html:44
@@ -2289,7 +2297,7 @@ msgstr "Delete"
 #: templates/accounts/fragments/list.html:52
 #: templates/categories/fragments/table.html:41
 #: templates/cotton/transaction/item.html:140
-#: templates/cotton/transaction/item.html:186
+#: templates/cotton/transaction/item.html:196
 #: templates/cotton/ui/deleted_transactions_action_bar.html:57
 #: templates/cotton/ui/transactions_action_bar.html:92
 #: templates/currencies/fragments/list.html:48
@@ -2320,7 +2328,7 @@ msgstr "Are you sure?"
 #: templates/accounts/fragments/list.html:53
 #: templates/categories/fragments/table.html:42
 #: templates/cotton/transaction/item.html:141
-#: templates/cotton/transaction/item.html:187
+#: templates/cotton/transaction/item.html:197
 #: templates/cotton/ui/deleted_transactions_action_bar.html:58
 #: templates/cotton/ui/transactions_action_bar.html:93
 #: templates/currencies/fragments/list.html:49
@@ -2343,7 +2351,7 @@ msgstr "You won't be able to revert this!"
 #: templates/accounts/fragments/list.html:54
 #: templates/categories/fragments/table.html:43
 #: templates/cotton/transaction/item.html:142
-#: templates/cotton/transaction/item.html:188
+#: templates/cotton/transaction/item.html:198
 #: templates/currencies/fragments/list.html:50
 #: templates/dca/fragments/strategy/details.html:82
 #: templates/dca/fragments/strategy/list.html:50
@@ -2436,7 +2444,15 @@ msgstr "Edit account"
 msgid "Is Asset"
 msgstr "Is Asset"

-#: templates/accounts/fragments/list.html:87
+#: templates/accounts/fragments/list.html:78
+msgid "Track"
+msgstr ""
+
+#: templates/accounts/fragments/list.html:78
+msgid "Untrack"
+msgstr ""
+
+#: templates/accounts/fragments/list.html:98
 #, fuzzy
 msgid "No accounts"
 msgstr "No accounts"
@@ -2537,38 +2553,44 @@ msgid "Select"
 msgstr "Select"

 #: templates/cotton/transaction/item.html:154
-#: templates/cotton/transaction/item.html:160
+#: templates/cotton/transaction/item.html:164
+#: templates/cotton/transaction/item.html:170
 msgid "Show on summaries"
 msgstr ""

 #: templates/cotton/transaction/item.html:155
 #, fuzzy
+msgid "Controlled by account"
+msgstr "No category"
+
+#: templates/cotton/transaction/item.html:165
+#, fuzzy
 msgid "Controlled by category"
 msgstr "No category"

-#: templates/cotton/transaction/item.html:162
+#: templates/cotton/transaction/item.html:172
 msgid "Hide from summaries"
 msgstr ""

-#: templates/cotton/transaction/item.html:164
+#: templates/cotton/transaction/item.html:174
 #, fuzzy
 #| msgid "Add quick transaction"
 msgid "Add as quick transaction"
 msgstr "Agregar transacción rápida"

-#: templates/cotton/transaction/item.html:166
+#: templates/cotton/transaction/item.html:176
 msgid "Move to previous month"
 msgstr ""

-#: templates/cotton/transaction/item.html:167
+#: templates/cotton/transaction/item.html:177
 msgid "Move to next month"
 msgstr ""

-#: templates/cotton/transaction/item.html:168
+#: templates/cotton/transaction/item.html:178
 msgid "Move to today"
 msgstr ""

-#: templates/cotton/transaction/item.html:170
+#: templates/cotton/transaction/item.html:180
 #: templates/cotton/ui/transactions_action_bar.html:82
 #, fuzzy
 msgid "Duplicate"
--- a/app/locale/fr/LC_MESSAGES/django.po
+++ b/app/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-08-08 02:41+0000\n"
+"POT-Creation-Date: 2025-08-09 06:57+0000\n"
 "PO-Revision-Date: 2025-07-28 22:17+0000\n"
 "Last-Translator: Erwan Colin <zephone@protonmail.com>\n"
 "Language-Team: French <https://translations.herculino.com/projects/wygiwyh/"
@@ -171,7 +171,7 @@ msgstr ""
 "Les comptes archivés ne sont ni affichés ni comptabilisés dans votre valeur "
 "nette"

-#: apps/accounts/models.py:70 apps/rules/forms.py:166 apps/rules/forms.py:179
+#: apps/accounts/models.py:75 apps/rules/forms.py:166 apps/rules/forms.py:179
 #: apps/rules/models.py:30 apps/rules/models.py:242
 #: apps/transactions/forms.py:62 apps/transactions/forms.py:276
 #: apps/transactions/forms.py:659 apps/transactions/forms.py:920
@@ -185,7 +185,7 @@ msgstr ""
 msgid "Account"
 msgstr "Compte"

-#: apps/accounts/models.py:71 apps/export_app/forms.py:20
+#: apps/accounts/models.py:76 apps/export_app/forms.py:20
 #: apps/export_app/forms.py:132 apps/transactions/filters.py:53
 #: templates/accounts/fragments/list.html:5
 #: templates/accounts/pages/index.html:4 templates/includes/navbar.html:117
@@ -197,7 +197,7 @@ msgstr "Compte"
 msgid "Accounts"
 msgstr "Comptes"

-#: apps/accounts/models.py:84
+#: apps/accounts/models.py:93
 msgid "Exchange currency cannot be the same as the account's main currency."
 msgstr ""
 "La devise de change ne peut pas être identique à la devise principal du "
@@ -235,7 +235,7 @@ msgid "Account Group deleted successfully"
 msgstr "Groupe de compte supprimé avec succès"

 #: apps/accounts/views/account_groups.py:135
-#: apps/accounts/views/accounts.py:169 apps/dca/views.py:129
+#: apps/accounts/views/accounts.py:189 apps/dca/views.py:129
 #: apps/rules/views.py:187 apps/transactions/views/categories.py:192
 #: apps/transactions/views/entities.py:154 apps/transactions/views/tags.py:154
 msgid "Ownership taken successfully"
@@ -260,6 +260,14 @@ msgstr "Compte mis à jour avec succès"
 msgid "Account deleted successfully"
 msgstr "Compte supprimé avec succès"

+#: apps/accounts/views/accounts.py:165
+msgid "Account is now tracked"
+msgstr ""
+
+#: apps/accounts/views/accounts.py:168
+msgid "Account is now untracked"
+msgstr ""
+
 #: apps/accounts/views/balance.py:77
 msgid "Balance reconciliation"
 msgstr "Rapprochement des soldes"
@@ -922,7 +930,7 @@ msgstr "Modifier l'action de transaction"
 msgid "Update or create transaction actions"
 msgstr "Mettre à jour ou créer des actions de transaction"

-#: apps/export_app/forms.py:185 templates/cotton/transaction/item.html:176
+#: apps/export_app/forms.py:185 templates/cotton/transaction/item.html:186
 #: templates/cotton/ui/deleted_transactions_action_bar.html:47
 #: templates/export_app/fragments/restore.html:5
 #: templates/export_app/pages/index.html:24
@@ -2025,7 +2033,7 @@ msgstr "Edit"
 #: templates/accounts/fragments/list.html:48
 #: templates/categories/fragments/table.html:36
 #: templates/cotton/transaction/item.html:136
-#: templates/cotton/transaction/item.html:182
+#: templates/cotton/transaction/item.html:192
 #: templates/cotton/ui/deleted_transactions_action_bar.html:55
 #: templates/cotton/ui/transactions_action_bar.html:90
 #: templates/currencies/fragments/list.html:44
@@ -2053,7 +2061,7 @@ msgstr "Delete"
 #: templates/accounts/fragments/list.html:52
 #: templates/categories/fragments/table.html:41
 #: templates/cotton/transaction/item.html:140
-#: templates/cotton/transaction/item.html:186
+#: templates/cotton/transaction/item.html:196
 #: templates/cotton/ui/deleted_transactions_action_bar.html:57
 #: templates/cotton/ui/transactions_action_bar.html:92
 #: templates/currencies/fragments/list.html:48
@@ -2084,7 +2092,7 @@ msgstr "Are you sure?"
 #: templates/accounts/fragments/list.html:53
 #: templates/categories/fragments/table.html:42
 #: templates/cotton/transaction/item.html:141
-#: templates/cotton/transaction/item.html:187
+#: templates/cotton/transaction/item.html:197
 #: templates/cotton/ui/deleted_transactions_action_bar.html:58
 #: templates/cotton/ui/transactions_action_bar.html:93
 #: templates/currencies/fragments/list.html:49
@@ -2107,7 +2115,7 @@ msgstr "You won't be able to revert this!"
 #: templates/accounts/fragments/list.html:54
 #: templates/categories/fragments/table.html:43
 #: templates/cotton/transaction/item.html:142
-#: templates/cotton/transaction/item.html:188
+#: templates/cotton/transaction/item.html:198
 #: templates/currencies/fragments/list.html:50
 #: templates/dca/fragments/strategy/details.html:82
 #: templates/dca/fragments/strategy/list.html:50
@@ -2200,7 +2208,15 @@ msgstr "Edit account"
 msgid "Is Asset"
 msgstr "Is Asset"

-#: templates/accounts/fragments/list.html:87
+#: templates/accounts/fragments/list.html:78
+msgid "Track"
+msgstr ""
+
+#: templates/accounts/fragments/list.html:78
+msgid "Untrack"
+msgstr ""
+
+#: templates/accounts/fragments/list.html:98
 #, fuzzy
 msgid "No accounts"
 msgstr "No accounts"
@@ -2301,38 +2317,45 @@ msgid "Select"
 msgstr "Select"

 #: templates/cotton/transaction/item.html:154
-#: templates/cotton/transaction/item.html:160
+#: templates/cotton/transaction/item.html:164
+#: templates/cotton/transaction/item.html:170
 msgid "Show on summaries"
 msgstr ""

 #: templates/cotton/transaction/item.html:155
 #, fuzzy
 #| msgid "No category"
+msgid "Controlled by account"
+msgstr "Pas de catégorie"
+
+#: templates/cotton/transaction/item.html:165
+#, fuzzy
+#| msgid "No category"
 msgid "Controlled by category"
 msgstr "Pas de catégorie"

-#: templates/cotton/transaction/item.html:162
+#: templates/cotton/transaction/item.html:172
 msgid "Hide from summaries"
 msgstr ""

-#: templates/cotton/transaction/item.html:164
+#: templates/cotton/transaction/item.html:174
 #, fuzzy
 msgid "Add as quick transaction"
 msgstr "Add recurring transaction"

-#: templates/cotton/transaction/item.html:166
+#: templates/cotton/transaction/item.html:176
 msgid "Move to previous month"
 msgstr ""

-#: templates/cotton/transaction/item.html:167
+#: templates/cotton/transaction/item.html:177
 msgid "Move to next month"
 msgstr ""

-#: templates/cotton/transaction/item.html:168
+#: templates/cotton/transaction/item.html:178
 msgid "Move to today"
 msgstr ""

-#: templates/cotton/transaction/item.html:170
+#: templates/cotton/transaction/item.html:180
 #: templates/cotton/ui/transactions_action_bar.html:82
 #, fuzzy
 msgid "Duplicate"
--- a/app/locale/nl/LC_MESSAGES/django.po
+++ b/app/locale/nl/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-08-08 02:41+0000\n"
-"PO-Revision-Date: 2025-08-08 06:17+0000\n"
+"POT-Creation-Date: 2025-08-09 06:57+0000\n"
+"PO-Revision-Date: 2025-08-09 10:17+0000\n"
 "Last-Translator: Dimitri Decrock <dj.flashpower@gmail.com>\n"
 "Language-Team: Dutch <https://translations.herculino.com/projects/wygiwyh/"
 "app/nl/>\n"
@@ -172,7 +172,7 @@ msgstr ""
 "Gearchiveerde rekeningen worden niet weergegeven en tellen niet mee voor je "
 "\"Netto Waarde\""

-#: apps/accounts/models.py:70 apps/rules/forms.py:166 apps/rules/forms.py:179
+#: apps/accounts/models.py:75 apps/rules/forms.py:166 apps/rules/forms.py:179
 #: apps/rules/models.py:30 apps/rules/models.py:242
 #: apps/transactions/forms.py:62 apps/transactions/forms.py:276
 #: apps/transactions/forms.py:659 apps/transactions/forms.py:920
@@ -186,7 +186,7 @@ msgstr ""
 msgid "Account"
 msgstr "Rekening"

-#: apps/accounts/models.py:71 apps/export_app/forms.py:20
+#: apps/accounts/models.py:76 apps/export_app/forms.py:20
 #: apps/export_app/forms.py:132 apps/transactions/filters.py:53
 #: templates/accounts/fragments/list.html:5
 #: templates/accounts/pages/index.html:4 templates/includes/navbar.html:117
@@ -198,7 +198,7 @@ msgstr "Rekening"
 msgid "Accounts"
 msgstr "Rekeningen"

-#: apps/accounts/models.py:84
+#: apps/accounts/models.py:93
 msgid "Exchange currency cannot be the same as the account's main currency."
 msgstr ""
 "Eenheid wisselgeld kan niet dezelfde zijn als de munteenheid van de rekening."
@@ -235,7 +235,7 @@ msgid "Account Group deleted successfully"
 msgstr "Rekeninggroep succesvol verwijderd"

 #: apps/accounts/views/account_groups.py:135
-#: apps/accounts/views/accounts.py:169 apps/dca/views.py:129
+#: apps/accounts/views/accounts.py:189 apps/dca/views.py:129
 #: apps/rules/views.py:187 apps/transactions/views/categories.py:192
 #: apps/transactions/views/entities.py:154 apps/transactions/views/tags.py:154
 msgid "Ownership taken successfully"
@@ -260,6 +260,14 @@ msgstr "Rekening succesvol bijgewerkt"
 msgid "Account deleted successfully"
 msgstr "Rekening succesvol verwijderd"

+#: apps/accounts/views/accounts.py:165
+msgid "Account is now tracked"
+msgstr "Account wordt nu bijgehouden"
+
+#: apps/accounts/views/accounts.py:168
+msgid "Account is now untracked"
+msgstr "Account wordt nu niet meer bijgehouden"
+
 #: apps/accounts/views/balance.py:77
 msgid "Balance reconciliation"
 msgstr "Saldi afstemming"
@@ -631,14 +639,14 @@ msgstr ""
 "ingestelde wisselkoers."

 #: apps/currencies/models.py:154
-#, fuzzy
-#| msgid "Edit exchange rate"
 msgid "Single exchange rate"
-msgstr "Wisselkoers bewerken"
+msgstr "Enkele Wisselkoers"

 #: apps/currencies/models.py:157
 msgid "Create one exchange rate and keep updating it. Avoids database clutter."
 msgstr ""
+"Maak één wisselkoers aan en houd deze bijgewerkt. Voorkomt een overvolle "
+"database."

 #: apps/currencies/models.py:162
 msgid "Exchange Rate Service"
@@ -923,7 +931,7 @@ msgstr "Bewerk verrichtingsactie"
 msgid "Update or create transaction actions"
 msgstr "Bewerk of maak verrichtingsregel acties"

-#: apps/export_app/forms.py:185 templates/cotton/transaction/item.html:176
+#: apps/export_app/forms.py:185 templates/cotton/transaction/item.html:186
 #: templates/cotton/ui/deleted_transactions_action_bar.html:47
 #: templates/export_app/fragments/restore.html:5
 #: templates/export_app/pages/index.html:24
@@ -1994,7 +2002,7 @@ msgstr "Bewerken"
 #: templates/accounts/fragments/list.html:48
 #: templates/categories/fragments/table.html:36
 #: templates/cotton/transaction/item.html:136
-#: templates/cotton/transaction/item.html:182
+#: templates/cotton/transaction/item.html:192
 #: templates/cotton/ui/deleted_transactions_action_bar.html:55
 #: templates/cotton/ui/transactions_action_bar.html:90
 #: templates/currencies/fragments/list.html:44
@@ -2021,7 +2029,7 @@ msgstr "Verwijderen"
 #: templates/accounts/fragments/list.html:52
 #: templates/categories/fragments/table.html:41
 #: templates/cotton/transaction/item.html:140
-#: templates/cotton/transaction/item.html:186
+#: templates/cotton/transaction/item.html:196
 #: templates/cotton/ui/deleted_transactions_action_bar.html:57
 #: templates/cotton/ui/transactions_action_bar.html:92
 #: templates/currencies/fragments/list.html:48
@@ -2051,7 +2059,7 @@ msgstr "Weet je het zeker?"
 #: templates/accounts/fragments/list.html:53
 #: templates/categories/fragments/table.html:42
 #: templates/cotton/transaction/item.html:141
-#: templates/cotton/transaction/item.html:187
+#: templates/cotton/transaction/item.html:197
 #: templates/cotton/ui/deleted_transactions_action_bar.html:58
 #: templates/cotton/ui/transactions_action_bar.html:93
 #: templates/currencies/fragments/list.html:49
@@ -2073,7 +2081,7 @@ msgstr "Je kunt dit niet meer terugdraaien!"
 #: templates/accounts/fragments/list.html:54
 #: templates/categories/fragments/table.html:43
 #: templates/cotton/transaction/item.html:142
-#: templates/cotton/transaction/item.html:188
+#: templates/cotton/transaction/item.html:198
 #: templates/currencies/fragments/list.html:50
 #: templates/dca/fragments/strategy/details.html:82
 #: templates/dca/fragments/strategy/list.html:50
@@ -2154,7 +2162,15 @@ msgstr "Rekening bewerken"
 msgid "Is Asset"
 msgstr "Is Vermogen"

-#: templates/accounts/fragments/list.html:87
+#: templates/accounts/fragments/list.html:78
+msgid "Track"
+msgstr "Gevolgd"
+
+#: templates/accounts/fragments/list.html:78
+msgid "Untrack"
+msgstr "Niet gevolgd"
+
+#: templates/accounts/fragments/list.html:98
 msgid "No accounts"
 msgstr "Geen rekeningen"

@@ -2236,35 +2252,40 @@ msgid "Select"
 msgstr "Selecteer"

 #: templates/cotton/transaction/item.html:154
-#: templates/cotton/transaction/item.html:160
+#: templates/cotton/transaction/item.html:164
+#: templates/cotton/transaction/item.html:170
 msgid "Show on summaries"
 msgstr "Toon op samenvattingen"

 #: templates/cotton/transaction/item.html:155
+msgid "Controlled by account"
+msgstr "Gecontroleerd door account"
+
+#: templates/cotton/transaction/item.html:165
 msgid "Controlled by category"
 msgstr "Gecontroleerd door categorie"

-#: templates/cotton/transaction/item.html:162
+#: templates/cotton/transaction/item.html:172
 msgid "Hide from summaries"
 msgstr "Verbergen in samenvattingen"

-#: templates/cotton/transaction/item.html:164
+#: templates/cotton/transaction/item.html:174
 msgid "Add as quick transaction"
 msgstr "Toevoegen als snelle transactie"

-#: templates/cotton/transaction/item.html:166
+#: templates/cotton/transaction/item.html:176
 msgid "Move to previous month"
 msgstr "Ga naar vorige maand"

-#: templates/cotton/transaction/item.html:167
+#: templates/cotton/transaction/item.html:177
 msgid "Move to next month"
 msgstr "Ga naar volgende maand"

-#: templates/cotton/transaction/item.html:168
+#: templates/cotton/transaction/item.html:178
 msgid "Move to today"
 msgstr "Ga naar vandaag"

-#: templates/cotton/transaction/item.html:170
+#: templates/cotton/transaction/item.html:180
 #: templates/cotton/ui/transactions_action_bar.html:82
 msgid "Duplicate"
 msgstr "Dupliceren"
--- a/app/locale/pt/LC_MESSAGES/django.po
+++ b/app/locale/pt/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-08-08 02:41+0000\n"
+"POT-Creation-Date: 2025-08-09 06:57+0000\n"
 "PO-Revision-Date: 2025-04-13 08:16+0000\n"
 "Last-Translator: Herculino Trotta <netotrotta@gmail.com>\n"
 "Language-Team: Portuguese <https://translations.herculino.com/projects/"
@@ -171,7 +171,7 @@ msgid "Archived accounts don't show up nor count towards your net worth"
 msgstr ""
 "Contas arquivadas não aparecem nem contam para o seu patrimônio líquido"

-#: apps/accounts/models.py:70 apps/rules/forms.py:166 apps/rules/forms.py:179
+#: apps/accounts/models.py:75 apps/rules/forms.py:166 apps/rules/forms.py:179
 #: apps/rules/models.py:30 apps/rules/models.py:242
 #: apps/transactions/forms.py:62 apps/transactions/forms.py:276
 #: apps/transactions/forms.py:659 apps/transactions/forms.py:920
@@ -185,7 +185,7 @@ msgstr ""
 msgid "Account"
 msgstr "Conta"

-#: apps/accounts/models.py:71 apps/export_app/forms.py:20
+#: apps/accounts/models.py:76 apps/export_app/forms.py:20
 #: apps/export_app/forms.py:132 apps/transactions/filters.py:53
 #: templates/accounts/fragments/list.html:5
 #: templates/accounts/pages/index.html:4 templates/includes/navbar.html:117
@@ -197,7 +197,7 @@ msgstr "Conta"
 msgid "Accounts"
 msgstr "Contas"

-#: apps/accounts/models.py:84
+#: apps/accounts/models.py:93
 msgid "Exchange currency cannot be the same as the account's main currency."
 msgstr "A moeda de câmbio não pode ser a mesma que a moeda principal da conta."

@@ -233,7 +233,7 @@ msgid "Account Group deleted successfully"
 msgstr "Grupo de Conta apagado com sucesso"

 #: apps/accounts/views/account_groups.py:135
-#: apps/accounts/views/accounts.py:169 apps/dca/views.py:129
+#: apps/accounts/views/accounts.py:189 apps/dca/views.py:129
 #: apps/rules/views.py:187 apps/transactions/views/categories.py:192
 #: apps/transactions/views/entities.py:154 apps/transactions/views/tags.py:154
 msgid "Ownership taken successfully"
@@ -258,6 +258,14 @@ msgstr "Conta atualizada com sucesso"
 msgid "Account deleted successfully"
 msgstr "Conta apagada com sucesso"

+#: apps/accounts/views/accounts.py:165
+msgid "Account is now tracked"
+msgstr ""
+
+#: apps/accounts/views/accounts.py:168
+msgid "Account is now untracked"
+msgstr ""
+
 #: apps/accounts/views/balance.py:77
 msgid "Balance reconciliation"
 msgstr "Reconciliação do saldo"
@@ -923,7 +931,7 @@ msgstr "Ação de editar de transação"
 msgid "Update or create transaction actions"
 msgstr "Ações de atualizar ou criar transação"

-#: apps/export_app/forms.py:185 templates/cotton/transaction/item.html:176
+#: apps/export_app/forms.py:185 templates/cotton/transaction/item.html:186
 #: templates/cotton/ui/deleted_transactions_action_bar.html:47
 #: templates/export_app/fragments/restore.html:5
 #: templates/export_app/pages/index.html:24
@@ -2007,7 +2015,7 @@ msgstr "Editar"
 #: templates/accounts/fragments/list.html:48
 #: templates/categories/fragments/table.html:36
 #: templates/cotton/transaction/item.html:136
-#: templates/cotton/transaction/item.html:182
+#: templates/cotton/transaction/item.html:192
 #: templates/cotton/ui/deleted_transactions_action_bar.html:55
 #: templates/cotton/ui/transactions_action_bar.html:90
 #: templates/currencies/fragments/list.html:44
@@ -2034,7 +2042,7 @@ msgstr "Apagar"
 #: templates/accounts/fragments/list.html:52
 #: templates/categories/fragments/table.html:41
 #: templates/cotton/transaction/item.html:140
-#: templates/cotton/transaction/item.html:186
+#: templates/cotton/transaction/item.html:196
 #: templates/cotton/ui/deleted_transactions_action_bar.html:57
 #: templates/cotton/ui/transactions_action_bar.html:92
 #: templates/currencies/fragments/list.html:48
@@ -2064,7 +2072,7 @@ msgstr "Tem certeza?"
 #: templates/accounts/fragments/list.html:53
 #: templates/categories/fragments/table.html:42
 #: templates/cotton/transaction/item.html:141
-#: templates/cotton/transaction/item.html:187
+#: templates/cotton/transaction/item.html:197
 #: templates/cotton/ui/deleted_transactions_action_bar.html:58
 #: templates/cotton/ui/transactions_action_bar.html:93
 #: templates/currencies/fragments/list.html:49
@@ -2086,7 +2094,7 @@ msgstr "Você não será capaz de reverter isso!"
 #: templates/accounts/fragments/list.html:54
 #: templates/categories/fragments/table.html:43
 #: templates/cotton/transaction/item.html:142
-#: templates/cotton/transaction/item.html:188
+#: templates/cotton/transaction/item.html:198
 #: templates/currencies/fragments/list.html:50
 #: templates/dca/fragments/strategy/details.html:82
 #: templates/dca/fragments/strategy/list.html:50
@@ -2167,7 +2175,15 @@ msgstr "Editar conta"
 msgid "Is Asset"
 msgstr "É ativo"

-#: templates/accounts/fragments/list.html:87
+#: templates/accounts/fragments/list.html:78
+msgid "Track"
+msgstr ""
+
+#: templates/accounts/fragments/list.html:78
+msgid "Untrack"
+msgstr ""
+
+#: templates/accounts/fragments/list.html:98
 msgid "No accounts"
 msgstr "Nenhuma conta"

@@ -2249,39 +2265,46 @@ msgid "Select"
 msgstr "Selecionar"

 #: templates/cotton/transaction/item.html:154
-#: templates/cotton/transaction/item.html:160
+#: templates/cotton/transaction/item.html:164
+#: templates/cotton/transaction/item.html:170
 msgid "Show on summaries"
 msgstr ""

 #: templates/cotton/transaction/item.html:155
 #, fuzzy
 #| msgid "No category"
+msgid "Controlled by account"
+msgstr "Sem categoria"
+
+#: templates/cotton/transaction/item.html:165
+#, fuzzy
+#| msgid "No category"
 msgid "Controlled by category"
 msgstr "Sem categoria"

-#: templates/cotton/transaction/item.html:162
+#: templates/cotton/transaction/item.html:172
 msgid "Hide from summaries"
 msgstr ""

-#: templates/cotton/transaction/item.html:164
+#: templates/cotton/transaction/item.html:174
 #, fuzzy
 #| msgid "Add recurring transaction"
 msgid "Add as quick transaction"
 msgstr "Adicionar transação recorrente"

-#: templates/cotton/transaction/item.html:166
+#: templates/cotton/transaction/item.html:176
 msgid "Move to previous month"
 msgstr ""

-#: templates/cotton/transaction/item.html:167
+#: templates/cotton/transaction/item.html:177
 msgid "Move to next month"
 msgstr ""

-#: templates/cotton/transaction/item.html:168
+#: templates/cotton/transaction/item.html:178
 msgid "Move to today"
 msgstr ""

-#: templates/cotton/transaction/item.html:170
+#: templates/cotton/transaction/item.html:180
 #: templates/cotton/ui/transactions_action_bar.html:82
 msgid "Duplicate"
 msgstr "Duplicar"
--- a/app/locale/pt_BR/LC_MESSAGES/django.po
+++ b/app/locale/pt_BR/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-08-08 02:41+0000\n"
+"POT-Creation-Date: 2025-08-09 06:57+0000\n"
 "PO-Revision-Date: 2025-08-08 04:17+0000\n"
 "Last-Translator: Herculino Trotta <netotrotta@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://translations.herculino.com/"
@@ -171,7 +171,7 @@ msgid "Archived accounts don't show up nor count towards your net worth"
 msgstr ""
 "Contas arquivadas não aparecem nem contam para o seu patrimônio líquido"

-#: apps/accounts/models.py:70 apps/rules/forms.py:166 apps/rules/forms.py:179
+#: apps/accounts/models.py:75 apps/rules/forms.py:166 apps/rules/forms.py:179
 #: apps/rules/models.py:30 apps/rules/models.py:242
 #: apps/transactions/forms.py:62 apps/transactions/forms.py:276
 #: apps/transactions/forms.py:659 apps/transactions/forms.py:920
@@ -185,7 +185,7 @@ msgstr ""
 msgid "Account"
 msgstr "Conta"

-#: apps/accounts/models.py:71 apps/export_app/forms.py:20
+#: apps/accounts/models.py:76 apps/export_app/forms.py:20
 #: apps/export_app/forms.py:132 apps/transactions/filters.py:53
 #: templates/accounts/fragments/list.html:5
 #: templates/accounts/pages/index.html:4 templates/includes/navbar.html:117
@@ -197,7 +197,7 @@ msgstr "Conta"
 msgid "Accounts"
 msgstr "Contas"

-#: apps/accounts/models.py:84
+#: apps/accounts/models.py:93
 msgid "Exchange currency cannot be the same as the account's main currency."
 msgstr "A moeda de câmbio não pode ser a mesma que a moeda principal da conta."

@@ -233,7 +233,7 @@ msgid "Account Group deleted successfully"
 msgstr "Grupo de Conta apagado com sucesso"

 #: apps/accounts/views/account_groups.py:135
-#: apps/accounts/views/accounts.py:169 apps/dca/views.py:129
+#: apps/accounts/views/accounts.py:189 apps/dca/views.py:129
 #: apps/rules/views.py:187 apps/transactions/views/categories.py:192
 #: apps/transactions/views/entities.py:154 apps/transactions/views/tags.py:154
 msgid "Ownership taken successfully"
@@ -258,6 +258,14 @@ msgstr "Conta atualizada com sucesso"
 msgid "Account deleted successfully"
 msgstr "Conta apagada com sucesso"

+#: apps/accounts/views/accounts.py:165
+msgid "Account is now tracked"
+msgstr ""
+
+#: apps/accounts/views/accounts.py:168
+msgid "Account is now untracked"
+msgstr ""
+
 #: apps/accounts/views/balance.py:77
 msgid "Balance reconciliation"
 msgstr "Reconciliação do saldo"
@@ -921,7 +929,7 @@ msgstr "Ação de editar de transação"
 msgid "Update or create transaction actions"
 msgstr "Ações de atualizar ou criar transação"

-#: apps/export_app/forms.py:185 templates/cotton/transaction/item.html:176
+#: apps/export_app/forms.py:185 templates/cotton/transaction/item.html:186
 #: templates/cotton/ui/deleted_transactions_action_bar.html:47
 #: templates/export_app/fragments/restore.html:5
 #: templates/export_app/pages/index.html:24
@@ -1993,7 +2001,7 @@ msgstr "Editar"
 #: templates/accounts/fragments/list.html:48
 #: templates/categories/fragments/table.html:36
 #: templates/cotton/transaction/item.html:136
-#: templates/cotton/transaction/item.html:182
+#: templates/cotton/transaction/item.html:192
 #: templates/cotton/ui/deleted_transactions_action_bar.html:55
 #: templates/cotton/ui/transactions_action_bar.html:90
 #: templates/currencies/fragments/list.html:44
@@ -2020,7 +2028,7 @@ msgstr "Apagar"
 #: templates/accounts/fragments/list.html:52
 #: templates/categories/fragments/table.html:41
 #: templates/cotton/transaction/item.html:140
-#: templates/cotton/transaction/item.html:186
+#: templates/cotton/transaction/item.html:196
 #: templates/cotton/ui/deleted_transactions_action_bar.html:57
 #: templates/cotton/ui/transactions_action_bar.html:92
 #: templates/currencies/fragments/list.html:48
@@ -2050,7 +2058,7 @@ msgstr "Tem certeza?"
 #: templates/accounts/fragments/list.html:53
 #: templates/categories/fragments/table.html:42
 #: templates/cotton/transaction/item.html:141
-#: templates/cotton/transaction/item.html:187
+#: templates/cotton/transaction/item.html:197
 #: templates/cotton/ui/deleted_transactions_action_bar.html:58
 #: templates/cotton/ui/transactions_action_bar.html:93
 #: templates/currencies/fragments/list.html:49
@@ -2072,7 +2080,7 @@ msgstr "Você não será capaz de reverter isso!"
 #: templates/accounts/fragments/list.html:54
 #: templates/categories/fragments/table.html:43
 #: templates/cotton/transaction/item.html:142
-#: templates/cotton/transaction/item.html:188
+#: templates/cotton/transaction/item.html:198
 #: templates/currencies/fragments/list.html:50
 #: templates/dca/fragments/strategy/details.html:82
 #: templates/dca/fragments/strategy/list.html:50
@@ -2153,7 +2161,15 @@ msgstr "Editar conta"
 msgid "Is Asset"
 msgstr "É ativo"

-#: templates/accounts/fragments/list.html:87
+#: templates/accounts/fragments/list.html:78
+msgid "Track"
+msgstr ""
+
+#: templates/accounts/fragments/list.html:78
+msgid "Untrack"
+msgstr ""
+
+#: templates/accounts/fragments/list.html:98
 msgid "No accounts"
 msgstr "Nenhuma conta"

@@ -2235,35 +2251,42 @@ msgid "Select"
 msgstr "Selecionar"

 #: templates/cotton/transaction/item.html:154
-#: templates/cotton/transaction/item.html:160
+#: templates/cotton/transaction/item.html:164
+#: templates/cotton/transaction/item.html:170
 msgid "Show on summaries"
 msgstr "Mostrar nos sumários"

 #: templates/cotton/transaction/item.html:155
+#, fuzzy
+#| msgid "Controlled by category"
+msgid "Controlled by account"
+msgstr "Controlado pela categoria"
+
+#: templates/cotton/transaction/item.html:165
 msgid "Controlled by category"
 msgstr "Controlado pela categoria"

-#: templates/cotton/transaction/item.html:162
+#: templates/cotton/transaction/item.html:172
 msgid "Hide from summaries"
 msgstr "Esconder dos sumários"

-#: templates/cotton/transaction/item.html:164
+#: templates/cotton/transaction/item.html:174
 msgid "Add as quick transaction"
 msgstr "Adicionar como transação rápida"

-#: templates/cotton/transaction/item.html:166
+#: templates/cotton/transaction/item.html:176
 msgid "Move to previous month"
 msgstr "Mover para o mês anterior"

-#: templates/cotton/transaction/item.html:167
+#: templates/cotton/transaction/item.html:177
 msgid "Move to next month"
 msgstr "Mover para o mês seguinte"

-#: templates/cotton/transaction/item.html:168
+#: templates/cotton/transaction/item.html:178
 msgid "Move to today"
 msgstr "Mover para hoje"

-#: templates/cotton/transaction/item.html:170
+#: templates/cotton/transaction/item.html:180
 #: templates/cotton/ui/transactions_action_bar.html:82
 msgid "Duplicate"
 msgstr "Duplicar"
--- a/app/locale/sv/LC_MESSAGES/django.po
+++ b/app/locale/sv/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-08-08 02:41+0000\n"
+"POT-Creation-Date: 2025-08-09 06:57+0000\n"
 "PO-Revision-Date: 2025-04-14 06:16+0000\n"
 "Last-Translator: Emil <emil.bjorkroth@gmail.com>\n"
 "Language-Team: Swedish <https://translations.herculino.com/projects/wygiwyh/"
@@ -168,7 +168,7 @@ msgstr ""
 msgid "Archived accounts don't show up nor count towards your net worth"
 msgstr ""

-#: apps/accounts/models.py:70 apps/rules/forms.py:166 apps/rules/forms.py:179
+#: apps/accounts/models.py:75 apps/rules/forms.py:166 apps/rules/forms.py:179
 #: apps/rules/models.py:30 apps/rules/models.py:242
 #: apps/transactions/forms.py:62 apps/transactions/forms.py:276
 #: apps/transactions/forms.py:659 apps/transactions/forms.py:920
@@ -182,7 +182,7 @@ msgstr ""
 msgid "Account"
 msgstr ""

-#: apps/accounts/models.py:71 apps/export_app/forms.py:20
+#: apps/accounts/models.py:76 apps/export_app/forms.py:20
 #: apps/export_app/forms.py:132 apps/transactions/filters.py:53
 #: templates/accounts/fragments/list.html:5
 #: templates/accounts/pages/index.html:4 templates/includes/navbar.html:117
@@ -194,7 +194,7 @@ msgstr ""
 msgid "Accounts"
 msgstr ""

-#: apps/accounts/models.py:84
+#: apps/accounts/models.py:93
 msgid "Exchange currency cannot be the same as the account's main currency."
 msgstr ""

@@ -230,7 +230,7 @@ msgid "Account Group deleted successfully"
 msgstr ""

 #: apps/accounts/views/account_groups.py:135
-#: apps/accounts/views/accounts.py:169 apps/dca/views.py:129
+#: apps/accounts/views/accounts.py:189 apps/dca/views.py:129
 #: apps/rules/views.py:187 apps/transactions/views/categories.py:192
 #: apps/transactions/views/entities.py:154 apps/transactions/views/tags.py:154
 msgid "Ownership taken successfully"
@@ -255,6 +255,14 @@ msgstr ""
 msgid "Account deleted successfully"
 msgstr ""

+#: apps/accounts/views/accounts.py:165
+msgid "Account is now tracked"
+msgstr ""
+
+#: apps/accounts/views/accounts.py:168
+msgid "Account is now untracked"
+msgstr ""
+
 #: apps/accounts/views/balance.py:77
 msgid "Balance reconciliation"
 msgstr ""
@@ -901,7 +909,7 @@ msgstr ""
 msgid "Update or create transaction actions"
 msgstr ""

-#: apps/export_app/forms.py:185 templates/cotton/transaction/item.html:176
+#: apps/export_app/forms.py:185 templates/cotton/transaction/item.html:186
 #: templates/cotton/ui/deleted_transactions_action_bar.html:47
 #: templates/export_app/fragments/restore.html:5
 #: templates/export_app/pages/index.html:24
@@ -1955,7 +1963,7 @@ msgstr ""
 #: templates/accounts/fragments/list.html:48
 #: templates/categories/fragments/table.html:36
 #: templates/cotton/transaction/item.html:136
-#: templates/cotton/transaction/item.html:182
+#: templates/cotton/transaction/item.html:192
 #: templates/cotton/ui/deleted_transactions_action_bar.html:55
 #: templates/cotton/ui/transactions_action_bar.html:90
 #: templates/currencies/fragments/list.html:44
@@ -1982,7 +1990,7 @@ msgstr ""
 #: templates/accounts/fragments/list.html:52
 #: templates/categories/fragments/table.html:41
 #: templates/cotton/transaction/item.html:140
-#: templates/cotton/transaction/item.html:186
+#: templates/cotton/transaction/item.html:196
 #: templates/cotton/ui/deleted_transactions_action_bar.html:57
 #: templates/cotton/ui/transactions_action_bar.html:92
 #: templates/currencies/fragments/list.html:48
@@ -2012,7 +2020,7 @@ msgstr ""
 #: templates/accounts/fragments/list.html:53
 #: templates/categories/fragments/table.html:42
 #: templates/cotton/transaction/item.html:141
-#: templates/cotton/transaction/item.html:187
+#: templates/cotton/transaction/item.html:197
 #: templates/cotton/ui/deleted_transactions_action_bar.html:58
 #: templates/cotton/ui/transactions_action_bar.html:93
 #: templates/currencies/fragments/list.html:49
@@ -2034,7 +2042,7 @@ msgstr ""
 #: templates/accounts/fragments/list.html:54
 #: templates/categories/fragments/table.html:43
 #: templates/cotton/transaction/item.html:142
-#: templates/cotton/transaction/item.html:188
+#: templates/cotton/transaction/item.html:198
 #: templates/currencies/fragments/list.html:50
 #: templates/dca/fragments/strategy/details.html:82
 #: templates/dca/fragments/strategy/list.html:50
@@ -2115,7 +2123,15 @@ msgstr ""
 msgid "Is Asset"
 msgstr ""

-#: templates/accounts/fragments/list.html:87
+#: templates/accounts/fragments/list.html:78
+msgid "Track"
+msgstr ""
+
+#: templates/accounts/fragments/list.html:78
+msgid "Untrack"
+msgstr ""
+
+#: templates/accounts/fragments/list.html:98
 msgid "No accounts"
 msgstr ""

@@ -2197,35 +2213,40 @@ msgid "Select"
 msgstr ""

 #: templates/cotton/transaction/item.html:154
-#: templates/cotton/transaction/item.html:160
+#: templates/cotton/transaction/item.html:164
+#: templates/cotton/transaction/item.html:170
 msgid "Show on summaries"
 msgstr ""

 #: templates/cotton/transaction/item.html:155
+msgid "Controlled by account"
+msgstr ""
+
+#: templates/cotton/transaction/item.html:165
 msgid "Controlled by category"
 msgstr ""

-#: templates/cotton/transaction/item.html:162
+#: templates/cotton/transaction/item.html:172
 msgid "Hide from summaries"
 msgstr ""

-#: templates/cotton/transaction/item.html:164
+#: templates/cotton/transaction/item.html:174
 msgid "Add as quick transaction"
 msgstr ""

-#: templates/cotton/transaction/item.html:166
+#: templates/cotton/transaction/item.html:176
 msgid "Move to previous month"
 msgstr ""

-#: templates/cotton/transaction/item.html:167
+#: templates/cotton/transaction/item.html:177
 msgid "Move to next month"
 msgstr ""

-#: templates/cotton/transaction/item.html:168
+#: templates/cotton/transaction/item.html:178
 msgid "Move to today"
 msgstr ""

-#: templates/cotton/transaction/item.html:170
+#: templates/cotton/transaction/item.html:180
 #: templates/cotton/ui/transactions_action_bar.html:82
 msgid "Duplicate"
 msgstr ""
--- a/app/locale/uk/LC_MESSAGES/django.po
+++ b/app/locale/uk/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-08-08 02:41+0000\n"
+"POT-Creation-Date: 2025-08-09 06:57+0000\n"
 "PO-Revision-Date: 2025-05-12 14:16+0000\n"
 "Last-Translator: Felix <xnovaua@gmail.com>\n"
 "Language-Team: Ukrainian <https://translations.herculino.com/projects/"
@@ -172,7 +172,7 @@ msgstr ""
 "Заархівовані рахунки не відображаються і не враховуються у вашій чистій "
 "вартості"

-#: apps/accounts/models.py:70 apps/rules/forms.py:166 apps/rules/forms.py:179
+#: apps/accounts/models.py:75 apps/rules/forms.py:166 apps/rules/forms.py:179
 #: apps/rules/models.py:30 apps/rules/models.py:242
 #: apps/transactions/forms.py:62 apps/transactions/forms.py:276
 #: apps/transactions/forms.py:659 apps/transactions/forms.py:920
@@ -186,7 +186,7 @@ msgstr ""
 msgid "Account"
 msgstr "Рахунок"

-#: apps/accounts/models.py:71 apps/export_app/forms.py:20
+#: apps/accounts/models.py:76 apps/export_app/forms.py:20
 #: apps/export_app/forms.py:132 apps/transactions/filters.py:53
 #: templates/accounts/fragments/list.html:5
 #: templates/accounts/pages/index.html:4 templates/includes/navbar.html:117
@@ -198,7 +198,7 @@ msgstr "Рахунок"
 msgid "Accounts"
 msgstr "Рахунки"

-#: apps/accounts/models.py:84
+#: apps/accounts/models.py:93
 msgid "Exchange currency cannot be the same as the account's main currency."
 msgstr "Валюта обміну не може збігатися з основною валютою рахунку."

@@ -234,7 +234,7 @@ msgid "Account Group deleted successfully"
 msgstr "Групу рахунків успішно видалено"

 #: apps/accounts/views/account_groups.py:135
-#: apps/accounts/views/accounts.py:169 apps/dca/views.py:129
+#: apps/accounts/views/accounts.py:189 apps/dca/views.py:129
 #: apps/rules/views.py:187 apps/transactions/views/categories.py:192
 #: apps/transactions/views/entities.py:154 apps/transactions/views/tags.py:154
 msgid "Ownership taken successfully"
@@ -259,6 +259,14 @@ msgstr "Рахунок успішно оновлено"
 msgid "Account deleted successfully"
 msgstr "Рахунок успішно видалено"

+#: apps/accounts/views/accounts.py:165
+msgid "Account is now tracked"
+msgstr ""
+
+#: apps/accounts/views/accounts.py:168
+msgid "Account is now untracked"
+msgstr ""
+
 #: apps/accounts/views/balance.py:77
 msgid "Balance reconciliation"
 msgstr "Звірка балансу"
@@ -918,7 +926,7 @@ msgstr ""
 msgid "Update or create transaction actions"
 msgstr ""

-#: apps/export_app/forms.py:185 templates/cotton/transaction/item.html:176
+#: apps/export_app/forms.py:185 templates/cotton/transaction/item.html:186
 #: templates/cotton/ui/deleted_transactions_action_bar.html:47
 #: templates/export_app/fragments/restore.html:5
 #: templates/export_app/pages/index.html:24
@@ -1974,7 +1982,7 @@ msgstr ""
 #: templates/accounts/fragments/list.html:48
 #: templates/categories/fragments/table.html:36
 #: templates/cotton/transaction/item.html:136
-#: templates/cotton/transaction/item.html:182
+#: templates/cotton/transaction/item.html:192
 #: templates/cotton/ui/deleted_transactions_action_bar.html:55
 #: templates/cotton/ui/transactions_action_bar.html:90
 #: templates/currencies/fragments/list.html:44
@@ -2001,7 +2009,7 @@ msgstr ""
 #: templates/accounts/fragments/list.html:52
 #: templates/categories/fragments/table.html:41
 #: templates/cotton/transaction/item.html:140
-#: templates/cotton/transaction/item.html:186
+#: templates/cotton/transaction/item.html:196
 #: templates/cotton/ui/deleted_transactions_action_bar.html:57
 #: templates/cotton/ui/transactions_action_bar.html:92
 #: templates/currencies/fragments/list.html:48
@@ -2031,7 +2039,7 @@ msgstr ""
 #: templates/accounts/fragments/list.html:53
 #: templates/categories/fragments/table.html:42
 #: templates/cotton/transaction/item.html:141
-#: templates/cotton/transaction/item.html:187
+#: templates/cotton/transaction/item.html:197
 #: templates/cotton/ui/deleted_transactions_action_bar.html:58
 #: templates/cotton/ui/transactions_action_bar.html:93
 #: templates/currencies/fragments/list.html:49
@@ -2053,7 +2061,7 @@ msgstr ""
 #: templates/accounts/fragments/list.html:54
 #: templates/categories/fragments/table.html:43
 #: templates/cotton/transaction/item.html:142
-#: templates/cotton/transaction/item.html:188
+#: templates/cotton/transaction/item.html:198
 #: templates/currencies/fragments/list.html:50
 #: templates/dca/fragments/strategy/details.html:82
 #: templates/dca/fragments/strategy/list.html:50
@@ -2134,7 +2142,15 @@ msgstr ""
 msgid "Is Asset"
 msgstr ""

-#: templates/accounts/fragments/list.html:87
+#: templates/accounts/fragments/list.html:78
+msgid "Track"
+msgstr ""
+
+#: templates/accounts/fragments/list.html:78
+msgid "Untrack"
+msgstr ""
+
+#: templates/accounts/fragments/list.html:98
 msgid "No accounts"
 msgstr ""

@@ -2216,35 +2232,40 @@ msgid "Select"
 msgstr ""

 #: templates/cotton/transaction/item.html:154
-#: templates/cotton/transaction/item.html:160
+#: templates/cotton/transaction/item.html:164
+#: templates/cotton/transaction/item.html:170
 msgid "Show on summaries"
 msgstr ""

 #: templates/cotton/transaction/item.html:155
+msgid "Controlled by account"
+msgstr ""
+
+#: templates/cotton/transaction/item.html:165
 msgid "Controlled by category"
 msgstr ""

-#: templates/cotton/transaction/item.html:162
+#: templates/cotton/transaction/item.html:172
 msgid "Hide from summaries"
 msgstr ""

-#: templates/cotton/transaction/item.html:164
+#: templates/cotton/transaction/item.html:174
 msgid "Add as quick transaction"
 msgstr ""

-#: templates/cotton/transaction/item.html:166
+#: templates/cotton/transaction/item.html:176
 msgid "Move to previous month"
 msgstr ""

-#: templates/cotton/transaction/item.html:167
+#: templates/cotton/transaction/item.html:177
 msgid "Move to next month"
 msgstr ""

-#: templates/cotton/transaction/item.html:168
+#: templates/cotton/transaction/item.html:178
 msgid "Move to today"
 msgstr ""

-#: templates/cotton/transaction/item.html:170
+#: templates/cotton/transaction/item.html:180
 #: templates/cotton/ui/transactions_action_bar.html:82
 msgid "Duplicate"
 msgstr ""
--- a/app/templates/accounts/fragments/list.html
+++ b/app/templates/accounts/fragments/list.html
@@ -71,6 +71,17 @@
                 hx-get="{% url 'account_share_settings' pk=account.id %}">
                <i class="fa-solid fa-share fa-fw"></i></a>
                {% endif %}
+                <a class="btn btn-secondary btn-sm"
+                   role="button"
+                   hx-get="{% url 'account_toggle_untracked' pk=account.id %}"
+                   data-bs-toggle="tooltip"
+                   data-bs-title="{% if account.is_untracked_by %}{% translate "Track" %}{% else %}{% translate "Untrack" %}{% endif %}">
+                  {% if account.is_untracked_by %}
+                    <i class="fa-solid fa-eye fa-fw"></i>
+                  {% else %}
+                    <i class="fa-solid fa-eye-slash fa-fw"></i>
+                  {% endif %}
+                </a>
              </div>
            </td>
            <td class="col">{{ account.name }}</td>
--- a/app/templates/cotton/transaction/item.html
+++ b/app/templates/cotton/transaction/item.html
@@ -33,7 +33,7 @@
            </div>
          {% endif %}
        </div>
-        <div class="col-lg col-12 {% if transaction.category.mute or transaction.mute %}tw:brightness-80{% endif %}">
+        <div class="col-lg col-12 {% if transaction.account.is_untracked_by or transaction.category.mute or transaction.mute %}tw:brightness-80{% endif %}">
          {#      Date#}
          <div class="row mb-2 mb-lg-1 tw:text-gray-400">
            <div class="col-auto pe-1"><i class="fa-solid fa-calendar fa-fw me-1 fa-xs"></i></div>
@@ -91,7 +91,7 @@
            {% endwith %}
          </div>
        </div>
-        <div class="col-lg-auto col-12 text-lg-end align-self-end {% if transaction.category.mute or transaction.mute %}tw:brightness-80{% endif %}">
+        <div class="col-lg-auto col-12 text-lg-end align-self-end {% if transaction.account.is_untracked_by or transaction.category.mute or transaction.mute %}tw:brightness-80{% endif %}">
          <div class="main-amount mb-2 mb-lg-0">
            <c-amount.display
                :amount="transaction.amount"
@@ -120,8 +120,8 @@
        <div>
          {#      Item actions#}
          <div
-              class="transaction-actions tw:absolute! tw:right-[15px] tw:top-[50%] tw:md:right-auto tw:md:left-1/2 tw:md:top-0 tw:md:-translate-x-1/2 tw:-translate-y-1/2 tw:invisible tw:group-hover/transaction:visible d-flex flex-row card">
-            <div class="card-body p-1 shadow-lg d-flex flex-column flex-md-row gap-1">
+              class="transaction-actions tw:absolute! tw:left-1/2 tw:top-0 tw:-translate-x-1/2 tw:-translate-y-1/2 tw:invisible tw:group-hover/transaction:visible d-flex flex-row card">
+            <div class="card-body p-1 shadow-lg d-flex flex-row gap-1">
              {% if not transaction.deleted %}
                <a class="btn btn-secondary btn-sm transaction-action"
                   role="button"
@@ -146,16 +146,26 @@
                  <i class="fa-solid fa-ellipsis fa-fw"></i>
                </button>
                <ul class="dropdown-menu dropdown-menu-end dropdown-menu-md-start">
-                  {% if transaction.category.mute %}
-                  <li>
-                    <a class="dropdown-item disabled d-flex align-items-center" aria-disabled="true">
-                      <i class="fa-solid fa-eye fa-fw me-2"></i>
-                      <div>
-                        {% translate 'Show on summaries' %}
-                        <div class="d-block text-body-secondary tw:text-xs tw:font-medium">{% translate 'Controlled by category' %}</div>
-                      </div>
-                    </a>
-                  </li>
+                  {% if transaction.account.is_untracked_by %}
+                    <li>
+                      <a class="dropdown-item disabled d-flex align-items-center" aria-disabled="true">
+                        <i class="fa-solid fa-eye fa-fw me-2"></i>
+                        <div>
+                          {% translate 'Show on summaries' %}
+                          <div class="d-block text-body-secondary tw:text-xs tw:font-medium">{% translate 'Controlled by account' %}</div>
+                        </div>
+                      </a>
+                    </li>
+                  {% elif transaction.category.mute %}
+                    <li>
+                      <a class="dropdown-item disabled d-flex align-items-center" aria-disabled="true">
+                        <i class="fa-solid fa-eye fa-fw me-2"></i>
+                        <div>
+                          {% translate 'Show on summaries' %}
+                          <div class="d-block text-body-secondary tw:text-xs tw:font-medium">{% translate 'Controlled by category' %}</div>
+                        </div>
+                      </a>
+                    </li>
                  {% elif transaction.mute %}
                    <li><a class="dropdown-item" href="#" hx-get="{% url 'transaction_mute' transaction_id=transaction.id %}" hx-target="closest .transaction" hx-swap="outerHTML"><i class="fa-solid fa-eye fa-fw me-2"></i>{% translate 'Show on summaries' %}</a></li>
                  {% else %}
--- a/frontend/src/styles/style.scss
+++ b/frontend/src/styles/style.scss
@@ -85,3 +85,7 @@ select[multiple] {
 [data-bs-toggle="collapse"][aria-expanded="true"] .fa-chevron-down {
  transform: rotate(-180deg);
 }
+
+div:where(.swal2-container) {
+  z-index: 1100 !important;
+}
Author	SHA1	Message	Date
Herculino Trotta	74899f63ab	Merge pull request #323 fix(locale): get_format doesn't override number formatting if use_l10n is None	2025-08-10 12:24:37 -03:00
Herculino Trotta	66a5e6d613	fix(locale): get_format doesn't override number formatting if use_l10n is None	2025-08-10 12:23:41 -03:00
Dimitri Decrock	e0ab32ec03	locale(Dutch): update translation Currently translated at 100.0% (680 of 680 strings) Translation: WYGIWYH/App Translate-URL: https://translations.herculino.com/projects/wygiwyh/app/nl/	2025-08-09 10:17:41 +00:00
eitchtee	a912e4a511	chore(locale): update translation files [skip ci] Automatically generated by Django makemessages workflow	2025-08-09 06:57:32 +00:00
Herculino Trotta	57ba672c91	Merge pull request #321 feat(accounts): add option for untracking accounts on a per user basis	2025-08-09 03:55:59 -03:00
Herculino Trotta	20c6989ffb	fix(insights:emergency-fund): hide untracked accounts	2025-08-09 03:45:16 -03:00
Herculino Trotta	c6cd525c49	fix(insights): display untracked accounts on sankey by account	2025-08-09 03:42:21 -03:00
Herculino Trotta	55c4b920ee	feat(accounts): add option for untracking accounts on a per user basis	2025-08-09 03:35:39 -03:00
google-labs-jules[bot]	7f8261b9cc	refactor: Style transaction items for untracked accounts This commit extends the "Untrack Account" feature by applying a special style to transaction items that belong to an untracked account. - The transaction item template is modified to apply a "dimmed" style to transactions from untracked accounts. - The styling follows the precedence: Account (untracked) > Category (muted) > Transaction (hidden). - The dropdown menu for transaction items now shows "Controlled by account" if the transaction's account is untracked.	2025-08-09 05:47:18 +00:00
Herculino Trotta	9102654eab	Merge pull request #320 style(swal): move swal prompt over tooltips	2025-08-08 19:01:54 -03:00
Herculino Trotta	1ff49a8a04	style(swal): move swal prompt over tooltips	2025-08-08 19:01:35 -03:00
Herculino Trotta	846dd1fd73	Merge remote-tracking branch 'origin/main'	2025-08-08 16:49:54 -03:00
Herculino Trotta	9eed3b6692	style(transactions): remove menu vertical positioning on smaller screens	2025-08-08 16:49:37 -03:00