diff --git a/app/WYGIWYH/settings.py b/app/WYGIWYH/settings.py
index 9adb0d72..ff20f06a 100644
--- a/app/WYGIWYH/settings.py
+++ b/app/WYGIWYH/settings.py
@@ -517,6 +517,11 @@ SPECTACULAR_SETTINGS = {
"DESCRIPTION": "A no-frills expense tracker",
"VERSION": "1.0.0",
"SERVE_INCLUDE_SCHEMA": False,
+ # Several models have a "type" field with different choices
+ "ENUM_NAME_OVERRIDES": {
+ "TransactionTypeEnum": "apps.transactions.models.Transaction.Type",
+ "TemplateTypeEnum": "apps.transactions.models.QuickTransaction.Type",
+ },
# OTHER SETTINGS
}
diff --git a/app/apps/api/apps.py b/app/apps/api/apps.py
index a79077ab..05889f2a 100644
--- a/app/apps/api/apps.py
+++ b/app/apps/api/apps.py
@@ -4,3 +4,6 @@ from django.apps import AppConfig
class ApiConfig(AppConfig):
default_auto_field = "django.db.models.BigAutoField"
name = "apps.api"
+
+ def ready(self):
+ import apps.api.schema # noqa: F401 registers the API token scheme for the docs
diff --git a/app/apps/api/fields/transactions.py b/app/apps/api/fields/transactions.py
index b64ac83c..c0185f6f 100644
--- a/app/apps/api/fields/transactions.py
+++ b/app/apps/api/fields/transactions.py
@@ -10,7 +10,8 @@ from apps.transactions.models import (
@extend_schema_field(
{
- "oneOf": [{"type": "string"}, {"type": "integer"}, {"type": "null"}],
+ "oneOf": [{"type": "string"}, {"type": "integer"}],
+ "nullable": True,
"description": "TransactionCategory ID or name. If the name doesn't exist, a new one will be created. Can be null if no category is assigned.",
}
)
diff --git a/app/apps/api/schema.py b/app/apps/api/schema.py
new file mode 100644
index 00000000..499c2542
--- /dev/null
+++ b/app/apps/api/schema.py
@@ -0,0 +1,20 @@
+from drf_spectacular.extensions import OpenApiAuthenticationExtension
+
+from apps.users.models import APIToken
+
+
+class APITokenAuthenticationScheme(OpenApiAuthenticationExtension):
+ """Describes APITokenAuthentication in the API docs."""
+
+ target_class = "apps.api.authentication.APITokenAuthentication"
+ name = "apiToken"
+
+ def get_security_definition(self, auto_schema):
+ return {
+ "type": "apiKey",
+ "in": "header",
+ "name": "Authorization",
+ "description": (
+ f"A personal API token, sent as `Token {APIToken.TOKEN_PREFIX}…`."
+ ),
+ }
diff --git a/app/apps/api/serializers/transactions.py b/app/apps/api/serializers/transactions.py
index 05d51c08..8628ffde 100644
--- a/app/apps/api/serializers/transactions.py
+++ b/app/apps/api/serializers/transactions.py
@@ -1,5 +1,6 @@
from decimal import Decimal
+from django.db import transaction as db_transaction
from django.utils.translation import gettext_lazy as _
from drf_spectacular import openapi
from drf_spectacular.types import OpenApiTypes
@@ -22,10 +23,85 @@ from apps.transactions.models import (
InstallmentPlan,
TransactionEntity,
RecurringTransaction,
+ SubTransaction,
)
from apps.common.middleware.thread_local import get_current_user
+class SubTransactionSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = SubTransaction
+ fields = ["id", "name", "amount"]
+ read_only_fields = ["id"]
+
+
+class SubTransactionsMixin:
+ """`sub_transactions`, when sent, replaces the parts; a non-empty list sets
+ the amount to their sum. Declare the field on the serializer itself."""
+
+ sub_amount_field = "amount"
+
+ def __init__(self, *args, **kwargs):
+ super().__init__(*args, **kwargs)
+ self.fields[self.sub_amount_field].required = False
+
+ def is_transfer(self, data):
+ return False
+
+ def validate(self, data):
+ field = self.sub_amount_field
+ subs = data.get("sub_transactions")
+ has_parts = self.instance is not None and self.instance.sub_transactions.exists()
+ if self.is_transfer(data):
+ if subs:
+ raise serializers.ValidationError(
+ {"sub_transactions": _("Transfers can't have sub-transactions.")}
+ )
+ if has_parts:
+ data["sub_transactions"] = []
+ elif subs:
+ data[field] = sum(sub["amount"] for sub in subs)
+ elif subs is None and field in data and has_parts:
+ raise serializers.ValidationError(
+ {
+ field: _(
+ "The amount is the sum of the sub-transactions; "
+ "send sub_transactions instead."
+ )
+ }
+ )
+ if not self.partial and data.get(field) is None:
+ raise serializers.ValidationError({field: _("This field is required.")})
+ return super().validate(data)
+
+ @staticmethod
+ def set_sub_transactions(instance, subs):
+ if subs is None:
+ return
+ instance.sub_transactions.all().delete()
+ for sub in subs:
+ instance.sub_transactions.create(**sub)
+
+ def create(self, validated_data):
+ subs = validated_data.pop("sub_transactions", None)
+ with db_transaction.atomic():
+ instance = super().create(validated_data)
+ self.set_sub_transactions(instance, subs)
+ self.after_save(instance, created=True)
+ return instance
+
+ def update(self, instance, validated_data):
+ subs = validated_data.pop("sub_transactions", None)
+ with db_transaction.atomic():
+ instance = super().update(instance, validated_data)
+ self.set_sub_transactions(instance, subs)
+ self.after_save(instance, created=False)
+ return instance
+
+ def after_save(self, instance, created):
+ """Runs once the parts are saved, e.g. to generate transactions from them."""
+
+
class TransactionCategorySerializer(serializers.ModelSerializer):
permission_classes = [IsAuthenticated]
@@ -62,7 +138,9 @@ class TransactionEntitySerializer(serializers.ModelSerializer):
]
-class InstallmentPlanSerializer(serializers.ModelSerializer):
+class InstallmentPlanSerializer(SubTransactionsMixin, serializers.ModelSerializer):
+ sub_amount_field = "installment_amount"
+ sub_transactions = SubTransactionSerializer(many=True, required=False)
category: str | int = TransactionCategoryField(required=False)
tags: str | int = TransactionTagField(required=False)
entities: str | int = TransactionEntityField(required=False)
@@ -84,6 +162,7 @@ class InstallmentPlanSerializer(serializers.ModelSerializer):
"end_date",
"recurrence",
"installment_amount",
+ "sub_transactions",
"category",
"tags",
"entities",
@@ -91,18 +170,15 @@ class InstallmentPlanSerializer(serializers.ModelSerializer):
]
read_only_fields = ["installment_total_number", "end_date"]
- def create(self, validated_data):
- instance = super().create(validated_data)
- instance.create_transactions()
- return instance
-
- def update(self, instance, validated_data):
- instance = super().update(instance, validated_data)
- instance.update_transactions()
- return instance
+ def after_save(self, instance, created):
+ if created:
+ instance.create_transactions()
+ else:
+ instance.update_transactions()
-class RecurringTransactionSerializer(serializers.ModelSerializer):
+class RecurringTransactionSerializer(SubTransactionsMixin, serializers.ModelSerializer):
+ sub_transactions = SubTransactionSerializer(many=True, required=False)
category: str | int = TransactionCategoryField(required=False)
tags: str | int = TransactionTagField(required=False)
entities: str | int = TransactionEntityField(required=False)
@@ -115,6 +191,7 @@ class RecurringTransactionSerializer(serializers.ModelSerializer):
"account",
"type",
"amount",
+ "sub_transactions",
"to_account",
"to_amount",
"description",
@@ -142,19 +219,20 @@ class RecurringTransactionSerializer(serializers.ModelSerializer):
)
return super().validate(attrs)
- def create(self, validated_data):
- instance = super().create(validated_data)
- instance.create_upcoming_transactions()
- return instance
+ def is_transfer(self, data):
+ type_ = data.get("type", getattr(self.instance, "type", None))
+ return type_ == RecurringTransaction.Type.TRANSFER
- def update(self, instance, validated_data):
- instance = super().update(instance, validated_data)
- instance.update_unpaid_transactions()
- instance.generate_upcoming_transactions()
- return instance
+ def after_save(self, instance, created):
+ if created:
+ instance.create_upcoming_transactions()
+ else:
+ instance.update_unpaid_transactions()
+ instance.generate_upcoming_transactions()
-class TransactionSerializer(serializers.ModelSerializer):
+class TransactionSerializer(SubTransactionsMixin, serializers.ModelSerializer):
+ sub_transactions = SubTransactionSerializer(many=True, required=False)
category: str | int = TransactionCategoryField(required=False)
tags: str | int = TransactionTagField(required=False)
entities: str | int = TransactionEntityField(required=False)
@@ -194,6 +272,9 @@ class TransactionSerializer(serializers.ModelSerializer):
self.fields["account_id"].queryset = Account.objects.all()
+ def is_transfer(self, data):
+ return bool(self.instance and self.instance.linked_transaction_id)
+
def validate(self, data):
if not self.partial:
if "date" in data and "reference_date" not in data:
@@ -204,12 +285,12 @@ class TransactionSerializer(serializers.ModelSerializer):
raise serializers.ValidationError(
_("Either 'date' or 'reference_date' must be provided.")
)
- return data
+ return super().validate(data)
def create(self, validated_data):
tags = validated_data.pop("tags", [])
entities = validated_data.pop("entities", [])
- transaction = Transaction.objects.create(**validated_data)
+ transaction = super().create(validated_data)
transaction.tags.set(tags)
transaction.entities.set(entities)
return transaction
@@ -217,9 +298,7 @@ class TransactionSerializer(serializers.ModelSerializer):
def update(self, instance, validated_data):
tags = validated_data.pop("tags", None)
entities = validated_data.pop("entities", None)
- for attr, value in validated_data.items():
- setattr(instance, attr, value)
- instance.save()
+ instance = super().update(instance, validated_data)
if tags is not None:
instance.tags.set(tags)
diff --git a/app/apps/api/tests/test_schema.py b/app/apps/api/tests/test_schema.py
new file mode 100644
index 00000000..9032ff3b
--- /dev/null
+++ b/app/apps/api/tests/test_schema.py
@@ -0,0 +1,11 @@
+import tempfile
+
+from django.core.management import call_command
+from django.test import SimpleTestCase
+
+
+class SchemaTests(SimpleTestCase):
+ def test_schema_is_valid_without_warnings(self):
+ """Keeps /api/docs/ complete: drf-spectacular warns when it can't describe something."""
+ with tempfile.NamedTemporaryFile(suffix=".yml") as schema:
+ call_command("spectacular", "--validate", "--fail-on-warn", "--file", schema.name)
diff --git a/app/apps/api/views/transactions.py b/app/apps/api/views/transactions.py
index fdc00030..50e11517 100644
--- a/app/apps/api/views/transactions.py
+++ b/app/apps/api/views/transactions.py
@@ -52,7 +52,7 @@ class TransactionViewSet(viewsets.ModelViewSet):
ordering = ["-id"]
def get_queryset(self):
- return Transaction.objects.all()
+ return Transaction.objects.prefetch_related("sub_transactions")
def perform_create(self, serializer):
instance = serializer.save()
@@ -145,7 +145,7 @@ class InstallmentPlanViewSet(viewsets.ModelViewSet):
ordering = ["-id"]
def get_queryset(self):
- return InstallmentPlan.objects.all()
+ return InstallmentPlan.objects.prefetch_related("sub_transactions")
class RecurringTransactionViewSet(viewsets.ModelViewSet):
@@ -175,4 +175,4 @@ class RecurringTransactionViewSet(viewsets.ModelViewSet):
ordering = ["-id"]
def get_queryset(self):
- return RecurringTransaction.objects.all()
+ return RecurringTransaction.objects.prefetch_related("sub_transactions")
diff --git a/app/apps/calendar_view/views.py b/app/apps/calendar_view/views.py
index bf03bb44..852e06a2 100644
--- a/app/apps/calendar_view/views.py
+++ b/app/apps/calendar_view/views.py
@@ -66,7 +66,7 @@ def calendar_list(request, month: int, year: int):
@require_http_methods(["GET"])
def calendar_transactions_list(request, day: int, month: int, year: int):
date = datetime.date(year=year, month=month, day=day)
- transactions = Transaction.objects.filter(date=date).collapse_transfers().order_by(
+ transactions = Transaction.objects.filter(date=date).collapse_transfers().prefetch_related("sub_transactions").order_by(
"date",
"-type",
"-is_paid",
diff --git a/app/apps/common/forms.py b/app/apps/common/forms.py
index 9f6ca959..560af509 100644
--- a/app/apps/common/forms.py
+++ b/app/apps/common/forms.py
@@ -40,9 +40,11 @@ class SharedObjectForm(forms.Form):
label=_("Visibility"),
widget=TomSelect(clear_button=False),
help_text=_(
- "Private: Only shown for the owner and shared users. Only editable by the owner."
+ "Private: Only shown for the owner and shared users."
" "
- "Public: Shown for all users. Only editable by the owner."
+ "Public: Shown for all users."
+ " "
+ "Only the owner can edit, share or delete it."
),
)
diff --git a/app/apps/common/management/commands/load_demo_data.py b/app/apps/common/management/commands/load_demo_data.py
index 8455e0c1..b17b86c1 100644
--- a/app/apps/common/management/commands/load_demo_data.py
+++ b/app/apps/common/management/commands/load_demo_data.py
@@ -118,6 +118,12 @@ class Command(BaseCommand):
out.save()
return out, inc
+ def split(self, owner, *parts):
+ """Breaks `owner` into named parts; call before it generates transactions."""
+ for name, amount in parts:
+ owner.sub_transactions.create(name=name, amount=Decimal(amount))
+ return owner
+
def rate(self, series, months):
return series[months + HISTORY_MONTHS]
@@ -278,6 +284,7 @@ class Command(BaseCommand):
notes="12 interest-free installments on the credit card.",
)
laptop.entities.set([self.ents["BuyMore"]])
+ self.split(laptop, ("Laptop", "99.90"), ("Extended warranty", "8.35"))
laptop.create_transactions()
dental = InstallmentPlan.objects.create(
account=checking, type=EX, description="Dental treatment",
@@ -289,7 +296,8 @@ class Command(BaseCommand):
# Recurring transactions
def recurring(account, amount, description, category, start, entity=None,
- recurrence=RecurringTransaction.RecurrenceType.MONTH, paused=False):
+ recurrence=RecurringTransaction.RecurrenceType.MONTH, paused=False,
+ parts=()):
r = RecurringTransaction.objects.create(
account=account, type=EX, amount=amount, description=description,
category=self.cats[category], start_date=start, recurrence_type=recurrence,
@@ -297,6 +305,7 @@ class Command(BaseCommand):
)
if entity:
r.entities.set([self.ents[entity]])
+ self.split(r, *parts)
if not paused:
r.create_upcoming_transactions()
return r
@@ -304,7 +313,8 @@ class Command(BaseCommand):
recurring(card, Decimal("15.99"), "StreamFlix", "Subscriptions",
self.day(-HISTORY_MONTHS, 3), "StreamFlix")
recurring(checking, Decimal("59.99"), "Internet", "Utilities",
- self.day(-HISTORY_MONTHS, 15), "FiberNet")
+ self.day(-HISTORY_MONTHS, 15), "FiberNet",
+ parts=[("Internet plan", "49.99"), ("Router rental", "10.00")])
recurring(checking, Decimal("39.90"), "Gym membership", "Health",
self.day(-HISTORY_MONTHS, 2), "Iron Gym")
recurring(card, Decimal("14.99"), "Domain renewal", "Subscriptions",
@@ -458,8 +468,9 @@ class Command(BaseCommand):
self.transfer(stock_acc, checking, Decimal("3"), self.day(-2, 21), "Sell AAPL",
to_amount=q(3 * self.rate(aapl_usd, -2)), mute=False,
category="Investments")
- self.tx(retirement, EX, Decimal("45.00"), self.day(-6, 30), "Annual management fee",
- "Fees")
+ fee = self.tx(retirement, EX, Decimal("45.00"), self.day(-6, 30),
+ "Annual management fee", "Fees")
+ self.split(fee, ("Management fee", "40.00"), ("Custody fee", "5.00"))
for m, spent in ((-9, 1500), (-3, 800)):
self.transfer(checking, gold_acc, Decimal(spent), self.day(m, 12), "Buy gold",
to_amount=q(Decimal(spent) / self.rate(gold_usd, m)), mute=False,
@@ -489,6 +500,11 @@ class Command(BaseCommand):
notes="Very old transactions are no problem.")
self.transfer(old_bank, checking, Decimal("1200.00"), self.day(-HISTORY_MONTHS, 3),
"Closing old bank account", category="Transfers")
+ # One receipt, split into what was bought
+ shop = self.tx(card, EX, Decimal("87.35"), self.day(-1, 24), "Big grocery shop",
+ "Groceries", ["essentials", "home"], ["Fresh Market"])
+ self.split(shop, ("Produce", "24.80"), ("Meat & fish", "38.15"),
+ ("Household supplies", "16.40"), ("Snacks", "8.00"))
# Balance reconciliation: the wallet had less cash than recorded
self.tx(cash, EX, Decimal("12.40"), self.day(-2, 28), "Balance reconciliation")
@@ -511,6 +527,7 @@ class Command(BaseCommand):
description="Lunch", category=self.cats["Dining"],
)
lunch.tags.set([self.tags["work"]])
+ self.split(lunch, ("Meal", "11.90"), ("Tip", "2.00"))
# Rules run on transactions you create or edit
ride = TransactionRule.objects.create(
diff --git a/app/apps/common/procrastinate.py b/app/apps/common/procrastinate.py
index 8e27e289..a6e2eebc 100644
--- a/app/apps/common/procrastinate.py
+++ b/app/apps/common/procrastinate.py
@@ -2,12 +2,20 @@ import functools
import inspect
import procrastinate
-from django.db import close_old_connections
+from django.db import close_old_connections as _close_old_connections
+from django.db import connection
_CONNECTION_CLEANUP_WRAPPED = "_wygiwyh_connection_cleanup_wrapped"
+def close_old_connections():
+ # Rule dry runs call tasks directly inside a transaction they roll back;
+ # closing its connection there would break it. Worker jobs never run in one.
+ if not connection.in_atomic_block:
+ _close_old_connections()
+
+
def _wrap_task_with_django_connection_cleanup(task):
if getattr(task.func, _CONNECTION_CLEANUP_WRAPPED, False):
return
diff --git a/app/apps/common/tests/test_demo_data.py b/app/apps/common/tests/test_demo_data.py
index 54eeb246..7a54625e 100644
--- a/app/apps/common/tests/test_demo_data.py
+++ b/app/apps/common/tests/test_demo_data.py
@@ -10,7 +10,12 @@ from apps.accounts.models import Account
from apps.common.middleware.thread_local import delete_current_user, write_current_user
from apps.dca.models import DCAStrategy
from apps.investments.services import get_holding_performance
-from apps.transactions.models import Transaction
+from apps.transactions.models import (
+ InstallmentPlan,
+ QuickTransaction,
+ RecurringTransaction,
+ Transaction,
+)
@override_settings(
@@ -73,6 +78,21 @@ class LoadDemoDataTests(TestCase):
self.assertNotEqual(apple.realized, 0) # partial sale
self.assertTrue(perfs["Retirement Fund"].results) # gains and losses
+ def test_sub_transactions_add_up(self):
+ self.load(date(2031, 7, 14))
+ owners = [
+ *Transaction.all_objects.filter(sub_transactions__isnull=False).distinct(),
+ *RecurringTransaction.all_objects.filter(sub_transactions__isnull=False).distinct(),
+ *QuickTransaction.objects.filter(sub_transactions__isnull=False).distinct(),
+ ]
+ plans = InstallmentPlan.all_objects.filter(sub_transactions__isnull=False).distinct()
+ self.assertTrue(plans)
+ self.assertGreater(len(owners), len(plans))
+ for owner in [*owners, *plans]:
+ with self.subTest(owner=str(owner)):
+ amount = getattr(owner, "installment_amount", None) or owner.amount
+ self.assertEqual(sum(s.amount for s in owner.sub_transactions.all()), amount)
+
def test_running_twice_is_a_no_op(self):
self.load(date(2031, 7, 14))
count = Transaction.all_objects.count()
diff --git a/app/apps/common/tests/test_procrastinate.py b/app/apps/common/tests/test_procrastinate.py
index be175bf3..97a396ab 100644
--- a/app/apps/common/tests/test_procrastinate.py
+++ b/app/apps/common/tests/test_procrastinate.py
@@ -1,7 +1,7 @@
from unittest.mock import patch
import procrastinate
-from django.db import connection
+from django.db import connection, transaction
from django.test import SimpleTestCase, TransactionTestCase
from procrastinate.testing import InMemoryConnector
@@ -87,3 +87,18 @@ class ProcrastinateConnectionRecoveryTests(TransactionTestCase):
connection.connection.close()
self.assertEqual(task.func(), 1)
+
+ def test_task_called_inside_a_transaction_keeps_its_connection(self):
+ """Rule dry runs call tasks directly inside a transaction they roll back."""
+
+ def sample_task():
+ with connection.cursor() as cursor:
+ cursor.execute("SELECT 1")
+ return cursor.fetchone()[0]
+
+ app, task = make_app_with_task(sample_task)
+ on_app_ready(app)
+
+ with transaction.atomic():
+ connection.close_at = 0 # obsolete, as with CONN_MAX_AGE=0
+ self.assertEqual(task.func(), 1)
diff --git a/app/apps/export_app/forms.py b/app/apps/export_app/forms.py
index caa436c8..7d50ffb1 100644
--- a/app/apps/export_app/forms.py
+++ b/app/apps/export_app/forms.py
@@ -61,6 +61,12 @@ class ExportForm(forms.Form):
label=_("Installment Plans"),
initial=True,
)
+ quick_transactions = forms.BooleanField(
+ required=False,
+ widget=forms.CheckboxInput(),
+ label=_("Quick Transactions"),
+ initial=True,
+ )
exchange_rates = forms.BooleanField(
required=False,
widget=forms.CheckboxInput(),
@@ -116,6 +122,7 @@ class ExportForm(forms.Form):
"tags",
"installment_plans",
"recurring_transactions",
+ "quick_transactions",
"exchange_rates_services",
"exchange_rates",
"bank_sync",
@@ -142,10 +149,12 @@ class RestoreForm(forms.Form):
transactions_tags = forms.FileField(required=False, label=_("Tags"))
transactions_entities = forms.FileField(required=False, label=_("Entities"))
transactions = forms.FileField(required=False, label=_("Transactions"))
+ sub_transactions = forms.FileField(required=False, label=_("Sub-transactions"))
installment_plans = forms.FileField(required=False, label=_("Installment Plans"))
recurring_transactions = forms.FileField(
required=False, label=_("Recurring Transactions")
)
+ quick_transactions = forms.FileField(required=False, label=_("Quick Transactions"))
automatic_exchange_rates = forms.FileField(
required=False, label=_("Automatic Exchange Rates")
)
@@ -180,11 +189,13 @@ class RestoreForm(forms.Form):
"accounts",
"currencies",
"transactions",
+ "sub_transactions",
"transactions_categories",
"transactions_entities",
"transactions_tags",
"installment_plans",
"recurring_transactions",
+ "quick_transactions",
"automatic_exchange_rates",
"exchange_rates",
"bank_sync_services",
diff --git a/app/apps/export_app/resources/transactions.py b/app/apps/export_app/resources/transactions.py
index dbcb0f14..1abde7ca 100644
--- a/app/apps/export_app/resources/transactions.py
+++ b/app/apps/export_app/resources/transactions.py
@@ -1,4 +1,9 @@
+from functools import reduce
+from operator import or_
+
+from django.db.models import Q
from import_export import fields, resources
+from import_export.widgets import ForeignKeyWidget
from apps.accounts.models import Account
from apps.export_app.widgets.foreign_key import (
@@ -14,6 +19,8 @@ from apps.transactions.models import (
TransactionEntity,
RecurringTransaction,
InstallmentPlan,
+ QuickTransaction,
+ SubTransaction,
)
from apps.export_app.widgets.numbers import UniversalDecimalWidget
@@ -166,3 +173,106 @@ class InstallmentPlanResource(resources.ModelResource):
def dehydrate_account_owner(self, obj):
"""Export the account's owner ID for proper import matching."""
return obj.account.owner_id if obj.account else None
+
+
+class AnyOwnerForeignKeyWidget(ForeignKeyWidget):
+ """Finds the parent among every user's rows, soft-deleted ones included."""
+
+ def get_queryset(self, value, row, *args, **kwargs):
+ return self.model._base_manager.all()
+
+
+class QuickTransactionResource(resources.ModelResource):
+ account = fields.Field(
+ attribute="account",
+ column_name="account",
+ widget=AllObjectsForeignKeyWidget(Account, "name"),
+ )
+ to_account = fields.Field(
+ attribute="to_account",
+ column_name="to_account",
+ widget=AllObjectsForeignKeyWidget(Account, "name"),
+ )
+ category = fields.Field(
+ attribute="category",
+ column_name="category",
+ widget=AutoCreateForeignKeyWidget(TransactionCategory, "name"),
+ )
+ tags = fields.Field(
+ attribute="tags",
+ column_name="tags",
+ widget=AutoCreateManyToManyWidget(TransactionTag, field="name"),
+ )
+ entities = fields.Field(
+ attribute="entities",
+ column_name="entities",
+ widget=AutoCreateManyToManyWidget(TransactionEntity, field="name"),
+ )
+ internal_id = EmptyStringToNoneField(
+ column_name="internal_id", attribute="internal_id"
+ )
+ amount = fields.Field(
+ attribute="amount",
+ column_name="amount",
+ widget=UniversalDecimalWidget(),
+ )
+ to_amount = fields.Field(
+ attribute="to_amount",
+ column_name="to_amount",
+ widget=UniversalDecimalWidget(),
+ )
+
+ class Meta:
+ model = QuickTransaction
+
+ def get_queryset(self):
+ return QuickTransaction.all_objects.all()
+
+
+SUB_TRANSACTION_BACKUP_PARENTS = (
+ "transaction",
+ "installment_plan",
+ "recurring_transaction",
+ "quick_transaction",
+)
+
+
+class SubTransactionResource(resources.ModelResource):
+ transaction = fields.Field(
+ attribute="transaction",
+ column_name="transaction",
+ widget=AnyOwnerForeignKeyWidget(Transaction),
+ )
+ installment_plan = fields.Field(
+ attribute="installment_plan",
+ column_name="installment_plan",
+ widget=AnyOwnerForeignKeyWidget(InstallmentPlan),
+ )
+ recurring_transaction = fields.Field(
+ attribute="recurring_transaction",
+ column_name="recurring_transaction",
+ widget=AnyOwnerForeignKeyWidget(RecurringTransaction),
+ )
+ quick_transaction = fields.Field(
+ attribute="quick_transaction",
+ column_name="quick_transaction",
+ widget=AnyOwnerForeignKeyWidget(QuickTransaction),
+ )
+ amount = fields.Field(
+ attribute="amount",
+ column_name="amount",
+ widget=UniversalDecimalWidget(),
+ )
+
+ def __init__(self, parents=SUB_TRANSACTION_BACKUP_PARENTS, **kwargs):
+ """`parents`: the kinds of parent being exported, whose parts go along."""
+ super().__init__(**kwargs)
+ self.parents = parents
+
+ class Meta:
+ model = SubTransaction
+
+ def get_queryset(self):
+ return SubTransaction.objects.filter(
+ reduce(or_, (Q(**{f"{p}__isnull": False}) for p in self.parents), Q(pk__in=[]))
+ )
diff --git a/app/apps/export_app/tests.py b/app/apps/export_app/tests.py
index e70c0357..e929864c 100644
--- a/app/apps/export_app/tests.py
+++ b/app/apps/export_app/tests.py
@@ -1,4 +1,5 @@
import io
+from datetime import date
import zipfile
from decimal import Decimal
@@ -9,9 +10,21 @@ from apps.accounts.models import Account, InvestmentClass
from apps.common.middleware.thread_local import delete_current_user, write_current_user
from apps.currencies.models import Currency
from apps.export_app.resources.accounts import AccountResource, InvestmentClassResource
-from apps.export_app.resources.transactions import TransactionEntityResource
+from apps.export_app.resources.transactions import (
+ InstallmentPlanResource,
+ QuickTransactionResource,
+ SubTransactionResource,
+ TransactionEntityResource,
+ TransactionResource,
+)
from apps.export_app.views import process_imports
-from apps.transactions.models import TransactionEntity
+from apps.transactions.models import (
+ InstallmentPlan,
+ QuickTransaction,
+ SubTransaction,
+ Transaction,
+ TransactionEntity,
+)
class InvestmentRestoreTests(TestCase):
@@ -51,3 +64,58 @@ class InvestmentRestoreTests(TestCase):
self.assertEqual(account.investment_class.name, "Stocks")
self.assertEqual(account.investment_class.target, Decimal("60"))
self.assertEqual([e.name for e in account.income_entities.all()], ["Broker"])
+
+
+class SubTransactionBackupTests(TestCase):
+ def setUp(self):
+ self.user = get_user_model().objects.create_user(email="s@test.com", password="pw")
+ write_current_user(self.user)
+ self.addCleanup(delete_current_user)
+ account = Account.objects.create(
+ name="A", currency=Currency.objects.create(code="USD", name="USD", decimal_places=2)
+ )
+ self.transaction = Transaction.objects.create(
+ account=account, type="EX", date=date(2030, 1, 10), amount=5
+ )
+ self.plan = InstallmentPlan.objects.create(
+ account=account, type="EX", description="Laptop", number_of_installments=2,
+ start_date=date(2030, 1, 10), installment_amount=100,
+ )
+ SubTransaction.objects.create(transaction=self.transaction, name="Fee", amount="1.25")
+ SubTransaction.objects.create(transaction=self.transaction, name="Item", amount="3.75")
+ SubTransaction.objects.create(installment_plan=self.plan, name="Principal", amount=100)
+ lunch = QuickTransaction.objects.create(
+ name="Lunch", account=account, type="EX", amount=Decimal("13.90")
+ )
+ SubTransaction.objects.create(quick_transaction=lunch, name="Meal", amount="11.90")
+ SubTransaction.objects.create(quick_transaction=lunch, name="Tip", amount=2)
+
+ def _parts(self):
+ return sorted(
+ SubTransaction.objects.values_list(
+ "name", "transaction", "installment_plan", "quick_transaction__name", "amount"
+ )
+ )
+
+ def test_round_trip_puts_parts_back_on_their_parents(self):
+ before = self._parts()
+ backup = io.BytesIO()
+ with zipfile.ZipFile(backup, "w") as z:
+ for resource, name in (
+ (TransactionResource(), "transactions"),
+ (InstallmentPlanResource(), "installment_plans"),
+ (QuickTransactionResource(), "quick_transactions"),
+ (SubTransactionResource(), "sub_transactions"),
+ ):
+ z.writestr(f"{name}.csv", resource.export().csv)
+
+ SubTransaction.objects.all().delete()
+ QuickTransaction.all_objects.all().delete()
+ backup.seek(0)
+ process_imports(None, {"zip_file": backup})
+
+ self.assertEqual(self._parts(), before)
+
+ def test_exports_only_the_parts_of_exported_parents(self):
+ dataset = SubTransactionResource(parents=["installment_plan"]).export()
+ self.assertEqual([row["name"] for row in dataset.dict], ["Principal"])
diff --git a/app/apps/export_app/views.py b/app/apps/export_app/views.py
index c413d3e4..3a521ddc 100644
--- a/app/apps/export_app/views.py
+++ b/app/apps/export_app/views.py
@@ -46,6 +46,8 @@ from apps.export_app.resources.transactions import (
TransactionCategoyResource,
InstallmentPlanResource,
RecurringTransactionResource,
+ QuickTransactionResource,
+ SubTransactionResource,
)
from apps.export_app.resources.users import UserResource
from apps.common.decorators.demo import disabled_on_demo
@@ -84,6 +86,9 @@ def export_form(request):
export_recurring_transactions = form.cleaned_data.get(
"recurring_transactions", False
)
+ export_quick_transactions = form.cleaned_data.get(
+ "quick_transactions", False
+ )
export_exchange_rates_services = form.cleaned_data.get(
"exchange_rates_services", False
@@ -123,6 +128,27 @@ def export_form(request):
exports.append(
(RecurringTransactionResource().export(), "recurring_transactions")
)
+ if export_quick_transactions:
+ exports.append(
+ (QuickTransactionResource().export(), "quick_transactions")
+ )
+ sub_transaction_parents = [
+ parent
+ for parent, exported in (
+ ("transaction", export_transactions),
+ ("installment_plan", export_installment_plans),
+ ("recurring_transaction", export_recurring_transactions),
+ ("quick_transaction", export_quick_transactions),
+ )
+ if exported
+ ]
+ if sub_transaction_parents:
+ exports.append(
+ (
+ SubTransactionResource(parents=sub_transaction_parents).export(),
+ "sub_transactions",
+ )
+ )
if export_exchange_rates_services:
exports.append(
(ExchangeRateServiceResource().export(), "automatic_exchange_rates")
@@ -250,7 +276,9 @@ def process_imports(request, cleaned_data):
("exchange_rates", ExchangeRateResource),
("installment_plans", InstallmentPlanResource),
("recurring_transactions", RecurringTransactionResource),
+ ("quick_transactions", QuickTransactionResource),
("transactions", TransactionResource),
+ ("sub_transactions", SubTransactionResource),
("bank_sync_services", BankSyncServiceResource),
("bank_sync_accounts", BankSyncAccountResource),
("dca_strategies", DCAStrategyResource),
diff --git a/app/apps/insights/views.py b/app/apps/insights/views.py
index f0a806e5..ff4e2857 100644
--- a/app/apps/insights/views.py
+++ b/app/apps/insights/views.py
@@ -308,6 +308,7 @@ def latest_transactions(request):
transactions = (
Transaction.objects.filter(created_at__gte=limit)
.collapse_transfers()
+ .prefetch_related("sub_transactions")
.order_by("-id")[:30]
)
@@ -325,7 +326,7 @@ def late_transactions(request):
now = timezone.localdate(timezone.now())
transactions = Transaction.objects.filter(
is_paid=False, date__lt=now
- ).collapse_transfers()
+ ).collapse_transfers().prefetch_related("sub_transactions")
return render(
request,
diff --git a/app/apps/investments/views.py b/app/apps/investments/views.py
index ddc18c45..417f0658 100644
--- a/app/apps/investments/views.py
+++ b/app/apps/investments/views.py
@@ -215,6 +215,7 @@ def investment_detail(request, account_id):
"account__currency__exchange_currency",
"account__exchange_currency",
)
+ .prefetch_related("sub_transactions")
.order_by("-date", "-id")[:50]
)
income = []
diff --git a/app/apps/monthly_overview/views.py b/app/apps/monthly_overview/views.py
index f0f85a20..01876021 100644
--- a/app/apps/monthly_overview/views.py
+++ b/app/apps/monthly_overview/views.py
@@ -93,6 +93,7 @@ def transactions_list(request, month: int, year: int):
"installment_plan",
"entities",
"dca_expense_entries",
+ "sub_transactions",
"dca_income_entries",
"linked_transaction__account__currency",
"linked_transaction__account__group",
diff --git a/app/apps/rules/forms.py b/app/apps/rules/forms.py
index b5b39357..d001efbf 100644
--- a/app/apps/rules/forms.py
+++ b/app/apps/rules/forms.py
@@ -190,6 +190,7 @@ class UpdateOrCreateTransactionRuleActionForm(forms.ModelForm):
"set_date": _("Date"),
"set_reference_date": _("Reference Date"),
"set_amount": _("Amount"),
+ "set_sub_transactions": _("Sub-transactions"),
"set_description": _("Description"),
"set_tags": _("Tags"),
"set_entities": _("Entities"),
@@ -367,6 +368,7 @@ class UpdateOrCreateTransactionRuleActionForm(forms.ModelForm):
Field("set_reference_date", rows=1),
Field("set_description", rows=1),
Field("set_amount", rows=1),
+ Field("set_sub_transactions", rows=1),
Field("set_category", rows=1),
Field("set_tags", rows=1),
Field("set_notes", rows=1),
diff --git a/app/apps/rules/migrations/0019_sub_transactions.py b/app/apps/rules/migrations/0019_sub_transactions.py
new file mode 100644
index 00000000..4106d3f7
--- /dev/null
+++ b/app/apps/rules/migrations/0019_sub_transactions.py
@@ -0,0 +1,23 @@
+# Generated by Django 5.2.17 on 2026-11-14 03:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('rules', '0018_transactionrule_order'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='updateorcreatetransactionruleaction',
+ name='set_sub_transactions',
+ field=models.TextField(blank=True, verbose_name='Sub-transactions'),
+ ),
+ migrations.AlterField(
+ model_name='transactionruleaction',
+ name='field',
+ field=models.CharField(choices=[('account', 'Account'), ('type', 'Type'), ('is_paid', 'Paid'), ('date', 'Date'), ('reference_date', 'Reference Date'), ('mute', 'Mute'), ('amount', 'Amount'), ('sub_transactions', 'Sub-transactions'), ('description', 'Description'), ('notes', 'Notes'), ('category', 'Category'), ('tags', 'Tags'), ('entities', 'Entities'), ('internal_nome', 'Internal Note'), ('internal_id', 'Internal ID')], max_length=50, verbose_name='Field'),
+ ),
+ ]
diff --git a/app/apps/rules/models.py b/app/apps/rules/models.py
index 653c87c7..85259278 100644
--- a/app/apps/rules/models.py
+++ b/app/apps/rules/models.py
@@ -39,6 +39,7 @@ class TransactionRuleAction(models.Model):
reference_date = "reference_date", _("Reference Date")
mute = "mute", _("Mute")
amount = "amount", _("Amount")
+ sub_transactions = "sub_transactions", _("Sub-transactions")
description = "description", _("Description")
notes = "notes", _("Notes")
category = "category", _("Category")
@@ -315,6 +316,10 @@ class UpdateOrCreateTransactionRuleAction(models.Model):
verbose_name=_("Tags"),
blank=True,
)
+ set_sub_transactions = models.TextField(
+ verbose_name=_("Sub-transactions"),
+ blank=True,
+ )
set_mute = models.TextField(
verbose_name=_("Mute"),
blank=True,
diff --git a/app/apps/rules/tasks.py b/app/apps/rules/tasks.py
index 427be97d..ba4573c1 100644
--- a/app/apps/rules/tasks.py
+++ b/app/apps/rules/tasks.py
@@ -17,12 +17,14 @@ from procrastinate.contrib.django import app
from simpleeval import EvalWithCompoundTypes
from apps.accounts.models import Account
+from apps.common.functions.decimals import truncate_decimal
from apps.common.middleware.thread_local import write_current_user, delete_current_user
from apps.rules.models import (
TransactionRule,
TransactionRuleAction,
)
from apps.transactions.models import (
+ SubTransaction,
Transaction,
TransactionCategory,
TransactionTag,
@@ -32,6 +34,39 @@ from apps.rules.utils import transactions
logger = logging.getLogger(__name__)
+SUB_TRANSACTIONS_SHAPE = (
+ "Sub-transactions must be a list like [{'name': 'Fee', 'amount': 1.5}, ...]"
+)
+
+
+def build_sub_transactions(transaction: Transaction, value) -> list[SubTransaction]:
+ """Validated sub-transactions for `transaction` from a rule expression's result."""
+ if not isinstance(value, (list, tuple)):
+ raise ValueError(SUB_TRANSACTIONS_SHAPE)
+ places = transaction.account.currency.decimal_places
+ subs = []
+ for item in value:
+ if not isinstance(item, dict) or item.get("amount") is None:
+ raise ValueError(SUB_TRANSACTIONS_SHAPE)
+ sub = SubTransaction(
+ transaction=transaction,
+ name=str(item.get("name") or "").strip(),
+ amount=truncate_decimal(
+ value=Decimal(str(item["amount"])), decimal_places=places
+ ),
+ )
+ # the transaction may not be saved yet, so its link isn't checked here
+ sub.full_clean(exclude=["transaction"], validate_constraints=False)
+ subs.append(sub)
+ return subs
+
+
+def _snapshot(transaction: Transaction) -> Transaction:
+ """A copy to show in dry-run results, as the transaction is right now."""
+ copy = transaction.deepcopy()
+ copy.copy_sub_transactions_from(transaction)
+ return copy
+
class DryRunResults:
def __init__(self, dry_run: bool):
@@ -49,7 +84,7 @@ class DryRunResults:
if not self.dry_run:
return
if isinstance(instance, Transaction):
- instance = instance.deepcopy()
+ instance = _snapshot(instance)
elif isinstance(instance, dict):
instance = deepcopy(instance)
@@ -65,7 +100,7 @@ class DryRunResults:
if not self.dry_run:
return
if isinstance(instance, Transaction):
- instance = instance.deepcopy()
+ instance = _snapshot(instance)
elif isinstance(instance, dict):
instance = deepcopy(instance)
@@ -95,7 +130,7 @@ class DryRunResults:
return
if isinstance(end_instance, Transaction):
- end_instance = end_instance.deepcopy()
+ end_instance = _snapshot(end_instance)
elif isinstance(end_instance, dict):
end_instance = deepcopy(end_instance)
@@ -201,6 +236,14 @@ def check_for_transaction_rules(
f"{prefix}entities_ids": (
[x.id for x in transaction.entities.all()] if transaction.id else []
),
+ f"{prefix}sub_transactions": (
+ [
+ {"name": s.name, "amount": s.amount}
+ for s in transaction.sub_transactions.all()
+ ]
+ if transaction.id
+ else []
+ ),
f"{prefix}is_expense": transaction.type == Transaction.Type.EXPENSE,
f"{prefix}is_income": transaction.type == Transaction.Type.INCOME,
f"{prefix}is_paid": transaction.is_paid,
@@ -250,6 +293,10 @@ def check_for_transaction_rules(
f"{prefix}entities_ids": [
x[0] for x in transaction.get("entities", [])
],
+ f"{prefix}sub_transactions": [
+ {"name": s["name"], "amount": Decimal(s["amount"])}
+ for s in transaction.get("sub_transactions", [])
+ ],
f"{prefix}is_expense": transaction.get("type")
== Transaction.Type.EXPENSE,
f"{prefix}is_income": transaction.get("type")
@@ -274,6 +321,22 @@ def check_for_transaction_rules(
f"{prefix}installment_total": transaction.get("installment_total"),
}
+ def _evaluate_sub_transactions(transaction, value):
+ """The parts an expression's `value` gives `transaction`, with its amount set
+ to their sum, or None for a transfer, which can't have any."""
+ if transaction.linked_transaction_id:
+ _log("Skipped: transfers can't have sub-transactions")
+ return None
+ subs = build_sub_transactions(transaction, value)
+ if subs:
+ transaction.amount = sum(s.amount for s in subs)
+ _log(f"Sub-transactions will be set as: {[(s.name, s.amount) for s in subs]}")
+ return subs
+
+ def _save_sub_transactions(transaction, subs):
+ transaction.sub_transactions.all().delete()
+ SubTransaction.objects.bulk_create(subs)
+
def _process_update_or_create_transaction_action(processed_action):
"""Helper to process a single linked transaction action"""
@@ -295,7 +358,7 @@ def check_for_transaction_rules(
existing = True
if dry_run:
- starting_instance = transaction.deepcopy()
+ starting_instance = _snapshot(transaction)
_log("Found at least one matching transaction, using latest:")
_log("{}".format(pformat(model_to_dict(transaction))))
@@ -348,7 +411,15 @@ def check_for_transaction_rules(
processed_action.set_reference_date
)
- if processed_action.set_amount:
+ subs = None
+ if processed_action.set_sub_transactions:
+ subs = _evaluate_sub_transactions(
+ transaction, simple.eval(processed_action.set_sub_transactions)
+ )
+
+ # A transaction with parts gets its amount from them
+ has_parts = bool(subs) if subs is not None else transaction.has_sub_transactions
+ if processed_action.set_amount and not has_parts:
transaction.amount = simple.eval(processed_action.set_amount)
if processed_action.set_description:
@@ -383,6 +454,8 @@ def check_for_transaction_rules(
)
)
transaction.save()
+ if subs is not None:
+ _save_sub_transactions(transaction, subs)
# Handle M2M fields after save
tags = []
@@ -441,7 +514,10 @@ def check_for_transaction_rules(
dry_run_results.header("edit_transaction", action=processed_action)
field = processed_action.field
- original_value = getattr(transaction, field)
+ if field == TransactionRuleAction.Field.sub_transactions:
+ original_value = list(transaction.sub_transactions.values("name", "amount"))
+ else:
+ original_value = getattr(transaction, field)
new_value = simple.eval(processed_action.value)
tags = []
@@ -518,6 +594,18 @@ def check_for_transaction_rules(
transaction.entities.add(entity)
entities.append(entity)
+ elif field == TransactionRuleAction.Field.sub_transactions:
+ subs = _evaluate_sub_transactions(transaction, new_value)
+ if subs is not None:
+ _save_sub_transactions(transaction, subs)
+ new_value = ", ".join(f"{s.name}: {s.amount}" for s in subs) or "[]"
+
+ elif (
+ field == TransactionRuleAction.Field.amount
+ and transaction.has_sub_transactions
+ ):
+ _log("Skipped: the amount is the sum of the transaction's sub-transactions")
+
else:
setattr(
transaction,
diff --git a/app/apps/rules/tests/test_tasks.py b/app/apps/rules/tests/test_tasks.py
index 9520318a..b03f26cc 100644
--- a/app/apps/rules/tests/test_tasks.py
+++ b/app/apps/rules/tests/test_tasks.py
@@ -6,10 +6,15 @@ from django.contrib.auth import get_user_model
from django.test import TransactionTestCase
from apps.accounts.models import Account
+from apps.common.middleware.thread_local import write_current_user
from apps.currencies.models import Currency
-from apps.rules.models import TransactionRule, UpdateOrCreateTransactionRuleAction
+from apps.rules.models import (
+ TransactionRule,
+ TransactionRuleAction,
+ UpdateOrCreateTransactionRuleAction,
+)
from apps.rules.tasks import check_for_transaction_rules
-from apps.transactions.models import Transaction
+from apps.transactions.models import SubTransaction, Transaction
def run_check_for_transaction_rules_without_worker_wrapper(**kwargs):
@@ -122,3 +127,104 @@ class CheckForTransactionRulesTests(TransactionTestCase):
generated_transaction = Transaction.objects.get(description="Muted copy")
self.assertTrue(generated_transaction.mute)
self.assertFalse(generated_transaction.is_paid)
+
+ @patch("apps.rules.signals.check_for_transaction_rules.defer")
+ def test_edit_amount_skips_transactions_with_sub_transactions(self, mock_defer):
+ rule = TransactionRule.objects.create(
+ active=True, on_update=True, name="Set amount", trigger="True", owner=self.user
+ )
+ TransactionRuleAction.objects.create(rule=rule, field="amount", value="99")
+ TransactionRuleAction.objects.create(rule=rule, field="description", value="'Ruled'")
+ amounts = {}
+ for parts in ([], [Decimal("4"), Decimal("6")]):
+ transaction = Transaction.objects.create(
+ account=self.account, type=Transaction.Type.EXPENSE, amount=sum(parts) or 1,
+ date=date(2026, 5, 4), owner=self.user,
+ )
+ for amount in parts:
+ SubTransaction.objects.create(transaction=transaction, name="Part", amount=amount)
+ run_check_for_transaction_rules_without_worker_wrapper(
+ instance_id=transaction.id, user_id=self.user.id, signal="transaction_updated"
+ )
+ transaction.refresh_from_db()
+ self.assertEqual(transaction.description, "Ruled")
+ amounts[len(parts)] = transaction.amount
+ self.assertEqual(amounts, {0: Decimal("99"), 2: Decimal("10")})
+
+
+class SubTransactionRuleTests(TransactionTestCase):
+ def setUp(self):
+ self.user = get_user_model().objects.create_user(email="subs@example.com", password="x")
+ currency = Currency.objects.create(code="USD", name="US Dollar", decimal_places=2)
+ self.account = Account.objects.create(name="Main", currency=currency, owner=self.user)
+ self.rule = TransactionRule.objects.create(
+ active=True, on_update=True, name="Parts", trigger="True", owner=self.user
+ )
+
+ def _transaction(self, *parts, amount=None):
+ transaction = Transaction.objects.create(
+ account=self.account, type=Transaction.Type.EXPENSE, date=date(2026, 5, 4),
+ amount=amount if amount is not None else sum(a for _, a in parts), owner=self.user,
+ )
+ for name, part in parts:
+ SubTransaction.objects.create(transaction=transaction, name=name, amount=part)
+ return transaction
+
+ def _run(self, transaction):
+ with patch("apps.rules.signals.check_for_transaction_rules.defer"):
+ run_check_for_transaction_rules_without_worker_wrapper(
+ instance_id=transaction.id, user_id=self.user.id, signal="transaction_updated"
+ )
+ transaction.refresh_from_db()
+ return transaction.amount, list(transaction.sub_transactions.values_list("name", "amount"))
+
+ def _edit(self, expression):
+ TransactionRuleAction.objects.create(rule=self.rule, field="sub_transactions", value=expression)
+
+ def test_edit_action_adds_changes_and_deletes_parts(self):
+ self._edit(
+ '[{"name": s["name"], "amount": s["amount"] * 2} for s in sub_transactions'
+ ' if s["name"] != "Tip"] + [{"name": "Fee", "amount": decimal("0.50")}]'
+ )
+ result = self._run(self._transaction(("Meal", Decimal("10")), ("Tip", Decimal("2"))))
+ self.assertEqual(result, (Decimal("20.50"), [("Meal", Decimal("20")), ("Fee", Decimal("0.5"))]))
+
+ def test_edit_action_splits_a_plain_transaction_and_clearing_keeps_amount(self):
+ self._edit('[{"name": "Principal", "amount": amount - 5}, {"name": "Fee", "amount": 5}]')
+ self.assertEqual(
+ self._run(self._transaction(amount=Decimal("100"))),
+ (Decimal("100"), [("Principal", Decimal("95")), ("Fee", Decimal("5"))]),
+ )
+ self.rule.transaction_actions.update(value="[]")
+ self.assertEqual(self._run(self._transaction(("A", Decimal("3")))), (Decimal("3"), []))
+
+ def test_invalid_parts_leave_the_transaction_alone(self):
+ transaction = self._transaction(("A", Decimal("3")))
+ for expression in ('"Fee"', '[{"name": "Fee"}]', '[{"name": "", "amount": 1}]',
+ '[{"name": "Refund", "amount": -1}]'):
+ with self.subTest(expression=expression):
+ self.rule.transaction_actions.all().delete()
+ self._edit(expression)
+ self.assertEqual(self._run(transaction), (Decimal("3"), [("A", Decimal("3"))]))
+
+ def test_transfers_are_skipped(self):
+ out, inc = self._transaction(amount=Decimal("5")), self._transaction(amount=Decimal("5"))
+ write_current_user(self.user)
+ with patch("apps.rules.signals.check_for_transaction_rules.defer"):
+ Transaction.objects.filter(pk=out.pk).update(linked_transaction=inc)
+ self._edit('[{"name": "Fee", "amount": 1}]')
+ self.assertEqual(self._run(out), (Decimal("5"), []))
+
+ def test_update_or_create_creates_a_transaction_from_its_parts(self):
+ UpdateOrCreateTransactionRuleAction.objects.create(
+ rule=self.rule, set_account="account_id", set_type="'EX'", set_date="date",
+ set_description="'Copy'", set_amount="999",
+ set_sub_transactions="sub_transactions + [{'name': 'Fee', 'amount': 1}]",
+ )
+ self._run(self._transaction(("A", Decimal("3"))))
+ copy = Transaction.objects.get(description="Copy")
+ self.assertEqual(copy.amount, Decimal("4"))
+ self.assertEqual(
+ list(copy.sub_transactions.values_list("name", "amount")),
+ [("A", Decimal("3")), ("Fee", Decimal("1"))],
+ )
diff --git a/app/apps/rules/utils/transactions.py b/app/apps/rules/utils/transactions.py
index 9dd7cba2..85361ebe 100644
--- a/app/apps/rules/utils/transactions.py
+++ b/app/apps/rules/utils/transactions.py
@@ -86,6 +86,10 @@ def serialize_transaction(sender: Transaction, deleted: bool):
"notes": sender.notes,
"tags": list(sender.tags.values_list("id", "name")),
"entities": list(sender.entities.values_list("id", "name")),
+ "sub_transactions": [
+ {"name": name, "amount": str(amount)}
+ for name, amount in sender.sub_transactions.values_list("name", "amount")
+ ],
"deleted": deleted,
"internal_note": sender.internal_note,
"internal_id": sender.internal_id,
diff --git a/app/apps/transactions/filters.py b/app/apps/transactions/filters.py
index 7196a277..a8ea1de7 100644
--- a/app/apps/transactions/filters.py
+++ b/app/apps/transactions/filters.py
@@ -8,13 +8,14 @@ from apps.common.widgets.decimal import ArbitraryDecimalDisplayNumberInput
from apps.common.widgets.tom_select import TomSelectMultiple
from apps.currencies.models import Currency
from apps.transactions.models import (
+ SubTransaction,
Transaction,
TransactionCategory,
TransactionEntity,
TransactionTag,
)
from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Column, Field, Layout, Row
+from crispy_forms.layout import HTML, Column, Div, Field, Layout, Row
from dateutil.relativedelta import relativedelta
from django import forms
from django.db.models import Q
@@ -34,11 +35,26 @@ MUTE_STATUS_CHOICES = (
def content_filter(queryset, name, value):
queryset = queryset.filter(
- Q(description__icontains=value) | Q(notes__icontains=value)
+ Q(description__icontains=value)
+ | Q(notes__icontains=value)
+ # a subquery, so a transaction with several matching parts isn't listed twice
+ | Q(pk__in=SubTransaction.objects.filter(name__icontains=value).values("transaction"))
)
return queryset
+def exclude_matching(positive_filter):
+ """Turn a positive filter method into one that drops the rows it would keep."""
+
+ def method(queryset, name, value):
+ if not value:
+ return queryset
+ matching = positive_filter(queryset, name, value)
+ return queryset.exclude(pk__in=matching.values("pk"))
+
+ return method
+
+
class MonthYearFilter(Filter):
field_class = MonthYearFormField
@@ -134,6 +150,42 @@ class TransactionsFilter(django_filters.FilterSet):
lookup_expr="lte",
label=_("Amount max"),
)
+ exclude_description = django_filters.CharFilter(
+ label=_("Content"),
+ method=exclude_matching(content_filter),
+ widget=forms.TextInput(attrs={"type": "search"}),
+ )
+ exclude_account = django_filters.ModelMultipleChoiceFilter(
+ field_name="account__name",
+ queryset=Account.objects.all(),
+ to_field_name="name",
+ exclude=True,
+ label=_("Accounts"),
+ widget=TomSelectMultiple(checkboxes=True, remove_button=True, group_by="group"),
+ )
+ exclude_currency = django_filters.ModelMultipleChoiceFilter(
+ field_name="account__currency",
+ queryset=Currency.objects.all(),
+ to_field_name="id",
+ exclude=True,
+ label=_("Currencies"),
+ widget=TomSelectMultiple(checkboxes=True, remove_button=True),
+ )
+ exclude_category = django_filters.MultipleChoiceFilter(
+ label=_("Categories"),
+ widget=TomSelectMultiple(checkboxes=True, remove_button=True),
+ method="filter_exclude_category",
+ )
+ exclude_tags = django_filters.MultipleChoiceFilter(
+ label=_("Tags"),
+ widget=TomSelectMultiple(checkboxes=True, remove_button=True),
+ method="filter_exclude_tags",
+ )
+ exclude_entities = django_filters.MultipleChoiceFilter(
+ label=_("Entities"),
+ widget=TomSelectMultiple(checkboxes=True, remove_button=True),
+ method="filter_exclude_entities",
+ )
class Meta:
model = Transaction
@@ -188,21 +240,53 @@ class TransactionsFilter(django_filters.FilterSet):
"mute_status",
template="transactions/widgets/transaction_type_filter_buttons.html",
),
- Field("description"),
- Row(Column("date_start"), Column("date_end")),
- Row(
- Column("reference_date_start"),
- Column("reference_date_end"),
+ Div(
+ HTML(
+ '
'
+ '"
+ f"{_('Include')} "
+ '"
+ f"{_('Exclude')} "
+ "
"
+ ),
+ Div(
+ Field("description"),
+ Row(Column("date_start"), Column("date_end")),
+ Row(
+ Column("reference_date_start"),
+ Column("reference_date_end"),
+ ),
+ Row(
+ Column("from_amount"),
+ Column("to_amount"),
+ ),
+ Field("account", size=1),
+ Field("currency", size=1),
+ Field("category", size=1),
+ Field("tags", size=1),
+ Field("entities", size=1),
+ role="tabpanel",
+ x_show="tab === 'include'",
+ ),
+ Div(
+ Field("exclude_description"),
+ Field("exclude_account", size=1),
+ Field("exclude_currency", size=1),
+ Field("exclude_category", size=1),
+ Field("exclude_tags", size=1),
+ Field("exclude_entities", size=1),
+ role="tabpanel",
+ x_show="tab === 'exclude'",
+ x_cloak="",
+ ),
+ x_data="{ tab: 'include' }",
),
- Row(
- Column("from_amount"),
- Column("to_amount"),
- ),
- Field("account", size=1),
- Field("currency", size=1),
- Field("category", size=1),
- Field("tags", size=1),
- Field("entities", size=1),
)
self.form.fields["to_amount"].widget = ArbitraryDecimalDisplayNumberInput()
@@ -211,6 +295,7 @@ class TransactionsFilter(django_filters.FilterSet):
self.form.fields["date_end"].widget = AirDatePickerInput()
self.form.fields["account"].queryset = Account.objects.all()
+ self.form.fields["exclude_account"].queryset = Account.objects.all()
category_choices = list(
TransactionCategory.objects.values_list("name", "name").order_by("name")
)
@@ -219,11 +304,15 @@ class TransactionsFilter(django_filters.FilterSet):
("uncategorized", _("Uncategorized")),
]
self.form.fields["category"].choices = custom_choices + category_choices
+ self.form.fields["exclude_category"].choices = (
+ custom_choices + category_choices
+ )
tag_choices = list(
TransactionTag.objects.values_list("name", "name").order_by("name")
)
custom_tag_choices = [("any", _("Tagged")), ("untagged", _("Untagged"))]
self.form.fields["tags"].choices = custom_tag_choices + tag_choices
+ self.form.fields["exclude_tags"].choices = custom_tag_choices + tag_choices
entity_choices = list(
TransactionEntity.objects.values_list("name", "name").order_by("name")
)
@@ -232,6 +321,9 @@ class TransactionsFilter(django_filters.FilterSet):
("no_entity", _("No entity")),
]
self.form.fields["entities"].choices = custom_entity_choices + entity_choices
+ self.form.fields["exclude_entities"].choices = (
+ custom_entity_choices + entity_choices
+ )
@property
def has_active_filters(self):
@@ -363,6 +455,15 @@ class TransactionsFilter(django_filters.FilterSet):
return queryset
+ def filter_exclude_category(self, queryset, name, value):
+ return exclude_matching(self.filter_category)(queryset, name, value)
+
+ def filter_exclude_tags(self, queryset, name, value):
+ return exclude_matching(self.filter_tags)(queryset, name, value)
+
+ def filter_exclude_entities(self, queryset, name, value):
+ return exclude_matching(self.filter_entities)(queryset, name, value)
+
@staticmethod
def filter_mute_status(queryset, name, value):
from apps.common.middleware.thread_local import get_current_user
diff --git a/app/apps/transactions/forms.py b/app/apps/transactions/forms.py
index 743dea1c..24ebe568 100644
--- a/app/apps/transactions/forms.py
+++ b/app/apps/transactions/forms.py
@@ -17,6 +17,7 @@ from apps.transactions.models import (
TransactionAttachment,
QuickTransaction,
RecurringTransaction,
+ SubTransaction,
Transaction,
TransactionCategory,
TransactionEntity,
@@ -54,7 +55,89 @@ class MultipleFileField(forms.FileField):
return []
-class TransactionForm(forms.ModelForm):
+class SubTransactionForm(forms.ModelForm):
+ class Meta:
+ model = SubTransaction
+ fields = ["name", "amount"]
+ widgets = {
+ "name": forms.TextInput(
+ attrs={"class": "input join-item flex-1", "placeholder": _("Name")}
+ ),
+ }
+
+ def __init__(self, *args, **kwargs):
+ super().__init__(*args, **kwargs)
+ # Built per request so the mask uses the user's number format
+ self.fields["amount"].widget = ArbitraryDecimalDisplayNumberInput(
+ attrs={
+ "class": "input join-item w-2/5",
+ "inputmode": "decimal",
+ "placeholder": _("Amount"),
+ }
+ )
+
+
+class SubTransactionsFormMixin:
+ """Adds sub-transactions to a transaction or template form; while there are any,
+ the amount field is their sum. Transfers don't take them.
+
+ Rendered by transactions/widgets/sub_transactions.html, placed after the amount.
+ """
+
+ sub_amount_field = "amount"
+
+ def __init__(self, *args, sub_transactions_initial=None, **kwargs):
+ super().__init__(*args, **kwargs)
+ data = self.data if self.is_bound else None
+ if data is not None and "sub-TOTAL_FORMS" not in data:
+ # Posts without the formset (e.g. shortcuts to /add/) leave sub-transactions alone
+ data = {"sub-TOTAL_FORMS": "0", "sub-INITIAL_FORMS": "0"}
+ initial = sub_transactions_initial or []
+ self.sub_transactions = forms.inlineformset_factory(
+ type(self.instance),
+ SubTransaction,
+ form=SubTransactionForm,
+ extra=len(initial),
+ can_delete=True,
+ )(data, instance=self.instance, prefix="sub", initial=initial)
+ # With sub-transactions the amount is their sum, see clean()
+ self.fields[self.sub_amount_field].required = False
+
+ def _takes_sub_transactions(self):
+ return self.cleaned_data.get("type") != "TR"
+
+ def clean(self):
+ cleaned_data = super().clean()
+ field = self.sub_amount_field
+ if self._takes_sub_transactions() and self.sub_transactions.is_valid():
+ amounts = [
+ f.cleaned_data["amount"]
+ for f in self.sub_transactions.forms
+ if f.cleaned_data and not f.cleaned_data.get("DELETE")
+ ]
+ if amounts:
+ cleaned_data[field] = sum(amounts)
+ if cleaned_data.get(field) is None and field not in self.errors:
+ self.add_error(field, self.fields[field].error_messages["required"])
+ return cleaned_data
+
+ def is_valid(self):
+ return super().is_valid() and (
+ not self._takes_sub_transactions() or self.sub_transactions.is_valid()
+ )
+
+ def save(self, *args, **kwargs):
+ with db_transaction.atomic():
+ instance = super().save(*args, **kwargs)
+ if self._takes_sub_transactions():
+ self.sub_transactions.instance = instance
+ self.sub_transactions.save()
+ else:
+ instance.sub_transactions.all().delete()
+ return instance
+
+
+class TransactionForm(SubTransactionsFormMixin, forms.ModelForm):
category = DynamicModelChoiceField(
create_field="name",
model=TransactionCategory,
@@ -164,6 +247,7 @@ class TransactionForm(forms.ModelForm):
),
"description",
Field("amount", inputmode="decimal"),
+ HTML('{% include "transactions/widgets/sub_transactions.html" %}'),
Row(
Column("category"),
Column("tags"),
@@ -187,6 +271,7 @@ class TransactionForm(forms.ModelForm):
),
"description",
Field("amount", inputmode="decimal"),
+ HTML('{% include "transactions/widgets/sub_transactions.html" %}'),
Accordion(
AccordionGroup(
_("More"),
@@ -322,7 +407,7 @@ def _type_aware(form, *layout):
)
-class QuickTransactionForm(forms.ModelForm):
+class QuickTransactionForm(SubTransactionsFormMixin, forms.ModelForm):
category = DynamicModelChoiceField(
create_field="name",
model=TransactionCategory,
@@ -432,6 +517,7 @@ class QuickTransactionForm(forms.ModelForm):
),
"description",
Field("amount", inputmode="decimal"),
+ HTML('{% include "transactions/widgets/sub_transactions.html" %}'),
_transfer_fields(self),
Row(
Column("category"),
@@ -833,7 +919,9 @@ class TransferForm(forms.Form):
return from_transaction, to_transaction
-class InstallmentPlanForm(forms.ModelForm):
+class InstallmentPlanForm(SubTransactionsFormMixin, forms.ModelForm):
+ sub_amount_field = "installment_amount"
+
account = forms.ModelChoiceField(
queryset=Account.objects.filter(is_archived=False),
label=_("Account"),
@@ -956,6 +1044,7 @@ class InstallmentPlanForm(forms.ModelForm):
Column("recurrence", css_class="col-span-12 md:col-span-4"),
),
"installment_amount",
+ HTML('{% include "transactions/widgets/sub_transactions.html" %}'),
Row(
Column("category"),
Column("tags"),
@@ -989,6 +1078,7 @@ class InstallmentPlanForm(forms.ModelForm):
# Take the amount set on the form, even if already paid
source_transaction.amount = instance.installment_amount
source_transaction.save()
+ source_transaction.copy_sub_transactions_from(instance)
instance.update_transactions()
elif is_new:
instance.create_transactions()
@@ -1085,7 +1175,7 @@ class TransactionCategoryForm(forms.ModelForm):
)
-class RecurringTransactionForm(forms.ModelForm):
+class RecurringTransactionForm(SubTransactionsFormMixin, forms.ModelForm):
account = forms.ModelChoiceField(
queryset=Account.objects.filter(is_archived=False),
label=_("Account"),
@@ -1209,6 +1299,7 @@ class RecurringTransactionForm(forms.ModelForm):
"description",
Switch("add_description_to_transaction"),
"amount",
+ HTML('{% include "transactions/widgets/sub_transactions.html" %}'),
_transfer_fields(self),
Row(
Column("category"),
diff --git a/app/apps/transactions/migrations/0053_sub_transaction.py b/app/apps/transactions/migrations/0053_sub_transaction.py
new file mode 100644
index 00000000..85f003fa
--- /dev/null
+++ b/app/apps/transactions/migrations/0053_sub_transaction.py
@@ -0,0 +1,34 @@
+# Generated by Django 5.2.17 on 2026-11-13 22:22
+
+import apps.transactions.validators
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('transactions', '0052_transfer_templates'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='SubTransaction',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(max_length=255, verbose_name='Name')),
+ ('amount', models.DecimalField(decimal_places=30, max_digits=42, validators=[apps.transactions.validators.validate_non_negative, apps.transactions.validators.validate_decimal_places], verbose_name='Amount')),
+ ('installment_plan', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='sub_transactions', to='transactions.installmentplan')),
+ ('quick_transaction', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='sub_transactions', to='transactions.quicktransaction')),
+ ('recurring_transaction', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='sub_transactions', to='transactions.recurringtransaction')),
+ ('transaction', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='sub_transactions', to='transactions.transaction', verbose_name='Transaction')),
+ ],
+ options={
+ 'verbose_name': 'Sub-transaction',
+ 'verbose_name_plural': 'Sub-transactions',
+ 'db_table': 'sub_transactions',
+ 'ordering': ['id'],
+ 'constraints': [models.CheckConstraint(condition=models.Q(models.Q(('installment_plan__isnull', True), ('quick_transaction__isnull', True), ('recurring_transaction__isnull', True), ('transaction__isnull', False)), models.Q(('installment_plan__isnull', True), ('quick_transaction__isnull', True), ('recurring_transaction__isnull', False), ('transaction__isnull', True)), models.Q(('installment_plan__isnull', False), ('quick_transaction__isnull', True), ('recurring_transaction__isnull', True), ('transaction__isnull', True)), models.Q(('installment_plan__isnull', True), ('quick_transaction__isnull', False), ('recurring_transaction__isnull', True), ('transaction__isnull', True)), _connector='OR'), name='sub_transaction_has_one_parent')],
+ },
+ ),
+ ]
diff --git a/app/apps/transactions/models.py b/app/apps/transactions/models.py
index d1dc8a96..9fc6a4ce 100644
--- a/app/apps/transactions/models.py
+++ b/app/apps/transactions/models.py
@@ -1,6 +1,8 @@
import calendar
import decimal
+import functools
import logging
+import operator
import uuid
from copy import deepcopy
from pathlib import Path
@@ -447,9 +449,10 @@ class Transaction(OwnedObject):
if isinstance(self.amount, (str, int, float)):
self.amount = decimal.Decimal(str(self.amount))
- self.amount = truncate_decimal(
- value=self.amount, decimal_places=account.currency.decimal_places
- )
+ if self.amount is not None: # missing amount is reported by field validation
+ self.amount = truncate_decimal(
+ value=self.amount, decimal_places=account.currency.decimal_places
+ )
# Normalize reference_date
if self.reference_date:
@@ -575,6 +578,24 @@ class Transaction(OwnedObject):
def hard_delete(self, *args, **kwargs):
super().delete(*args, **kwargs)
+ @property
+ def has_sub_transactions(self):
+ return bool(self.pk) and self.sub_transactions.exists()
+
+ @property
+ def saved_sub_transactions(self):
+ """Sub-transactions, or none for an unsaved preview (which can't query them)."""
+ return self.sub_transactions.all() if self.pk else []
+
+ def copy_sub_transactions_from(self, source):
+ """Makes this transaction's sub-transactions copies of ``source``'s (a
+ transaction or a template that generates them)."""
+ self.sub_transactions.all().delete()
+ SubTransaction.objects.bulk_create(
+ SubTransaction(transaction=self, name=sub.name, amount=sub.amount)
+ for sub in source.sub_transactions.all()
+ )
+
def exchanged_amount(self):
return self._exchanged_to(
self.account.exchange_currency or self.account.currency.exchange_currency
@@ -661,6 +682,81 @@ class Transaction(OwnedObject):
return new_obj
+SUB_TRANSACTION_PARENTS = (
+ "transaction",
+ "recurring_transaction",
+ "installment_plan",
+ "quick_transaction",
+)
+
+
+class SubTransaction(models.Model):
+ """A named part of a transaction, or of a template that generates them; when
+ present, the parts add up to its amount. Exactly one parent is set.
+
+ Soft deletion follows the parent: sub-transactions are only reached through it.
+ """
+
+ transaction = models.ForeignKey(
+ Transaction,
+ on_delete=models.CASCADE,
+ null=True,
+ blank=True,
+ related_name="sub_transactions",
+ verbose_name=_("Transaction"),
+ )
+ recurring_transaction = models.ForeignKey(
+ "RecurringTransaction",
+ on_delete=models.CASCADE,
+ null=True,
+ blank=True,
+ related_name="sub_transactions",
+ )
+ installment_plan = models.ForeignKey(
+ "InstallmentPlan",
+ on_delete=models.CASCADE,
+ null=True,
+ blank=True,
+ related_name="sub_transactions",
+ )
+ quick_transaction = models.ForeignKey(
+ "QuickTransaction",
+ on_delete=models.CASCADE,
+ null=True,
+ blank=True,
+ related_name="sub_transactions",
+ )
+ name = models.CharField(max_length=255, verbose_name=_("Name"))
+ amount = models.DecimalField(
+ max_digits=42,
+ decimal_places=30,
+ verbose_name=_("Amount"),
+ validators=[validate_non_negative, validate_decimal_places],
+ )
+
+ class Meta:
+ verbose_name = _("Sub-transaction")
+ verbose_name_plural = _("Sub-transactions")
+ db_table = "sub_transactions"
+ ordering = ["id"]
+ constraints = [
+ models.CheckConstraint(
+ # One of: only "transaction" set, only "recurring_transaction" set, ...
+ condition=functools.reduce(
+ operator.or_,
+ (
+ Q(**{f"{p}__isnull": p != parent for p in SUB_TRANSACTION_PARENTS})
+ for parent in SUB_TRANSACTION_PARENTS
+ ),
+ ),
+ name="sub_transaction_has_one_parent",
+ )
+ ]
+
+ def __str__(self):
+ return self.name
+
+
class TransactionAttachment(models.Model):
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
transaction = models.ForeignKey(
@@ -858,6 +954,7 @@ class InstallmentPlan(models.Model):
)
new_transaction.tags.set(self.tags.all())
new_transaction.entities.set(self.entities.all())
+ new_transaction.copy_sub_transactions_from(self)
@transaction.atomic
def update_transactions(self):
@@ -899,6 +996,7 @@ class InstallmentPlan(models.Model):
not existing_transaction.is_paid
): # Don't update value for paid transactions
existing_transaction.amount = self.installment_amount
+ existing_transaction.copy_sub_transactions_from(self)
existing_transaction.save()
@@ -925,6 +1023,7 @@ class InstallmentPlan(models.Model):
)
new_transaction.tags.set(self.tags.all())
new_transaction.entities.set(self.entities.all())
+ new_transaction.copy_sub_transactions_from(self)
# Remove any extra transactions that are no longer part of the plan
self.transactions.filter(
@@ -1130,6 +1229,7 @@ class RecurringTransaction(TransferTemplate):
# different one, and the scoped default manager would hide private rows.
created_transaction.tags.set(self.tags(manager="all_objects").all())
created_transaction.entities.set(self.entities(manager="all_objects").all())
+ created_transaction.copy_sub_transactions_from(self)
self.complete_transfer(created_transaction)
def adopt_transaction(self, existing_transaction, date, reference_date):
@@ -1172,6 +1272,7 @@ class RecurringTransaction(TransferTemplate):
existing_transaction.save()
existing_transaction.tags.set(self.tags(manager="all_objects").all())
existing_transaction.entities.set(self.entities(manager="all_objects").all())
+ existing_transaction.copy_sub_transactions_from(self)
def get_recurrence_delta(self):
if self.recurrence_type == self.RecurrenceType.DAY:
@@ -1261,36 +1362,82 @@ class RecurringTransaction(TransferTemplate):
"""
Updates all unpaid transactions associated with this RecurringTransaction.
- Only unpaid transactions (`is_paid=False`) are modified. Updates fields like
- amount, description, category, notes, and many-to-many relationships (tags, entities).
+ Only unpaid transactions (`is_paid=False`) are modified. They keep their dates
+ and take the account, type, amount, description, category, notes, tags and
+ entities of the recurrence; a transfer's "to" side takes the "to" account and
+ amount. Turning the recurrence into a transfer adds the missing "to" sides,
+ and turning it into an income or expense removes them.
"""
- unpaid_transactions = self.transactions.filter(is_paid=False)
+ unpaid_transactions = list(
+ self.transactions.filter(is_paid=False).select_related(
+ "linked_transaction"
+ )
+ )
+ to_side_ids = {
+ existing_transaction.pk
+ for existing_transaction in unpaid_transactions
+ if self._is_to_side(existing_transaction)
+ }
for existing_transaction in unpaid_transactions:
- # Update fields based on RecurringTransaction
- is_to_side = (
- existing_transaction.linked_transaction_id
- and existing_transaction.type == Transaction.Type.INCOME
- )
- existing_transaction.amount = (
- self.to_amount or self.amount if is_to_side else self.amount
- )
- existing_transaction.description = (
- self.description if self.add_description_to_transaction else ""
- )
- existing_transaction.category = self.category
- existing_transaction.notes = (
- self.notes if self.add_notes_to_transaction else ""
- )
+ if existing_transaction.pk in to_side_ids:
+ if self.is_transfer:
+ self._apply_to(
+ existing_transaction,
+ self.to_account,
+ Transaction.Type.INCOME,
+ self.to_amount or self.amount,
+ existing_transaction.date,
+ existing_transaction.reference_date,
+ )
+ # Otherwise its unpaid "from" side removes it below
+ continue
- # Update many-to-many relationships (see create_transaction)
- existing_transaction.tags.set(self.tags(manager="all_objects").all())
- existing_transaction.entities.set(
- self.entities(manager="all_objects").all()
- )
+ if (
+ not self.is_transfer
+ and existing_transaction.linked_transaction_id in to_side_ids
+ ):
+ to_side = existing_transaction.linked_transaction
+ existing_transaction.linked_transaction = None
+ to_side.linked_transaction = None
+ to_side.delete(_with_partner=False)
- # Save updated transaction
- existing_transaction.save()
+ partner = existing_transaction.linked_transaction
+ if (
+ partner
+ and partner.recurring_transaction_id != self.pk
+ and (
+ {self.transaction_type, partner.type}
+ != {Transaction.Type.INCOME, Transaction.Type.EXPENSE}
+ or self.account_id == partner.account_id
+ )
+ ):
+ # A link made elsewhere (e.g. a DCA entry) that the new type or account
+ # would break: unlink it and keep the partner
+ Transaction.all_objects.filter(pk=partner.pk).update(
+ linked_transaction=None
+ )
+ existing_transaction.linked_transaction = None
+
+ self._apply_to(
+ existing_transaction,
+ self.account,
+ self.transaction_type,
+ self.amount,
+ existing_transaction.date,
+ existing_transaction.reference_date,
+ )
+ if not existing_transaction.linked_transaction_id:
+ self.complete_transfer(existing_transaction)
+
+ def _is_to_side(self, existing_transaction):
+ """Whether a transaction is the "to" side of a transfer this generated."""
+ return bool(
+ existing_transaction.linked_transaction_id
+ and existing_transaction.type == Transaction.Type.INCOME
+ and existing_transaction.linked_transaction.recurring_transaction_id
+ == self.pk
+ )
def delete_unpaid_transactions(self):
"""
diff --git a/app/apps/transactions/tests/test_exclude_filters.py b/app/apps/transactions/tests/test_exclude_filters.py
new file mode 100644
index 00000000..b1b5f326
--- /dev/null
+++ b/app/apps/transactions/tests/test_exclude_filters.py
@@ -0,0 +1,71 @@
+from decimal import Decimal
+
+from django.contrib.auth import get_user_model
+from django.test import TestCase, override_settings
+from django.urls import reverse
+from django.utils import timezone
+
+from apps.accounts.models import Account
+from apps.currencies.models import Currency
+from apps.transactions.models import Transaction, TransactionCategory, TransactionTag
+
+
+@override_settings(
+ STORAGES={
+ "default": {"BACKEND": "django.core.files.storage.FileSystemStorage"},
+ "staticfiles": {
+ "BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"
+ },
+ },
+ WHITENOISE_AUTOREFRESH=True,
+)
+class ExcludeFilterTests(TestCase):
+ def setUp(self):
+ self.user = get_user_model().objects.create_user(
+ email="exclude@test.com", password="pass"
+ )
+ self.client.force_login(self.user)
+ currency = Currency.objects.create(code="BRL", name="Real", decimal_places=2)
+ self.account = Account.objects.create(name="Wallet", currency=currency)
+ food = TransactionCategory.objects.create(name="Food")
+ home = TransactionTag.objects.create(name="home")
+
+ self.make("Groceries", category=food).tags.add(home)
+ self.make("Restaurant", category=food, notes="with friends")
+ self.make("Rent").tags.add(home)
+ self.make("Gift")
+
+ def make(self, description, **kwargs):
+ today = timezone.localdate(timezone.now())
+ return Transaction.objects.create(
+ account=self.account,
+ type=Transaction.Type.EXPENSE,
+ date=today,
+ reference_date=today.replace(day=1),
+ amount=Decimal("10"),
+ description=description,
+ **kwargs,
+ )
+
+ def listed(self, params):
+ response = self.client.get(
+ reverse("transactions_all_list"), params, HTTP_HX_REQUEST="true"
+ )
+ self.assertEqual(response.status_code, 200)
+ page = response.context["page_obj"]
+ late = response.context["late_transactions"] or []
+ return sorted(t.description for t in [*page, *late])
+
+ def test_exclusions_join_with_inclusions(self):
+ cases = [
+ ({"exclude_category": ["Food"]}, ["Gift", "Rent"]),
+ ({"exclude_category": ["uncategorized"]}, ["Groceries", "Restaurant"]),
+ ({"exclude_tags": ["home"]}, ["Gift", "Restaurant"]),
+ ({"exclude_tags": ["untagged"]}, ["Groceries", "Rent"]),
+ ({"exclude_description": "friends"}, ["Gift", "Groceries", "Rent"]),
+ ({"exclude_account": ["Wallet"]}, []),
+ # positive and negative filters are applied together
+ ({"category": ["Food"], "exclude_tags": ["home"]}, ["Restaurant"]),
+ ]
+ for params, expected in cases:
+ self.assertEqual(self.listed(params), expected, params)
diff --git a/app/apps/transactions/tests/test_sub_transactions.py b/app/apps/transactions/tests/test_sub_transactions.py
new file mode 100644
index 00000000..7d2104b7
--- /dev/null
+++ b/app/apps/transactions/tests/test_sub_transactions.py
@@ -0,0 +1,321 @@
+from decimal import Decimal
+
+from django.contrib.auth import get_user_model
+from django.test import TestCase, override_settings
+from django.urls import reverse
+from django.utils import timezone
+from rest_framework.test import APIClient
+
+from apps.accounts.models import Account, AccountGroup
+from apps.currencies.models import Currency
+from apps.transactions.models import (
+ InstallmentPlan,
+ QuickTransaction,
+ RecurringTransaction,
+ SubTransaction,
+ Transaction,
+)
+from apps.transactions.filters import content_filter, exclude_matching
+from apps.transactions.views.actions import clone_transaction
+
+
+def _subs(*rows, initial=0):
+ data = {"sub-TOTAL_FORMS": str(len(rows)), "sub-INITIAL_FORMS": str(initial)}
+ for i, row in enumerate(rows):
+ data.update({f"sub-{i}-{k}": v for k, v in row.items()})
+ return data
+
+
+@override_settings(
+ STORAGES={
+ "default": {"BACKEND": "django.core.files.storage.FileSystemStorage"},
+ "staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"},
+ },
+ WHITENOISE_AUTOREFRESH=True,
+)
+class SubTransactionTests(TestCase):
+ def setUp(self):
+ user = get_user_model().objects.create_user(email="u@test.com", password="pw")
+ self.client.login(username="u@test.com", password="pw")
+ currency = Currency.objects.create(code="USD", name="USD", decimal_places=2)
+ self.account = Account.objects.create(
+ name="A", group=AccountGroup.objects.create(name="G"), currency=currency
+ )
+ self.base = {
+ "account": self.account.id,
+ "type": "EX",
+ "is_paid": True,
+ "date": timezone.localdate().isoformat(),
+ "description": "Groceries",
+ }
+
+ def _add(self, data):
+ return self.client.post(
+ reverse("transaction_add"), {**data, "submit": ""}, headers={"HX-Request": "true"}
+ )
+
+ def test_amount_is_sum_of_sub_transactions(self):
+ response = self._add(
+ {**self.base, "amount": "999", **_subs(
+ {"name": "Milk", "amount": "2.50"}, {"name": "Bread", "amount": "4"}
+ )}
+ )
+ self.assertEqual(response.status_code, 204)
+ transaction = Transaction.objects.get()
+ self.assertEqual(transaction.amount, Decimal("6.50"))
+ self.assertEqual(
+ list(transaction.sub_transactions.values_list("name", flat=True)),
+ ["Milk", "Bread"],
+ )
+
+ def test_amount_required_without_sub_transactions(self):
+ response = self._add({**self.base, **_subs()})
+ self.assertEqual(response.status_code, 200)
+ self.assertIn("amount", response.context["form"].errors)
+ self.assertFalse(Transaction.objects.exists())
+
+ def test_sub_transaction_needs_name(self):
+ response = self._add({**self.base, **_subs({"name": "", "amount": "3"})})
+ self.assertEqual(response.status_code, 200)
+ self.assertFalse(Transaction.objects.exists())
+
+ def test_edit_removing_sub_transactions_restores_typed_amount(self):
+ transaction = Transaction.objects.create(
+ account=self.account, type="EX", date=timezone.localdate(), amount=5
+ )
+ sub = SubTransaction.objects.create(transaction=transaction, name="Fee", amount=5)
+ response = self.client.post(
+ reverse("transaction_edit", kwargs={"transaction_id": transaction.id}),
+ {**self.base, "amount": "12", **_subs(
+ {"id": sub.id, "name": "Fee", "amount": "5", "DELETE": "on"}, initial=1
+ )},
+ headers={"HX-Request": "true"},
+ )
+ self.assertEqual(response.status_code, 204)
+ transaction.refresh_from_db()
+ self.assertEqual(transaction.amount, Decimal("12"))
+ self.assertFalse(transaction.sub_transactions.exists())
+
+ @override_settings(ENABLE_SOFT_DELETE=True)
+ def test_soft_delete_hides_and_hard_delete_removes_sub_transactions(self):
+ transaction = Transaction.objects.create(
+ account=self.account, type="EX", date=timezone.localdate(), amount=5
+ )
+ SubTransaction.objects.create(transaction=transaction, name="Fee", amount=5)
+ url = reverse("transaction_delete", kwargs={"transaction_id": transaction.id})
+ self.client.delete(url, headers={"HX-Request": "true"})
+ # soft: sub-transactions stay with (and are hidden by) the deleted parent
+ self.assertTrue(Transaction.deleted_objects.filter(pk=transaction.pk).exists())
+ self.assertEqual(SubTransaction.objects.count(), 1)
+ self.client.delete(url, headers={"HX-Request": "true"})
+ self.assertFalse(SubTransaction.objects.exists())
+
+ def test_clone_copies_sub_transactions(self):
+ transaction = Transaction.objects.create(
+ account=self.account, type="EX", date=timezone.localdate(), amount=5
+ )
+ SubTransaction.objects.create(transaction=transaction, name="Fee", amount=5)
+ clone = clone_transaction(transaction)
+ self.assertEqual(list(clone.sub_transactions.values_list("name", "amount")), [("Fee", Decimal("5"))])
+
+ def test_content_filter_matches_sub_transaction_names(self):
+ shop = Transaction.objects.create(
+ account=self.account, type="EX", date=timezone.localdate(), amount=5, description="Shop"
+ )
+ SubTransaction.objects.create(transaction=shop, name="Milk", amount=2)
+ SubTransaction.objects.create(transaction=shop, name="Oat milk", amount=3)
+ other = Transaction.objects.create(
+ account=self.account, type="EX", date=timezone.localdate(), amount=1, description="Bus"
+ )
+ everything = Transaction.all_objects.all()
+ self.assertEqual(list(content_filter(everything, "description", "milk")), [shop])
+ self.assertEqual(list(exclude_matching(content_filter)(everything, "x", "milk")), [other])
+
+ def test_bulk_edit_leaves_amount_of_split_transactions(self):
+ split = Transaction.objects.create(
+ account=self.account, type="EX", date=timezone.localdate(), amount=5
+ )
+ SubTransaction.objects.create(transaction=split, name="Fee", amount=5)
+ plain = Transaction.objects.create(
+ account=self.account, type="EX", date=timezone.localdate(), amount=1
+ )
+ response = self.client.post(
+ reverse("transactions_bulk_edit"),
+ {"transactions": [split.id, plain.id], "amount": "50", "description": "Edited"},
+ headers={"HX-Request": "true"},
+ )
+ self.assertEqual(response.status_code, 204)
+ split.refresh_from_db()
+ plain.refresh_from_db()
+ self.assertEqual((split.amount, split.description), (Decimal("5"), "Edited"))
+ self.assertEqual(plain.amount, Decimal("50"))
+
+ def _post(self, url_name, data):
+ return self.client.post(reverse(url_name), data, headers={"HX-Request": "true"})
+
+ def _parts(self, transaction):
+ return list(transaction.sub_transactions.values_list("name", "amount"))
+
+ def test_quick_transaction_parts_are_copied_to_created_transaction(self):
+ self._post(
+ "quick_transaction_add",
+ {**self.base, "name": "Lunch", **_subs({"name": "Meal", "amount": "20"}, {"name": "Tip", "amount": "2"})},
+ )
+ quick = QuickTransaction.objects.get()
+ self.assertEqual(quick.amount, Decimal("22"))
+ self.client.get(
+ reverse("quick_transaction_add_as_transaction", kwargs={"quick_transaction_id": quick.id}),
+ headers={"HX-Request": "true"},
+ )
+ transaction = Transaction.objects.get()
+ self.assertEqual(transaction.amount, Decimal("22"))
+ self.assertEqual(self._parts(transaction), [("Meal", Decimal("20")), ("Tip", Decimal("2"))])
+
+ def test_quick_transfer_drops_parts(self):
+ other = Account.objects.create(name="B", group=self.account.group, currency=self.account.currency)
+ response = self._post(
+ "quick_transaction_add",
+ {**self.base, "type": "TR", "to_account": other.id, "amount": "5", "name": "Move",
+ **_subs({"name": "Hidden", "amount": "9"})},
+ )
+ self.assertEqual(response.status_code, 204)
+ quick = QuickTransaction.objects.get()
+ self.assertEqual(quick.amount, Decimal("5"))
+ self.assertFalse(quick.sub_transactions.exists())
+
+ def test_recurring_parts_follow_generated_and_unpaid_transactions(self):
+ self._post(
+ "recurring_transaction_add",
+ {**self.base, "start_date": timezone.localdate().isoformat(), "recurrence_type": "month",
+ "recurrence_interval": 1, "keep_at_most": 2, **_subs({"name": "Plan", "amount": "10"})},
+ )
+ recurring = RecurringTransaction.all_objects.get()
+ self.assertEqual(recurring.amount, Decimal("10"))
+ generated = recurring.transactions.all()
+ self.assertTrue(generated)
+ for transaction in generated:
+ self.assertEqual(self._parts(transaction), [("Plan", Decimal("10"))])
+
+ sub = recurring.sub_transactions.get()
+ self.client.post(
+ reverse("recurring_transaction_edit", kwargs={"recurring_transaction_id": recurring.id}),
+ {**self.base, "start_date": timezone.localdate().isoformat(), "recurrence_type": "month",
+ "recurrence_interval": 1, "keep_at_most": 2,
+ **_subs({"id": sub.id, "name": "Plan", "amount": "10"}, {"name": "Tax", "amount": "1"}, initial=1)},
+ headers={"HX-Request": "true"},
+ )
+ for transaction in recurring.transactions.all():
+ self.assertEqual(transaction.amount, Decimal("11"))
+ self.assertEqual(len(self._parts(transaction)), 2)
+
+ def test_installment_parts_are_copied_to_each_installment(self):
+ self._post(
+ "installment_plan_add",
+ {**self.base, "number_of_installments": 2, "installment_start": 1,
+ "start_date": timezone.localdate().isoformat(), "recurrence": "monthly",
+ **_subs({"name": "Principal", "amount": "90"}, {"name": "Interest", "amount": "10"})},
+ )
+ plan = InstallmentPlan.all_objects.get()
+ self.assertEqual(plan.installment_amount, Decimal("100"))
+ self.assertEqual(plan.transactions.count(), 2)
+ for transaction in plan.transactions.all():
+ self.assertEqual(transaction.amount, Decimal("100"))
+ self.assertEqual(len(self._parts(transaction)), 2)
+
+
+class SubTransactionApiTests(TestCase):
+ def setUp(self):
+ user = get_user_model().objects.create_user(
+ email="api@test.com", password="pw", is_superuser=True
+ )
+ self.api = APIClient()
+ self.api.force_authenticate(user=user)
+ currency = Currency.objects.create(code="EUR", name="EUR", decimal_places=2)
+ self.account = Account.objects.create(name="A", currency=currency, owner=user)
+
+ def test_create_read_and_update_sub_transactions(self):
+ response = self.api.post(
+ "/api/transactions/",
+ {"account_id": self.account.id, "type": "EX", "date": "2030-01-10", "description": "Shop",
+ "sub_transactions": [{"name": "A", "amount": "1.50"}, {"name": "B", "amount": "2"}]},
+ format="json",
+ )
+ self.assertEqual(response.status_code, 201, response.data)
+ self.assertEqual(Decimal(response.data["amount"]), Decimal("3.50"))
+ self.assertEqual([s["name"] for s in response.data["sub_transactions"]], ["A", "B"])
+ url = f"/api/transactions/{response.data['id']}/"
+
+ # The amount can't drift from the parts
+ response = self.api.patch(url, {"amount": "9"}, format="json")
+ self.assertEqual(response.status_code, 400)
+
+ response = self.api.patch(url, {"sub_transactions": [{"name": "C", "amount": "4"}]}, format="json")
+ self.assertEqual(response.status_code, 200, response.data)
+ self.assertEqual(Decimal(response.data["amount"]), Decimal("4"))
+ self.assertEqual(self.api.get(url).data["sub_transactions"][0]["name"], "C")
+
+ def test_amount_required_without_sub_transactions(self):
+ response = self.api.post(
+ "/api/transactions/",
+ {"account_id": self.account.id, "type": "EX", "date": "2030-01-10"},
+ format="json",
+ )
+ self.assertEqual(response.status_code, 400)
+ self.assertIn("amount", response.data)
+
+ def _parts(self, owner):
+ return [(s.name, s.amount) for s in owner.sub_transactions.all()]
+
+ def test_installment_plan_parts_reach_every_installment(self):
+ response = self.api.post(
+ "/api/installment-plans/",
+ {"account": self.account.id, "type": "EX", "description": "Laptop",
+ "number_of_installments": 3, "start_date": "2030-01-10", "recurrence": "monthly",
+ "sub_transactions": [{"name": "Principal", "amount": "90"}, {"name": "Interest", "amount": "10"}]},
+ format="json",
+ )
+ self.assertEqual(response.status_code, 201, response.data)
+ self.assertEqual(Decimal(response.data["installment_amount"]), Decimal("100"))
+ plan = InstallmentPlan.all_objects.get()
+ installments = plan.transactions.all()
+ self.assertEqual(len(installments), 3)
+ for transaction in installments:
+ self.assertEqual(transaction.amount, Decimal("100"))
+ self.assertEqual(len(self._parts(transaction)), 2)
+
+ url = f"/api/installment-plans/{plan.id}/"
+ self.assertEqual(self.api.patch(url, {"installment_amount": "5"}, format="json").status_code, 400)
+ response = self.api.patch(url, {"sub_transactions": [{"name": "Principal", "amount": "80"}]}, format="json")
+ self.assertEqual(response.status_code, 200, response.data)
+ for transaction in plan.transactions.all():
+ self.assertEqual(self._parts(transaction), [("Principal", Decimal("80"))])
+ self.assertEqual(transaction.amount, Decimal("80"))
+
+ def test_recurring_parts_follow_its_transactions_and_transfers_drop_them(self):
+ response = self.api.post(
+ "/api/recurring-transactions/",
+ {"account": self.account.id, "type": "EX", "description": "Internet",
+ "start_date": timezone.localdate().isoformat(), "recurrence_type": "month", "recurrence_interval": 1,
+ "sub_transactions": [{"name": "Plan", "amount": "50"}, {"name": "Router", "amount": "10"}]},
+ format="json",
+ )
+ self.assertEqual(response.status_code, 201, response.data)
+ self.assertEqual(Decimal(response.data["amount"]), Decimal("60"))
+ self.assertEqual([s["name"] for s in response.data["sub_transactions"]], ["Plan", "Router"])
+ recurring = RecurringTransaction.all_objects.get()
+ generated = Transaction.all_objects.filter(recurring_transaction=recurring)
+ self.assertTrue(generated)
+ for transaction in generated:
+ self.assertEqual(transaction.amount, Decimal("60"))
+ self.assertEqual(len(self._parts(transaction)), 2)
+
+ other = Account.objects.create(name="B", currency=self.account.currency, owner=self.account.owner)
+ url = f"/api/recurring-transactions/{recurring.id}/"
+ self.assertEqual(
+ self.api.patch(url, {"type": "TR", "to_account": other.id,
+ "sub_transactions": [{"name": "X", "amount": "1"}]}, format="json").status_code,
+ 400,
+ )
+ response = self.api.patch(url, {"type": "TR", "to_account": other.id}, format="json")
+ self.assertEqual(response.status_code, 200, response.data)
+ self.assertEqual(response.data["sub_transactions"], [])
diff --git a/app/apps/transactions/tests/test_transfers.py b/app/apps/transactions/tests/test_transfers.py
index cdaf7a16..3cd72112 100644
--- a/app/apps/transactions/tests/test_transfers.py
+++ b/app/apps/transactions/tests/test_transfers.py
@@ -251,19 +251,20 @@ class TransferTemplateTests(TransferTestBase):
"""Recurring and quick transactions of type Transfer."""
def _recurring(self, **overrides):
- return RecurringTransaction.objects.create(
- account=self.checking,
- type=RecurringTransaction.Type.TRANSFER,
- to_account=self.savings,
- amount=Decimal("100"),
- to_amount=Decimal("95"),
- description="Savings",
- start_date=timezone.localdate(),
- recurrence_type=RecurringTransaction.RecurrenceType.MONTH,
- recurrence_interval=1,
- keep_at_most=2,
+ data = {
+ "account": self.checking,
+ "type": RecurringTransaction.Type.TRANSFER,
+ "to_account": self.savings,
+ "amount": Decimal("100"),
+ "to_amount": Decimal("95"),
+ "description": "Savings",
+ "start_date": timezone.localdate(),
+ "recurrence_type": RecurringTransaction.RecurrenceType.MONTH,
+ "recurrence_interval": 1,
+ "keep_at_most": 2,
**overrides,
- )
+ }
+ return RecurringTransaction.objects.create(**data)
def test_recurring_transfer_generates_linked_pairs(self):
recurring = self._recurring()
@@ -294,6 +295,187 @@ class TransferTemplateTests(TransferTestBase):
{(Transaction.Type.EXPENSE, Decimal("10")), (Transaction.Type.INCOME, Decimal("9"))},
)
+ def test_recurring_update_moves_unpaid_to_new_account_and_type(self):
+ recurring = self._recurring(type=RecurringTransaction.Type.EXPENSE)
+ recurring.create_upcoming_transactions()
+ paid = recurring.transactions.earliest("date")
+ paid.is_paid = True
+ paid.save()
+
+ recurring.account = self.savings
+ recurring.type = RecurringTransaction.Type.INCOME
+ recurring.save()
+ recurring.update_unpaid_transactions()
+
+ paid.refresh_from_db()
+ self.assertEqual(
+ (paid.account, paid.type), (self.checking, Transaction.Type.EXPENSE)
+ )
+ unpaid = recurring.transactions.filter(is_paid=False)
+ self.assertTrue(unpaid.exists())
+ self.assertEqual(
+ set(unpaid.values_list("account", "type")),
+ {(self.savings.id, Transaction.Type.INCOME)},
+ )
+
+ def test_recurring_transfer_update_moves_to_sides_to_new_account(self):
+ recurring = self._recurring()
+ recurring.create_upcoming_transactions()
+ brokerage = Account.objects.create(
+ name="Brokerage", group=self.checking.group, currency=self.checking.currency
+ )
+
+ recurring.to_account = brokerage
+ recurring.save()
+ recurring.update_unpaid_transactions()
+
+ self.assertEqual(
+ set(recurring.transactions.values_list("type", "account")),
+ {
+ (Transaction.Type.EXPENSE, self.checking.id),
+ (Transaction.Type.INCOME, brokerage.id),
+ },
+ )
+
+ def test_recurring_update_into_transfer_adds_to_sides(self):
+ recurring = self._recurring(type=RecurringTransaction.Type.INCOME)
+ recurring.create_upcoming_transactions()
+ occurrences = recurring.transactions.count()
+
+ recurring.type = RecurringTransaction.Type.TRANSFER
+ recurring.save()
+ recurring.update_unpaid_transactions()
+
+ expenses = recurring.transactions.filter(type=Transaction.Type.EXPENSE)
+ self.assertEqual(expenses.count(), occurrences)
+ self.assertEqual(recurring.transactions.count(), occurrences * 2)
+ for from_t in expenses:
+ to_t = from_t.linked_transaction
+ self.assertEqual(from_t.account, self.checking)
+ self.assertEqual(to_t.linked_transaction, from_t)
+ self.assertEqual(to_t.account, self.savings)
+ self.assertEqual(to_t.amount, Decimal("95"))
+ self.assertEqual(to_t.recurring_transaction, recurring)
+
+ def _assert_update_out_of_transfer_removes_to_sides(self):
+ recurring = self._recurring()
+ recurring.create_upcoming_transactions()
+ paid_from = recurring.transactions.filter(
+ type=Transaction.Type.EXPENSE
+ ).earliest("date")
+ paid_from.is_paid = True
+ paid_from.save()
+ paid_to = paid_from.linked_transaction
+ occurrences = recurring.transactions.filter(
+ type=Transaction.Type.EXPENSE
+ ).count()
+
+ recurring.type = RecurringTransaction.Type.EXPENSE
+ recurring.save()
+ recurring.update_unpaid_transactions()
+
+ unpaid = recurring.transactions.filter(is_paid=False)
+ self.assertEqual(unpaid.count(), occurrences - 1)
+ self.assertEqual(
+ set(unpaid.values_list("account", "type", "linked_transaction")),
+ {(self.checking.id, Transaction.Type.EXPENSE, None)},
+ )
+ paid_from.refresh_from_db()
+ self.assertEqual(paid_from.linked_transaction, paid_to)
+
+ def test_recurring_update_out_of_transfer_removes_to_sides(self):
+ self._assert_update_out_of_transfer_removes_to_sides()
+ self.assertFalse(Transaction.deleted_objects.exists())
+
+ @override_settings(ENABLE_SOFT_DELETE=True)
+ def test_recurring_update_out_of_transfer_soft_deletes_to_sides(self):
+ self._assert_update_out_of_transfer_removes_to_sides()
+ self.assertTrue(Transaction.deleted_objects.exists())
+ self.assertFalse(
+ Transaction.deleted_objects.exclude(linked_transaction=None).exists()
+ )
+
+ def test_recurring_update_keeps_transfer_linked_by_hand(self):
+ recurring = self._recurring(type=RecurringTransaction.Type.INCOME)
+ recurring.create_upcoming_transactions()
+ income = recurring.transactions.earliest("date")
+ expense = Transaction.objects.create(
+ account=self.savings,
+ type=Transaction.Type.EXPENSE,
+ amount=Decimal("100"),
+ date=income.date,
+ description="Outside",
+ is_paid=False,
+ )
+ expense.link_transfer(income)
+
+ recurring.amount = Decimal("120")
+ recurring.save()
+ recurring.update_unpaid_transactions()
+
+ income.refresh_from_db()
+ self.assertEqual(income.linked_transaction, expense)
+ self.assertEqual(income.amount, Decimal("120"))
+ self.assertTrue(Transaction.objects.filter(pk=expense.pk).exists())
+
+ def test_recurring_update_unlinks_transfer_linked_by_hand_when_broken(self):
+ for change in ({"type": RecurringTransaction.Type.EXPENSE}, {"account": self.savings}):
+ with self.subTest(change=change):
+ recurring = self._recurring(type=RecurringTransaction.Type.INCOME)
+ recurring.create_upcoming_transactions()
+ income = recurring.transactions.earliest("date")
+ outside = Transaction.objects.create(
+ account=self.savings,
+ type=Transaction.Type.EXPENSE,
+ amount=Decimal("100"),
+ date=income.date,
+ description="Outside",
+ is_paid=False,
+ )
+ outside.link_transfer(income)
+
+ for field, value in change.items():
+ setattr(recurring, field, value)
+ recurring.save()
+ recurring.update_unpaid_transactions()
+
+ income.refresh_from_db()
+ outside.refresh_from_db()
+ self.assertIsNone(income.linked_transaction)
+ self.assertIsNone(outside.linked_transaction)
+ self.assertEqual(
+ (outside.account, outside.type, outside.amount),
+ (self.savings, Transaction.Type.EXPENSE, Decimal("100")),
+ )
+
+ def test_edit_view_moves_unpaid_transactions(self):
+ recurring = self._recurring(type=RecurringTransaction.Type.EXPENSE)
+ recurring.create_upcoming_transactions()
+
+ response = self.client.post(
+ reverse(
+ "recurring_transaction_edit",
+ kwargs={"recurring_transaction_id": recurring.id},
+ ),
+ {
+ "type": "EX",
+ "account": self.savings.id,
+ "amount": "100",
+ "description": "Savings",
+ "start_date": recurring.start_date.isoformat(),
+ "recurrence_type": "month",
+ "recurrence_interval": "1",
+ "keep_at_most": "2",
+ },
+ HTTP_HX_REQUEST="true",
+ )
+
+ self.assertEqual(response.status_code, 204)
+ self.assertEqual(
+ set(recurring.transactions.values_list("account", flat=True)),
+ {self.savings.id},
+ )
+
def test_transfer_type_requires_other_account(self):
form = RecurringTransactionForm(
{
@@ -439,3 +621,62 @@ class TransferReviewFixTests(TransferTestBase):
partner.refresh_from_db()
self.assertIsNone(partner.linked_transaction)
+
+
+class BulkActionTests(TransferTestBase):
+ def _get(self, name, *ids, **kwargs):
+ query = "&".join(f"transactions={pk}" for pk in ids)
+ return self.client.get(
+ reverse(name, kwargs=kwargs) + f"?{query}", HTTP_HX_REQUEST="true"
+ )
+
+ def _expense(self, **fields):
+ return Transaction.objects.create(
+ account=self.checking,
+ type=Transaction.Type.EXPENSE,
+ amount=Decimal("10"),
+ date=date(2026, 3, 10),
+ description="Coffee",
+ **fields,
+ )
+
+ def test_change_month_updates_a_fully_selected_transfer_once_per_side(self):
+ from_t, to_t = self._transfer()
+ updated = []
+ receiver = lambda sender, **kwargs: updated.append(sender.pk) # noqa: E731
+ transaction_updated.connect(receiver, weak=False)
+ self.addCleanup(transaction_updated.disconnect, receiver)
+
+ response = self._get(
+ "transactions_bulk_change_month", from_t.id, to_t.id, change_type="next"
+ )
+
+ self.assertEqual(response.status_code, 204)
+ from_t.refresh_from_db()
+ to_t.refresh_from_db()
+ self.assertEqual(from_t.reference_date, date(2026, 4, 1))
+ self.assertEqual(to_t.reference_date, date(2026, 4, 1))
+ self.assertEqual(sorted(updated), sorted([from_t.pk, to_t.pk])) # once per side
+
+ def test_change_month_rejects_unknown_direction(self):
+ t = self._expense()
+ response = self._get("transactions_bulk_change_month", t.id, change_type="sideways")
+ self.assertEqual(response.status_code, 400)
+
+ def test_move_to_today(self):
+ t = self._expense()
+ self._get("transactions_bulk_move_to_today", t.id)
+ t.refresh_from_db()
+ self.assertEqual(t.date, timezone.localdate(timezone.now()))
+
+ def test_mute_skips_transactions_controlled_elsewhere(self):
+ muted_category = TransactionCategory.objects.create(name="Hidden", mute=True)
+ plain = self._expense()
+ by_category = self._expense(category=muted_category)
+
+ self._get("transactions_bulk_mute", plain.id, by_category.id)
+
+ plain.refresh_from_db()
+ by_category.refresh_from_db()
+ self.assertTrue(plain.mute)
+ self.assertFalse(by_category.mute)
diff --git a/app/apps/transactions/tests/test_views.py b/app/apps/transactions/tests/test_views.py
index 32481e8e..660111b5 100644
--- a/app/apps/transactions/tests/test_views.py
+++ b/app/apps/transactions/tests/test_views.py
@@ -312,6 +312,54 @@ class TransactionConvertViewTests(TestCase):
set(plan.transactions.values_list("amount", flat=True)), {70}
)
+ def test_transfer_form_prefills_side_from_type(self):
+ initial = self._get("transaction_convert_to_transfer").context["form"].initial
+ self.assertEqual(initial["from_account"], self.account.id)
+ self.assertEqual(initial["from_tags"], ["TestTag"])
+ self.assertNotIn("to_account", initial)
+
+ self.transaction.type = Transaction.Type.INCOME
+ self.transaction.save()
+ initial = self._get("transaction_convert_to_transfer").context["form"].initial
+ self.assertEqual(initial["to_account"], self.account.id)
+ self.assertNotIn("from_account", initial)
+ self.assertEqual(initial["from_amount"], 50)
+ self.assertNotIn("to_amount", initial)
+
+ def test_transfer_replaces_original_transaction(self):
+ other = Account.objects.create(name="Savings", currency=self.currency)
+ response = self._post(
+ "transaction_convert_to_transfer",
+ {
+ "from_account": self.account.id,
+ "to_account": other.id,
+ "from_amount": "50",
+ "date": "2030-01-15",
+ "is_paid": "on",
+ },
+ )
+ self.assertEqual(response.status_code, 204)
+ self.assertFalse(Transaction.objects.filter(id=self.transaction.id).exists())
+ self.assertEqual(
+ Transaction.objects.filter(linked_transaction__isnull=False).count(), 2
+ )
+ # A transfer can't be converted into one again
+ self.transaction = Transaction.objects.get(account=other)
+ self.assertEqual(self._get("transaction_convert_to_transfer").status_code, 404)
+
+ def test_invalid_transfer_keeps_original_transaction(self):
+ response = self._post(
+ "transaction_convert_to_transfer",
+ {
+ "from_account": self.account.id,
+ "to_account": self.account.id,
+ "from_amount": "50",
+ "date": "2030-01-15",
+ },
+ )
+ self.assertEqual(response.status_code, 200)
+ self.assertTrue(Transaction.objects.filter(id=self.transaction.id).exists())
+
def test_linked_transaction_cannot_be_converted_into_plan(self):
self._post(
"transaction_convert_to_installment_plan",
@@ -332,3 +380,63 @@ class TransactionConvertViewTests(TestCase):
self.assertEqual(
self._get("transaction_convert_to_installment_plan").status_code, 404
)
+
+
+@override_settings(
+ STORAGES={
+ "default": {"BACKEND": "django.core.files.storage.FileSystemStorage"},
+ "staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"},
+ },
+ WHITENOISE_AUTOREFRESH=True,
+)
+class InstallmentRecurringIsolationTests(TestCase):
+ """Per-object plan views must 404 for objects on another user's private account."""
+
+ def setUp(self):
+ User = get_user_model()
+ owner = User.objects.create_user(email="owner@test.com", password="pw")
+ User.objects.create_user(email="other@test.com", password="pw")
+ self.client.login(username="other@test.com", password="pw")
+
+ currency = Currency.objects.create(code="USD", name="US Dollar", decimal_places=2)
+ account = Account.all_objects.create(name="Private", currency=currency, owner=owner)
+ self.plan = InstallmentPlan.all_objects.create(
+ account=account,
+ type=Transaction.Type.EXPENSE,
+ description="Owner plan",
+ number_of_installments=3,
+ start_date=date(2025, 1, 1),
+ installment_amount=100,
+ )
+ self.recurring = RecurringTransaction.all_objects.create(
+ account=account,
+ type=Transaction.Type.EXPENSE,
+ amount=50,
+ description="Owner recurring",
+ start_date=date(2025, 1, 1),
+ recurrence_type=RecurringTransaction.RecurrenceType.MONTH,
+ recurrence_interval=1,
+ )
+
+ def test_other_user_gets_404(self):
+ cases = [
+ ("get", "installment_plan_transactions", "installment_plan_id", self.plan),
+ ("get", "installment_plan_edit", "installment_plan_id", self.plan),
+ ("get", "installment_plan_refresh", "installment_plan_id", self.plan),
+ ("delete", "installment_plan_delete", "installment_plan_id", self.plan),
+ ("get", "recurring_transaction_transactions", "recurring_transaction_id", self.recurring),
+ ("get", "recurring_transaction_edit", "recurring_transaction_id", self.recurring),
+ ("get", "recurring_transaction_toggle_pause", "recurring_transaction_id", self.recurring),
+ ("get", "recurring_transaction_finish", "recurring_transaction_id", self.recurring),
+ ("delete", "recurring_transaction_delete", "recurring_transaction_id", self.recurring),
+ ]
+ for method, name, kwarg, obj in cases:
+ with self.subTest(name=name):
+ url = reverse(name, kwargs={kwarg: obj.id})
+ response = getattr(self.client, method)(url, HTTP_HX_REQUEST="true")
+ self.assertEqual(response.status_code, 404)
+
+ self.assertTrue(InstallmentPlan.all_objects.filter(id=self.plan.id).exists())
+ self.recurring.refresh_from_db()
+ self.assertFalse(self.recurring.is_paused)
+ self.assertIsNone(self.recurring.end_date)
diff --git a/app/apps/transactions/urls.py b/app/apps/transactions/urls.py
index fa54b3a6..9f0d27e7 100644
--- a/app/apps/transactions/urls.py
+++ b/app/apps/transactions/urls.py
@@ -81,6 +81,21 @@ urlpatterns = [
views.bulk_clone_transactions,
name="transactions_bulk_clone",
),
+ path(
+ "transactions/actions/change-month//",
+ views.bulk_change_month,
+ name="transactions_bulk_change_month",
+ ),
+ path(
+ "transactions/actions/move-to-today/",
+ views.bulk_move_to_today,
+ name="transactions_bulk_move_to_today",
+ ),
+ path(
+ "transactions/actions/mute/",
+ views.bulk_mute,
+ name="transactions_bulk_mute",
+ ),
path(
"transaction//pay/",
views.transaction_pay,
@@ -417,4 +432,9 @@ urlpatterns = [
views.transaction_convert_to_installment_plan,
name="transaction_convert_to_installment_plan",
),
+ path(
+ "transaction//convert/transfer/",
+ views.transaction_convert_to_transfer,
+ name="transaction_convert_to_transfer",
+ ),
]
diff --git a/app/apps/transactions/views/actions.py b/app/apps/transactions/views/actions.py
index eec3af02..287e9ca8 100644
--- a/app/apps/transactions/views/actions.py
+++ b/app/apps/transactions/views/actions.py
@@ -1,10 +1,12 @@
import json
from copy import deepcopy
+from dateutil.relativedelta import relativedelta
from django.contrib import messages
from django.contrib.auth.decorators import login_required
from django.db.models import Q
from django.http import HttpResponse
+from django.utils import timezone
from django.utils.translation import gettext_lazy as _, ngettext_lazy
from apps.common.decorators.htmx import only_htmx
@@ -30,6 +32,7 @@ def _copy(transaction):
new_transaction.tags.add(*transaction.tags.all())
new_transaction.entities.add(*transaction.entities.all())
+ new_transaction.copy_sub_transactions_from(transaction)
return new_transaction
@@ -149,6 +152,80 @@ def bulk_undelete_transactions(request):
)
+def _bulk_update(request, transactions, change):
+ """Applies change to each selected transaction like its single action does.
+
+ A transfer moves as a pair through save(), so a selected partner is skipped.
+ """
+ done = set()
+ for transaction in transactions:
+ if transaction.linked_transaction_id in done:
+ continue
+ old_data = deepcopy(transaction)
+ change(transaction)
+ transaction.save()
+ transaction_updated.send(sender=transaction, old_data=old_data)
+ done.add(transaction.id)
+
+ count = len(done)
+ messages.success(
+ request,
+ ngettext_lazy(
+ "%(count)s transaction updated successfully",
+ "%(count)s transactions updated successfully",
+ count,
+ )
+ % {"count": count},
+ )
+ return HttpResponse(status=204, headers={"HX-Trigger": "updated"})
+
+
+@only_htmx
+@login_required
+def bulk_change_month(request, change_type):
+ months = {"previous": -1, "next": 1}.get(change_type)
+ if months is None:
+ return HttpResponse(status=400)
+
+ def change(transaction):
+ transaction.reference_date += relativedelta(months=months)
+
+ return _bulk_update(
+ request,
+ Transaction.objects.filter(id__in=request.GET.getlist("transactions")),
+ change,
+ )
+
+
+@only_htmx
+@login_required
+def bulk_move_to_today(request):
+ today = timezone.localdate(timezone.now())
+
+ def change(transaction):
+ transaction.date = today
+
+ return _bulk_update(
+ request,
+ Transaction.objects.filter(id__in=request.GET.getlist("transactions")),
+ change,
+ )
+
+
+@only_htmx
+@login_required
+def bulk_mute(request):
+ # Visibility controlled by the account or category can't be changed here.
+ transactions = Transaction.objects.filter(
+ id__in=request.GET.getlist("transactions"), mute=False
+ ).exclude(Q(account__untracked_by=request.user) | Q(category__mute=True))
+
+ def change(transaction):
+ transaction.mute = True
+
+ return _bulk_update(request, transactions, change)
+
+
@only_htmx
@login_required
def bulk_clone_transactions(request):
diff --git a/app/apps/transactions/views/conversions.py b/app/apps/transactions/views/conversions.py
index 89a37249..6a6b5911 100644
--- a/app/apps/transactions/views/conversions.py
+++ b/app/apps/transactions/views/conversions.py
@@ -12,6 +12,7 @@ from apps.transactions.forms import (
InstallmentPlanForm,
QuickTransactionForm,
RecurringTransactionForm,
+ TransferForm,
)
from apps.transactions.models import Transaction
@@ -36,6 +37,10 @@ def _initial_from_transaction(transaction: Transaction):
return initial
+def _sub_transactions_initial(transaction: Transaction):
+ return list(transaction.sub_transactions.values("name", "amount"))
+
+
def _get_unlinked_transaction(transaction_id):
# Transactions already generated by a plan or recurrence can't be converted again
return get_object_or_404(
@@ -77,6 +82,7 @@ def transaction_convert_to_quick_transaction(request, transaction_id):
)
else:
form = QuickTransactionForm(
+ sub_transactions_initial=_sub_transactions_initial(transaction),
initial={
**_initial_from_transaction(transaction),
"is_paid": transaction.is_paid,
@@ -113,6 +119,7 @@ def transaction_convert_to_recurring_transaction(request, transaction_id):
)
else:
form = RecurringTransactionForm(
+ sub_transactions_initial=_sub_transactions_initial(transaction),
initial={
**_initial_from_transaction(transaction),
"amount": transaction.amount,
@@ -153,6 +160,7 @@ def transaction_convert_to_installment_plan(request, transaction_id):
)
else:
form = InstallmentPlanForm(
+ sub_transactions_initial=_sub_transactions_initial(transaction),
initial={
**_initial_from_transaction(transaction),
"installment_amount": transaction.amount,
@@ -168,3 +176,54 @@ def transaction_convert_to_installment_plan(request, transaction_id):
transaction_id,
"transaction_convert_to_installment_plan",
)
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET", "POST"])
+def transaction_convert_to_transfer(request, transaction_id):
+ transaction = _get_unlinked_transaction(transaction_id)
+ if transaction.linked_transaction_id:
+ raise Http404() # Already a transfer
+
+ if request.method == "POST":
+ form = TransferForm(request.POST)
+ if form.is_valid():
+ with db_transaction.atomic():
+ form.save()
+ transaction.delete()
+ messages.success(request, _("Transaction converted into a transfer"))
+
+ return HttpResponse(
+ status=204,
+ headers={"HX-Trigger": "updated, hide_offcanvas"},
+ )
+ else:
+ # An expense leaves its account (the "from" side), an income enters it ("to")
+ side = "from" if transaction.type == Transaction.Type.EXPENSE else "to"
+ form = TransferForm(
+ initial={
+ f"{side}_account": transaction.account_id,
+ f"{side}_category": transaction.category_id,
+ f"{side}_tags": list(transaction.tags.values_list("name", flat=True)),
+ f"{side}_entities": list(
+ transaction.entities.values_list("name", flat=True)
+ ),
+ # To amount stays empty, so it follows from amount
+ "from_amount": transaction.amount,
+ "date": transaction.date,
+ "reference_date": transaction.reference_date,
+ "description": transaction.description,
+ "notes": transaction.notes,
+ "mute": transaction.mute,
+ "is_paid": transaction.is_paid,
+ }
+ )
+
+ return _render_convert_form(
+ request,
+ form,
+ _("Convert into transfer"),
+ transaction_id,
+ "transaction_convert_to_transfer",
+ )
diff --git a/app/apps/transactions/views/installment_plans.py b/app/apps/transactions/views/installment_plans.py
index f2927591..c89b9cd5 100644
--- a/app/apps/transactions/views/installment_plans.py
+++ b/app/apps/transactions/views/installment_plans.py
@@ -66,8 +66,8 @@ def finished_installment_plans_list(request):
@login_required
@require_http_methods(["GET"])
def installment_plan_transactions(request, installment_plan_id):
- installment_plan = get_object_or_404(InstallmentPlan, id=installment_plan_id)
- transactions = installment_plan.transactions.all().order_by("reference_date", "id")
+ installment_plan = get_object_or_404(InstallmentPlan.objects, id=installment_plan_id)
+ transactions = installment_plan.transactions.prefetch_related("sub_transactions").order_by("reference_date", "id")
return render(
request,
@@ -106,7 +106,7 @@ def installment_plan_add(request):
@login_required
@require_http_methods(["GET", "POST"])
def installment_plan_edit(request, installment_plan_id):
- installment_plan = get_object_or_404(InstallmentPlan, id=installment_plan_id)
+ installment_plan = get_object_or_404(InstallmentPlan.objects, id=installment_plan_id)
if request.method == "POST":
form = InstallmentPlanForm(request.POST, instance=installment_plan)
@@ -134,7 +134,7 @@ def installment_plan_edit(request, installment_plan_id):
@login_required
@require_http_methods(["GET"])
def installment_plan_refresh(request, installment_plan_id):
- installment_plan = get_object_or_404(InstallmentPlan, id=installment_plan_id)
+ installment_plan = get_object_or_404(InstallmentPlan.objects, id=installment_plan_id)
installment_plan.update_transactions()
messages.success(request, _("Installment Plan refreshed successfully"))
@@ -151,7 +151,7 @@ def installment_plan_refresh(request, installment_plan_id):
@login_required
@require_http_methods(["DELETE"])
def installment_plan_delete(request, installment_plan_id):
- installment_plan = get_object_or_404(InstallmentPlan, id=installment_plan_id)
+ installment_plan = get_object_or_404(InstallmentPlan.objects, id=installment_plan_id)
installment_plan.delete()
diff --git a/app/apps/transactions/views/quick_transactions.py b/app/apps/transactions/views/quick_transactions.py
index 0c60e438..59af0192 100644
--- a/app/apps/transactions/views/quick_transactions.py
+++ b/app/apps/transactions/views/quick_transactions.py
@@ -155,6 +155,7 @@ def quick_transaction_add_as_transaction(request, quick_transaction_id):
new_transaction.save()
new_transaction.tags.set(quick_transaction.tags.all())
new_transaction.entities.set(quick_transaction.entities.all())
+ new_transaction.copy_sub_transactions_from(quick_transaction)
to_transaction = quick_transaction.complete_transfer(new_transaction)
transaction_created.send(sender=new_transaction)
diff --git a/app/apps/transactions/views/recurring_transactions.py b/app/apps/transactions/views/recurring_transactions.py
index d12cfd9a..e41386e7 100644
--- a/app/apps/transactions/views/recurring_transactions.py
+++ b/app/apps/transactions/views/recurring_transactions.py
@@ -88,9 +88,9 @@ def finished_recurring_transactions_list(request):
@require_http_methods(["GET"])
def recurring_transaction_transactions(request, recurring_transaction_id):
recurring_transaction = get_object_or_404(
- RecurringTransaction, id=recurring_transaction_id
+ RecurringTransaction.objects, id=recurring_transaction_id
)
- transactions = recurring_transaction.transactions.collapse_transfers().order_by(
+ transactions = recurring_transaction.transactions.collapse_transfers().prefetch_related("sub_transactions").order_by(
"reference_date", "id"
)
@@ -132,7 +132,7 @@ def recurring_transaction_add(request):
@require_http_methods(["GET", "POST"])
def recurring_transaction_edit(request, recurring_transaction_id):
recurring_transaction = get_object_or_404(
- RecurringTransaction, id=recurring_transaction_id
+ RecurringTransaction.objects, id=recurring_transaction_id
)
if request.method == "POST":
@@ -162,7 +162,7 @@ def recurring_transaction_edit(request, recurring_transaction_id):
@require_http_methods(["GET"])
def recurring_transaction_toggle_pause(request, recurring_transaction_id):
recurring_transaction = get_object_or_404(
- RecurringTransaction, id=recurring_transaction_id
+ RecurringTransaction.objects, id=recurring_transaction_id
)
current_paused = recurring_transaction.is_paused
recurring_transaction.is_paused = not current_paused
@@ -201,7 +201,7 @@ def recurring_transaction_toggle_pause(request, recurring_transaction_id):
@require_http_methods(["GET"])
def recurring_transaction_finish(request, recurring_transaction_id):
recurring_transaction: RecurringTransaction = get_object_or_404(
- RecurringTransaction, id=recurring_transaction_id
+ RecurringTransaction.objects, id=recurring_transaction_id
)
today = timezone.localdate(timezone.now()) - relativedelta(days=1)
@@ -227,7 +227,7 @@ def recurring_transaction_finish(request, recurring_transaction_id):
@require_http_methods(["DELETE"])
def recurring_transaction_delete(request, recurring_transaction_id):
recurring_transaction = get_object_or_404(
- RecurringTransaction, id=recurring_transaction_id
+ RecurringTransaction.objects, id=recurring_transaction_id
)
recurring_transaction.delete()
diff --git a/app/apps/transactions/views/transactions.py b/app/apps/transactions/views/transactions.py
index 19abd33e..5a670304 100644
--- a/app/apps/transactions/views/transactions.py
+++ b/app/apps/transactions/views/transactions.py
@@ -409,6 +409,8 @@ def transactions_bulk_edit(request):
transaction.tags.set(value)
elif field_name == "entities":
transaction.entities.set(value)
+ elif field_name == "amount" and transaction.has_sub_transactions:
+ continue # its amount is the sum of its parts
else:
setattr(transaction, field_name, value)
@@ -821,6 +823,7 @@ def transaction_all_list(request):
"installment_plan",
"entities",
"dca_expense_entries",
+ "sub_transactions",
"dca_income_entries",
"linked_transaction__account__currency",
"linked_transaction__account__group",
@@ -990,6 +993,7 @@ def transactions_trash_can_list(request):
"installment_plan",
"entities",
"dca_expense_entries",
+ "sub_transactions",
"dca_income_entries",
"linked_transaction__account__currency",
"linked_transaction__account__group",
diff --git a/app/locale/de/LC_MESSAGES/django.po b/app/locale/de/LC_MESSAGES/django.po
index be2a17a7..86cac455 100644
--- 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: 2026-11-12 03:24+0000\n"
+"POT-Creation-Date: 2026-11-14 14:06+0000\n"
"PO-Revision-Date: 2026-08-10 12:57+0000\n"
"Last-Translator: GitEbu \n"
"Language-Team: German Public: Shown for all users. Only editable by the owner."
msgid ""
-"Private: Only shown for the owner and shared users. Only editable by the "
-"owner. Public: Shown for all users. Only editable by the owner."
+"Private: Only shown for the owner and shared users. Public: Shown for "
+"all users. Only the owner can edit, share or delete it."
msgstr ""
"Privat: Nur für den Besitzer und geteilte Nutzer sichtbar. Öffentlich: "
"Sichtbar für alle Nutzer. Nur bearbeitbar durch Besitzer."
-#: apps/common/forms.py:76 apps/users/forms.py:191
+#: apps/common/forms.py:78 apps/users/forms.py:191
#: templates/bank_sync/fragments/accounts.html:34
#: templates/transactions/fragments/filter_actions.html:5
msgid "Save"
msgstr "Speichern"
-#: apps/common/forms.py:90
+#: apps/common/forms.py:92
msgid "You cannot share this item with its owner."
msgstr "Sie können dieses Objekt nicht mit seinem Besitzer teilen."
@@ -843,6 +860,7 @@ msgid "Now"
msgstr "Jetzt"
#: apps/common/widgets/tom_select.py:14
+#: templates/transactions/widgets/sub_transaction_row.html:9
msgid "Remove"
msgstr "Löschen"
@@ -919,8 +937,8 @@ msgstr "Datum und Uhrzeit"
msgid "Auto"
msgstr "Automatisch"
-#: apps/currencies/models.py:91 apps/export_app/forms.py:67
-#: apps/export_app/forms.py:152 templates/exchange_rates/fragments/list.html:10
+#: apps/currencies/models.py:91 apps/export_app/forms.py:73
+#: apps/export_app/forms.py:161 templates/exchange_rates/fragments/list.html:10
#: templates/exchange_rates/pages/index.html:4
#: templates/includes/sidebar.html:204
msgid "Exchange Rates"
@@ -1083,25 +1101,25 @@ msgstr "Dienst erfolgreich in die Warteschlange eingereiht"
msgid "Create transaction"
msgstr "Erstelle Transaktion"
-#: apps/dca/forms.py:69 apps/transactions/forms.py:582
+#: apps/dca/forms.py:69 apps/transactions/forms.py:668
msgid "From Account"
msgstr "Startkonto"
-#: apps/dca/forms.py:75 apps/transactions/forms.py:587
+#: apps/dca/forms.py:75 apps/transactions/forms.py:673
msgid "To Account"
msgstr "Zielkonto"
#: apps/dca/forms.py:117 apps/dca/forms.py:125 apps/export_app/forms.py:49
-#: apps/export_app/forms.py:143 apps/insights/views.py:57
-#: apps/rules/forms.py:185 apps/rules/forms.py:195 apps/rules/models.py:46
-#: apps/rules/models.py:307 apps/transactions/filters.py:84
-#: apps/transactions/forms.py:78 apps/transactions/forms.py:346
-#: apps/transactions/forms.py:526 apps/transactions/forms.py:640
-#: apps/transactions/forms.py:647 apps/transactions/forms.py:862
-#: apps/transactions/forms.py:1114 apps/transactions/models.py:313
-#: apps/transactions/models.py:369 apps/transactions/models.py:770
-#: apps/transactions/models.py:1028 apps/transactions/models.py:1353
-#: templates/entities/fragments/list.html:9
+#: apps/export_app/forms.py:150 apps/insights/views.py:57
+#: apps/rules/forms.py:185 apps/rules/forms.py:196 apps/rules/models.py:47
+#: apps/rules/models.py:308 apps/transactions/filters.py:100
+#: apps/transactions/filters.py:175 apps/transactions/forms.py:161
+#: apps/transactions/forms.py:431 apps/transactions/forms.py:612
+#: apps/transactions/forms.py:726 apps/transactions/forms.py:733
+#: apps/transactions/forms.py:950 apps/transactions/forms.py:1204
+#: apps/transactions/models.py:315 apps/transactions/models.py:371
+#: apps/transactions/models.py:866 apps/transactions/models.py:1127
+#: apps/transactions/models.py:1500 templates/entities/fragments/list.html:9
#: templates/entities/pages/index.html:4 templates/includes/sidebar.html:168
#: templates/insights/fragments/month_by_month.html:40
#: templates/insights/fragments/month_by_month.html:43
@@ -1139,8 +1157,8 @@ msgstr "Beträge sind nun versteckt"
msgid "You must provide an account."
msgstr "Du musst ein Konto angeben."
-#: apps/dca/forms.py:322 apps/transactions/forms.py:780
-#: apps/transactions/models.py:978
+#: apps/dca/forms.py:322 apps/transactions/forms.py:866
+#: apps/transactions/models.py:1077
msgid "From and To accounts must be different."
msgstr "Start- und Zielkonten müssen unterschiedlich sein."
@@ -1158,10 +1176,10 @@ msgid "Payment Currency"
msgstr "Startwährung"
#: apps/dca/models.py:26 apps/dca/models.py:181 apps/rules/forms.py:180
-#: apps/rules/forms.py:196 apps/rules/models.py:43 apps/rules/models.py:295
-#: apps/transactions/forms.py:504 apps/transactions/forms.py:668
-#: apps/transactions/models.py:354 apps/transactions/models.py:774
-#: apps/transactions/models.py:1031 apps/transactions/models.py:1338
+#: apps/rules/forms.py:197 apps/rules/models.py:44 apps/rules/models.py:296
+#: apps/transactions/forms.py:590 apps/transactions/forms.py:754
+#: apps/transactions/models.py:356 apps/transactions/models.py:870
+#: apps/transactions/models.py:1130 apps/transactions/models.py:1485
msgid "Notes"
msgstr "Notizen"
@@ -1169,7 +1187,7 @@ msgstr "Notizen"
msgid "DCA Strategy"
msgstr "DCA-Strategie"
-#: apps/dca/models.py:35 apps/export_app/forms.py:166
+#: apps/dca/models.py:35 apps/export_app/forms.py:175
msgid "DCA Strategies"
msgstr "DCA-Strategien"
@@ -1189,7 +1207,7 @@ msgstr "Betrag Erhalten"
msgid "DCA Entry"
msgstr "DCA-Eintrag"
-#: apps/dca/models.py:187 apps/export_app/forms.py:167
+#: apps/dca/models.py:187 apps/export_app/forms.py:176
msgid "DCA Entries"
msgstr "DCA-Einträge"
@@ -1217,14 +1235,14 @@ msgstr "Eintrag erfolgreich aktualisiert"
msgid "Entry deleted successfully"
msgstr "Eintrag erfolgreich gelöscht"
-#: apps/export_app/forms.py:13 apps/export_app/forms.py:137
+#: apps/export_app/forms.py:13 apps/export_app/forms.py:144
#: templates/includes/sidebar.html:247 templates/users/fragments/list.html:10
#: templates/users/pages/index.html:4
msgid "Users"
msgstr "Nutzer"
-#: apps/export_app/forms.py:31 apps/export_app/forms.py:144
-#: apps/transactions/models.py:423 templates/includes/sidebar.html:81
+#: apps/export_app/forms.py:31 apps/export_app/forms.py:151
+#: apps/transactions/models.py:425 templates/includes/sidebar.html:81
#: templates/includes/sidebar.html:154
#: templates/recurring_transactions/fragments/list_transactions.html:5
#: templates/recurring_transactions/fragments/table.html:37
@@ -1232,9 +1250,9 @@ msgstr "Nutzer"
msgid "Transactions"
msgstr "Transaktionen"
-#: apps/export_app/forms.py:37 apps/export_app/forms.py:141
-#: apps/insights/views.py:43 apps/transactions/filters.py:74
-#: templates/categories/fragments/list.html:9
+#: apps/export_app/forms.py:37 apps/export_app/forms.py:148
+#: apps/insights/views.py:43 apps/transactions/filters.py:90
+#: apps/transactions/filters.py:165 templates/categories/fragments/list.html:9
#: templates/categories/pages/index.html:4 templates/includes/sidebar.html:156
#: templates/insights/fragments/month_by_month.html:18
#: templates/insights/fragments/month_by_month.html:21
@@ -1243,102 +1261,117 @@ msgstr "Transaktionen"
msgid "Categories"
msgstr "Kategorien"
-#: apps/export_app/forms.py:55 apps/export_app/forms.py:147
-#: apps/transactions/models.py:1068 templates/includes/sidebar.html:110
+#: apps/export_app/forms.py:55 apps/export_app/forms.py:155
+#: apps/transactions/models.py:1167 templates/includes/sidebar.html:110
#: templates/recurring_transactions/fragments/list.html:9
#: templates/recurring_transactions/pages/index.html:4
msgid "Recurring Transactions"
msgstr "Wiederkehrende Transaktionen"
-#: apps/export_app/forms.py:61 apps/export_app/forms.py:145
-#: apps/transactions/models.py:788 templates/includes/sidebar.html:104
+#: apps/export_app/forms.py:61 apps/export_app/forms.py:153
+#: apps/transactions/models.py:884 templates/includes/sidebar.html:104
#: templates/installment_plans/fragments/list.html:9
#: templates/installment_plans/pages/index.html:4
msgid "Installment Plans"
msgstr "Ratenzahlungs-Pläne"
-#: apps/export_app/forms.py:73 apps/export_app/forms.py:150
+#: apps/export_app/forms.py:67 apps/export_app/forms.py:157
+#: apps/transactions/models.py:1518 templates/includes/sidebar.html:98
+#: templates/quick_transactions/pages/index.html:5
+#: templates/quick_transactions/pages/index.html:15
+msgid "Quick Transactions"
+msgstr "Schnelle Transaktionen"
+
+#: apps/export_app/forms.py:79 apps/export_app/forms.py:159
#: templates/exchange_rates_services/fragments/list.html:10
#: templates/exchange_rates_services/pages/index.html:4
#: templates/includes/sidebar.html:232
msgid "Automatic Exchange Rates"
msgstr "Automatische Umrechnungskurse"
-#: apps/export_app/forms.py:79 templates/bank_sync/fragments/list.html:8
+#: apps/export_app/forms.py:85 templates/bank_sync/fragments/list.html:8
#: templates/bank_sync/pages/index.html:4 templates/includes/sidebar.html:238
msgid "Bank Sync"
msgstr ""
-#: apps/export_app/forms.py:80
+#: apps/export_app/forms.py:86
msgid "Includes the providers' API keys"
msgstr ""
-#: apps/export_app/forms.py:86 templates/includes/sidebar.html:212
+#: apps/export_app/forms.py:92 templates/includes/sidebar.html:212
#: templates/rules/fragments/list.html:9 templates/rules/pages/index.html:4
msgid "Rules"
msgstr "Regeln"
-#: apps/export_app/forms.py:92 templates/cotton/transaction/item.html:66
+#: apps/export_app/forms.py:98 templates/cotton/transaction/item.html:68
msgid "DCA"
msgstr "DCA"
-#: apps/export_app/forms.py:98 apps/export_app/forms.py:168
+#: apps/export_app/forms.py:104 apps/export_app/forms.py:177
#: templates/import_app/fragments/profiles/list.html:21
#: templates/import_app/pages/profiles_index.html:4
msgid "Import Profiles"
msgstr "Import-Profile"
-#: apps/export_app/forms.py:126 templates/export_app/fragments/export.html:5
+#: apps/export_app/forms.py:133 templates/export_app/fragments/export.html:5
#: templates/export_app/pages/index.html:13
msgid "Export"
msgstr "Export"
-#: apps/export_app/forms.py:134
+#: apps/export_app/forms.py:141
msgid "Import a ZIP file exported from WYGIWYH"
msgstr "Eine ZIP-Datei importieren, die von WYGIWYH exportiert wurde"
-#: apps/export_app/forms.py:135
+#: apps/export_app/forms.py:142
msgid "ZIP File"
msgstr "ZIP-Datei"
-#: apps/export_app/forms.py:157
+#: apps/export_app/forms.py:152 apps/rules/forms.py:193 apps/rules/models.py:42
+#: apps/rules/models.py:320 apps/transactions/models.py:736
+#: templates/transactions/widgets/sub_transactions.html:39
+#, fuzzy
+#| msgid "transactions"
+msgid "Sub-transactions"
+msgstr "Transaktionen"
+
+#: apps/export_app/forms.py:166
#, fuzzy
#| msgid "By account"
msgid "Bank Sync Accounts"
msgstr "Nach Konto"
-#: apps/export_app/forms.py:159 apps/rules/models.py:27
+#: apps/export_app/forms.py:168 apps/rules/models.py:27
msgid "Transaction rules"
msgstr "Transaktions-Regeln"
-#: apps/export_app/forms.py:161 apps/rules/models.py:68
+#: apps/export_app/forms.py:170 apps/rules/models.py:69
msgid "Edit transaction action"
msgstr "Aktion der Transaktions-Regel bearbeiten"
-#: apps/export_app/forms.py:164 apps/rules/models.py:327
+#: apps/export_app/forms.py:173 apps/rules/models.py:332
msgid "Update or create transaction actions"
msgstr "Aktualisierung oder Erstellung von Transaktions-Aktionen"
-#: apps/export_app/forms.py:199 templates/cotton/transaction/item.html:310
+#: apps/export_app/forms.py:210 templates/cotton/transaction/item.html:327
#: templates/cotton/ui/deleted_transactions_action_bar.html:53
#: templates/export_app/fragments/restore.html:5
#: templates/export_app/pages/index.html:19
msgid "Restore"
msgstr "Wiederherstellen"
-#: apps/export_app/forms.py:209
+#: apps/export_app/forms.py:220
msgid "Please upload either a ZIP file or at least one CSV file"
msgstr "Bitte eine ZIP-Datei oder zumindest eine CSV-Datei hochladen"
-#: apps/export_app/views.py:190
+#: apps/export_app/views.py:216
msgid "You have to select at least one export"
msgstr "Du musst mindestens einen Export auswählen"
-#: apps/export_app/views.py:210
+#: apps/export_app/views.py:236
msgid "Data restored successfully"
msgstr "Daten erfolgreich wiederhergestellt"
-#: apps/export_app/views.py:222
+#: apps/export_app/views.py:248
msgid ""
"There was an error restoring your data. Check the logs for more details."
msgstr ""
@@ -1427,7 +1460,7 @@ msgstr "Vorgang erfolgreich gelöscht"
#: apps/insights/forms.py:118 apps/insights/utils/sankey.py:36
#: apps/insights/utils/sankey.py:167 apps/insights/views.py:45
-#: apps/transactions/filters.py:209
+#: apps/transactions/filters.py:294
#: templates/insights/fragments/month_by_month.html:119
#: templates/insights/fragments/year_by_year.html:73
msgid "Uncategorized"
@@ -1486,24 +1519,24 @@ msgstr "Keine Kategorien"
msgid "Tag"
msgstr "Tags"
-#: apps/insights/views.py:52 apps/transactions/filters.py:215
+#: apps/insights/views.py:52 apps/transactions/filters.py:303
#: templates/insights/fragments/month_by_month.html:121
#: templates/insights/fragments/year_by_year.html:75
msgid "Untagged"
msgstr "Unmarkiert"
-#: apps/insights/views.py:53 apps/transactions/models.py:611
+#: apps/insights/views.py:53 apps/transactions/models.py:632
#: templates/tags/fragments/table.html:69
msgid "No tags"
msgstr "Keine Tags"
-#: apps/insights/views.py:58 apps/transactions/models.py:312
+#: apps/insights/views.py:58 apps/transactions/models.py:314
#: templates/insights/fragments/month_by_month.html:88
#: templates/insights/fragments/year_by_year.html:56
msgid "Entity"
msgstr "Entität"
-#: apps/insights/views.py:59 apps/transactions/filters.py:222
+#: apps/insights/views.py:59 apps/transactions/filters.py:311
#: templates/insights/fragments/month_by_month.html:123
#: templates/insights/fragments/year_by_year.html:77
msgid "No entity"
@@ -1521,19 +1554,19 @@ msgstr ""
msgid "Unclassified"
msgstr ""
-#: apps/investments/views.py:289
+#: apps/investments/views.py:290
#, fuzzy
#| msgid "Installment Plan added successfully"
msgid "Asset class added successfully"
msgstr "Ratenzahlungs-Plan erfolgreich hinzugefügt"
-#: apps/investments/views.py:297
+#: apps/investments/views.py:298
#, fuzzy
#| msgid "Tag updated successfully"
msgid "Asset class updated successfully"
msgstr "Tag erfolgreich aktualisiert"
-#: apps/investments/views.py:318
+#: apps/investments/views.py:319
#, fuzzy
#| msgid "Tag deleted successfully"
msgid "Asset class deleted successfully"
@@ -1568,13 +1601,13 @@ msgstr "Transaktionen zur Regeln kannst du im nächsten Fenster eingeben."
msgid "Set field"
msgstr "Setze Feld"
-#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:123
+#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:101
msgid "To"
msgstr "Zu"
#: apps/rules/forms.py:78 apps/rules/forms.py:158 apps/rules/models.py:20
-#: apps/rules/models.py:62 apps/rules/models.py:323
+#: apps/rules/models.py:63 apps/rules/models.py:328
#: templates/rules/fragments/list.html:23
msgid "Order"
msgstr "Sortieren nach"
@@ -1592,36 +1625,37 @@ msgid "Operator"
msgstr "Bediener"
#: apps/rules/forms.py:174 apps/rules/forms.py:188 apps/rules/models.py:36
-#: apps/rules/models.py:271 apps/transactions/forms.py:468
-#: apps/transactions/models.py:337 apps/transactions/models.py:730
-#: apps/transactions/models.py:1009 apps/transactions/models.py:1323
+#: apps/rules/models.py:272 apps/transactions/forms.py:554
+#: apps/transactions/models.py:339 apps/transactions/models.py:826
+#: apps/transactions/models.py:1108 apps/transactions/models.py:1470
#: templates/mini_tools/simulator.html:63
msgid "Type"
msgstr "Typ"
#: apps/rules/forms.py:175 apps/rules/forms.py:189 apps/rules/models.py:37
-#: apps/rules/models.py:275 apps/transactions/filters.py:22
-#: apps/transactions/forms.py:472 apps/transactions/forms.py:650
-#: apps/transactions/models.py:339 apps/transactions/models.py:1325
-#: templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/rules/models.py:276 apps/transactions/filters.py:23
+#: apps/transactions/forms.py:558 apps/transactions/forms.py:736
+#: apps/transactions/models.py:341 apps/transactions/models.py:1472
+#: templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/transactions/widgets/paid_toggle_button.html:10
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:13
msgid "Paid"
msgstr "Bezahlt"
#: apps/rules/forms.py:177 apps/rules/forms.py:191 apps/rules/models.py:39
-#: apps/rules/models.py:283 apps/transactions/forms.py:90
-#: apps/transactions/forms.py:488 apps/transactions/forms.py:655
-#: apps/transactions/forms.py:868 apps/transactions/models.py:341
-#: apps/transactions/models.py:748 apps/transactions/models.py:1033
+#: apps/rules/models.py:284 apps/transactions/forms.py:173
+#: apps/transactions/forms.py:574 apps/transactions/forms.py:741
+#: apps/transactions/forms.py:956 apps/transactions/models.py:343
+#: apps/transactions/models.py:844 apps/transactions/models.py:1132
msgid "Reference Date"
msgstr "Referenzdatum"
#: apps/rules/forms.py:178 apps/rules/forms.py:192 apps/rules/models.py:41
-#: apps/rules/models.py:287 apps/transactions/forms.py:495
-#: apps/transactions/models.py:347 apps/transactions/models.py:1014
-#: apps/transactions/models.py:1331
+#: apps/rules/models.py:288 apps/transactions/forms.py:75
+#: apps/transactions/forms.py:581 apps/transactions/models.py:349
+#: apps/transactions/models.py:730 apps/transactions/models.py:1113
+#: apps/transactions/models.py:1478
#: templates/insights/fragments/sankey.html:102
#: templates/installment_plans/fragments/table.html:18
#: templates/mini_tools/simulator.html:70
@@ -1630,47 +1664,48 @@ msgstr "Referenzdatum"
msgid "Amount"
msgstr "Betrag"
-#: apps/rules/forms.py:179 apps/rules/forms.py:193 apps/rules/models.py:14
-#: apps/rules/models.py:42 apps/rules/models.py:291
-#: apps/transactions/forms.py:499 apps/transactions/forms.py:659
-#: apps/transactions/models.py:352 apps/transactions/models.py:732
-#: apps/transactions/models.py:1017 apps/transactions/models.py:1336
+#: apps/rules/forms.py:179 apps/rules/forms.py:194 apps/rules/models.py:14
+#: apps/rules/models.py:43 apps/rules/models.py:292
+#: apps/transactions/forms.py:585 apps/transactions/forms.py:745
+#: apps/transactions/models.py:354 apps/transactions/models.py:828
+#: apps/transactions/models.py:1116 apps/transactions/models.py:1483
msgid "Description"
msgstr "Beschreibung"
-#: apps/rules/forms.py:182 apps/rules/forms.py:198 apps/rules/models.py:47
-#: apps/rules/models.py:299 apps/transactions/models.py:399
-#: apps/transactions/models.py:1358
+#: apps/rules/forms.py:182 apps/rules/forms.py:199 apps/rules/models.py:48
+#: apps/rules/models.py:300 apps/transactions/models.py:401
+#: apps/transactions/models.py:1505
msgid "Internal Note"
msgstr "Interne Notiz"
-#: apps/rules/forms.py:183 apps/rules/forms.py:199 apps/rules/models.py:48
-#: apps/rules/models.py:303 apps/transactions/models.py:401
-#: apps/transactions/models.py:1360
+#: apps/rules/forms.py:183 apps/rules/forms.py:200 apps/rules/models.py:49
+#: apps/rules/models.py:304 apps/transactions/models.py:403
+#: apps/transactions/models.py:1507
msgid "Internal ID"
msgstr "Interne ID"
-#: apps/rules/forms.py:186 apps/rules/forms.py:200 apps/rules/models.py:40
-#: apps/rules/models.py:319 apps/transactions/forms.py:672
-#: apps/transactions/models.py:251 apps/transactions/models.py:342
-#: apps/transactions/models.py:1326
+#: apps/rules/forms.py:186 apps/rules/forms.py:201 apps/rules/models.py:40
+#: apps/rules/models.py:324 apps/transactions/forms.py:758
+#: apps/transactions/models.py:253 apps/transactions/models.py:344
+#: apps/transactions/models.py:1473
msgid "Mute"
msgstr "Stummschalten"
-#: apps/rules/forms.py:215
+#: apps/rules/forms.py:216
msgid "Search Criteria"
msgstr "Suchkriterien"
-#: apps/rules/forms.py:360
+#: apps/rules/forms.py:361
msgid "Set Values"
msgstr "Wert setzen"
-#: apps/rules/forms.py:407 apps/rules/forms.py:442 apps/rules/forms.py:477
-#: apps/transactions/models.py:422 apps/transactions/models.py:667
+#: apps/rules/forms.py:409 apps/rules/forms.py:444 apps/rules/forms.py:479
+#: apps/transactions/models.py:424 apps/transactions/models.py:703
+#: apps/transactions/models.py:763
msgid "Transaction"
msgstr "Transaktion"
-#: apps/rules/forms.py:411 apps/rules/forms.py:446 apps/rules/forms.py:481
+#: apps/rules/forms.py:413 apps/rules/forms.py:448 apps/rules/forms.py:483
#, fuzzy
#| msgid "Type to search for a transaction to link to this entry"
msgid "Type to search for a transaction"
@@ -1678,7 +1713,7 @@ msgstr ""
"Tippen, um nach einer Transaktion zu suchen, die mit diesem Eintrag "
"verknüpft werden soll"
-#: apps/rules/forms.py:422 apps/rules/forms.py:457 apps/rules/forms.py:491
+#: apps/rules/forms.py:424 apps/rules/forms.py:459 apps/rules/forms.py:493
#: templates/rules/fragments/transaction_rule/dry_run/created.html:5
#: templates/rules/fragments/transaction_rule/dry_run/deleted.html:5
#: templates/rules/fragments/transaction_rule/dry_run/updated.html:5
@@ -1698,15 +1733,15 @@ msgstr "Regelmäßig"
msgid "Transaction rule"
msgstr "Transaktions-Regel"
-#: apps/rules/models.py:54 apps/rules/models.py:98
+#: apps/rules/models.py:55 apps/rules/models.py:99
msgid "Rule"
msgstr "Regel"
-#: apps/rules/models.py:59
+#: apps/rules/models.py:60
msgid "Field"
msgstr "Feld"
-#: apps/rules/models.py:61 templates/investments/fragments/charts.html:86
+#: apps/rules/models.py:62 templates/investments/fragments/charts.html:86
#: templates/investments/fragments/detail.html:68
#: templates/investments/fragments/detail.html:127
#: templates/investments/fragments/detail.html:245
@@ -1714,51 +1749,51 @@ msgstr "Feld"
msgid "Value"
msgstr "Wert"
-#: apps/rules/models.py:69
+#: apps/rules/models.py:70
msgid "Edit transaction actions"
msgstr "Transaktions-Aktion bearbeiten"
-#: apps/rules/models.py:84
+#: apps/rules/models.py:85
msgid "is exactly"
msgstr "ist exakt"
-#: apps/rules/models.py:85
+#: apps/rules/models.py:86
msgid "contains"
msgstr "enthält"
-#: apps/rules/models.py:86
+#: apps/rules/models.py:87
msgid "starts with"
msgstr "beginnt mit"
-#: apps/rules/models.py:87
+#: apps/rules/models.py:88
msgid "ends with"
msgstr "endet mit"
-#: apps/rules/models.py:88
+#: apps/rules/models.py:89
msgid "equals"
msgstr "gleich"
-#: apps/rules/models.py:89
+#: apps/rules/models.py:90
msgid "greater than"
msgstr "größer als"
-#: apps/rules/models.py:90
+#: apps/rules/models.py:91
msgid "less than"
msgstr "kleiner als"
-#: apps/rules/models.py:91
+#: apps/rules/models.py:92
msgid "greater than or equal"
msgstr "größer als oder gleich"
-#: apps/rules/models.py:92
+#: apps/rules/models.py:93
msgid "less than or equal"
msgstr "kleiner als oder gleich"
-#: apps/rules/models.py:102
+#: apps/rules/models.py:103
msgid "Filter"
msgstr "Filter"
-#: apps/rules/models.py:105
+#: apps/rules/models.py:106
msgid ""
"Generic expression to enable or disable execution. Should evaluate to True "
"or False"
@@ -1766,7 +1801,7 @@ msgstr ""
"Allgemeiner Ausdruck um die Ausführung zu aktivieren oder zu deaktivieren. "
"Sollte zu Wahr oder Falsch ausgewertet werden"
-#: apps/rules/models.py:326
+#: apps/rules/models.py:331
msgid "Update or create transaction action"
msgstr "Transaktions-Aktion aktualisieren oder erstellen"
@@ -1815,8 +1850,8 @@ msgid "Update or Create Transaction action deleted successfully"
msgstr ""
"\"Transaktions-Aktualisierung oder -Erstellung\"-Aktion erfolgreich gelöscht"
-#: apps/transactions/filters.py:23 templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/transactions/filters.py:24 templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/insights/fragments/overview/index.html:68
#: templates/net_worth/net_worth.html:39 templates/net_worth/net_worth.html:43
#: templates/transactions/widgets/paid_toggle_button.html:7
@@ -1824,137 +1859,147 @@ msgstr ""
msgid "Projected"
msgstr "Erwartet"
-#: apps/transactions/filters.py:28 templates/categories/fragments/table.html:18
+#: apps/transactions/filters.py:29 templates/categories/fragments/table.html:18
msgid "Muted"
msgstr "Ausgeblendet"
-#: apps/transactions/filters.py:51
+#: apps/transactions/filters.py:67 apps/transactions/filters.py:144
msgid "Content"
msgstr "Inhalt"
-#: apps/transactions/filters.py:57
+#: apps/transactions/filters.py:73
msgid "Transaction Type"
msgstr "Transaktionstyp"
-#: apps/transactions/filters.py:95
+#: apps/transactions/filters.py:111
msgid "Mute Status"
msgstr "Stummschalten"
-#: apps/transactions/filters.py:100
+#: apps/transactions/filters.py:116
msgid "Date from"
msgstr "Datum von"
-#: apps/transactions/filters.py:105 apps/transactions/filters.py:115
+#: apps/transactions/filters.py:121 apps/transactions/filters.py:131
msgid "Until"
msgstr "Bis"
-#: apps/transactions/filters.py:110
+#: apps/transactions/filters.py:126
msgid "Reference date from"
msgstr "Referenzdatum von"
-#: apps/transactions/filters.py:120
+#: apps/transactions/filters.py:136
msgid "Amount min"
msgstr "Betrag Minimum"
-#: apps/transactions/filters.py:125
+#: apps/transactions/filters.py:141
msgid "Amount max"
msgstr "Betrag Maximum"
-#: apps/transactions/filters.py:208
+#: apps/transactions/filters.py:240
+msgid "Include"
+msgstr ""
+
+#: apps/transactions/filters.py:245
+msgid "Exclude"
+msgstr ""
+
+#: apps/transactions/filters.py:293
msgid "Categorized"
msgstr "Kategorisiert"
-#: apps/transactions/filters.py:215
+#: apps/transactions/filters.py:303
msgid "Tagged"
msgstr "Markiert"
-#: apps/transactions/filters.py:221
+#: apps/transactions/filters.py:310
msgid "Any entity"
msgstr "Jegliche Entität"
-#: apps/transactions/forms.py:192
+#: apps/transactions/forms.py:277
msgid "More"
msgstr "Mehr"
-#: apps/transactions/forms.py:229
+#: apps/transactions/forms.py:314
msgid "Save and add similar"
msgstr "Speichern und ähnliches hinzufügen"
-#: apps/transactions/forms.py:234
+#: apps/transactions/forms.py:319
msgid "Save and add another"
msgstr "Speichern und etwas neu hinzufügen"
-#: apps/transactions/forms.py:271 templates/cotton/transaction/item.html:184
+#: apps/transactions/forms.py:356 templates/cotton/transaction/item.html:186
#: templates/transactions/fragments/attachments.html:4
#, fuzzy
#| msgid "Installments"
msgid "Attachments"
msgstr "Ratenzahlungen"
-#: apps/transactions/forms.py:272
+#: apps/transactions/forms.py:357
msgid ""
"Files are private and only visible to users with access to this transaction."
msgstr ""
-#: apps/transactions/forms.py:283
+#: apps/transactions/forms.py:368
msgid "Upload"
msgstr ""
-#: apps/transactions/forms.py:355 apps/transactions/forms.py:1120
-#: apps/transactions/models.py:947
+#: apps/transactions/forms.py:440 apps/transactions/forms.py:1210
+#: apps/transactions/models.py:1046
#, fuzzy
#| msgid "To Account"
msgid "To account"
msgstr "Zielkonto"
-#: apps/transactions/forms.py:382 apps/transactions/forms.py:675
+#: apps/transactions/forms.py:467 apps/transactions/forms.py:761
msgid "Muted transactions won't be displayed on monthly summaries"
msgstr ""
"Stummgeschaltete Transaktionen werden nicht in der monatlichen Übersicht "
"berücksichtigt"
-#: apps/transactions/forms.py:594
+#: apps/transactions/forms.py:680
msgid "From Amount"
msgstr "Startbetrag"
-#: apps/transactions/forms.py:599
+#: apps/transactions/forms.py:685
msgid "To Amount"
msgstr "Zielbetrag"
-#: apps/transactions/forms.py:741 apps/transactions/models.py:992
-#: apps/transactions/models.py:1303 templates/cotton/transaction/item.html:52
-#: templates/cotton/transaction/item.html:60
+#: apps/transactions/forms.py:827 apps/transactions/models.py:1091
+#: apps/transactions/models.py:1450 templates/cotton/transaction/item.html:54
+#: templates/cotton/transaction/item.html:62
+#: templates/cotton/transaction/item.html:272
+#: templates/cotton/transaction/item.html:304
#: templates/cotton/ui/quick_transactions_buttons.html:40
#: templates/cotton/ui/transactions_fab.html:44
msgid "Transfer"
msgstr "Transfer"
-#: apps/transactions/forms.py:1005
+#: apps/transactions/forms.py:1095
msgid "Tag name"
msgstr "Tagname"
-#: apps/transactions/forms.py:1033
+#: apps/transactions/forms.py:1123
msgid "Entity name"
msgstr "Entitätsname"
-#: apps/transactions/forms.py:1061
+#: apps/transactions/forms.py:1151
msgid "Category name"
msgstr "Kategoriename"
-#: apps/transactions/forms.py:1063
+#: apps/transactions/forms.py:1153
msgid "Muted categories won't be displayed on monthly summaries"
msgstr ""
"Ausgeblendete Kategorien werden nicht bei deiner Monatsübersicht angezeigt"
-#: apps/transactions/forms.py:1228
+#: apps/transactions/forms.py:1319
msgid "future transactions"
msgstr "künftige Transaktionen"
-#: apps/transactions/forms.py:1255
+#: apps/transactions/forms.py:1346
msgid "End date should be after the start date"
msgstr "Enddatum sollte hinter dem Startdatum liegen"
-#: apps/transactions/models.py:256
+#: apps/transactions/models.py:258
msgid ""
"Deactivated categories won't be able to be selected when creating new "
"transactions"
@@ -1962,26 +2007,26 @@ msgstr ""
"Ausgeblendete Kategorien können bei der Erstellung neuer Transaktionen nicht "
"ausgewählt werden"
-#: apps/transactions/models.py:264
+#: apps/transactions/models.py:266
msgid "Transaction Category"
msgstr "Transaktionskategorie"
-#: apps/transactions/models.py:265
+#: apps/transactions/models.py:267
msgid "Transaction Categories"
msgstr "Transaktionskategorien"
-#: apps/transactions/models.py:280
+#: apps/transactions/models.py:282
msgid ""
"Deactivated tags won't be able to be selected when creating new transactions"
msgstr ""
"Deaktivierte Tags können bei der Erstellung neuer Transaktionen nicht "
"ausgewählt werden"
-#: apps/transactions/models.py:288 apps/transactions/models.py:289
+#: apps/transactions/models.py:290 apps/transactions/models.py:291
msgid "Transaction Tags"
msgstr "Tranksaktionstags"
-#: apps/transactions/models.py:304
+#: apps/transactions/models.py:306
msgid ""
"Deactivated entities won't be able to be selected when creating new "
"transactions"
@@ -1989,8 +2034,8 @@ msgstr ""
"Deaktivierte Entitäten können bei der Erstellung neuer Transaktionen nicht "
"ausgewählt werden"
-#: apps/transactions/models.py:324 apps/transactions/models.py:991
-#: apps/transactions/models.py:1302
+#: apps/transactions/models.py:326 apps/transactions/models.py:1090
+#: apps/transactions/models.py:1449
#: templates/calendar_view/fragments/list.html:42
#: templates/calendar_view/fragments/list.html:44
#: templates/calendar_view/fragments/list.html:52
@@ -2002,14 +2047,14 @@ msgstr ""
#: templates/investments/fragments/detail.html:71
#: templates/investments/fragments/detail.html:175
#: templates/investments/fragments/detail.html:227
-#: templates/investments/fragments/detail.html:318
+#: templates/investments/fragments/detail.html:326
#: templates/mini_tools/simulator.html:66
#: templates/monthly_overview/fragments/monthly_summary.html:42
msgid "Income"
msgstr "Einnahme"
-#: apps/transactions/models.py:325 apps/transactions/models.py:993
-#: apps/transactions/models.py:1304
+#: apps/transactions/models.py:327 apps/transactions/models.py:1092
+#: apps/transactions/models.py:1451
#: templates/calendar_view/fragments/list.html:46
#: templates/calendar_view/fragments/list.html:48
#: templates/calendar_view/fragments/list.html:56
@@ -2021,205 +2066,205 @@ msgstr "Einnahme"
msgid "Expense"
msgstr "Ausgabe"
-#: apps/transactions/models.py:380 apps/transactions/models.py:787
-#: templates/cotton/transaction/item.html:260
-#: templates/cotton/transaction/item.html:277
-#: templates/cotton/transaction/item.html:287
+#: apps/transactions/models.py:382 apps/transactions/models.py:883
+#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:289
+#: templates/cotton/transaction/item.html:299
msgid "Installment Plan"
msgstr "Ratenzahlungs-Plan"
-#: apps/transactions/models.py:389 apps/transactions/models.py:1067
-#: templates/cotton/transaction/item.html:250
-#: templates/cotton/transaction/item.html:270
+#: apps/transactions/models.py:391 apps/transactions/models.py:1166
+#: templates/cotton/transaction/item.html:252
+#: templates/cotton/transaction/item.html:282
msgid "Recurring Transaction"
msgstr "Wiederkehrende Transaktion"
-#: apps/transactions/models.py:397
+#: apps/transactions/models.py:399
#, fuzzy
#| msgid "Link transaction"
msgid "Linked Transaction"
msgstr "Verknüpfe Transaktion"
-#: apps/transactions/models.py:405
+#: apps/transactions/models.py:407
msgid "Deleted"
msgstr "Gelöscht"
-#: apps/transactions/models.py:410
+#: apps/transactions/models.py:412
msgid "Deleted At"
msgstr "Gelöscht am"
-#: apps/transactions/models.py:518
+#: apps/transactions/models.py:521
msgid "A transfer needs one expense and one income."
msgstr ""
-#: apps/transactions/models.py:520
+#: apps/transactions/models.py:523
msgid "A transfer needs two different accounts."
msgstr ""
-#: apps/transactions/models.py:524
+#: apps/transactions/models.py:527
msgid "This transaction is already part of another transfer."
msgstr ""
-#: apps/transactions/models.py:613
+#: apps/transactions/models.py:634
msgid "No category"
msgstr "Keine Kategorie"
-#: apps/transactions/models.py:615
+#: apps/transactions/models.py:636
msgid "No description"
msgstr "Keine Beschreibung"
-#: apps/transactions/models.py:672
+#: apps/transactions/models.py:735
+#, fuzzy
+#| msgid "transactions"
+msgid "Sub-transaction"
+msgstr "Transaktionen"
+
+#: apps/transactions/models.py:768
#, fuzzy
#| msgid "ZIP File"
msgid "File"
msgstr "ZIP-Datei"
-#: apps/transactions/models.py:674
+#: apps/transactions/models.py:770
msgid "Original Name"
msgstr ""
-#: apps/transactions/models.py:676
+#: apps/transactions/models.py:772
#, fuzzy
#| msgid "Content"
msgid "Content Type"
msgstr "Inhalt"
-#: apps/transactions/models.py:678
+#: apps/transactions/models.py:774
msgid "Size"
msgstr ""
-#: apps/transactions/models.py:683
+#: apps/transactions/models.py:779
msgid "Uploaded By"
msgstr ""
-#: apps/transactions/models.py:688
+#: apps/transactions/models.py:784
#, fuzzy
#| msgid "Transactions on"
msgid "Transaction Attachment"
msgstr "Transaktionen am"
-#: apps/transactions/models.py:689
+#: apps/transactions/models.py:785
#, fuzzy
#| msgid "Transaction Tags"
msgid "Transaction Attachments"
msgstr "Tranksaktionstags"
-#: apps/transactions/models.py:719 templates/includes/sidebar.html:57
+#: apps/transactions/models.py:815 templates/includes/sidebar.html:57
msgid "Yearly"
msgstr "Jährlich"
-#: apps/transactions/models.py:720 apps/users/models.py:469
+#: apps/transactions/models.py:816 apps/users/models.py:469
#: templates/includes/sidebar.html:51
msgid "Monthly"
msgstr "Monatlich"
-#: apps/transactions/models.py:721
+#: apps/transactions/models.py:817
msgid "Weekly"
msgstr "Wöchentlich"
-#: apps/transactions/models.py:722
+#: apps/transactions/models.py:818
msgid "Daily"
msgstr "Täglich"
-#: apps/transactions/models.py:735
+#: apps/transactions/models.py:831
msgid "Number of Installments"
msgstr "Anzahl von Ratenzahlungen"
-#: apps/transactions/models.py:740
+#: apps/transactions/models.py:836
msgid "Installment Start"
msgstr "Start der Ratenzahlung"
-#: apps/transactions/models.py:741
+#: apps/transactions/models.py:837
msgid "The installment number to start counting from"
msgstr ""
"Die Zahl mit der bei der Zählung der Ratenzahlungen begonnen werden soll"
-#: apps/transactions/models.py:746 apps/transactions/models.py:1037
+#: apps/transactions/models.py:842 apps/transactions/models.py:1136
msgid "Start Date"
msgstr "Startdatum"
-#: apps/transactions/models.py:750 apps/transactions/models.py:1038
+#: apps/transactions/models.py:846 apps/transactions/models.py:1137
msgid "End Date"
msgstr "Enddatum"
-#: apps/transactions/models.py:755
+#: apps/transactions/models.py:851
msgid "Recurrence"
msgstr "Regelmäßigkeit"
-#: apps/transactions/models.py:758
+#: apps/transactions/models.py:854
msgid "Installment Amount"
msgstr "Ratenzahlungs-Wert"
-#: apps/transactions/models.py:777 apps/transactions/models.py:1057
+#: apps/transactions/models.py:873 apps/transactions/models.py:1156
msgid "Add description to transactions"
msgstr "Beschreibung zu Transaktionen hinzufügen"
-#: apps/transactions/models.py:780 apps/transactions/models.py:1060
+#: apps/transactions/models.py:876 apps/transactions/models.py:1159
msgid "Add notes to transactions"
msgstr "Notizen zu Transaktionen hinzufügen"
-#: apps/transactions/models.py:954
+#: apps/transactions/models.py:1053
#, fuzzy
#| msgid "To Amount"
msgid "To amount"
msgstr "Zielbetrag"
-#: apps/transactions/models.py:955
+#: apps/transactions/models.py:1054
msgid "Leave empty to use the same amount"
msgstr ""
-#: apps/transactions/models.py:996 templates/mini_tools/simulator.html:129
+#: apps/transactions/models.py:1095 templates/mini_tools/simulator.html:129
msgid "day(s)"
msgstr "Tag(e)"
-#: apps/transactions/models.py:997 templates/mini_tools/simulator.html:130
+#: apps/transactions/models.py:1096 templates/mini_tools/simulator.html:130
msgid "week(s)"
msgstr "Woche(n)"
-#: apps/transactions/models.py:998 templates/mini_tools/simulator.html:131
+#: apps/transactions/models.py:1097 templates/mini_tools/simulator.html:131
msgid "month(s)"
msgstr "Monat(e)"
-#: apps/transactions/models.py:999 templates/mini_tools/simulator.html:132
+#: apps/transactions/models.py:1098 templates/mini_tools/simulator.html:132
msgid "year(s)"
msgstr "Jahr(e)"
-#: apps/transactions/models.py:1001
+#: apps/transactions/models.py:1100
#: templates/recurring_transactions/fragments/list.html:18
msgid "Paused"
msgstr "Pausiert"
-#: apps/transactions/models.py:1040
+#: apps/transactions/models.py:1139
msgid "Recurrence Type"
msgstr "Regelmäßigkeit"
-#: apps/transactions/models.py:1043
+#: apps/transactions/models.py:1142
msgid "Recurrence Interval"
msgstr "Wiederholungsintervall"
-#: apps/transactions/models.py:1046
+#: apps/transactions/models.py:1145
msgid "Keep at most"
msgstr "Höchtens"
-#: apps/transactions/models.py:1050
+#: apps/transactions/models.py:1149
msgid "Last Generated Date"
msgstr "Letztes generiertes Datum"
-#: apps/transactions/models.py:1053
+#: apps/transactions/models.py:1152
msgid "Last Generated Reference Date"
msgstr "Letztes generiertes Referenzdatum"
-#: apps/transactions/models.py:1370 templates/cotton/transaction/item.html:243
+#: apps/transactions/models.py:1517 templates/cotton/transaction/item.html:245
#: templates/cotton/ui/transactions_fab.html:59
msgid "Quick Transaction"
msgstr "Schnelle Transaktion"
-#: apps/transactions/models.py:1371 templates/includes/sidebar.html:98
-#: templates/quick_transactions/pages/index.html:5
-#: templates/quick_transactions/pages/index.html:15
-msgid "Quick Transactions"
-msgstr "Schnelle Transaktionen"
-
#: apps/transactions/validators.py:8
#, python-format
msgid "%(value)s has too many decimal places. Maximum is 30."
@@ -2230,35 +2275,43 @@ msgstr "%(value)s hat zu viele Dezimalstellen. Maximum liegt bei 30."
msgid "%(value)s is not a non-negative number"
msgstr "%(value)s ist keine nicht-negative Zahl"
-#: apps/transactions/views/actions.py:58
+#: apps/transactions/views/actions.py:61
#, python-format
msgid "%(count)s transaction marked as paid"
msgid_plural "%(count)s transactions marked as paid"
msgstr[0] "%(count)s Transaktion als bezahlt markiert"
msgstr[1] "%(count)s Transaktionen als bezahlt markiert"
-#: apps/transactions/views/actions.py:81
+#: apps/transactions/views/actions.py:84
#, python-format
msgid "%(count)s transaction marked as not paid"
msgid_plural "%(count)s transactions marked as not paid"
msgstr[0] "%(count)s Transaktion als nicht bezahlt markiert"
msgstr[1] "%(count)s Transaktionen als nicht bezahlt markiert"
-#: apps/transactions/views/actions.py:105
+#: apps/transactions/views/actions.py:108
#, python-format
msgid "%(count)s transaction deleted successfully"
msgid_plural "%(count)s transactions deleted successfully"
msgstr[0] "%(count)s Transaktion erfolgreich gelöscht"
msgstr[1] "%(count)s Transaktionen erfolgreich gelöscht"
-#: apps/transactions/views/actions.py:139
+#: apps/transactions/views/actions.py:142
#, python-format
msgid "%(count)s transaction restored successfully"
msgid_plural "%(count)s transactions restored successfully"
msgstr[0] "%(count)s Transaktion erfolgreich wiederhergestellt"
msgstr[1] "%(count)s Transaktionen erfolgreich gelöscht"
-#: apps/transactions/views/actions.py:170
+#: apps/transactions/views/actions.py:174
+#: apps/transactions/views/transactions.py:423
+#, python-format
+msgid "%(count)s transaction updated successfully"
+msgid_plural "%(count)s transactions updated successfully"
+msgstr[0] "%(count)s Transaktion erfolgreich aktualisiert"
+msgstr[1] "%(count)s Transaktionen erfolgreich aktualisiert"
+
+#: apps/transactions/views/actions.py:247
#, python-format
msgid "%(count)s transaction duplicated successfully"
msgid_plural "%(count)s transactions duplicated successfully"
@@ -2277,39 +2330,49 @@ msgstr "Kategorie erfolgreich aktualisiert"
msgid "Category deleted successfully"
msgstr "Kategorie erfolgreich gelöscht"
-#: apps/transactions/views/conversions.py:72
+#: apps/transactions/views/conversions.py:77
#: apps/transactions/views/quick_transactions.py:46 apps/users/views.py:252
msgid "Item added successfully"
msgstr "Objekt erfolgreich hinzugefügt"
-#: apps/transactions/views/conversions.py:91
+#: apps/transactions/views/conversions.py:97
#, fuzzy
#| msgid "Edit transaction"
msgid "Convert into quick transaction"
msgstr "Transaktion bearbeiten"
-#: apps/transactions/views/conversions.py:108
+#: apps/transactions/views/conversions.py:114
#: apps/transactions/views/recurring_transactions.py:112
msgid "Recurring Transaction added successfully"
msgstr "Wiederkehrende Transaktion erfolgreich hinzugefügt"
-#: apps/transactions/views/conversions.py:129
+#: apps/transactions/views/conversions.py:136
#, fuzzy
#| msgid "Edit recurring transaction"
msgid "Convert into recurring transaction"
msgstr "Wiederkehrende Transaktion bearbeiten"
-#: apps/transactions/views/conversions.py:148
+#: apps/transactions/views/conversions.py:155
#: apps/transactions/views/installment_plans.py:87
msgid "Installment Plan added successfully"
msgstr "Ratenzahlungs-Plan erfolgreich hinzugefügt"
-#: apps/transactions/views/conversions.py:167
+#: apps/transactions/views/conversions.py:175
#, fuzzy
#| msgid "Edit installment plan"
msgid "Convert into installment plan"
msgstr "Ratenzahlungs-Plan bearbeiten"
+#: apps/transactions/views/conversions.py:195
+msgid "Transaction converted into a transfer"
+msgstr ""
+
+#: apps/transactions/views/conversions.py:226
+#, fuzzy
+#| msgid "Edit transaction"
+msgid "Convert into transfer"
+msgstr "Transaktion bearbeiten"
+
#: apps/transactions/views/entities.py:72
msgid "Entity added successfully"
msgstr "Entität erfolgreich hinzugefügt"
@@ -2342,7 +2405,7 @@ msgstr "Objekt erfolgreich aktualisiert"
msgid "Item deleted successfully"
msgstr "Objekt erfolgreich gelöscht"
-#: apps/transactions/views/quick_transactions.py:164
+#: apps/transactions/views/quick_transactions.py:165
#: apps/transactions/views/transactions.py:156
#: apps/transactions/views/transactions.py:343
msgid "Transaction added successfully"
@@ -2396,30 +2459,23 @@ msgstr "Konto erfolgreich gelöscht"
msgid "Transaction updated successfully"
msgstr "Transaktion erfolgreich aktualisiert"
-#: apps/transactions/views/transactions.py:421
-#, python-format
-msgid "%(count)s transaction updated successfully"
-msgid_plural "%(count)s transactions updated successfully"
-msgstr[0] "%(count)s Transaktion erfolgreich aktualisiert"
-msgstr[1] "%(count)s Transaktionen erfolgreich aktualisiert"
-
-#: apps/transactions/views/transactions.py:448
+#: apps/transactions/views/transactions.py:450
msgid "Transaction duplicated successfully"
msgstr "Transaktion erfolgreich duplisiert"
-#: apps/transactions/views/transactions.py:493
+#: apps/transactions/views/transactions.py:495
msgid "Transaction deleted successfully"
msgstr "Transaktion erfolgreich gelöscht"
-#: apps/transactions/views/transactions.py:523
+#: apps/transactions/views/transactions.py:525
msgid "Transaction restored successfully"
msgstr "Transaktion erfolgreich wiederhergestellt"
-#: apps/transactions/views/transactions.py:549
+#: apps/transactions/views/transactions.py:551
msgid "Transfer added successfully"
msgstr "Transfer erfolgreich hinzugefügt"
-#: apps/transactions/views/transactions.py:579
+#: apps/transactions/views/transactions.py:581
#, fuzzy
#| msgid "Transfer added successfully"
msgid "Transfer updated successfully"
@@ -2772,8 +2828,9 @@ msgstr "Aktionen"
#: templates/accounts/fragments/list.html:37
#: templates/bank_sync/fragments/list.html:33
#: templates/categories/fragments/table.html:29
-#: templates/cotton/transaction/item.html:178
-#: templates/cotton/ui/transactions_action_bar.html:54
+#: templates/cotton/transaction/item.html:180
+#: templates/cotton/ui/transactions_action_bar.html:56
+#: templates/cotton/ui/transactions_action_bar.html:90
#: templates/currencies/fragments/list.html:34
#: templates/dca/fragments/strategy/details.html:63
#: templates/dca/fragments/strategy/list.html:31
@@ -2784,8 +2841,8 @@ msgstr "Aktionen"
#: templates/import_app/fragments/profiles/list.html:46
#: templates/installment_plans/fragments/table.html:28
#: templates/investment_classes/fragments/list.html:39
-#: templates/investments/fragments/detail.html:302
-#: templates/investments/fragments/detail.html:330
+#: templates/investments/fragments/detail.html:310
+#: templates/investments/fragments/detail.html:338
#: templates/quick_transactions/fragments/list.html:25
#: templates/recurring_transactions/fragments/table.html:30
#: templates/rules/fragments/transaction_rule/view.html:22
@@ -2822,10 +2879,11 @@ msgstr "Teilen"
#: templates/accounts/fragments/list.html:71
#: templates/bank_sync/fragments/list.html:50
#: templates/categories/fragments/table.html:51
-#: templates/cotton/transaction/item.html:190
-#: templates/cotton/transaction/item.html:316
+#: templates/cotton/transaction/item.html:192
+#: templates/cotton/transaction/item.html:333
#: templates/cotton/ui/deleted_transactions_action_bar.html:57
-#: templates/cotton/ui/transactions_action_bar.html:82
+#: templates/cotton/ui/transactions_action_bar.html:75
+#: templates/cotton/ui/transactions_action_bar.html:107
#: templates/currencies/fragments/list.html:40
#: templates/dca/fragments/strategy/details.html:70
#: templates/dca/fragments/strategy/list.html:38
@@ -2856,10 +2914,11 @@ msgstr "Löschen"
#: templates/accounts/fragments/list.html:75
#: templates/bank_sync/fragments/list.html:54
#: templates/categories/fragments/table.html:56
-#: templates/cotton/transaction/item.html:192
-#: templates/cotton/transaction/item.html:322
+#: templates/cotton/transaction/item.html:194
+#: templates/cotton/transaction/item.html:339
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:44
#: templates/dca/fragments/strategy/details.html:75
#: templates/dca/fragments/strategy/list.html:42
@@ -2887,10 +2946,11 @@ msgstr "Bist du sicher?"
#: templates/account_groups/fragments/list.html:59
#: templates/accounts/fragments/list.html:76
#: templates/categories/fragments/table.html:57
-#: templates/cotton/transaction/item.html:193
-#: templates/cotton/transaction/item.html:323
+#: templates/cotton/transaction/item.html:195
+#: templates/cotton/transaction/item.html:340
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:45
#: templates/dca/fragments/strategy/details.html:76
#: templates/dca/fragments/strategy/list.html:43
@@ -2910,8 +2970,8 @@ msgstr "Dies kann nicht rückgängig gemacht werden!"
#: templates/accounts/fragments/list.html:77
#: templates/bank_sync/fragments/list.html:56
#: templates/categories/fragments/table.html:58
-#: templates/cotton/transaction/item.html:194
-#: templates/cotton/transaction/item.html:324
+#: templates/cotton/transaction/item.html:196
+#: templates/cotton/transaction/item.html:341
#: templates/currencies/fragments/list.html:46
#: templates/dca/fragments/strategy/details.html:77
#: templates/dca/fragments/strategy/list.html:44
@@ -2991,6 +3051,12 @@ msgstr "Entfolgen"
msgid "No accounts"
msgstr "Keine Konten"
+#: templates/accounts/fragments/share.html:8
+msgid ""
+"Everyone who can see this account can add, edit and delete its transactions, "
+"installment plans and recurring transactions."
+msgstr ""
+
#: templates/bank_sync/fragments/accounts.html:31
#, fuzzy
#| msgid "No transactions on this date"
@@ -3091,65 +3157,78 @@ msgstr "Schließen"
msgid "Search"
msgstr "Suche"
-#: templates/cotton/transaction/item.html:12
+#: templates/cotton/transaction/item.html:14
msgid "Select"
msgstr "Auswahl"
-#: templates/cotton/transaction/item.html:123
+#: templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:100
msgid "From"
msgstr "Von"
-#: templates/cotton/transaction/item.html:207
-#: templates/cotton/transaction/item.html:218
-#: templates/cotton/transaction/item.html:228
+#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:230
msgid "Show on summaries"
msgstr "Anzeigen auf Zusammenfassungen"
-#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:211
msgid "Controlled by account"
msgstr "Gesteuert durch Konto"
-#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:222
msgid "Controlled by category"
msgstr "Gesteuert durch Kategorie"
-#: templates/cotton/transaction/item.html:233
+#: templates/cotton/transaction/item.html:235
+#: templates/includes/transactions_bulk_actions.html:15
msgid "Hide from summaries"
msgstr "Verstecken bei Zusammenfassungen"
-#: templates/cotton/transaction/item.html:237
+#: templates/cotton/transaction/item.html:239
#, fuzzy
#| msgid "Invert"
msgid "Convert"
msgstr "Invertieren"
-#: templates/cotton/transaction/item.html:252
-#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:254
+#: templates/cotton/transaction/item.html:264
+#: templates/cotton/transaction/item.html:274
msgid "Already part of a plan or recurrence"
msgstr ""
-#: templates/cotton/transaction/item.html:279
+#: templates/cotton/transaction/item.html:291
msgid "Not available for transfers"
msgstr ""
-#: templates/cotton/transaction/item.html:296
+#: templates/cotton/transaction/item.html:313
+#: templates/includes/transactions_bulk_actions.html:22
msgid "Move to previous month"
msgstr ""
-#: templates/cotton/transaction/item.html:300
+#: templates/cotton/transaction/item.html:317
+#: templates/includes/transactions_bulk_actions.html:28
msgid "Move to next month"
msgstr ""
-#: templates/cotton/transaction/item.html:303
+#: templates/cotton/transaction/item.html:320
+#: templates/includes/transactions_bulk_actions.html:33
msgid "Move to today"
msgstr ""
-#: templates/cotton/transaction/item.html:307
-#: templates/cotton/ui/transactions_action_bar.html:78
+#: templates/cotton/transaction/item.html:324
+#: templates/cotton/ui/transactions_action_bar.html:71
+#: templates/cotton/ui/transactions_action_bar.html:98
msgid "Duplicate"
msgstr "Duplikat"
+#: templates/cotton/transaction/item.html:373
+#, python-format
+msgid "%(counter)s item"
+msgid_plural "%(counter)s items"
+msgstr[0] ""
+msgstr[1] ""
+
#: templates/cotton/ui/account_card.html:10
#: templates/cotton/ui/currency_card.html:10
msgid "projected income"
@@ -3185,22 +3264,26 @@ msgstr "aktuelle Bilanz"
msgid "final total"
msgstr "Gesamtbilanz"
-#: templates/cotton/ui/deleted_transactions_action_bar.html:34
-#: templates/cotton/ui/transactions_action_bar.html:34
-msgid "Select All"
-msgstr "Alle auswählen"
-
-#: templates/cotton/ui/deleted_transactions_action_bar.html:40
-#: templates/cotton/ui/transactions_action_bar.html:40
+#: templates/cotton/ui/deleted_transactions_action_bar.html:25
+#: templates/cotton/ui/deleted_transactions_action_bar.html:26
+#: templates/cotton/ui/transactions_action_bar.html:25
+#: templates/cotton/ui/transactions_action_bar.html:26
msgid "Unselect All"
msgstr "Alle abwählen"
-#: templates/cotton/ui/deleted_transactions_action_bar.html:46
-msgid "Invert election"
+#: templates/cotton/ui/deleted_transactions_action_bar.html:39
+#: templates/cotton/ui/transactions_action_bar.html:39
+msgid "Select All"
+msgstr "Alle auswählen"
+
+#: templates/cotton/ui/deleted_transactions_action_bar.html:45
+#: templates/cotton/ui/transactions_action_bar.html:45
+msgid "Invert selection"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:59
-#: templates/cotton/ui/transactions_action_bar.html:84
+#: templates/cotton/ui/transactions_action_bar.html:77
+#: templates/cotton/ui/transactions_action_bar.html:106
#, fuzzy
#| msgid "Yes, delete them!"
msgid "Yes, delete them!"
@@ -3213,45 +3296,45 @@ msgstr "Ja, löschen!"
#: templates/cotton/ui/deleted_transactions_action_bar.html:166
#: templates/cotton/ui/deleted_transactions_action_bar.html:182
#: templates/cotton/ui/deleted_transactions_action_bar.html:198
-#: templates/cotton/ui/transactions_action_bar.html:128
-#: templates/cotton/ui/transactions_action_bar.html:143
-#: templates/cotton/ui/transactions_action_bar.html:159
-#: templates/cotton/ui/transactions_action_bar.html:175
-#: templates/cotton/ui/transactions_action_bar.html:191
-#: templates/cotton/ui/transactions_action_bar.html:207
-#: templates/cotton/ui/transactions_action_bar.html:223
+#: templates/cotton/ui/transactions_action_bar.html:153
+#: templates/cotton/ui/transactions_action_bar.html:168
+#: templates/cotton/ui/transactions_action_bar.html:184
+#: templates/cotton/ui/transactions_action_bar.html:200
+#: templates/cotton/ui/transactions_action_bar.html:216
+#: templates/cotton/ui/transactions_action_bar.html:232
+#: templates/cotton/ui/transactions_action_bar.html:248
#, fuzzy
#| msgid "copied!"
msgid "copied!"
msgstr "kopiert!"
#: templates/cotton/ui/deleted_transactions_action_bar.html:123
-#: templates/cotton/ui/transactions_action_bar.html:148
+#: templates/cotton/ui/transactions_action_bar.html:173
msgid "Flat Total"
msgstr "Bruttosumme"
#: templates/cotton/ui/deleted_transactions_action_bar.html:139
-#: templates/cotton/ui/transactions_action_bar.html:164
+#: templates/cotton/ui/transactions_action_bar.html:189
msgid "Real Total"
msgstr "Nettosumme"
#: templates/cotton/ui/deleted_transactions_action_bar.html:155
-#: templates/cotton/ui/transactions_action_bar.html:180
+#: templates/cotton/ui/transactions_action_bar.html:205
msgid "Mean"
msgstr "Mittelwert"
#: templates/cotton/ui/deleted_transactions_action_bar.html:171
-#: templates/cotton/ui/transactions_action_bar.html:196
+#: templates/cotton/ui/transactions_action_bar.html:221
msgid "Max"
msgstr "Maximum"
#: templates/cotton/ui/deleted_transactions_action_bar.html:187
-#: templates/cotton/ui/transactions_action_bar.html:212
+#: templates/cotton/ui/transactions_action_bar.html:237
msgid "Min"
msgstr "Minimum"
#: templates/cotton/ui/deleted_transactions_action_bar.html:203
-#: templates/cotton/ui/transactions_action_bar.html:228
+#: templates/cotton/ui/transactions_action_bar.html:253
msgid "Count"
msgstr "Anzahl"
@@ -3277,17 +3360,11 @@ msgstr "Wiederkehrend"
msgid "Balance"
msgstr "Saldo"
-#: templates/cotton/ui/transactions_action_bar.html:46
-msgid "Invert selection"
-msgstr ""
-
-#: templates/cotton/ui/transactions_action_bar.html:66
-msgid "Mark as unpaid"
-msgstr "Als unbezahlt markieren"
-
-#: templates/cotton/ui/transactions_action_bar.html:71
-msgid "Mark as paid"
-msgstr "Als bezahlt markieren"
+#: templates/cotton/ui/transactions_action_bar.html:83
+#, fuzzy
+#| msgid "Transactions"
+msgid "More actions"
+msgstr "Transaktionen"
#: templates/currencies/fragments/add.html:5
msgid "Add currency"
@@ -3730,6 +3807,14 @@ msgstr ""
msgid "Calculator"
msgstr "Rechner"
+#: templates/includes/transactions_bulk_actions.html:4
+msgid "Mark as unpaid"
+msgstr "Als unbezahlt markieren"
+
+#: templates/includes/transactions_bulk_actions.html:9
+msgid "Mark as paid"
+msgstr "Als bezahlt markieren"
+
#: templates/insights/fragments/category_explorer/charts/account.html:100
#: templates/insights/fragments/category_explorer/charts/currency.html:92
#: templates/monthly_overview/fragments/monthly_account_summary.html:14
@@ -3795,6 +3880,7 @@ msgstr "Keine kürzlich erfolgten Transaktionen"
#: templates/insights/fragments/year_by_year.html:140
#: templates/investment_classes/fragments/list.html:65
#: templates/monthly_overview/fragments/monthly_summary.html:168
+#: templates/transactions/widgets/sub_transactions.html:55
msgid "Total"
msgstr "Gesamt"
@@ -4247,13 +4333,13 @@ msgstr ""
msgid "Loss, tax or fee"
msgstr ""
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
#, fuzzy
#| msgid "No presets yet"
msgid "No movements yet"
msgstr "Keine Vorlagen bisher"
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
msgid "Use the + button to buy or contribute"
msgstr ""
@@ -4863,6 +4949,12 @@ msgstr "Keine gelöschten Transaktionen vorhanden"
msgid "Deleted transactions"
msgstr "Gelöschte Transaktionen"
+#: templates/transactions/widgets/sub_transactions.html:53
+#, fuzzy
+#| msgid "Add quick transaction"
+msgid "Add sub-transaction"
+msgstr "Schnelle Transaktion hinzufügen"
+
#: templates/transactions/widgets/unselectable_income_expense_toggle_buttons.html:11
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:7
msgid "Unchanged"
diff --git a/app/locale/en/LC_MESSAGES/django.po b/app/locale/en/LC_MESSAGES/django.po
index 996e18b6..59e9bcd9 100644
--- 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: 2026-11-12 03:24+0000\n"
+"POT-Creation-Date: 2026-11-14 14:06+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -27,11 +27,11 @@ msgstr ""
#: apps/currencies/forms.py:59 apps/currencies/forms.py:93
#: apps/currencies/forms.py:170 apps/dca/forms.py:51 apps/dca/forms.py:216
#: apps/import_app/forms.py:34 apps/rules/forms.py:60 apps/rules/forms.py:100
-#: apps/rules/forms.py:385 apps/transactions/forms.py:219
-#: apps/transactions/forms.py:452 apps/transactions/forms.py:571
-#: apps/transactions/forms.py:741 apps/transactions/forms.py:971
-#: apps/transactions/forms.py:1018 apps/transactions/forms.py:1046
-#: apps/transactions/forms.py:1077 apps/transactions/forms.py:1239
+#: apps/rules/forms.py:387 apps/transactions/forms.py:304
+#: apps/transactions/forms.py:538 apps/transactions/forms.py:657
+#: apps/transactions/forms.py:827 apps/transactions/forms.py:1060
+#: apps/transactions/forms.py:1108 apps/transactions/forms.py:1136
+#: apps/transactions/forms.py:1167 apps/transactions/forms.py:1330
#: apps/users/forms.py:264 apps/users/forms.py:422
#: templates/rules/fragments/transaction_rule/dry_run/updated.html:5
#: templates/rules/fragments/transaction_rule/view.html:128
@@ -43,11 +43,11 @@ msgstr ""
#: apps/common/widgets/tom_select.py:16 apps/currencies/forms.py:65
#: apps/currencies/forms.py:99 apps/currencies/forms.py:176
#: apps/dca/forms.py:57 apps/dca/forms.py:222 apps/import_app/forms.py:40
-#: apps/rules/forms.py:66 apps/rules/forms.py:106 apps/rules/forms.py:391
-#: apps/transactions/forms.py:206 apps/transactions/forms.py:226
-#: apps/transactions/forms.py:459 apps/transactions/forms.py:977
-#: apps/transactions/forms.py:1024 apps/transactions/forms.py:1052
-#: apps/transactions/forms.py:1083 apps/transactions/forms.py:1245
+#: apps/rules/forms.py:66 apps/rules/forms.py:106 apps/rules/forms.py:393
+#: apps/transactions/forms.py:291 apps/transactions/forms.py:311
+#: apps/transactions/forms.py:545 apps/transactions/forms.py:1066
+#: apps/transactions/forms.py:1114 apps/transactions/forms.py:1142
+#: apps/transactions/forms.py:1173 apps/transactions/forms.py:1336
#: apps/users/forms.py:270 apps/users/forms.py:428
#: templates/mini_tools/simulator.html:177
#: templates/mini_tools/unit_price_calculator.html:168
@@ -70,29 +70,29 @@ msgstr ""
#: apps/accounts/forms.py:206 apps/dca/forms.py:84 apps/dca/forms.py:91
#: apps/insights/forms.py:117 apps/insights/views.py:44 apps/rules/forms.py:181
-#: apps/rules/forms.py:197 apps/rules/models.py:44 apps/rules/models.py:311
-#: apps/transactions/forms.py:62 apps/transactions/forms.py:330
-#: apps/transactions/forms.py:510 apps/transactions/forms.py:607
-#: apps/transactions/forms.py:614 apps/transactions/forms.py:854
-#: apps/transactions/forms.py:1106 apps/transactions/models.py:358
-#: apps/transactions/models.py:765 apps/transactions/models.py:1021
-#: apps/transactions/models.py:1342
+#: apps/rules/forms.py:198 apps/rules/models.py:45 apps/rules/models.py:312
+#: apps/transactions/forms.py:145 apps/transactions/forms.py:415
+#: apps/transactions/forms.py:596 apps/transactions/forms.py:693
+#: apps/transactions/forms.py:700 apps/transactions/forms.py:942
+#: apps/transactions/forms.py:1196 apps/transactions/models.py:360
+#: apps/transactions/models.py:861 apps/transactions/models.py:1120
+#: apps/transactions/models.py:1489
#: templates/insights/fragments/month_by_month.html:84
#: templates/insights/fragments/year_by_year.html:52
msgid "Category"
msgstr ""
#: apps/accounts/forms.py:213 apps/dca/forms.py:100 apps/dca/forms.py:108
-#: apps/export_app/forms.py:43 apps/export_app/forms.py:142
-#: apps/insights/views.py:50 apps/rules/forms.py:184 apps/rules/forms.py:194
-#: apps/rules/models.py:45 apps/rules/models.py:315
-#: apps/transactions/filters.py:79 apps/transactions/forms.py:70
-#: apps/transactions/forms.py:338 apps/transactions/forms.py:518
-#: apps/transactions/forms.py:623 apps/transactions/forms.py:631
-#: apps/transactions/forms.py:847 apps/transactions/forms.py:1099
-#: apps/transactions/models.py:364 apps/transactions/models.py:767
-#: apps/transactions/models.py:1025 apps/transactions/models.py:1348
-#: templates/includes/sidebar.html:162
+#: apps/export_app/forms.py:43 apps/export_app/forms.py:149
+#: apps/insights/views.py:50 apps/rules/forms.py:184 apps/rules/forms.py:195
+#: apps/rules/models.py:46 apps/rules/models.py:316
+#: apps/transactions/filters.py:95 apps/transactions/filters.py:170
+#: apps/transactions/forms.py:153 apps/transactions/forms.py:423
+#: apps/transactions/forms.py:604 apps/transactions/forms.py:709
+#: apps/transactions/forms.py:717 apps/transactions/forms.py:935
+#: apps/transactions/forms.py:1189 apps/transactions/models.py:366
+#: apps/transactions/models.py:863 apps/transactions/models.py:1124
+#: apps/transactions/models.py:1495 templates/includes/sidebar.html:162
#: templates/insights/fragments/month_by_month.html:29
#: templates/insights/fragments/month_by_month.html:32
#: templates/insights/fragments/year_by_year.html:24
@@ -119,9 +119,9 @@ msgstr ""
#: apps/accounts/forms.py:266 apps/currencies/forms.py:72
#: apps/dca/models.py:158 apps/rules/forms.py:176 apps/rules/forms.py:190
-#: apps/rules/models.py:38 apps/rules/models.py:279
-#: apps/transactions/forms.py:86 apps/transactions/forms.py:482
-#: apps/transactions/forms.py:652 apps/transactions/models.py:340
+#: apps/rules/models.py:38 apps/rules/models.py:280
+#: apps/transactions/forms.py:169 apps/transactions/forms.py:568
+#: apps/transactions/forms.py:738 apps/transactions/models.py:342
#: templates/dca/fragments/strategy/details.html:49
#: templates/exchange_rates/fragments/table.html:10
#: templates/exchange_rates_services/fragments/table.html:11
@@ -135,8 +135,9 @@ msgstr ""
#: apps/accounts/models.py:19 apps/accounts/models.py:36
#: apps/accounts/models.py:84 apps/bank_sync/models.py:14 apps/dca/models.py:13
#: apps/import_app/models.py:20 apps/rules/models.py:13
-#: apps/transactions/models.py:250 apps/transactions/models.py:275
-#: apps/transactions/models.py:299 apps/transactions/models.py:1310
+#: apps/transactions/forms.py:64 apps/transactions/models.py:252
+#: apps/transactions/models.py:277 apps/transactions/models.py:301
+#: apps/transactions/models.py:726 apps/transactions/models.py:1457
#: apps/users/models.py:577 templates/account_groups/fragments/list.html:22
#: templates/accounts/fragments/list.html:22
#: templates/bank_sync/fragments/list.html:20
@@ -186,7 +187,7 @@ msgid ""
"%(taken)s%%."
msgstr ""
-#: apps/accounts/models.py:74 apps/export_app/forms.py:139
+#: apps/accounts/models.py:74 apps/export_app/forms.py:146
#: templates/includes/sidebar.html:190
#: templates/investment_classes/fragments/list.html:9
#: templates/investment_classes/pages/index.html:4
@@ -293,11 +294,11 @@ msgstr ""
#: apps/accounts/models.py:190 apps/bank_sync/models.py:89
#: apps/import_app/forms.py:50 apps/import_app/models.py:88
#: apps/rules/forms.py:173 apps/rules/forms.py:187 apps/rules/models.py:35
-#: apps/rules/models.py:267 apps/transactions/forms.py:82
-#: apps/transactions/forms.py:350 apps/transactions/forms.py:477
-#: apps/transactions/forms.py:839 apps/transactions/forms.py:1091
-#: apps/transactions/models.py:330 apps/transactions/models.py:725
-#: apps/transactions/models.py:1003 apps/transactions/models.py:1316
+#: apps/rules/models.py:268 apps/transactions/forms.py:165
+#: apps/transactions/forms.py:435 apps/transactions/forms.py:563
+#: apps/transactions/forms.py:927 apps/transactions/forms.py:1181
+#: apps/transactions/models.py:332 apps/transactions/models.py:821
+#: apps/transactions/models.py:1102 apps/transactions/models.py:1463
#: templates/import_app/fragments/runs/list.html:95
#: templates/installment_plans/fragments/table.html:17
#: templates/quick_transactions/fragments/list.html:14
@@ -307,8 +308,8 @@ msgid "Account"
msgstr ""
#: apps/accounts/models.py:191 apps/export_app/forms.py:19
-#: apps/export_app/forms.py:138 apps/transactions/filters.py:63
-#: templates/accounts/fragments/list.html:9
+#: apps/export_app/forms.py:145 apps/transactions/filters.py:79
+#: apps/transactions/filters.py:153 templates/accounts/fragments/list.html:9
#: templates/accounts/pages/index.html:4
#: templates/bank_sync/fragments/accounts.html:5
#: templates/bank_sync/fragments/list.html:22
@@ -387,27 +388,27 @@ msgstr ""
msgid "Account balances have been reconciled successfully"
msgstr ""
-#: apps/api/fields/transactions.py:31
+#: apps/api/fields/transactions.py:32
msgid "Category with this ID does not exist."
msgstr ""
-#: apps/api/fields/transactions.py:41
+#: apps/api/fields/transactions.py:42
msgid "Invalid category data. Provide an ID or name."
msgstr ""
-#: apps/api/fields/transactions.py:74
+#: apps/api/fields/transactions.py:75
msgid "Tag with this ID does not exist."
msgstr ""
-#: apps/api/fields/transactions.py:84
+#: apps/api/fields/transactions.py:85
msgid "Invalid tag data. Provide an ID or name."
msgstr ""
-#: apps/api/fields/transactions.py:109
+#: apps/api/fields/transactions.py:110
msgid "Entity with this ID does not exist."
msgstr ""
-#: apps/api/fields/transactions.py:119
+#: apps/api/fields/transactions.py:120
msgid "Invalid entity data. Provide an ID or name."
msgstr ""
@@ -415,12 +416,22 @@ msgstr ""
msgid "Only transaction imports can use an account."
msgstr ""
-#: apps/api/serializers/transactions.py:141 apps/dca/forms.py:298
-#: apps/transactions/models.py:975
+#: apps/api/serializers/transactions.py:58
+msgid "Transfers can't have sub-transactions."
+msgstr ""
+
+#: apps/api/serializers/transactions.py:68
+msgid ""
+"The amount is the sum of the sub-transactions; send sub_transactions instead."
+msgstr ""
+
+#: apps/api/serializers/transactions.py:74
+#: apps/api/serializers/transactions.py:218 apps/dca/forms.py:298
+#: apps/transactions/models.py:1074
msgid "This field is required."
msgstr ""
-#: apps/api/serializers/transactions.py:205
+#: apps/api/serializers/transactions.py:286
msgid "Either 'date' or 'reference_date' must be provided."
msgstr ""
@@ -431,8 +442,8 @@ msgstr ""
#: apps/bank_sync/forms.py:113 apps/bank_sync/models.py:76
#: apps/currencies/models.py:54 apps/export_app/forms.py:25
-#: apps/export_app/forms.py:140 apps/transactions/filters.py:70
-#: templates/currencies/fragments/list.html:9
+#: apps/export_app/forms.py:147 apps/transactions/filters.py:86
+#: apps/transactions/filters.py:161 templates/currencies/fragments/list.html:9
#: templates/currencies/pages/index.html:4 templates/includes/sidebar.html:196
#: templates/includes/sidebar.html:198
#: templates/monthly_overview/pages/overview.html:63
@@ -457,8 +468,8 @@ msgid "Service Type"
msgstr ""
#: apps/bank_sync/models.py:18 apps/currencies/models.py:130
-#: apps/transactions/filters.py:27 apps/transactions/models.py:254
-#: apps/transactions/models.py:278 apps/transactions/models.py:302
+#: apps/transactions/filters.py:28 apps/transactions/models.py:256
+#: apps/transactions/models.py:280 apps/transactions/models.py:304
#: templates/categories/fragments/list.html:16
#: templates/entities/fragments/list.html:16
#: templates/installment_plans/fragments/list.html:16
@@ -507,7 +518,7 @@ msgstr ""
msgid "Bank Sync Service"
msgstr ""
-#: apps/bank_sync/models.py:51 apps/export_app/forms.py:154
+#: apps/bank_sync/models.py:51 apps/export_app/forms.py:163
msgid "Bank Sync Services"
msgstr ""
@@ -672,17 +683,17 @@ msgstr ""
#: apps/common/forms.py:43
msgid ""
-"Private: Only shown for the owner and shared users. Only editable by the "
-"owner. Public: Shown for all users. Only editable by the owner."
+"Private: Only shown for the owner and shared users. Public: Shown for "
+"all users. Only the owner can edit, share or delete it."
msgstr ""
-#: apps/common/forms.py:76 apps/users/forms.py:191
+#: apps/common/forms.py:78 apps/users/forms.py:191
#: templates/bank_sync/fragments/accounts.html:34
#: templates/transactions/fragments/filter_actions.html:5
msgid "Save"
msgstr ""
-#: apps/common/forms.py:90
+#: apps/common/forms.py:92
msgid "You cannot share this item with its owner."
msgstr ""
@@ -789,6 +800,7 @@ msgid "Now"
msgstr ""
#: apps/common/widgets/tom_select.py:14
+#: templates/transactions/widgets/sub_transaction_row.html:9
msgid "Remove"
msgstr ""
@@ -865,8 +877,8 @@ msgstr ""
msgid "Auto"
msgstr ""
-#: apps/currencies/models.py:91 apps/export_app/forms.py:67
-#: apps/export_app/forms.py:152 templates/exchange_rates/fragments/list.html:10
+#: apps/currencies/models.py:91 apps/export_app/forms.py:73
+#: apps/export_app/forms.py:161 templates/exchange_rates/fragments/list.html:10
#: templates/exchange_rates/pages/index.html:4
#: templates/includes/sidebar.html:204
msgid "Exchange Rates"
@@ -1015,25 +1027,25 @@ msgstr ""
msgid "Create transaction"
msgstr ""
-#: apps/dca/forms.py:69 apps/transactions/forms.py:582
+#: apps/dca/forms.py:69 apps/transactions/forms.py:668
msgid "From Account"
msgstr ""
-#: apps/dca/forms.py:75 apps/transactions/forms.py:587
+#: apps/dca/forms.py:75 apps/transactions/forms.py:673
msgid "To Account"
msgstr ""
#: apps/dca/forms.py:117 apps/dca/forms.py:125 apps/export_app/forms.py:49
-#: apps/export_app/forms.py:143 apps/insights/views.py:57
-#: apps/rules/forms.py:185 apps/rules/forms.py:195 apps/rules/models.py:46
-#: apps/rules/models.py:307 apps/transactions/filters.py:84
-#: apps/transactions/forms.py:78 apps/transactions/forms.py:346
-#: apps/transactions/forms.py:526 apps/transactions/forms.py:640
-#: apps/transactions/forms.py:647 apps/transactions/forms.py:862
-#: apps/transactions/forms.py:1114 apps/transactions/models.py:313
-#: apps/transactions/models.py:369 apps/transactions/models.py:770
-#: apps/transactions/models.py:1028 apps/transactions/models.py:1353
-#: templates/entities/fragments/list.html:9
+#: apps/export_app/forms.py:150 apps/insights/views.py:57
+#: apps/rules/forms.py:185 apps/rules/forms.py:196 apps/rules/models.py:47
+#: apps/rules/models.py:308 apps/transactions/filters.py:100
+#: apps/transactions/filters.py:175 apps/transactions/forms.py:161
+#: apps/transactions/forms.py:431 apps/transactions/forms.py:612
+#: apps/transactions/forms.py:726 apps/transactions/forms.py:733
+#: apps/transactions/forms.py:950 apps/transactions/forms.py:1204
+#: apps/transactions/models.py:315 apps/transactions/models.py:371
+#: apps/transactions/models.py:866 apps/transactions/models.py:1127
+#: apps/transactions/models.py:1500 templates/entities/fragments/list.html:9
#: templates/entities/pages/index.html:4 templates/includes/sidebar.html:168
#: templates/insights/fragments/month_by_month.html:40
#: templates/insights/fragments/month_by_month.html:43
@@ -1068,8 +1080,8 @@ msgstr ""
msgid "You must provide an account."
msgstr ""
-#: apps/dca/forms.py:322 apps/transactions/forms.py:780
-#: apps/transactions/models.py:978
+#: apps/dca/forms.py:322 apps/transactions/forms.py:866
+#: apps/transactions/models.py:1077
msgid "From and To accounts must be different."
msgstr ""
@@ -1087,10 +1099,10 @@ msgid "Payment Currency"
msgstr ""
#: apps/dca/models.py:26 apps/dca/models.py:181 apps/rules/forms.py:180
-#: apps/rules/forms.py:196 apps/rules/models.py:43 apps/rules/models.py:295
-#: apps/transactions/forms.py:504 apps/transactions/forms.py:668
-#: apps/transactions/models.py:354 apps/transactions/models.py:774
-#: apps/transactions/models.py:1031 apps/transactions/models.py:1338
+#: apps/rules/forms.py:197 apps/rules/models.py:44 apps/rules/models.py:296
+#: apps/transactions/forms.py:590 apps/transactions/forms.py:754
+#: apps/transactions/models.py:356 apps/transactions/models.py:870
+#: apps/transactions/models.py:1130 apps/transactions/models.py:1485
msgid "Notes"
msgstr ""
@@ -1098,7 +1110,7 @@ msgstr ""
msgid "DCA Strategy"
msgstr ""
-#: apps/dca/models.py:35 apps/export_app/forms.py:166
+#: apps/dca/models.py:35 apps/export_app/forms.py:175
msgid "DCA Strategies"
msgstr ""
@@ -1118,7 +1130,7 @@ msgstr ""
msgid "DCA Entry"
msgstr ""
-#: apps/dca/models.py:187 apps/export_app/forms.py:167
+#: apps/dca/models.py:187 apps/export_app/forms.py:176
msgid "DCA Entries"
msgstr ""
@@ -1146,14 +1158,14 @@ msgstr ""
msgid "Entry deleted successfully"
msgstr ""
-#: apps/export_app/forms.py:13 apps/export_app/forms.py:137
+#: apps/export_app/forms.py:13 apps/export_app/forms.py:144
#: templates/includes/sidebar.html:247 templates/users/fragments/list.html:10
#: templates/users/pages/index.html:4
msgid "Users"
msgstr ""
-#: apps/export_app/forms.py:31 apps/export_app/forms.py:144
-#: apps/transactions/models.py:423 templates/includes/sidebar.html:81
+#: apps/export_app/forms.py:31 apps/export_app/forms.py:151
+#: apps/transactions/models.py:425 templates/includes/sidebar.html:81
#: templates/includes/sidebar.html:154
#: templates/recurring_transactions/fragments/list_transactions.html:5
#: templates/recurring_transactions/fragments/table.html:37
@@ -1161,9 +1173,9 @@ msgstr ""
msgid "Transactions"
msgstr ""
-#: apps/export_app/forms.py:37 apps/export_app/forms.py:141
-#: apps/insights/views.py:43 apps/transactions/filters.py:74
-#: templates/categories/fragments/list.html:9
+#: apps/export_app/forms.py:37 apps/export_app/forms.py:148
+#: apps/insights/views.py:43 apps/transactions/filters.py:90
+#: apps/transactions/filters.py:165 templates/categories/fragments/list.html:9
#: templates/categories/pages/index.html:4 templates/includes/sidebar.html:156
#: templates/insights/fragments/month_by_month.html:18
#: templates/insights/fragments/month_by_month.html:21
@@ -1172,100 +1184,113 @@ msgstr ""
msgid "Categories"
msgstr ""
-#: apps/export_app/forms.py:55 apps/export_app/forms.py:147
-#: apps/transactions/models.py:1068 templates/includes/sidebar.html:110
+#: apps/export_app/forms.py:55 apps/export_app/forms.py:155
+#: apps/transactions/models.py:1167 templates/includes/sidebar.html:110
#: templates/recurring_transactions/fragments/list.html:9
#: templates/recurring_transactions/pages/index.html:4
msgid "Recurring Transactions"
msgstr ""
-#: apps/export_app/forms.py:61 apps/export_app/forms.py:145
-#: apps/transactions/models.py:788 templates/includes/sidebar.html:104
+#: apps/export_app/forms.py:61 apps/export_app/forms.py:153
+#: apps/transactions/models.py:884 templates/includes/sidebar.html:104
#: templates/installment_plans/fragments/list.html:9
#: templates/installment_plans/pages/index.html:4
msgid "Installment Plans"
msgstr ""
-#: apps/export_app/forms.py:73 apps/export_app/forms.py:150
+#: apps/export_app/forms.py:67 apps/export_app/forms.py:157
+#: apps/transactions/models.py:1518 templates/includes/sidebar.html:98
+#: templates/quick_transactions/pages/index.html:5
+#: templates/quick_transactions/pages/index.html:15
+msgid "Quick Transactions"
+msgstr ""
+
+#: apps/export_app/forms.py:79 apps/export_app/forms.py:159
#: templates/exchange_rates_services/fragments/list.html:10
#: templates/exchange_rates_services/pages/index.html:4
#: templates/includes/sidebar.html:232
msgid "Automatic Exchange Rates"
msgstr ""
-#: apps/export_app/forms.py:79 templates/bank_sync/fragments/list.html:8
+#: apps/export_app/forms.py:85 templates/bank_sync/fragments/list.html:8
#: templates/bank_sync/pages/index.html:4 templates/includes/sidebar.html:238
msgid "Bank Sync"
msgstr ""
-#: apps/export_app/forms.py:80
+#: apps/export_app/forms.py:86
msgid "Includes the providers' API keys"
msgstr ""
-#: apps/export_app/forms.py:86 templates/includes/sidebar.html:212
+#: apps/export_app/forms.py:92 templates/includes/sidebar.html:212
#: templates/rules/fragments/list.html:9 templates/rules/pages/index.html:4
msgid "Rules"
msgstr ""
-#: apps/export_app/forms.py:92 templates/cotton/transaction/item.html:66
+#: apps/export_app/forms.py:98 templates/cotton/transaction/item.html:68
msgid "DCA"
msgstr ""
-#: apps/export_app/forms.py:98 apps/export_app/forms.py:168
+#: apps/export_app/forms.py:104 apps/export_app/forms.py:177
#: templates/import_app/fragments/profiles/list.html:21
#: templates/import_app/pages/profiles_index.html:4
msgid "Import Profiles"
msgstr ""
-#: apps/export_app/forms.py:126 templates/export_app/fragments/export.html:5
+#: apps/export_app/forms.py:133 templates/export_app/fragments/export.html:5
#: templates/export_app/pages/index.html:13
msgid "Export"
msgstr ""
-#: apps/export_app/forms.py:134
+#: apps/export_app/forms.py:141
msgid "Import a ZIP file exported from WYGIWYH"
msgstr ""
-#: apps/export_app/forms.py:135
+#: apps/export_app/forms.py:142
msgid "ZIP File"
msgstr ""
-#: apps/export_app/forms.py:157
+#: apps/export_app/forms.py:152 apps/rules/forms.py:193 apps/rules/models.py:42
+#: apps/rules/models.py:320 apps/transactions/models.py:736
+#: templates/transactions/widgets/sub_transactions.html:39
+msgid "Sub-transactions"
+msgstr ""
+
+#: apps/export_app/forms.py:166
msgid "Bank Sync Accounts"
msgstr ""
-#: apps/export_app/forms.py:159 apps/rules/models.py:27
+#: apps/export_app/forms.py:168 apps/rules/models.py:27
msgid "Transaction rules"
msgstr ""
-#: apps/export_app/forms.py:161 apps/rules/models.py:68
+#: apps/export_app/forms.py:170 apps/rules/models.py:69
msgid "Edit transaction action"
msgstr ""
-#: apps/export_app/forms.py:164 apps/rules/models.py:327
+#: apps/export_app/forms.py:173 apps/rules/models.py:332
msgid "Update or create transaction actions"
msgstr ""
-#: apps/export_app/forms.py:199 templates/cotton/transaction/item.html:310
+#: apps/export_app/forms.py:210 templates/cotton/transaction/item.html:327
#: templates/cotton/ui/deleted_transactions_action_bar.html:53
#: templates/export_app/fragments/restore.html:5
#: templates/export_app/pages/index.html:19
msgid "Restore"
msgstr ""
-#: apps/export_app/forms.py:209
+#: apps/export_app/forms.py:220
msgid "Please upload either a ZIP file or at least one CSV file"
msgstr ""
-#: apps/export_app/views.py:190
+#: apps/export_app/views.py:216
msgid "You have to select at least one export"
msgstr ""
-#: apps/export_app/views.py:210
+#: apps/export_app/views.py:236
msgid "Data restored successfully"
msgstr ""
-#: apps/export_app/views.py:222
+#: apps/export_app/views.py:248
msgid ""
"There was an error restoring your data. Check the logs for more details."
msgstr ""
@@ -1352,7 +1377,7 @@ msgstr ""
#: apps/insights/forms.py:118 apps/insights/utils/sankey.py:36
#: apps/insights/utils/sankey.py:167 apps/insights/views.py:45
-#: apps/transactions/filters.py:209
+#: apps/transactions/filters.py:294
#: templates/insights/fragments/month_by_month.html:119
#: templates/insights/fragments/year_by_year.html:73
msgid "Uncategorized"
@@ -1409,24 +1434,24 @@ msgstr ""
msgid "Tag"
msgstr ""
-#: apps/insights/views.py:52 apps/transactions/filters.py:215
+#: apps/insights/views.py:52 apps/transactions/filters.py:303
#: templates/insights/fragments/month_by_month.html:121
#: templates/insights/fragments/year_by_year.html:75
msgid "Untagged"
msgstr ""
-#: apps/insights/views.py:53 apps/transactions/models.py:611
+#: apps/insights/views.py:53 apps/transactions/models.py:632
#: templates/tags/fragments/table.html:69
msgid "No tags"
msgstr ""
-#: apps/insights/views.py:58 apps/transactions/models.py:312
+#: apps/insights/views.py:58 apps/transactions/models.py:314
#: templates/insights/fragments/month_by_month.html:88
#: templates/insights/fragments/year_by_year.html:56
msgid "Entity"
msgstr ""
-#: apps/insights/views.py:59 apps/transactions/filters.py:222
+#: apps/insights/views.py:59 apps/transactions/filters.py:311
#: templates/insights/fragments/month_by_month.html:123
#: templates/insights/fragments/year_by_year.html:77
msgid "No entity"
@@ -1444,15 +1469,15 @@ msgstr ""
msgid "Unclassified"
msgstr ""
-#: apps/investments/views.py:289
+#: apps/investments/views.py:290
msgid "Asset class added successfully"
msgstr ""
-#: apps/investments/views.py:297
+#: apps/investments/views.py:298
msgid "Asset class updated successfully"
msgstr ""
-#: apps/investments/views.py:318
+#: apps/investments/views.py:319
msgid "Asset class deleted successfully"
msgstr ""
@@ -1485,13 +1510,13 @@ msgstr ""
msgid "Set field"
msgstr ""
-#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:123
+#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:101
msgid "To"
msgstr ""
#: apps/rules/forms.py:78 apps/rules/forms.py:158 apps/rules/models.py:20
-#: apps/rules/models.py:62 apps/rules/models.py:323
+#: apps/rules/models.py:63 apps/rules/models.py:328
#: templates/rules/fragments/list.html:23
msgid "Order"
msgstr ""
@@ -1509,36 +1534,37 @@ msgid "Operator"
msgstr ""
#: apps/rules/forms.py:174 apps/rules/forms.py:188 apps/rules/models.py:36
-#: apps/rules/models.py:271 apps/transactions/forms.py:468
-#: apps/transactions/models.py:337 apps/transactions/models.py:730
-#: apps/transactions/models.py:1009 apps/transactions/models.py:1323
+#: apps/rules/models.py:272 apps/transactions/forms.py:554
+#: apps/transactions/models.py:339 apps/transactions/models.py:826
+#: apps/transactions/models.py:1108 apps/transactions/models.py:1470
#: templates/mini_tools/simulator.html:63
msgid "Type"
msgstr ""
#: apps/rules/forms.py:175 apps/rules/forms.py:189 apps/rules/models.py:37
-#: apps/rules/models.py:275 apps/transactions/filters.py:22
-#: apps/transactions/forms.py:472 apps/transactions/forms.py:650
-#: apps/transactions/models.py:339 apps/transactions/models.py:1325
-#: templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/rules/models.py:276 apps/transactions/filters.py:23
+#: apps/transactions/forms.py:558 apps/transactions/forms.py:736
+#: apps/transactions/models.py:341 apps/transactions/models.py:1472
+#: templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/transactions/widgets/paid_toggle_button.html:10
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:13
msgid "Paid"
msgstr ""
#: apps/rules/forms.py:177 apps/rules/forms.py:191 apps/rules/models.py:39
-#: apps/rules/models.py:283 apps/transactions/forms.py:90
-#: apps/transactions/forms.py:488 apps/transactions/forms.py:655
-#: apps/transactions/forms.py:868 apps/transactions/models.py:341
-#: apps/transactions/models.py:748 apps/transactions/models.py:1033
+#: apps/rules/models.py:284 apps/transactions/forms.py:173
+#: apps/transactions/forms.py:574 apps/transactions/forms.py:741
+#: apps/transactions/forms.py:956 apps/transactions/models.py:343
+#: apps/transactions/models.py:844 apps/transactions/models.py:1132
msgid "Reference Date"
msgstr ""
#: apps/rules/forms.py:178 apps/rules/forms.py:192 apps/rules/models.py:41
-#: apps/rules/models.py:287 apps/transactions/forms.py:495
-#: apps/transactions/models.py:347 apps/transactions/models.py:1014
-#: apps/transactions/models.py:1331
+#: apps/rules/models.py:288 apps/transactions/forms.py:75
+#: apps/transactions/forms.py:581 apps/transactions/models.py:349
+#: apps/transactions/models.py:730 apps/transactions/models.py:1113
+#: apps/transactions/models.py:1478
#: templates/insights/fragments/sankey.html:102
#: templates/installment_plans/fragments/table.html:18
#: templates/mini_tools/simulator.html:70
@@ -1547,51 +1573,52 @@ msgstr ""
msgid "Amount"
msgstr ""
-#: apps/rules/forms.py:179 apps/rules/forms.py:193 apps/rules/models.py:14
-#: apps/rules/models.py:42 apps/rules/models.py:291
-#: apps/transactions/forms.py:499 apps/transactions/forms.py:659
-#: apps/transactions/models.py:352 apps/transactions/models.py:732
-#: apps/transactions/models.py:1017 apps/transactions/models.py:1336
+#: apps/rules/forms.py:179 apps/rules/forms.py:194 apps/rules/models.py:14
+#: apps/rules/models.py:43 apps/rules/models.py:292
+#: apps/transactions/forms.py:585 apps/transactions/forms.py:745
+#: apps/transactions/models.py:354 apps/transactions/models.py:828
+#: apps/transactions/models.py:1116 apps/transactions/models.py:1483
msgid "Description"
msgstr ""
-#: apps/rules/forms.py:182 apps/rules/forms.py:198 apps/rules/models.py:47
-#: apps/rules/models.py:299 apps/transactions/models.py:399
-#: apps/transactions/models.py:1358
+#: apps/rules/forms.py:182 apps/rules/forms.py:199 apps/rules/models.py:48
+#: apps/rules/models.py:300 apps/transactions/models.py:401
+#: apps/transactions/models.py:1505
msgid "Internal Note"
msgstr ""
-#: apps/rules/forms.py:183 apps/rules/forms.py:199 apps/rules/models.py:48
-#: apps/rules/models.py:303 apps/transactions/models.py:401
-#: apps/transactions/models.py:1360
+#: apps/rules/forms.py:183 apps/rules/forms.py:200 apps/rules/models.py:49
+#: apps/rules/models.py:304 apps/transactions/models.py:403
+#: apps/transactions/models.py:1507
msgid "Internal ID"
msgstr ""
-#: apps/rules/forms.py:186 apps/rules/forms.py:200 apps/rules/models.py:40
-#: apps/rules/models.py:319 apps/transactions/forms.py:672
-#: apps/transactions/models.py:251 apps/transactions/models.py:342
-#: apps/transactions/models.py:1326
+#: apps/rules/forms.py:186 apps/rules/forms.py:201 apps/rules/models.py:40
+#: apps/rules/models.py:324 apps/transactions/forms.py:758
+#: apps/transactions/models.py:253 apps/transactions/models.py:344
+#: apps/transactions/models.py:1473
msgid "Mute"
msgstr ""
-#: apps/rules/forms.py:215
+#: apps/rules/forms.py:216
msgid "Search Criteria"
msgstr ""
-#: apps/rules/forms.py:360
+#: apps/rules/forms.py:361
msgid "Set Values"
msgstr ""
-#: apps/rules/forms.py:407 apps/rules/forms.py:442 apps/rules/forms.py:477
-#: apps/transactions/models.py:422 apps/transactions/models.py:667
+#: apps/rules/forms.py:409 apps/rules/forms.py:444 apps/rules/forms.py:479
+#: apps/transactions/models.py:424 apps/transactions/models.py:703
+#: apps/transactions/models.py:763
msgid "Transaction"
msgstr ""
-#: apps/rules/forms.py:411 apps/rules/forms.py:446 apps/rules/forms.py:481
+#: apps/rules/forms.py:413 apps/rules/forms.py:448 apps/rules/forms.py:483
msgid "Type to search for a transaction"
msgstr ""
-#: apps/rules/forms.py:422 apps/rules/forms.py:457 apps/rules/forms.py:491
+#: apps/rules/forms.py:424 apps/rules/forms.py:459 apps/rules/forms.py:493
#: templates/rules/fragments/transaction_rule/dry_run/created.html:5
#: templates/rules/fragments/transaction_rule/dry_run/deleted.html:5
#: templates/rules/fragments/transaction_rule/dry_run/updated.html:5
@@ -1611,15 +1638,15 @@ msgstr ""
msgid "Transaction rule"
msgstr ""
-#: apps/rules/models.py:54 apps/rules/models.py:98
+#: apps/rules/models.py:55 apps/rules/models.py:99
msgid "Rule"
msgstr ""
-#: apps/rules/models.py:59
+#: apps/rules/models.py:60
msgid "Field"
msgstr ""
-#: apps/rules/models.py:61 templates/investments/fragments/charts.html:86
+#: apps/rules/models.py:62 templates/investments/fragments/charts.html:86
#: templates/investments/fragments/detail.html:68
#: templates/investments/fragments/detail.html:127
#: templates/investments/fragments/detail.html:245
@@ -1627,57 +1654,57 @@ msgstr ""
msgid "Value"
msgstr ""
-#: apps/rules/models.py:69
+#: apps/rules/models.py:70
msgid "Edit transaction actions"
msgstr ""
-#: apps/rules/models.py:84
+#: apps/rules/models.py:85
msgid "is exactly"
msgstr ""
-#: apps/rules/models.py:85
+#: apps/rules/models.py:86
msgid "contains"
msgstr ""
-#: apps/rules/models.py:86
+#: apps/rules/models.py:87
msgid "starts with"
msgstr ""
-#: apps/rules/models.py:87
+#: apps/rules/models.py:88
msgid "ends with"
msgstr ""
-#: apps/rules/models.py:88
+#: apps/rules/models.py:89
msgid "equals"
msgstr ""
-#: apps/rules/models.py:89
+#: apps/rules/models.py:90
msgid "greater than"
msgstr ""
-#: apps/rules/models.py:90
+#: apps/rules/models.py:91
msgid "less than"
msgstr ""
-#: apps/rules/models.py:91
+#: apps/rules/models.py:92
msgid "greater than or equal"
msgstr ""
-#: apps/rules/models.py:92
+#: apps/rules/models.py:93
msgid "less than or equal"
msgstr ""
-#: apps/rules/models.py:102
+#: apps/rules/models.py:103
msgid "Filter"
msgstr ""
-#: apps/rules/models.py:105
+#: apps/rules/models.py:106
msgid ""
"Generic expression to enable or disable execution. Should evaluate to True "
"or False"
msgstr ""
-#: apps/rules/models.py:326
+#: apps/rules/models.py:331
msgid "Update or create transaction action"
msgstr ""
@@ -1721,8 +1748,8 @@ msgstr ""
msgid "Update or Create Transaction action deleted successfully"
msgstr ""
-#: apps/transactions/filters.py:23 templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/transactions/filters.py:24 templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/insights/fragments/overview/index.html:68
#: templates/net_worth/net_worth.html:39 templates/net_worth/net_worth.html:43
#: templates/transactions/widgets/paid_toggle_button.html:7
@@ -1730,160 +1757,170 @@ msgstr ""
msgid "Projected"
msgstr ""
-#: apps/transactions/filters.py:28 templates/categories/fragments/table.html:18
+#: apps/transactions/filters.py:29 templates/categories/fragments/table.html:18
msgid "Muted"
msgstr ""
-#: apps/transactions/filters.py:51
+#: apps/transactions/filters.py:67 apps/transactions/filters.py:144
msgid "Content"
msgstr ""
-#: apps/transactions/filters.py:57
+#: apps/transactions/filters.py:73
msgid "Transaction Type"
msgstr ""
-#: apps/transactions/filters.py:95
+#: apps/transactions/filters.py:111
msgid "Mute Status"
msgstr ""
-#: apps/transactions/filters.py:100
+#: apps/transactions/filters.py:116
msgid "Date from"
msgstr ""
-#: apps/transactions/filters.py:105 apps/transactions/filters.py:115
+#: apps/transactions/filters.py:121 apps/transactions/filters.py:131
msgid "Until"
msgstr ""
-#: apps/transactions/filters.py:110
+#: apps/transactions/filters.py:126
msgid "Reference date from"
msgstr ""
-#: apps/transactions/filters.py:120
+#: apps/transactions/filters.py:136
msgid "Amount min"
msgstr ""
-#: apps/transactions/filters.py:125
+#: apps/transactions/filters.py:141
msgid "Amount max"
msgstr ""
-#: apps/transactions/filters.py:208
+#: apps/transactions/filters.py:240
+msgid "Include"
+msgstr ""
+
+#: apps/transactions/filters.py:245
+msgid "Exclude"
+msgstr ""
+
+#: apps/transactions/filters.py:293
msgid "Categorized"
msgstr ""
-#: apps/transactions/filters.py:215
+#: apps/transactions/filters.py:303
msgid "Tagged"
msgstr ""
-#: apps/transactions/filters.py:221
+#: apps/transactions/filters.py:310
msgid "Any entity"
msgstr ""
-#: apps/transactions/forms.py:192
+#: apps/transactions/forms.py:277
msgid "More"
msgstr ""
-#: apps/transactions/forms.py:229
+#: apps/transactions/forms.py:314
msgid "Save and add similar"
msgstr ""
-#: apps/transactions/forms.py:234
+#: apps/transactions/forms.py:319
msgid "Save and add another"
msgstr ""
-#: apps/transactions/forms.py:271 templates/cotton/transaction/item.html:184
+#: apps/transactions/forms.py:356 templates/cotton/transaction/item.html:186
#: templates/transactions/fragments/attachments.html:4
msgid "Attachments"
msgstr ""
-#: apps/transactions/forms.py:272
+#: apps/transactions/forms.py:357
msgid ""
"Files are private and only visible to users with access to this transaction."
msgstr ""
-#: apps/transactions/forms.py:283
+#: apps/transactions/forms.py:368
msgid "Upload"
msgstr ""
-#: apps/transactions/forms.py:355 apps/transactions/forms.py:1120
-#: apps/transactions/models.py:947
+#: apps/transactions/forms.py:440 apps/transactions/forms.py:1210
+#: apps/transactions/models.py:1046
msgid "To account"
msgstr ""
-#: apps/transactions/forms.py:382 apps/transactions/forms.py:675
+#: apps/transactions/forms.py:467 apps/transactions/forms.py:761
msgid "Muted transactions won't be displayed on monthly summaries"
msgstr ""
-#: apps/transactions/forms.py:594
+#: apps/transactions/forms.py:680
msgid "From Amount"
msgstr ""
-#: apps/transactions/forms.py:599
+#: apps/transactions/forms.py:685
msgid "To Amount"
msgstr ""
-#: apps/transactions/forms.py:741 apps/transactions/models.py:992
-#: apps/transactions/models.py:1303 templates/cotton/transaction/item.html:52
-#: templates/cotton/transaction/item.html:60
+#: apps/transactions/forms.py:827 apps/transactions/models.py:1091
+#: apps/transactions/models.py:1450 templates/cotton/transaction/item.html:54
+#: templates/cotton/transaction/item.html:62
+#: templates/cotton/transaction/item.html:272
+#: templates/cotton/transaction/item.html:304
#: templates/cotton/ui/quick_transactions_buttons.html:40
#: templates/cotton/ui/transactions_fab.html:44
msgid "Transfer"
msgstr ""
-#: apps/transactions/forms.py:1005
+#: apps/transactions/forms.py:1095
msgid "Tag name"
msgstr ""
-#: apps/transactions/forms.py:1033
+#: apps/transactions/forms.py:1123
msgid "Entity name"
msgstr ""
-#: apps/transactions/forms.py:1061
+#: apps/transactions/forms.py:1151
msgid "Category name"
msgstr ""
-#: apps/transactions/forms.py:1063
+#: apps/transactions/forms.py:1153
msgid "Muted categories won't be displayed on monthly summaries"
msgstr ""
-#: apps/transactions/forms.py:1228
+#: apps/transactions/forms.py:1319
msgid "future transactions"
msgstr ""
-#: apps/transactions/forms.py:1255
+#: apps/transactions/forms.py:1346
msgid "End date should be after the start date"
msgstr ""
-#: apps/transactions/models.py:256
+#: apps/transactions/models.py:258
msgid ""
"Deactivated categories won't be able to be selected when creating new "
"transactions"
msgstr ""
-#: apps/transactions/models.py:264
+#: apps/transactions/models.py:266
msgid "Transaction Category"
msgstr ""
-#: apps/transactions/models.py:265
+#: apps/transactions/models.py:267
msgid "Transaction Categories"
msgstr ""
-#: apps/transactions/models.py:280
+#: apps/transactions/models.py:282
msgid ""
"Deactivated tags won't be able to be selected when creating new transactions"
msgstr ""
-#: apps/transactions/models.py:288 apps/transactions/models.py:289
+#: apps/transactions/models.py:290 apps/transactions/models.py:291
msgid "Transaction Tags"
msgstr ""
-#: apps/transactions/models.py:304
+#: apps/transactions/models.py:306
msgid ""
"Deactivated entities won't be able to be selected when creating new "
"transactions"
msgstr ""
-#: apps/transactions/models.py:324 apps/transactions/models.py:991
-#: apps/transactions/models.py:1302
+#: apps/transactions/models.py:326 apps/transactions/models.py:1090
+#: apps/transactions/models.py:1449
#: templates/calendar_view/fragments/list.html:42
#: templates/calendar_view/fragments/list.html:44
#: templates/calendar_view/fragments/list.html:52
@@ -1895,14 +1932,14 @@ msgstr ""
#: templates/investments/fragments/detail.html:71
#: templates/investments/fragments/detail.html:175
#: templates/investments/fragments/detail.html:227
-#: templates/investments/fragments/detail.html:318
+#: templates/investments/fragments/detail.html:326
#: templates/mini_tools/simulator.html:66
#: templates/monthly_overview/fragments/monthly_summary.html:42
msgid "Income"
msgstr ""
-#: apps/transactions/models.py:325 apps/transactions/models.py:993
-#: apps/transactions/models.py:1304
+#: apps/transactions/models.py:327 apps/transactions/models.py:1092
+#: apps/transactions/models.py:1451
#: templates/calendar_view/fragments/list.html:46
#: templates/calendar_view/fragments/list.html:48
#: templates/calendar_view/fragments/list.html:56
@@ -1914,192 +1951,190 @@ msgstr ""
msgid "Expense"
msgstr ""
-#: apps/transactions/models.py:380 apps/transactions/models.py:787
-#: templates/cotton/transaction/item.html:260
-#: templates/cotton/transaction/item.html:277
-#: templates/cotton/transaction/item.html:287
+#: apps/transactions/models.py:382 apps/transactions/models.py:883
+#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:289
+#: templates/cotton/transaction/item.html:299
msgid "Installment Plan"
msgstr ""
-#: apps/transactions/models.py:389 apps/transactions/models.py:1067
-#: templates/cotton/transaction/item.html:250
-#: templates/cotton/transaction/item.html:270
+#: apps/transactions/models.py:391 apps/transactions/models.py:1166
+#: templates/cotton/transaction/item.html:252
+#: templates/cotton/transaction/item.html:282
msgid "Recurring Transaction"
msgstr ""
-#: apps/transactions/models.py:397
+#: apps/transactions/models.py:399
msgid "Linked Transaction"
msgstr ""
-#: apps/transactions/models.py:405
+#: apps/transactions/models.py:407
msgid "Deleted"
msgstr ""
-#: apps/transactions/models.py:410
+#: apps/transactions/models.py:412
msgid "Deleted At"
msgstr ""
-#: apps/transactions/models.py:518
+#: apps/transactions/models.py:521
msgid "A transfer needs one expense and one income."
msgstr ""
-#: apps/transactions/models.py:520
+#: apps/transactions/models.py:523
msgid "A transfer needs two different accounts."
msgstr ""
-#: apps/transactions/models.py:524
+#: apps/transactions/models.py:527
msgid "This transaction is already part of another transfer."
msgstr ""
-#: apps/transactions/models.py:613
+#: apps/transactions/models.py:634
msgid "No category"
msgstr ""
-#: apps/transactions/models.py:615
+#: apps/transactions/models.py:636
msgid "No description"
msgstr ""
-#: apps/transactions/models.py:672
+#: apps/transactions/models.py:735
+msgid "Sub-transaction"
+msgstr ""
+
+#: apps/transactions/models.py:768
msgid "File"
msgstr ""
-#: apps/transactions/models.py:674
+#: apps/transactions/models.py:770
msgid "Original Name"
msgstr ""
-#: apps/transactions/models.py:676
+#: apps/transactions/models.py:772
msgid "Content Type"
msgstr ""
-#: apps/transactions/models.py:678
+#: apps/transactions/models.py:774
msgid "Size"
msgstr ""
-#: apps/transactions/models.py:683
+#: apps/transactions/models.py:779
msgid "Uploaded By"
msgstr ""
-#: apps/transactions/models.py:688
+#: apps/transactions/models.py:784
msgid "Transaction Attachment"
msgstr ""
-#: apps/transactions/models.py:689
+#: apps/transactions/models.py:785
msgid "Transaction Attachments"
msgstr ""
-#: apps/transactions/models.py:719 templates/includes/sidebar.html:57
+#: apps/transactions/models.py:815 templates/includes/sidebar.html:57
msgid "Yearly"
msgstr ""
-#: apps/transactions/models.py:720 apps/users/models.py:469
+#: apps/transactions/models.py:816 apps/users/models.py:469
#: templates/includes/sidebar.html:51
msgid "Monthly"
msgstr ""
-#: apps/transactions/models.py:721
+#: apps/transactions/models.py:817
msgid "Weekly"
msgstr ""
-#: apps/transactions/models.py:722
+#: apps/transactions/models.py:818
msgid "Daily"
msgstr ""
-#: apps/transactions/models.py:735
+#: apps/transactions/models.py:831
msgid "Number of Installments"
msgstr ""
-#: apps/transactions/models.py:740
+#: apps/transactions/models.py:836
msgid "Installment Start"
msgstr ""
-#: apps/transactions/models.py:741
+#: apps/transactions/models.py:837
msgid "The installment number to start counting from"
msgstr ""
-#: apps/transactions/models.py:746 apps/transactions/models.py:1037
+#: apps/transactions/models.py:842 apps/transactions/models.py:1136
msgid "Start Date"
msgstr ""
-#: apps/transactions/models.py:750 apps/transactions/models.py:1038
+#: apps/transactions/models.py:846 apps/transactions/models.py:1137
msgid "End Date"
msgstr ""
-#: apps/transactions/models.py:755
+#: apps/transactions/models.py:851
msgid "Recurrence"
msgstr ""
-#: apps/transactions/models.py:758
+#: apps/transactions/models.py:854
msgid "Installment Amount"
msgstr ""
-#: apps/transactions/models.py:777 apps/transactions/models.py:1057
+#: apps/transactions/models.py:873 apps/transactions/models.py:1156
msgid "Add description to transactions"
msgstr ""
-#: apps/transactions/models.py:780 apps/transactions/models.py:1060
+#: apps/transactions/models.py:876 apps/transactions/models.py:1159
msgid "Add notes to transactions"
msgstr ""
-#: apps/transactions/models.py:954
+#: apps/transactions/models.py:1053
msgid "To amount"
msgstr ""
-#: apps/transactions/models.py:955
+#: apps/transactions/models.py:1054
msgid "Leave empty to use the same amount"
msgstr ""
-#: apps/transactions/models.py:996 templates/mini_tools/simulator.html:129
+#: apps/transactions/models.py:1095 templates/mini_tools/simulator.html:129
msgid "day(s)"
msgstr ""
-#: apps/transactions/models.py:997 templates/mini_tools/simulator.html:130
+#: apps/transactions/models.py:1096 templates/mini_tools/simulator.html:130
msgid "week(s)"
msgstr ""
-#: apps/transactions/models.py:998 templates/mini_tools/simulator.html:131
+#: apps/transactions/models.py:1097 templates/mini_tools/simulator.html:131
msgid "month(s)"
msgstr ""
-#: apps/transactions/models.py:999 templates/mini_tools/simulator.html:132
+#: apps/transactions/models.py:1098 templates/mini_tools/simulator.html:132
msgid "year(s)"
msgstr ""
-#: apps/transactions/models.py:1001
+#: apps/transactions/models.py:1100
#: templates/recurring_transactions/fragments/list.html:18
msgid "Paused"
msgstr ""
-#: apps/transactions/models.py:1040
+#: apps/transactions/models.py:1139
msgid "Recurrence Type"
msgstr ""
-#: apps/transactions/models.py:1043
+#: apps/transactions/models.py:1142
msgid "Recurrence Interval"
msgstr ""
-#: apps/transactions/models.py:1046
+#: apps/transactions/models.py:1145
msgid "Keep at most"
msgstr ""
-#: apps/transactions/models.py:1050
+#: apps/transactions/models.py:1149
msgid "Last Generated Date"
msgstr ""
-#: apps/transactions/models.py:1053
+#: apps/transactions/models.py:1152
msgid "Last Generated Reference Date"
msgstr ""
-#: apps/transactions/models.py:1370 templates/cotton/transaction/item.html:243
+#: apps/transactions/models.py:1517 templates/cotton/transaction/item.html:245
#: templates/cotton/ui/transactions_fab.html:59
msgid "Quick Transaction"
msgstr ""
-#: apps/transactions/models.py:1371 templates/includes/sidebar.html:98
-#: templates/quick_transactions/pages/index.html:5
-#: templates/quick_transactions/pages/index.html:15
-msgid "Quick Transactions"
-msgstr ""
-
#: apps/transactions/validators.py:8
#, python-format
msgid "%(value)s has too many decimal places. Maximum is 30."
@@ -2110,35 +2145,43 @@ msgstr ""
msgid "%(value)s is not a non-negative number"
msgstr ""
-#: apps/transactions/views/actions.py:58
+#: apps/transactions/views/actions.py:61
#, python-format
msgid "%(count)s transaction marked as paid"
msgid_plural "%(count)s transactions marked as paid"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:81
+#: apps/transactions/views/actions.py:84
#, python-format
msgid "%(count)s transaction marked as not paid"
msgid_plural "%(count)s transactions marked as not paid"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:105
+#: apps/transactions/views/actions.py:108
#, python-format
msgid "%(count)s transaction deleted successfully"
msgid_plural "%(count)s transactions deleted successfully"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:139
+#: apps/transactions/views/actions.py:142
#, python-format
msgid "%(count)s transaction restored successfully"
msgid_plural "%(count)s transactions restored successfully"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:170
+#: apps/transactions/views/actions.py:174
+#: apps/transactions/views/transactions.py:423
+#, python-format
+msgid "%(count)s transaction updated successfully"
+msgid_plural "%(count)s transactions updated successfully"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apps/transactions/views/actions.py:247
#, python-format
msgid "%(count)s transaction duplicated successfully"
msgid_plural "%(count)s transactions duplicated successfully"
@@ -2157,33 +2200,41 @@ msgstr ""
msgid "Category deleted successfully"
msgstr ""
-#: apps/transactions/views/conversions.py:72
+#: apps/transactions/views/conversions.py:77
#: apps/transactions/views/quick_transactions.py:46 apps/users/views.py:252
msgid "Item added successfully"
msgstr ""
-#: apps/transactions/views/conversions.py:91
+#: apps/transactions/views/conversions.py:97
msgid "Convert into quick transaction"
msgstr ""
-#: apps/transactions/views/conversions.py:108
+#: apps/transactions/views/conversions.py:114
#: apps/transactions/views/recurring_transactions.py:112
msgid "Recurring Transaction added successfully"
msgstr ""
-#: apps/transactions/views/conversions.py:129
+#: apps/transactions/views/conversions.py:136
msgid "Convert into recurring transaction"
msgstr ""
-#: apps/transactions/views/conversions.py:148
+#: apps/transactions/views/conversions.py:155
#: apps/transactions/views/installment_plans.py:87
msgid "Installment Plan added successfully"
msgstr ""
-#: apps/transactions/views/conversions.py:167
+#: apps/transactions/views/conversions.py:175
msgid "Convert into installment plan"
msgstr ""
+#: apps/transactions/views/conversions.py:195
+msgid "Transaction converted into a transfer"
+msgstr ""
+
+#: apps/transactions/views/conversions.py:226
+msgid "Convert into transfer"
+msgstr ""
+
#: apps/transactions/views/entities.py:72
msgid "Entity added successfully"
msgstr ""
@@ -2216,7 +2267,7 @@ msgstr ""
msgid "Item deleted successfully"
msgstr ""
-#: apps/transactions/views/quick_transactions.py:164
+#: apps/transactions/views/quick_transactions.py:165
#: apps/transactions/views/transactions.py:156
#: apps/transactions/views/transactions.py:343
msgid "Transaction added successfully"
@@ -2266,30 +2317,23 @@ msgstr ""
msgid "Transaction updated successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:421
-#, python-format
-msgid "%(count)s transaction updated successfully"
-msgid_plural "%(count)s transactions updated successfully"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apps/transactions/views/transactions.py:448
+#: apps/transactions/views/transactions.py:450
msgid "Transaction duplicated successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:493
+#: apps/transactions/views/transactions.py:495
msgid "Transaction deleted successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:523
+#: apps/transactions/views/transactions.py:525
msgid "Transaction restored successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:549
+#: apps/transactions/views/transactions.py:551
msgid "Transfer added successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:579
+#: apps/transactions/views/transactions.py:581
msgid "Transfer updated successfully"
msgstr ""
@@ -2607,8 +2651,9 @@ msgstr ""
#: templates/accounts/fragments/list.html:37
#: templates/bank_sync/fragments/list.html:33
#: templates/categories/fragments/table.html:29
-#: templates/cotton/transaction/item.html:178
-#: templates/cotton/ui/transactions_action_bar.html:54
+#: templates/cotton/transaction/item.html:180
+#: templates/cotton/ui/transactions_action_bar.html:56
+#: templates/cotton/ui/transactions_action_bar.html:90
#: templates/currencies/fragments/list.html:34
#: templates/dca/fragments/strategy/details.html:63
#: templates/dca/fragments/strategy/list.html:31
@@ -2619,8 +2664,8 @@ msgstr ""
#: templates/import_app/fragments/profiles/list.html:46
#: templates/installment_plans/fragments/table.html:28
#: templates/investment_classes/fragments/list.html:39
-#: templates/investments/fragments/detail.html:302
-#: templates/investments/fragments/detail.html:330
+#: templates/investments/fragments/detail.html:310
+#: templates/investments/fragments/detail.html:338
#: templates/quick_transactions/fragments/list.html:25
#: templates/recurring_transactions/fragments/table.html:30
#: templates/rules/fragments/transaction_rule/view.html:22
@@ -2657,10 +2702,11 @@ msgstr ""
#: templates/accounts/fragments/list.html:71
#: templates/bank_sync/fragments/list.html:50
#: templates/categories/fragments/table.html:51
-#: templates/cotton/transaction/item.html:190
-#: templates/cotton/transaction/item.html:316
+#: templates/cotton/transaction/item.html:192
+#: templates/cotton/transaction/item.html:333
#: templates/cotton/ui/deleted_transactions_action_bar.html:57
-#: templates/cotton/ui/transactions_action_bar.html:82
+#: templates/cotton/ui/transactions_action_bar.html:75
+#: templates/cotton/ui/transactions_action_bar.html:107
#: templates/currencies/fragments/list.html:40
#: templates/dca/fragments/strategy/details.html:70
#: templates/dca/fragments/strategy/list.html:38
@@ -2691,10 +2737,11 @@ msgstr ""
#: templates/accounts/fragments/list.html:75
#: templates/bank_sync/fragments/list.html:54
#: templates/categories/fragments/table.html:56
-#: templates/cotton/transaction/item.html:192
-#: templates/cotton/transaction/item.html:322
+#: templates/cotton/transaction/item.html:194
+#: templates/cotton/transaction/item.html:339
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:44
#: templates/dca/fragments/strategy/details.html:75
#: templates/dca/fragments/strategy/list.html:42
@@ -2722,10 +2769,11 @@ msgstr ""
#: templates/account_groups/fragments/list.html:59
#: templates/accounts/fragments/list.html:76
#: templates/categories/fragments/table.html:57
-#: templates/cotton/transaction/item.html:193
-#: templates/cotton/transaction/item.html:323
+#: templates/cotton/transaction/item.html:195
+#: templates/cotton/transaction/item.html:340
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:45
#: templates/dca/fragments/strategy/details.html:76
#: templates/dca/fragments/strategy/list.html:43
@@ -2745,8 +2793,8 @@ msgstr ""
#: templates/accounts/fragments/list.html:77
#: templates/bank_sync/fragments/list.html:56
#: templates/categories/fragments/table.html:58
-#: templates/cotton/transaction/item.html:194
-#: templates/cotton/transaction/item.html:324
+#: templates/cotton/transaction/item.html:196
+#: templates/cotton/transaction/item.html:341
#: templates/currencies/fragments/list.html:46
#: templates/dca/fragments/strategy/details.html:77
#: templates/dca/fragments/strategy/list.html:44
@@ -2826,6 +2874,12 @@ msgstr ""
msgid "No accounts"
msgstr ""
+#: templates/accounts/fragments/share.html:8
+msgid ""
+"Everyone who can see this account can add, edit and delete its transactions, "
+"installment plans and recurring transactions."
+msgstr ""
+
#: templates/bank_sync/fragments/accounts.html:31
msgid "No accounts found on this service"
msgstr ""
@@ -2920,63 +2974,76 @@ msgstr ""
msgid "Search"
msgstr ""
-#: templates/cotton/transaction/item.html:12
+#: templates/cotton/transaction/item.html:14
msgid "Select"
msgstr ""
-#: templates/cotton/transaction/item.html:123
+#: templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:100
msgid "From"
msgstr ""
-#: templates/cotton/transaction/item.html:207
-#: templates/cotton/transaction/item.html:218
-#: templates/cotton/transaction/item.html:228
+#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:230
msgid "Show on summaries"
msgstr ""
-#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:211
msgid "Controlled by account"
msgstr ""
-#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:222
msgid "Controlled by category"
msgstr ""
-#: templates/cotton/transaction/item.html:233
+#: templates/cotton/transaction/item.html:235
+#: templates/includes/transactions_bulk_actions.html:15
msgid "Hide from summaries"
msgstr ""
-#: templates/cotton/transaction/item.html:237
+#: templates/cotton/transaction/item.html:239
msgid "Convert"
msgstr ""
-#: templates/cotton/transaction/item.html:252
-#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:254
+#: templates/cotton/transaction/item.html:264
+#: templates/cotton/transaction/item.html:274
msgid "Already part of a plan or recurrence"
msgstr ""
-#: templates/cotton/transaction/item.html:279
+#: templates/cotton/transaction/item.html:291
msgid "Not available for transfers"
msgstr ""
-#: templates/cotton/transaction/item.html:296
+#: templates/cotton/transaction/item.html:313
+#: templates/includes/transactions_bulk_actions.html:22
msgid "Move to previous month"
msgstr ""
-#: templates/cotton/transaction/item.html:300
+#: templates/cotton/transaction/item.html:317
+#: templates/includes/transactions_bulk_actions.html:28
msgid "Move to next month"
msgstr ""
-#: templates/cotton/transaction/item.html:303
+#: templates/cotton/transaction/item.html:320
+#: templates/includes/transactions_bulk_actions.html:33
msgid "Move to today"
msgstr ""
-#: templates/cotton/transaction/item.html:307
-#: templates/cotton/ui/transactions_action_bar.html:78
+#: templates/cotton/transaction/item.html:324
+#: templates/cotton/ui/transactions_action_bar.html:71
+#: templates/cotton/ui/transactions_action_bar.html:98
msgid "Duplicate"
msgstr ""
+#: templates/cotton/transaction/item.html:373
+#, python-format
+msgid "%(counter)s item"
+msgid_plural "%(counter)s items"
+msgstr[0] ""
+msgstr[1] ""
+
#: templates/cotton/ui/account_card.html:10
#: templates/cotton/ui/currency_card.html:10
msgid "projected income"
@@ -3012,22 +3079,26 @@ msgstr ""
msgid "final total"
msgstr ""
-#: templates/cotton/ui/deleted_transactions_action_bar.html:34
-#: templates/cotton/ui/transactions_action_bar.html:34
-msgid "Select All"
-msgstr ""
-
-#: templates/cotton/ui/deleted_transactions_action_bar.html:40
-#: templates/cotton/ui/transactions_action_bar.html:40
+#: templates/cotton/ui/deleted_transactions_action_bar.html:25
+#: templates/cotton/ui/deleted_transactions_action_bar.html:26
+#: templates/cotton/ui/transactions_action_bar.html:25
+#: templates/cotton/ui/transactions_action_bar.html:26
msgid "Unselect All"
msgstr ""
-#: templates/cotton/ui/deleted_transactions_action_bar.html:46
-msgid "Invert election"
+#: templates/cotton/ui/deleted_transactions_action_bar.html:39
+#: templates/cotton/ui/transactions_action_bar.html:39
+msgid "Select All"
+msgstr ""
+
+#: templates/cotton/ui/deleted_transactions_action_bar.html:45
+#: templates/cotton/ui/transactions_action_bar.html:45
+msgid "Invert selection"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:59
-#: templates/cotton/ui/transactions_action_bar.html:84
+#: templates/cotton/ui/transactions_action_bar.html:77
+#: templates/cotton/ui/transactions_action_bar.html:106
msgid "Yes, delete them!"
msgstr ""
@@ -3038,43 +3109,43 @@ msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:166
#: templates/cotton/ui/deleted_transactions_action_bar.html:182
#: templates/cotton/ui/deleted_transactions_action_bar.html:198
-#: templates/cotton/ui/transactions_action_bar.html:128
-#: templates/cotton/ui/transactions_action_bar.html:143
-#: templates/cotton/ui/transactions_action_bar.html:159
-#: templates/cotton/ui/transactions_action_bar.html:175
-#: templates/cotton/ui/transactions_action_bar.html:191
-#: templates/cotton/ui/transactions_action_bar.html:207
-#: templates/cotton/ui/transactions_action_bar.html:223
+#: templates/cotton/ui/transactions_action_bar.html:153
+#: templates/cotton/ui/transactions_action_bar.html:168
+#: templates/cotton/ui/transactions_action_bar.html:184
+#: templates/cotton/ui/transactions_action_bar.html:200
+#: templates/cotton/ui/transactions_action_bar.html:216
+#: templates/cotton/ui/transactions_action_bar.html:232
+#: templates/cotton/ui/transactions_action_bar.html:248
msgid "copied!"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:123
-#: templates/cotton/ui/transactions_action_bar.html:148
+#: templates/cotton/ui/transactions_action_bar.html:173
msgid "Flat Total"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:139
-#: templates/cotton/ui/transactions_action_bar.html:164
+#: templates/cotton/ui/transactions_action_bar.html:189
msgid "Real Total"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:155
-#: templates/cotton/ui/transactions_action_bar.html:180
+#: templates/cotton/ui/transactions_action_bar.html:205
msgid "Mean"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:171
-#: templates/cotton/ui/transactions_action_bar.html:196
+#: templates/cotton/ui/transactions_action_bar.html:221
msgid "Max"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:187
-#: templates/cotton/ui/transactions_action_bar.html:212
+#: templates/cotton/ui/transactions_action_bar.html:237
msgid "Min"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:203
-#: templates/cotton/ui/transactions_action_bar.html:228
+#: templates/cotton/ui/transactions_action_bar.html:253
msgid "Count"
msgstr ""
@@ -3098,16 +3169,8 @@ msgstr ""
msgid "Balance"
msgstr ""
-#: templates/cotton/ui/transactions_action_bar.html:46
-msgid "Invert selection"
-msgstr ""
-
-#: templates/cotton/ui/transactions_action_bar.html:66
-msgid "Mark as unpaid"
-msgstr ""
-
-#: templates/cotton/ui/transactions_action_bar.html:71
-msgid "Mark as paid"
+#: templates/cotton/ui/transactions_action_bar.html:83
+msgid "More actions"
msgstr ""
#: templates/currencies/fragments/add.html:5
@@ -3539,6 +3602,14 @@ msgstr ""
msgid "Calculator"
msgstr ""
+#: templates/includes/transactions_bulk_actions.html:4
+msgid "Mark as unpaid"
+msgstr ""
+
+#: templates/includes/transactions_bulk_actions.html:9
+msgid "Mark as paid"
+msgstr ""
+
#: templates/insights/fragments/category_explorer/charts/account.html:100
#: templates/insights/fragments/category_explorer/charts/currency.html:92
#: templates/monthly_overview/fragments/monthly_account_summary.html:14
@@ -3604,6 +3675,7 @@ msgstr ""
#: templates/insights/fragments/year_by_year.html:140
#: templates/investment_classes/fragments/list.html:65
#: templates/monthly_overview/fragments/monthly_summary.html:168
+#: templates/transactions/widgets/sub_transactions.html:55
msgid "Total"
msgstr ""
@@ -4006,11 +4078,11 @@ msgstr ""
msgid "Loss, tax or fee"
msgstr ""
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
msgid "No movements yet"
msgstr ""
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
msgid "Use the + button to buy or contribute"
msgstr ""
@@ -4565,6 +4637,10 @@ msgstr ""
msgid "Deleted transactions"
msgstr ""
+#: templates/transactions/widgets/sub_transactions.html:53
+msgid "Add sub-transaction"
+msgstr ""
+
#: templates/transactions/widgets/unselectable_income_expense_toggle_buttons.html:11
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:7
msgid "Unchanged"
diff --git a/app/locale/es/LC_MESSAGES/django.po b/app/locale/es/LC_MESSAGES/django.po
index 69f6f860..dead14b0 100644
--- 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: 2026-11-12 03:24+0000\n"
+"POT-Creation-Date: 2026-11-14 14:06+0000\n"
"PO-Revision-Date: 2026-07-10 04:57+0000\n"
"Last-Translator: Juan David Afanador \n"
"Language-Team: Spanish Public: Shown for all users. Only editable by the owner."
msgid ""
-"Private: Only shown for the owner and shared users. Only editable by the "
-"owner. Public: Shown for all users. Only editable by the owner."
+"Private: Only shown for the owner and shared users. Public: Shown for "
+"all users. Only the owner can edit, share or delete it."
msgstr ""
"Privado: Solo visible para el propietario y los usuarios con los que se haya "
"compartido. Solo el propietario puede editarlo. Público: Visible para "
"todos los usuarios. Solo el propietario puede editarlo."
-#: apps/common/forms.py:76 apps/users/forms.py:191
+#: apps/common/forms.py:78 apps/users/forms.py:191
#: templates/bank_sync/fragments/accounts.html:34
#: templates/transactions/fragments/filter_actions.html:5
msgid "Save"
msgstr "Guardar"
-#: apps/common/forms.py:90
+#: apps/common/forms.py:92
msgid "You cannot share this item with its owner."
msgstr "No puede compartir este item con su propietario."
@@ -842,6 +859,7 @@ msgid "Now"
msgstr "Ahora"
#: apps/common/widgets/tom_select.py:14
+#: templates/transactions/widgets/sub_transaction_row.html:9
msgid "Remove"
msgstr "Remover"
@@ -918,8 +936,8 @@ msgstr "Fecha y Hora"
msgid "Auto"
msgstr "Automático"
-#: apps/currencies/models.py:91 apps/export_app/forms.py:67
-#: apps/export_app/forms.py:152 templates/exchange_rates/fragments/list.html:10
+#: apps/currencies/models.py:91 apps/export_app/forms.py:73
+#: apps/export_app/forms.py:161 templates/exchange_rates/fragments/list.html:10
#: templates/exchange_rates/pages/index.html:4
#: templates/includes/sidebar.html:204
msgid "Exchange Rates"
@@ -1084,25 +1102,25 @@ msgstr "Servicios agregados a la cola con éxito"
msgid "Create transaction"
msgstr "Crear transacción"
-#: apps/dca/forms.py:69 apps/transactions/forms.py:582
+#: apps/dca/forms.py:69 apps/transactions/forms.py:668
msgid "From Account"
msgstr "Cuenta de Origen"
-#: apps/dca/forms.py:75 apps/transactions/forms.py:587
+#: apps/dca/forms.py:75 apps/transactions/forms.py:673
msgid "To Account"
msgstr "Cuenta de Destino"
#: apps/dca/forms.py:117 apps/dca/forms.py:125 apps/export_app/forms.py:49
-#: apps/export_app/forms.py:143 apps/insights/views.py:57
-#: apps/rules/forms.py:185 apps/rules/forms.py:195 apps/rules/models.py:46
-#: apps/rules/models.py:307 apps/transactions/filters.py:84
-#: apps/transactions/forms.py:78 apps/transactions/forms.py:346
-#: apps/transactions/forms.py:526 apps/transactions/forms.py:640
-#: apps/transactions/forms.py:647 apps/transactions/forms.py:862
-#: apps/transactions/forms.py:1114 apps/transactions/models.py:313
-#: apps/transactions/models.py:369 apps/transactions/models.py:770
-#: apps/transactions/models.py:1028 apps/transactions/models.py:1353
-#: templates/entities/fragments/list.html:9
+#: apps/export_app/forms.py:150 apps/insights/views.py:57
+#: apps/rules/forms.py:185 apps/rules/forms.py:196 apps/rules/models.py:47
+#: apps/rules/models.py:308 apps/transactions/filters.py:100
+#: apps/transactions/filters.py:175 apps/transactions/forms.py:161
+#: apps/transactions/forms.py:431 apps/transactions/forms.py:612
+#: apps/transactions/forms.py:726 apps/transactions/forms.py:733
+#: apps/transactions/forms.py:950 apps/transactions/forms.py:1204
+#: apps/transactions/models.py:315 apps/transactions/models.py:371
+#: apps/transactions/models.py:866 apps/transactions/models.py:1127
+#: apps/transactions/models.py:1500 templates/entities/fragments/list.html:9
#: templates/entities/pages/index.html:4 templates/includes/sidebar.html:168
#: templates/insights/fragments/month_by_month.html:40
#: templates/insights/fragments/month_by_month.html:43
@@ -1138,8 +1156,8 @@ msgstr "Los montos de las transacciones ahora están ocultos"
msgid "You must provide an account."
msgstr "Debes proporcionar una cuenta."
-#: apps/dca/forms.py:322 apps/transactions/forms.py:780
-#: apps/transactions/models.py:978
+#: apps/dca/forms.py:322 apps/transactions/forms.py:866
+#: apps/transactions/models.py:1077
msgid "From and To accounts must be different."
msgstr "Las cuentas de origen y destino deben ser diferentes."
@@ -1157,10 +1175,10 @@ msgid "Payment Currency"
msgstr "Moneda de pago"
#: apps/dca/models.py:26 apps/dca/models.py:181 apps/rules/forms.py:180
-#: apps/rules/forms.py:196 apps/rules/models.py:43 apps/rules/models.py:295
-#: apps/transactions/forms.py:504 apps/transactions/forms.py:668
-#: apps/transactions/models.py:354 apps/transactions/models.py:774
-#: apps/transactions/models.py:1031 apps/transactions/models.py:1338
+#: apps/rules/forms.py:197 apps/rules/models.py:44 apps/rules/models.py:296
+#: apps/transactions/forms.py:590 apps/transactions/forms.py:754
+#: apps/transactions/models.py:356 apps/transactions/models.py:870
+#: apps/transactions/models.py:1130 apps/transactions/models.py:1485
msgid "Notes"
msgstr "Notas"
@@ -1168,7 +1186,7 @@ msgstr "Notas"
msgid "DCA Strategy"
msgstr "Estrategia DCA"
-#: apps/dca/models.py:35 apps/export_app/forms.py:166
+#: apps/dca/models.py:35 apps/export_app/forms.py:175
msgid "DCA Strategies"
msgstr "Estrategias DCA"
@@ -1188,7 +1206,7 @@ msgstr "Monto Recibido"
msgid "DCA Entry"
msgstr "Entrada DCA"
-#: apps/dca/models.py:187 apps/export_app/forms.py:167
+#: apps/dca/models.py:187 apps/export_app/forms.py:176
msgid "DCA Entries"
msgstr "Entradas DCA"
@@ -1216,14 +1234,14 @@ msgstr "Entrada actualizada con éxito"
msgid "Entry deleted successfully"
msgstr "Entrada eliminada con éxito"
-#: apps/export_app/forms.py:13 apps/export_app/forms.py:137
+#: apps/export_app/forms.py:13 apps/export_app/forms.py:144
#: templates/includes/sidebar.html:247 templates/users/fragments/list.html:10
#: templates/users/pages/index.html:4
msgid "Users"
msgstr "Usuarios"
-#: apps/export_app/forms.py:31 apps/export_app/forms.py:144
-#: apps/transactions/models.py:423 templates/includes/sidebar.html:81
+#: apps/export_app/forms.py:31 apps/export_app/forms.py:151
+#: apps/transactions/models.py:425 templates/includes/sidebar.html:81
#: templates/includes/sidebar.html:154
#: templates/recurring_transactions/fragments/list_transactions.html:5
#: templates/recurring_transactions/fragments/table.html:37
@@ -1231,9 +1249,9 @@ msgstr "Usuarios"
msgid "Transactions"
msgstr "Transacciones"
-#: apps/export_app/forms.py:37 apps/export_app/forms.py:141
-#: apps/insights/views.py:43 apps/transactions/filters.py:74
-#: templates/categories/fragments/list.html:9
+#: apps/export_app/forms.py:37 apps/export_app/forms.py:148
+#: apps/insights/views.py:43 apps/transactions/filters.py:90
+#: apps/transactions/filters.py:165 templates/categories/fragments/list.html:9
#: templates/categories/pages/index.html:4 templates/includes/sidebar.html:156
#: templates/insights/fragments/month_by_month.html:18
#: templates/insights/fragments/month_by_month.html:21
@@ -1242,102 +1260,117 @@ msgstr "Transacciones"
msgid "Categories"
msgstr "Categorías"
-#: apps/export_app/forms.py:55 apps/export_app/forms.py:147
-#: apps/transactions/models.py:1068 templates/includes/sidebar.html:110
+#: apps/export_app/forms.py:55 apps/export_app/forms.py:155
+#: apps/transactions/models.py:1167 templates/includes/sidebar.html:110
#: templates/recurring_transactions/fragments/list.html:9
#: templates/recurring_transactions/pages/index.html:4
msgid "Recurring Transactions"
msgstr "Transacciones Recurrentes"
-#: apps/export_app/forms.py:61 apps/export_app/forms.py:145
-#: apps/transactions/models.py:788 templates/includes/sidebar.html:104
+#: apps/export_app/forms.py:61 apps/export_app/forms.py:153
+#: apps/transactions/models.py:884 templates/includes/sidebar.html:104
#: templates/installment_plans/fragments/list.html:9
#: templates/installment_plans/pages/index.html:4
msgid "Installment Plans"
msgstr "Planes de Cuotas"
-#: apps/export_app/forms.py:73 apps/export_app/forms.py:150
+#: apps/export_app/forms.py:67 apps/export_app/forms.py:157
+#: apps/transactions/models.py:1518 templates/includes/sidebar.html:98
+#: templates/quick_transactions/pages/index.html:5
+#: templates/quick_transactions/pages/index.html:15
+msgid "Quick Transactions"
+msgstr "Transacciones Rápidas"
+
+#: apps/export_app/forms.py:79 apps/export_app/forms.py:159
#: templates/exchange_rates_services/fragments/list.html:10
#: templates/exchange_rates_services/pages/index.html:4
#: templates/includes/sidebar.html:232
msgid "Automatic Exchange Rates"
msgstr "Tasas de Cambio Automáticas"
-#: apps/export_app/forms.py:79 templates/bank_sync/fragments/list.html:8
+#: apps/export_app/forms.py:85 templates/bank_sync/fragments/list.html:8
#: templates/bank_sync/pages/index.html:4 templates/includes/sidebar.html:238
msgid "Bank Sync"
msgstr ""
-#: apps/export_app/forms.py:80
+#: apps/export_app/forms.py:86
msgid "Includes the providers' API keys"
msgstr ""
-#: apps/export_app/forms.py:86 templates/includes/sidebar.html:212
+#: apps/export_app/forms.py:92 templates/includes/sidebar.html:212
#: templates/rules/fragments/list.html:9 templates/rules/pages/index.html:4
msgid "Rules"
msgstr "Reglas"
-#: apps/export_app/forms.py:92 templates/cotton/transaction/item.html:66
+#: apps/export_app/forms.py:98 templates/cotton/transaction/item.html:68
msgid "DCA"
msgstr "DCA"
-#: apps/export_app/forms.py:98 apps/export_app/forms.py:168
+#: apps/export_app/forms.py:104 apps/export_app/forms.py:177
#: templates/import_app/fragments/profiles/list.html:21
#: templates/import_app/pages/profiles_index.html:4
msgid "Import Profiles"
msgstr "Perfiles de Importación"
-#: apps/export_app/forms.py:126 templates/export_app/fragments/export.html:5
+#: apps/export_app/forms.py:133 templates/export_app/fragments/export.html:5
#: templates/export_app/pages/index.html:13
msgid "Export"
msgstr "Exportar"
-#: apps/export_app/forms.py:134
+#: apps/export_app/forms.py:141
msgid "Import a ZIP file exported from WYGIWYH"
msgstr "Importa un archivo ZIP exportado desde WYGIWYH"
-#: apps/export_app/forms.py:135
+#: apps/export_app/forms.py:142
msgid "ZIP File"
msgstr "Archivo ZIP"
-#: apps/export_app/forms.py:157
+#: apps/export_app/forms.py:152 apps/rules/forms.py:193 apps/rules/models.py:42
+#: apps/rules/models.py:320 apps/transactions/models.py:736
+#: templates/transactions/widgets/sub_transactions.html:39
+#, fuzzy
+#| msgid "transactions"
+msgid "Sub-transactions"
+msgstr "transacciones"
+
+#: apps/export_app/forms.py:166
#, fuzzy
#| msgid "By account"
msgid "Bank Sync Accounts"
msgstr "Por cuenta"
-#: apps/export_app/forms.py:159 apps/rules/models.py:27
+#: apps/export_app/forms.py:168 apps/rules/models.py:27
msgid "Transaction rules"
msgstr "Reglas de transacción"
-#: apps/export_app/forms.py:161 apps/rules/models.py:68
+#: apps/export_app/forms.py:170 apps/rules/models.py:69
msgid "Edit transaction action"
msgstr "Editar acción de transacción"
-#: apps/export_app/forms.py:164 apps/rules/models.py:327
+#: apps/export_app/forms.py:173 apps/rules/models.py:332
msgid "Update or create transaction actions"
msgstr "Actualizar o crear acciones de transacción"
-#: apps/export_app/forms.py:199 templates/cotton/transaction/item.html:310
+#: apps/export_app/forms.py:210 templates/cotton/transaction/item.html:327
#: templates/cotton/ui/deleted_transactions_action_bar.html:53
#: templates/export_app/fragments/restore.html:5
#: templates/export_app/pages/index.html:19
msgid "Restore"
msgstr "Restaurar"
-#: apps/export_app/forms.py:209
+#: apps/export_app/forms.py:220
msgid "Please upload either a ZIP file or at least one CSV file"
msgstr "Por favor, sube un archivo ZIP o al menos un archivo CSV"
-#: apps/export_app/views.py:190
+#: apps/export_app/views.py:216
msgid "You have to select at least one export"
msgstr "Debes seleccionar al menos una exportación"
-#: apps/export_app/views.py:210
+#: apps/export_app/views.py:236
msgid "Data restored successfully"
msgstr "Datos restaurados con éxito"
-#: apps/export_app/views.py:222
+#: apps/export_app/views.py:248
msgid ""
"There was an error restoring your data. Check the logs for more details."
msgstr ""
@@ -1425,7 +1458,7 @@ msgstr "Tarea de importación eliminada con éxito"
#: apps/insights/forms.py:118 apps/insights/utils/sankey.py:36
#: apps/insights/utils/sankey.py:167 apps/insights/views.py:45
-#: apps/transactions/filters.py:209
+#: apps/transactions/filters.py:294
#: templates/insights/fragments/month_by_month.html:119
#: templates/insights/fragments/year_by_year.html:73
msgid "Uncategorized"
@@ -1482,24 +1515,24 @@ msgstr "Sin categorías"
msgid "Tag"
msgstr "Etiqueta"
-#: apps/insights/views.py:52 apps/transactions/filters.py:215
+#: apps/insights/views.py:52 apps/transactions/filters.py:303
#: templates/insights/fragments/month_by_month.html:121
#: templates/insights/fragments/year_by_year.html:75
msgid "Untagged"
msgstr "Sin etiqueta"
-#: apps/insights/views.py:53 apps/transactions/models.py:611
+#: apps/insights/views.py:53 apps/transactions/models.py:632
#: templates/tags/fragments/table.html:69
msgid "No tags"
msgstr "Sin etiquetas"
-#: apps/insights/views.py:58 apps/transactions/models.py:312
+#: apps/insights/views.py:58 apps/transactions/models.py:314
#: templates/insights/fragments/month_by_month.html:88
#: templates/insights/fragments/year_by_year.html:56
msgid "Entity"
msgstr "Entidad"
-#: apps/insights/views.py:59 apps/transactions/filters.py:222
+#: apps/insights/views.py:59 apps/transactions/filters.py:311
#: templates/insights/fragments/month_by_month.html:123
#: templates/insights/fragments/year_by_year.html:77
msgid "No entity"
@@ -1517,19 +1550,19 @@ msgstr ""
msgid "Unclassified"
msgstr ""
-#: apps/investments/views.py:289
+#: apps/investments/views.py:290
#, fuzzy
#| msgid "Installment Plan added successfully"
msgid "Asset class added successfully"
msgstr "Plan de cuotas agregado con éxito"
-#: apps/investments/views.py:297
+#: apps/investments/views.py:298
#, fuzzy
#| msgid "Tag updated successfully"
msgid "Asset class updated successfully"
msgstr "Etiqueta actualizada con éxito"
-#: apps/investments/views.py:318
+#: apps/investments/views.py:319
#, fuzzy
#| msgid "Tag deleted successfully"
msgid "Asset class deleted successfully"
@@ -1564,13 +1597,13 @@ msgstr "Puedes agregar acciones a esta regla en la proxima pantalla."
msgid "Set field"
msgstr "Establecer campo"
-#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:123
+#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:101
msgid "To"
msgstr "A"
#: apps/rules/forms.py:78 apps/rules/forms.py:158 apps/rules/models.py:20
-#: apps/rules/models.py:62 apps/rules/models.py:323
+#: apps/rules/models.py:63 apps/rules/models.py:328
#: templates/rules/fragments/list.html:23
msgid "Order"
msgstr "Orden"
@@ -1588,36 +1621,37 @@ msgid "Operator"
msgstr "Operador"
#: apps/rules/forms.py:174 apps/rules/forms.py:188 apps/rules/models.py:36
-#: apps/rules/models.py:271 apps/transactions/forms.py:468
-#: apps/transactions/models.py:337 apps/transactions/models.py:730
-#: apps/transactions/models.py:1009 apps/transactions/models.py:1323
+#: apps/rules/models.py:272 apps/transactions/forms.py:554
+#: apps/transactions/models.py:339 apps/transactions/models.py:826
+#: apps/transactions/models.py:1108 apps/transactions/models.py:1470
#: templates/mini_tools/simulator.html:63
msgid "Type"
msgstr "Tipo"
#: apps/rules/forms.py:175 apps/rules/forms.py:189 apps/rules/models.py:37
-#: apps/rules/models.py:275 apps/transactions/filters.py:22
-#: apps/transactions/forms.py:472 apps/transactions/forms.py:650
-#: apps/transactions/models.py:339 apps/transactions/models.py:1325
-#: templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/rules/models.py:276 apps/transactions/filters.py:23
+#: apps/transactions/forms.py:558 apps/transactions/forms.py:736
+#: apps/transactions/models.py:341 apps/transactions/models.py:1472
+#: templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/transactions/widgets/paid_toggle_button.html:10
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:13
msgid "Paid"
msgstr "Pagado"
#: apps/rules/forms.py:177 apps/rules/forms.py:191 apps/rules/models.py:39
-#: apps/rules/models.py:283 apps/transactions/forms.py:90
-#: apps/transactions/forms.py:488 apps/transactions/forms.py:655
-#: apps/transactions/forms.py:868 apps/transactions/models.py:341
-#: apps/transactions/models.py:748 apps/transactions/models.py:1033
+#: apps/rules/models.py:284 apps/transactions/forms.py:173
+#: apps/transactions/forms.py:574 apps/transactions/forms.py:741
+#: apps/transactions/forms.py:956 apps/transactions/models.py:343
+#: apps/transactions/models.py:844 apps/transactions/models.py:1132
msgid "Reference Date"
msgstr "Fecha de Referencia"
#: apps/rules/forms.py:178 apps/rules/forms.py:192 apps/rules/models.py:41
-#: apps/rules/models.py:287 apps/transactions/forms.py:495
-#: apps/transactions/models.py:347 apps/transactions/models.py:1014
-#: apps/transactions/models.py:1331
+#: apps/rules/models.py:288 apps/transactions/forms.py:75
+#: apps/transactions/forms.py:581 apps/transactions/models.py:349
+#: apps/transactions/models.py:730 apps/transactions/models.py:1113
+#: apps/transactions/models.py:1478
#: templates/insights/fragments/sankey.html:102
#: templates/installment_plans/fragments/table.html:18
#: templates/mini_tools/simulator.html:70
@@ -1626,51 +1660,52 @@ msgstr "Fecha de Referencia"
msgid "Amount"
msgstr "Monto"
-#: apps/rules/forms.py:179 apps/rules/forms.py:193 apps/rules/models.py:14
-#: apps/rules/models.py:42 apps/rules/models.py:291
-#: apps/transactions/forms.py:499 apps/transactions/forms.py:659
-#: apps/transactions/models.py:352 apps/transactions/models.py:732
-#: apps/transactions/models.py:1017 apps/transactions/models.py:1336
+#: apps/rules/forms.py:179 apps/rules/forms.py:194 apps/rules/models.py:14
+#: apps/rules/models.py:43 apps/rules/models.py:292
+#: apps/transactions/forms.py:585 apps/transactions/forms.py:745
+#: apps/transactions/models.py:354 apps/transactions/models.py:828
+#: apps/transactions/models.py:1116 apps/transactions/models.py:1483
msgid "Description"
msgstr "Descripción"
-#: apps/rules/forms.py:182 apps/rules/forms.py:198 apps/rules/models.py:47
-#: apps/rules/models.py:299 apps/transactions/models.py:399
-#: apps/transactions/models.py:1358
+#: apps/rules/forms.py:182 apps/rules/forms.py:199 apps/rules/models.py:48
+#: apps/rules/models.py:300 apps/transactions/models.py:401
+#: apps/transactions/models.py:1505
msgid "Internal Note"
msgstr "Nota Interna"
-#: apps/rules/forms.py:183 apps/rules/forms.py:199 apps/rules/models.py:48
-#: apps/rules/models.py:303 apps/transactions/models.py:401
-#: apps/transactions/models.py:1360
+#: apps/rules/forms.py:183 apps/rules/forms.py:200 apps/rules/models.py:49
+#: apps/rules/models.py:304 apps/transactions/models.py:403
+#: apps/transactions/models.py:1507
msgid "Internal ID"
msgstr "ID Interno"
-#: apps/rules/forms.py:186 apps/rules/forms.py:200 apps/rules/models.py:40
-#: apps/rules/models.py:319 apps/transactions/forms.py:672
-#: apps/transactions/models.py:251 apps/transactions/models.py:342
-#: apps/transactions/models.py:1326
+#: apps/rules/forms.py:186 apps/rules/forms.py:201 apps/rules/models.py:40
+#: apps/rules/models.py:324 apps/transactions/forms.py:758
+#: apps/transactions/models.py:253 apps/transactions/models.py:344
+#: apps/transactions/models.py:1473
msgid "Mute"
msgstr "Silenciar"
-#: apps/rules/forms.py:215
+#: apps/rules/forms.py:216
msgid "Search Criteria"
msgstr "Criterio de Búsqueda"
-#: apps/rules/forms.py:360
+#: apps/rules/forms.py:361
msgid "Set Values"
msgstr "Establecer Valores"
-#: apps/rules/forms.py:407 apps/rules/forms.py:442 apps/rules/forms.py:477
-#: apps/transactions/models.py:422 apps/transactions/models.py:667
+#: apps/rules/forms.py:409 apps/rules/forms.py:444 apps/rules/forms.py:479
+#: apps/transactions/models.py:424 apps/transactions/models.py:703
+#: apps/transactions/models.py:763
msgid "Transaction"
msgstr "Transacción"
-#: apps/rules/forms.py:411 apps/rules/forms.py:446 apps/rules/forms.py:481
+#: apps/rules/forms.py:413 apps/rules/forms.py:448 apps/rules/forms.py:483
msgid "Type to search for a transaction"
msgstr "Escribe para buscar una transacción y vincularla a esta entrada"
-#: apps/rules/forms.py:422 apps/rules/forms.py:457 apps/rules/forms.py:491
+#: apps/rules/forms.py:424 apps/rules/forms.py:459 apps/rules/forms.py:493
#: templates/rules/fragments/transaction_rule/dry_run/created.html:5
#: templates/rules/fragments/transaction_rule/dry_run/deleted.html:5
#: templates/rules/fragments/transaction_rule/dry_run/updated.html:5
@@ -1690,15 +1725,15 @@ msgstr "Secuenciado"
msgid "Transaction rule"
msgstr "Regla de transacción"
-#: apps/rules/models.py:54 apps/rules/models.py:98
+#: apps/rules/models.py:55 apps/rules/models.py:99
msgid "Rule"
msgstr "Regla"
-#: apps/rules/models.py:59
+#: apps/rules/models.py:60
msgid "Field"
msgstr "Campo"
-#: apps/rules/models.py:61 templates/investments/fragments/charts.html:86
+#: apps/rules/models.py:62 templates/investments/fragments/charts.html:86
#: templates/investments/fragments/detail.html:68
#: templates/investments/fragments/detail.html:127
#: templates/investments/fragments/detail.html:245
@@ -1706,51 +1741,51 @@ msgstr "Campo"
msgid "Value"
msgstr "Valor"
-#: apps/rules/models.py:69
+#: apps/rules/models.py:70
msgid "Edit transaction actions"
msgstr "Editar acciones de transacción"
-#: apps/rules/models.py:84
+#: apps/rules/models.py:85
msgid "is exactly"
msgstr "es exactamente"
-#: apps/rules/models.py:85
+#: apps/rules/models.py:86
msgid "contains"
msgstr "contiene"
-#: apps/rules/models.py:86
+#: apps/rules/models.py:87
msgid "starts with"
msgstr "empieza por"
-#: apps/rules/models.py:87
+#: apps/rules/models.py:88
msgid "ends with"
msgstr "termina por"
-#: apps/rules/models.py:88
+#: apps/rules/models.py:89
msgid "equals"
msgstr "es igual a"
-#: apps/rules/models.py:89
+#: apps/rules/models.py:90
msgid "greater than"
msgstr "mayor que"
-#: apps/rules/models.py:90
+#: apps/rules/models.py:91
msgid "less than"
msgstr "menor que"
-#: apps/rules/models.py:91
+#: apps/rules/models.py:92
msgid "greater than or equal"
msgstr "mayor que o igual"
-#: apps/rules/models.py:92
+#: apps/rules/models.py:93
msgid "less than or equal"
msgstr "menor que o igual"
-#: apps/rules/models.py:102
+#: apps/rules/models.py:103
msgid "Filter"
msgstr "Filtrar"
-#: apps/rules/models.py:105
+#: apps/rules/models.py:106
msgid ""
"Generic expression to enable or disable execution. Should evaluate to True "
"or False"
@@ -1758,7 +1793,7 @@ msgstr ""
"Expresión genérica para habilitar o deshabilitar la ejecución. Debe "
"evaluarse como True o False"
-#: apps/rules/models.py:326
+#: apps/rules/models.py:331
msgid "Update or create transaction action"
msgstr "Actualizar o crear acción de transacción"
@@ -1802,8 +1837,8 @@ msgstr "Acción de Actualizar o Crear Transacción actualizada con éxito"
msgid "Update or Create Transaction action deleted successfully"
msgstr "Acción de Actualizar o Crear Transacción eliminada con éxito"
-#: apps/transactions/filters.py:23 templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/transactions/filters.py:24 templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/insights/fragments/overview/index.html:68
#: templates/net_worth/net_worth.html:39 templates/net_worth/net_worth.html:43
#: templates/transactions/widgets/paid_toggle_button.html:7
@@ -1811,136 +1846,146 @@ msgstr "Acción de Actualizar o Crear Transacción eliminada con éxito"
msgid "Projected"
msgstr "Proyectado"
-#: apps/transactions/filters.py:28 templates/categories/fragments/table.html:18
+#: apps/transactions/filters.py:29 templates/categories/fragments/table.html:18
msgid "Muted"
msgstr "Silenciado"
-#: apps/transactions/filters.py:51
+#: apps/transactions/filters.py:67 apps/transactions/filters.py:144
msgid "Content"
msgstr "Contenido"
-#: apps/transactions/filters.py:57
+#: apps/transactions/filters.py:73
msgid "Transaction Type"
msgstr "Tipo de Transacción"
-#: apps/transactions/filters.py:95
+#: apps/transactions/filters.py:111
msgid "Mute Status"
msgstr "Silenciada"
-#: apps/transactions/filters.py:100
+#: apps/transactions/filters.py:116
msgid "Date from"
msgstr "Desde la fecha"
-#: apps/transactions/filters.py:105 apps/transactions/filters.py:115
+#: apps/transactions/filters.py:121 apps/transactions/filters.py:131
msgid "Until"
msgstr "Hasta"
-#: apps/transactions/filters.py:110
+#: apps/transactions/filters.py:126
msgid "Reference date from"
msgstr "Desde la fecha de referencia"
-#: apps/transactions/filters.py:120
+#: apps/transactions/filters.py:136
msgid "Amount min"
msgstr "Monto mínimo"
-#: apps/transactions/filters.py:125
+#: apps/transactions/filters.py:141
msgid "Amount max"
msgstr "Monto máximo"
-#: apps/transactions/filters.py:208
+#: apps/transactions/filters.py:240
+msgid "Include"
+msgstr ""
+
+#: apps/transactions/filters.py:245
+msgid "Exclude"
+msgstr ""
+
+#: apps/transactions/filters.py:293
msgid "Categorized"
msgstr "Con Categoría"
-#: apps/transactions/filters.py:215
+#: apps/transactions/filters.py:303
msgid "Tagged"
msgstr "Etiquetado"
-#: apps/transactions/filters.py:221
+#: apps/transactions/filters.py:310
msgid "Any entity"
msgstr "Cualquier entidad"
-#: apps/transactions/forms.py:192
+#: apps/transactions/forms.py:277
msgid "More"
msgstr "Más"
-#: apps/transactions/forms.py:229
+#: apps/transactions/forms.py:314
msgid "Save and add similar"
msgstr "Guardar y añadir similar"
-#: apps/transactions/forms.py:234
+#: apps/transactions/forms.py:319
msgid "Save and add another"
msgstr "Guardar y añadir otro"
-#: apps/transactions/forms.py:271 templates/cotton/transaction/item.html:184
+#: apps/transactions/forms.py:356 templates/cotton/transaction/item.html:186
#: templates/transactions/fragments/attachments.html:4
msgid "Attachments"
msgstr "Archivos Adjuntos"
-#: apps/transactions/forms.py:272
+#: apps/transactions/forms.py:357
msgid ""
"Files are private and only visible to users with access to this transaction."
msgstr ""
"Los archivos adjuntos son privados y únicamente son visibles para los "
"usuarios con acceso a esta transacción."
-#: apps/transactions/forms.py:283
+#: apps/transactions/forms.py:368
msgid "Upload"
msgstr "Subir"
-#: apps/transactions/forms.py:355 apps/transactions/forms.py:1120
-#: apps/transactions/models.py:947
+#: apps/transactions/forms.py:440 apps/transactions/forms.py:1210
+#: apps/transactions/models.py:1046
#, fuzzy
#| msgid "To Account"
msgid "To account"
msgstr "Cuenta de Destino"
-#: apps/transactions/forms.py:382 apps/transactions/forms.py:675
+#: apps/transactions/forms.py:467 apps/transactions/forms.py:761
msgid "Muted transactions won't be displayed on monthly summaries"
msgstr ""
"Las transacciones silenciadas no se mostrarán en los resúmenes mensuales"
-#: apps/transactions/forms.py:594
+#: apps/transactions/forms.py:680
msgid "From Amount"
msgstr "Monto de Origen"
-#: apps/transactions/forms.py:599
+#: apps/transactions/forms.py:685
msgid "To Amount"
msgstr "Monto de Destino"
-#: apps/transactions/forms.py:741 apps/transactions/models.py:992
-#: apps/transactions/models.py:1303 templates/cotton/transaction/item.html:52
-#: templates/cotton/transaction/item.html:60
+#: apps/transactions/forms.py:827 apps/transactions/models.py:1091
+#: apps/transactions/models.py:1450 templates/cotton/transaction/item.html:54
+#: templates/cotton/transaction/item.html:62
+#: templates/cotton/transaction/item.html:272
+#: templates/cotton/transaction/item.html:304
#: templates/cotton/ui/quick_transactions_buttons.html:40
#: templates/cotton/ui/transactions_fab.html:44
msgid "Transfer"
msgstr "Transferir"
-#: apps/transactions/forms.py:1005
+#: apps/transactions/forms.py:1095
msgid "Tag name"
msgstr "Nombre de etiqueta"
-#: apps/transactions/forms.py:1033
+#: apps/transactions/forms.py:1123
msgid "Entity name"
msgstr "Nombre de Entidad"
-#: apps/transactions/forms.py:1061
+#: apps/transactions/forms.py:1151
msgid "Category name"
msgstr "Nombre de Categoría"
-#: apps/transactions/forms.py:1063
+#: apps/transactions/forms.py:1153
msgid "Muted categories won't be displayed on monthly summaries"
msgstr ""
"Las categorías silenciadas no serán mostradas en los resúmenes mensuales"
-#: apps/transactions/forms.py:1228
+#: apps/transactions/forms.py:1319
msgid "future transactions"
msgstr "transacciones futuras"
-#: apps/transactions/forms.py:1255
+#: apps/transactions/forms.py:1346
msgid "End date should be after the start date"
msgstr "La fecha de fin debe ser posterior a la fecha de inicio"
-#: apps/transactions/models.py:256
+#: apps/transactions/models.py:258
msgid ""
"Deactivated categories won't be able to be selected when creating new "
"transactions"
@@ -1948,26 +1993,26 @@ msgstr ""
"Las categorías desactivadas no podrán seleccionarse al crear nuevas "
"transacciones"
-#: apps/transactions/models.py:264
+#: apps/transactions/models.py:266
msgid "Transaction Category"
msgstr "Categoría de Transacción"
-#: apps/transactions/models.py:265
+#: apps/transactions/models.py:267
msgid "Transaction Categories"
msgstr "Categorías de Transacción"
-#: apps/transactions/models.py:280
+#: apps/transactions/models.py:282
msgid ""
"Deactivated tags won't be able to be selected when creating new transactions"
msgstr ""
"Las etiquetas desactivadas no podrán seleccionarse al crear nuevas "
"transacciones"
-#: apps/transactions/models.py:288 apps/transactions/models.py:289
+#: apps/transactions/models.py:290 apps/transactions/models.py:291
msgid "Transaction Tags"
msgstr "Etiquetas de Transacción"
-#: apps/transactions/models.py:304
+#: apps/transactions/models.py:306
msgid ""
"Deactivated entities won't be able to be selected when creating new "
"transactions"
@@ -1975,8 +2020,8 @@ msgstr ""
"Las entidades desactivadas no podrán seleccionarse al crear nuevas "
"transacciones"
-#: apps/transactions/models.py:324 apps/transactions/models.py:991
-#: apps/transactions/models.py:1302
+#: apps/transactions/models.py:326 apps/transactions/models.py:1090
+#: apps/transactions/models.py:1449
#: templates/calendar_view/fragments/list.html:42
#: templates/calendar_view/fragments/list.html:44
#: templates/calendar_view/fragments/list.html:52
@@ -1988,14 +2033,14 @@ msgstr ""
#: templates/investments/fragments/detail.html:71
#: templates/investments/fragments/detail.html:175
#: templates/investments/fragments/detail.html:227
-#: templates/investments/fragments/detail.html:318
+#: templates/investments/fragments/detail.html:326
#: templates/mini_tools/simulator.html:66
#: templates/monthly_overview/fragments/monthly_summary.html:42
msgid "Income"
msgstr "Ingreso"
-#: apps/transactions/models.py:325 apps/transactions/models.py:993
-#: apps/transactions/models.py:1304
+#: apps/transactions/models.py:327 apps/transactions/models.py:1092
+#: apps/transactions/models.py:1451
#: templates/calendar_view/fragments/list.html:46
#: templates/calendar_view/fragments/list.html:48
#: templates/calendar_view/fragments/list.html:56
@@ -2007,196 +2052,196 @@ msgstr "Ingreso"
msgid "Expense"
msgstr "Gasto"
-#: apps/transactions/models.py:380 apps/transactions/models.py:787
-#: templates/cotton/transaction/item.html:260
-#: templates/cotton/transaction/item.html:277
-#: templates/cotton/transaction/item.html:287
+#: apps/transactions/models.py:382 apps/transactions/models.py:883
+#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:289
+#: templates/cotton/transaction/item.html:299
msgid "Installment Plan"
msgstr "Plan de Cuotas"
-#: apps/transactions/models.py:389 apps/transactions/models.py:1067
-#: templates/cotton/transaction/item.html:250
-#: templates/cotton/transaction/item.html:270
+#: apps/transactions/models.py:391 apps/transactions/models.py:1166
+#: templates/cotton/transaction/item.html:252
+#: templates/cotton/transaction/item.html:282
msgid "Recurring Transaction"
msgstr "Transacción Recurrente"
-#: apps/transactions/models.py:397
+#: apps/transactions/models.py:399
#, fuzzy
#| msgid "Link transaction"
msgid "Linked Transaction"
msgstr "Enlazar transacción"
-#: apps/transactions/models.py:405
+#: apps/transactions/models.py:407
msgid "Deleted"
msgstr "Eliminado"
-#: apps/transactions/models.py:410
+#: apps/transactions/models.py:412
msgid "Deleted At"
msgstr "Eliminado en"
-#: apps/transactions/models.py:518
+#: apps/transactions/models.py:521
msgid "A transfer needs one expense and one income."
msgstr ""
-#: apps/transactions/models.py:520
+#: apps/transactions/models.py:523
msgid "A transfer needs two different accounts."
msgstr ""
-#: apps/transactions/models.py:524
+#: apps/transactions/models.py:527
msgid "This transaction is already part of another transfer."
msgstr ""
-#: apps/transactions/models.py:613
+#: apps/transactions/models.py:634
msgid "No category"
msgstr "Sin categoría"
-#: apps/transactions/models.py:615
+#: apps/transactions/models.py:636
msgid "No description"
msgstr "Sin descripción"
-#: apps/transactions/models.py:672
+#: apps/transactions/models.py:735
+#, fuzzy
+#| msgid "transactions"
+msgid "Sub-transaction"
+msgstr "transacciones"
+
+#: apps/transactions/models.py:768
msgid "File"
msgstr "Archivo"
-#: apps/transactions/models.py:674
+#: apps/transactions/models.py:770
msgid "Original Name"
msgstr "Nombre Original"
-#: apps/transactions/models.py:676
+#: apps/transactions/models.py:772
msgid "Content Type"
msgstr "Tipo de Contenido"
-#: apps/transactions/models.py:678
+#: apps/transactions/models.py:774
msgid "Size"
msgstr "Tamaño"
-#: apps/transactions/models.py:683
+#: apps/transactions/models.py:779
msgid "Uploaded By"
msgstr "Subido por"
-#: apps/transactions/models.py:688
+#: apps/transactions/models.py:784
msgid "Transaction Attachment"
msgstr "Archivos Adjunto"
-#: apps/transactions/models.py:689
+#: apps/transactions/models.py:785
msgid "Transaction Attachments"
msgstr "Archivos Adjuntos"
-#: apps/transactions/models.py:719 templates/includes/sidebar.html:57
+#: apps/transactions/models.py:815 templates/includes/sidebar.html:57
msgid "Yearly"
msgstr "Anual"
-#: apps/transactions/models.py:720 apps/users/models.py:469
+#: apps/transactions/models.py:816 apps/users/models.py:469
#: templates/includes/sidebar.html:51
msgid "Monthly"
msgstr "Mensual"
-#: apps/transactions/models.py:721
+#: apps/transactions/models.py:817
msgid "Weekly"
msgstr "Semanal"
-#: apps/transactions/models.py:722
+#: apps/transactions/models.py:818
msgid "Daily"
msgstr "Diario"
-#: apps/transactions/models.py:735
+#: apps/transactions/models.py:831
msgid "Number of Installments"
msgstr "Cantidad de cuotas"
-#: apps/transactions/models.py:740
+#: apps/transactions/models.py:836
msgid "Installment Start"
msgstr "Cuota de Inicio"
-#: apps/transactions/models.py:741
+#: apps/transactions/models.py:837
msgid "The installment number to start counting from"
msgstr "El número de la cuota desde la cual comenzar a contar"
-#: apps/transactions/models.py:746 apps/transactions/models.py:1037
+#: apps/transactions/models.py:842 apps/transactions/models.py:1136
msgid "Start Date"
msgstr "Fecha de Inicio"
-#: apps/transactions/models.py:750 apps/transactions/models.py:1038
+#: apps/transactions/models.py:846 apps/transactions/models.py:1137
msgid "End Date"
msgstr "Fecha de Fin"
-#: apps/transactions/models.py:755
+#: apps/transactions/models.py:851
msgid "Recurrence"
msgstr "Recurrencia"
-#: apps/transactions/models.py:758
+#: apps/transactions/models.py:854
msgid "Installment Amount"
msgstr "Monto de la Cuota"
-#: apps/transactions/models.py:777 apps/transactions/models.py:1057
+#: apps/transactions/models.py:873 apps/transactions/models.py:1156
msgid "Add description to transactions"
msgstr "Agregar descripción a las transacciones"
-#: apps/transactions/models.py:780 apps/transactions/models.py:1060
+#: apps/transactions/models.py:876 apps/transactions/models.py:1159
msgid "Add notes to transactions"
msgstr "Agregar notas a las transacciones"
-#: apps/transactions/models.py:954
+#: apps/transactions/models.py:1053
#, fuzzy
#| msgid "To Amount"
msgid "To amount"
msgstr "Monto de Destino"
-#: apps/transactions/models.py:955
+#: apps/transactions/models.py:1054
msgid "Leave empty to use the same amount"
msgstr ""
-#: apps/transactions/models.py:996 templates/mini_tools/simulator.html:129
+#: apps/transactions/models.py:1095 templates/mini_tools/simulator.html:129
msgid "day(s)"
msgstr "día(s)"
-#: apps/transactions/models.py:997 templates/mini_tools/simulator.html:130
+#: apps/transactions/models.py:1096 templates/mini_tools/simulator.html:130
msgid "week(s)"
msgstr "semana(s)"
-#: apps/transactions/models.py:998 templates/mini_tools/simulator.html:131
+#: apps/transactions/models.py:1097 templates/mini_tools/simulator.html:131
msgid "month(s)"
msgstr "mes(es)"
-#: apps/transactions/models.py:999 templates/mini_tools/simulator.html:132
+#: apps/transactions/models.py:1098 templates/mini_tools/simulator.html:132
msgid "year(s)"
msgstr "año(s)"
-#: apps/transactions/models.py:1001
+#: apps/transactions/models.py:1100
#: templates/recurring_transactions/fragments/list.html:18
msgid "Paused"
msgstr "Pausado"
-#: apps/transactions/models.py:1040
+#: apps/transactions/models.py:1139
msgid "Recurrence Type"
msgstr "Tipo de Recurrencia"
-#: apps/transactions/models.py:1043
+#: apps/transactions/models.py:1142
msgid "Recurrence Interval"
msgstr "Intervalo de Recurrencia"
-#: apps/transactions/models.py:1046
+#: apps/transactions/models.py:1145
msgid "Keep at most"
msgstr "Mantener como máximo"
-#: apps/transactions/models.py:1050
+#: apps/transactions/models.py:1149
msgid "Last Generated Date"
msgstr "Última Fecha Generada"
-#: apps/transactions/models.py:1053
+#: apps/transactions/models.py:1152
msgid "Last Generated Reference Date"
msgstr "Última Fecha de Referencia Generada"
-#: apps/transactions/models.py:1370 templates/cotton/transaction/item.html:243
+#: apps/transactions/models.py:1517 templates/cotton/transaction/item.html:245
#: templates/cotton/ui/transactions_fab.html:59
msgid "Quick Transaction"
msgstr "Transacción Rápida"
-#: apps/transactions/models.py:1371 templates/includes/sidebar.html:98
-#: templates/quick_transactions/pages/index.html:5
-#: templates/quick_transactions/pages/index.html:15
-msgid "Quick Transactions"
-msgstr "Transacciones Rápidas"
-
#: apps/transactions/validators.py:8
#, python-format
msgid "%(value)s has too many decimal places. Maximum is 30."
@@ -2207,35 +2252,43 @@ msgstr "%(value)s tiene demasiados decimales. El máximo permitido es 30."
msgid "%(value)s is not a non-negative number"
msgstr "%(value)s no es un número positivo"
-#: apps/transactions/views/actions.py:58
+#: apps/transactions/views/actions.py:61
#, python-format
msgid "%(count)s transaction marked as paid"
msgid_plural "%(count)s transactions marked as paid"
msgstr[0] "%(count)s transacción marcada como pagada"
msgstr[1] "%(count)s transacciones marcadas como pagadas"
-#: apps/transactions/views/actions.py:81
+#: apps/transactions/views/actions.py:84
#, python-format
msgid "%(count)s transaction marked as not paid"
msgid_plural "%(count)s transactions marked as not paid"
msgstr[0] "%(count)s transacción marcada como no pagada"
msgstr[1] "%(count)s transacciones marcadas como no pagadas"
-#: apps/transactions/views/actions.py:105
+#: apps/transactions/views/actions.py:108
#, python-format
msgid "%(count)s transaction deleted successfully"
msgid_plural "%(count)s transactions deleted successfully"
msgstr[0] "%(count)s transacción eliminada con éxito"
msgstr[1] "%(count)s transacciones eliminadas con éxito"
-#: apps/transactions/views/actions.py:139
+#: apps/transactions/views/actions.py:142
#, python-format
msgid "%(count)s transaction restored successfully"
msgid_plural "%(count)s transactions restored successfully"
msgstr[0] "%(count)s transacción restaurada con éxito"
msgstr[1] "%(count)s transacciones restauradas con éxito"
-#: apps/transactions/views/actions.py:170
+#: apps/transactions/views/actions.py:174
+#: apps/transactions/views/transactions.py:423
+#, python-format
+msgid "%(count)s transaction updated successfully"
+msgid_plural "%(count)s transactions updated successfully"
+msgstr[0] "%(count)s transacción actualizada exitosamente"
+msgstr[1] "%(count)s transacciones actualizadas exitosamente"
+
+#: apps/transactions/views/actions.py:247
#, python-format
msgid "%(count)s transaction duplicated successfully"
msgid_plural "%(count)s transactions duplicated successfully"
@@ -2254,39 +2307,49 @@ msgstr "Categoría actualizada con éxito"
msgid "Category deleted successfully"
msgstr "Categoría eliminada con éxito"
-#: apps/transactions/views/conversions.py:72
+#: apps/transactions/views/conversions.py:77
#: apps/transactions/views/quick_transactions.py:46 apps/users/views.py:252
msgid "Item added successfully"
msgstr "Ítem agregado con éxito"
-#: apps/transactions/views/conversions.py:91
+#: apps/transactions/views/conversions.py:97
#, fuzzy
#| msgid "Edit quick transaction"
msgid "Convert into quick transaction"
msgstr "Editar transacción rápida"
-#: apps/transactions/views/conversions.py:108
+#: apps/transactions/views/conversions.py:114
#: apps/transactions/views/recurring_transactions.py:112
msgid "Recurring Transaction added successfully"
msgstr "Transacción Recurrente añadida exitosamente"
-#: apps/transactions/views/conversions.py:129
+#: apps/transactions/views/conversions.py:136
#, fuzzy
#| msgid "Edit recurring transaction"
msgid "Convert into recurring transaction"
msgstr "Editar transacción recurrente"
-#: apps/transactions/views/conversions.py:148
+#: apps/transactions/views/conversions.py:155
#: apps/transactions/views/installment_plans.py:87
msgid "Installment Plan added successfully"
msgstr "Plan de cuotas agregado con éxito"
-#: apps/transactions/views/conversions.py:167
+#: apps/transactions/views/conversions.py:175
#, fuzzy
#| msgid "Edit installment plan"
msgid "Convert into installment plan"
msgstr "Editar plan de cuotas"
+#: apps/transactions/views/conversions.py:195
+msgid "Transaction converted into a transfer"
+msgstr ""
+
+#: apps/transactions/views/conversions.py:226
+#, fuzzy
+#| msgid "Edit quick transaction"
+msgid "Convert into transfer"
+msgstr "Editar transacción rápida"
+
#: apps/transactions/views/entities.py:72
msgid "Entity added successfully"
msgstr "Entidad agregada con éxito"
@@ -2319,7 +2382,7 @@ msgstr "Ítem actualizado con éxito"
msgid "Item deleted successfully"
msgstr "Ítem eliminado con éxito"
-#: apps/transactions/views/quick_transactions.py:164
+#: apps/transactions/views/quick_transactions.py:165
#: apps/transactions/views/transactions.py:156
#: apps/transactions/views/transactions.py:343
msgid "Transaction added successfully"
@@ -2369,30 +2432,23 @@ msgstr "Archivo eliminado exitosamente"
msgid "Transaction updated successfully"
msgstr "Transacción actualizada con éxito"
-#: apps/transactions/views/transactions.py:421
-#, python-format
-msgid "%(count)s transaction updated successfully"
-msgid_plural "%(count)s transactions updated successfully"
-msgstr[0] "%(count)s transacción actualizada exitosamente"
-msgstr[1] "%(count)s transacciones actualizadas exitosamente"
-
-#: apps/transactions/views/transactions.py:448
+#: apps/transactions/views/transactions.py:450
msgid "Transaction duplicated successfully"
msgstr "Transacción duplicada exitosamente"
-#: apps/transactions/views/transactions.py:493
+#: apps/transactions/views/transactions.py:495
msgid "Transaction deleted successfully"
msgstr "Transacción borrada exitosamente"
-#: apps/transactions/views/transactions.py:523
+#: apps/transactions/views/transactions.py:525
msgid "Transaction restored successfully"
msgstr "Transacción restaurada exitosamente"
-#: apps/transactions/views/transactions.py:549
+#: apps/transactions/views/transactions.py:551
msgid "Transfer added successfully"
msgstr "Transferencia añadida exitosamente"
-#: apps/transactions/views/transactions.py:579
+#: apps/transactions/views/transactions.py:581
#, fuzzy
#| msgid "Transfer added successfully"
msgid "Transfer updated successfully"
@@ -2742,8 +2798,9 @@ msgstr "Acciones"
#: templates/accounts/fragments/list.html:37
#: templates/bank_sync/fragments/list.html:33
#: templates/categories/fragments/table.html:29
-#: templates/cotton/transaction/item.html:178
-#: templates/cotton/ui/transactions_action_bar.html:54
+#: templates/cotton/transaction/item.html:180
+#: templates/cotton/ui/transactions_action_bar.html:56
+#: templates/cotton/ui/transactions_action_bar.html:90
#: templates/currencies/fragments/list.html:34
#: templates/dca/fragments/strategy/details.html:63
#: templates/dca/fragments/strategy/list.html:31
@@ -2754,8 +2811,8 @@ msgstr "Acciones"
#: templates/import_app/fragments/profiles/list.html:46
#: templates/installment_plans/fragments/table.html:28
#: templates/investment_classes/fragments/list.html:39
-#: templates/investments/fragments/detail.html:302
-#: templates/investments/fragments/detail.html:330
+#: templates/investments/fragments/detail.html:310
+#: templates/investments/fragments/detail.html:338
#: templates/quick_transactions/fragments/list.html:25
#: templates/recurring_transactions/fragments/table.html:30
#: templates/rules/fragments/transaction_rule/view.html:22
@@ -2792,10 +2849,11 @@ msgstr "Compartir"
#: templates/accounts/fragments/list.html:71
#: templates/bank_sync/fragments/list.html:50
#: templates/categories/fragments/table.html:51
-#: templates/cotton/transaction/item.html:190
-#: templates/cotton/transaction/item.html:316
+#: templates/cotton/transaction/item.html:192
+#: templates/cotton/transaction/item.html:333
#: templates/cotton/ui/deleted_transactions_action_bar.html:57
-#: templates/cotton/ui/transactions_action_bar.html:82
+#: templates/cotton/ui/transactions_action_bar.html:75
+#: templates/cotton/ui/transactions_action_bar.html:107
#: templates/currencies/fragments/list.html:40
#: templates/dca/fragments/strategy/details.html:70
#: templates/dca/fragments/strategy/list.html:38
@@ -2826,10 +2884,11 @@ msgstr "Borrar"
#: templates/accounts/fragments/list.html:75
#: templates/bank_sync/fragments/list.html:54
#: templates/categories/fragments/table.html:56
-#: templates/cotton/transaction/item.html:192
-#: templates/cotton/transaction/item.html:322
+#: templates/cotton/transaction/item.html:194
+#: templates/cotton/transaction/item.html:339
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:44
#: templates/dca/fragments/strategy/details.html:75
#: templates/dca/fragments/strategy/list.html:42
@@ -2857,10 +2916,11 @@ msgstr "¿Estás seguro?"
#: templates/account_groups/fragments/list.html:59
#: templates/accounts/fragments/list.html:76
#: templates/categories/fragments/table.html:57
-#: templates/cotton/transaction/item.html:193
-#: templates/cotton/transaction/item.html:323
+#: templates/cotton/transaction/item.html:195
+#: templates/cotton/transaction/item.html:340
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:45
#: templates/dca/fragments/strategy/details.html:76
#: templates/dca/fragments/strategy/list.html:43
@@ -2880,8 +2940,8 @@ msgstr "¡No podrás revertir esto!"
#: templates/accounts/fragments/list.html:77
#: templates/bank_sync/fragments/list.html:56
#: templates/categories/fragments/table.html:58
-#: templates/cotton/transaction/item.html:194
-#: templates/cotton/transaction/item.html:324
+#: templates/cotton/transaction/item.html:196
+#: templates/cotton/transaction/item.html:341
#: templates/currencies/fragments/list.html:46
#: templates/dca/fragments/strategy/details.html:77
#: templates/dca/fragments/strategy/list.html:44
@@ -2961,6 +3021,12 @@ msgstr "Dejar de seguir"
msgid "No accounts"
msgstr "Sin cuentas"
+#: templates/accounts/fragments/share.html:8
+msgid ""
+"Everyone who can see this account can add, edit and delete its transactions, "
+"installment plans and recurring transactions."
+msgstr ""
+
#: templates/bank_sync/fragments/accounts.html:31
#, fuzzy
#| msgid "No transactions for this year"
@@ -3061,65 +3127,78 @@ msgstr "Cerrar"
msgid "Search"
msgstr "Buscar"
-#: templates/cotton/transaction/item.html:12
+#: templates/cotton/transaction/item.html:14
msgid "Select"
msgstr "Seleccionar"
-#: templates/cotton/transaction/item.html:123
+#: templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:100
msgid "From"
msgstr "Desde"
-#: templates/cotton/transaction/item.html:207
-#: templates/cotton/transaction/item.html:218
-#: templates/cotton/transaction/item.html:228
+#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:230
msgid "Show on summaries"
msgstr "Mostrar en los resúmenes"
-#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:211
msgid "Controlled by account"
msgstr "Controlado por cuenta"
-#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:222
msgid "Controlled by category"
msgstr "Controlado por categoría"
-#: templates/cotton/transaction/item.html:233
+#: templates/cotton/transaction/item.html:235
+#: templates/includes/transactions_bulk_actions.html:15
msgid "Hide from summaries"
msgstr "Ocultar de los resúmenes"
-#: templates/cotton/transaction/item.html:237
+#: templates/cotton/transaction/item.html:239
#, fuzzy
#| msgid "Invert"
msgid "Convert"
msgstr "Intercambiar"
-#: templates/cotton/transaction/item.html:252
-#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:254
+#: templates/cotton/transaction/item.html:264
+#: templates/cotton/transaction/item.html:274
msgid "Already part of a plan or recurrence"
msgstr ""
-#: templates/cotton/transaction/item.html:279
+#: templates/cotton/transaction/item.html:291
msgid "Not available for transfers"
msgstr ""
-#: templates/cotton/transaction/item.html:296
+#: templates/cotton/transaction/item.html:313
+#: templates/includes/transactions_bulk_actions.html:22
msgid "Move to previous month"
msgstr "Mover al mes anterior"
-#: templates/cotton/transaction/item.html:300
+#: templates/cotton/transaction/item.html:317
+#: templates/includes/transactions_bulk_actions.html:28
msgid "Move to next month"
msgstr "Mover al mes siguiente"
-#: templates/cotton/transaction/item.html:303
+#: templates/cotton/transaction/item.html:320
+#: templates/includes/transactions_bulk_actions.html:33
msgid "Move to today"
msgstr "Mover a hoy"
-#: templates/cotton/transaction/item.html:307
-#: templates/cotton/ui/transactions_action_bar.html:78
+#: templates/cotton/transaction/item.html:324
+#: templates/cotton/ui/transactions_action_bar.html:71
+#: templates/cotton/ui/transactions_action_bar.html:98
msgid "Duplicate"
msgstr "Duplicado"
+#: templates/cotton/transaction/item.html:373
+#, python-format
+msgid "%(counter)s item"
+msgid_plural "%(counter)s items"
+msgstr[0] ""
+msgstr[1] ""
+
#: templates/cotton/ui/account_card.html:10
#: templates/cotton/ui/currency_card.html:10
msgid "projected income"
@@ -3155,22 +3234,26 @@ msgstr "total actual"
msgid "final total"
msgstr "total final"
-#: templates/cotton/ui/deleted_transactions_action_bar.html:34
-#: templates/cotton/ui/transactions_action_bar.html:34
-msgid "Select All"
-msgstr "Seleccionar Todo"
-
-#: templates/cotton/ui/deleted_transactions_action_bar.html:40
-#: templates/cotton/ui/transactions_action_bar.html:40
+#: templates/cotton/ui/deleted_transactions_action_bar.html:25
+#: templates/cotton/ui/deleted_transactions_action_bar.html:26
+#: templates/cotton/ui/transactions_action_bar.html:25
+#: templates/cotton/ui/transactions_action_bar.html:26
msgid "Unselect All"
msgstr "Deseleccionar Todo"
-#: templates/cotton/ui/deleted_transactions_action_bar.html:46
-msgid "Invert election"
-msgstr "Invertir Seleccion"
+#: templates/cotton/ui/deleted_transactions_action_bar.html:39
+#: templates/cotton/ui/transactions_action_bar.html:39
+msgid "Select All"
+msgstr "Seleccionar Todo"
+
+#: templates/cotton/ui/deleted_transactions_action_bar.html:45
+#: templates/cotton/ui/transactions_action_bar.html:45
+msgid "Invert selection"
+msgstr "invertir seleccion"
#: templates/cotton/ui/deleted_transactions_action_bar.html:59
-#: templates/cotton/ui/transactions_action_bar.html:84
+#: templates/cotton/ui/transactions_action_bar.html:77
+#: templates/cotton/ui/transactions_action_bar.html:106
msgid "Yes, delete them!"
msgstr "Sí, eliminalos!"
@@ -3181,43 +3264,43 @@ msgstr "Sí, eliminalos!"
#: templates/cotton/ui/deleted_transactions_action_bar.html:166
#: templates/cotton/ui/deleted_transactions_action_bar.html:182
#: templates/cotton/ui/deleted_transactions_action_bar.html:198
-#: templates/cotton/ui/transactions_action_bar.html:128
-#: templates/cotton/ui/transactions_action_bar.html:143
-#: templates/cotton/ui/transactions_action_bar.html:159
-#: templates/cotton/ui/transactions_action_bar.html:175
-#: templates/cotton/ui/transactions_action_bar.html:191
-#: templates/cotton/ui/transactions_action_bar.html:207
-#: templates/cotton/ui/transactions_action_bar.html:223
+#: templates/cotton/ui/transactions_action_bar.html:153
+#: templates/cotton/ui/transactions_action_bar.html:168
+#: templates/cotton/ui/transactions_action_bar.html:184
+#: templates/cotton/ui/transactions_action_bar.html:200
+#: templates/cotton/ui/transactions_action_bar.html:216
+#: templates/cotton/ui/transactions_action_bar.html:232
+#: templates/cotton/ui/transactions_action_bar.html:248
msgid "copied!"
msgstr "copiado!"
#: templates/cotton/ui/deleted_transactions_action_bar.html:123
-#: templates/cotton/ui/transactions_action_bar.html:148
+#: templates/cotton/ui/transactions_action_bar.html:173
msgid "Flat Total"
msgstr "Total Fijo"
#: templates/cotton/ui/deleted_transactions_action_bar.html:139
-#: templates/cotton/ui/transactions_action_bar.html:164
+#: templates/cotton/ui/transactions_action_bar.html:189
msgid "Real Total"
msgstr "Total Real"
#: templates/cotton/ui/deleted_transactions_action_bar.html:155
-#: templates/cotton/ui/transactions_action_bar.html:180
+#: templates/cotton/ui/transactions_action_bar.html:205
msgid "Mean"
msgstr "Promedio"
#: templates/cotton/ui/deleted_transactions_action_bar.html:171
-#: templates/cotton/ui/transactions_action_bar.html:196
+#: templates/cotton/ui/transactions_action_bar.html:221
msgid "Max"
msgstr "Máximo"
#: templates/cotton/ui/deleted_transactions_action_bar.html:187
-#: templates/cotton/ui/transactions_action_bar.html:212
+#: templates/cotton/ui/transactions_action_bar.html:237
msgid "Min"
msgstr "Mínimo"
#: templates/cotton/ui/deleted_transactions_action_bar.html:203
-#: templates/cotton/ui/transactions_action_bar.html:228
+#: templates/cotton/ui/transactions_action_bar.html:253
msgid "Count"
msgstr "Conteo"
@@ -3241,17 +3324,11 @@ msgstr "Recurrente"
msgid "Balance"
msgstr "Saldo"
-#: templates/cotton/ui/transactions_action_bar.html:46
-msgid "Invert selection"
-msgstr "invertir seleccion"
-
-#: templates/cotton/ui/transactions_action_bar.html:66
-msgid "Mark as unpaid"
-msgstr "Marcar como sin pagar"
-
-#: templates/cotton/ui/transactions_action_bar.html:71
-msgid "Mark as paid"
-msgstr "Marcar como pago"
+#: templates/cotton/ui/transactions_action_bar.html:83
+#, fuzzy
+#| msgid "Transactions"
+msgid "More actions"
+msgstr "Transacciones"
#: templates/currencies/fragments/add.html:5
msgid "Add currency"
@@ -3690,6 +3767,14 @@ msgstr "está disponible"
msgid "Calculator"
msgstr "Calculadora"
+#: templates/includes/transactions_bulk_actions.html:4
+msgid "Mark as unpaid"
+msgstr "Marcar como sin pagar"
+
+#: templates/includes/transactions_bulk_actions.html:9
+msgid "Mark as paid"
+msgstr "Marcar como pago"
+
#: templates/insights/fragments/category_explorer/charts/account.html:100
#: templates/insights/fragments/category_explorer/charts/currency.html:92
#: templates/monthly_overview/fragments/monthly_account_summary.html:14
@@ -3755,6 +3840,7 @@ msgstr "No hay transacciones recientes"
#: templates/insights/fragments/year_by_year.html:140
#: templates/investment_classes/fragments/list.html:65
#: templates/monthly_overview/fragments/monthly_summary.html:168
+#: templates/transactions/widgets/sub_transactions.html:55
msgid "Total"
msgstr "Total"
@@ -4193,13 +4279,13 @@ msgstr ""
msgid "Loss, tax or fee"
msgstr ""
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
#, fuzzy
#| msgid "No presets yet"
msgid "No movements yet"
msgstr "Aún no hay plantillas"
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
msgid "Use the + button to buy or contribute"
msgstr ""
@@ -4798,6 +4884,12 @@ msgstr "No hay transacciones eliminadas para mostrar"
msgid "Deleted transactions"
msgstr "Transacciones eliminadas"
+#: templates/transactions/widgets/sub_transactions.html:53
+#, fuzzy
+#| msgid "Add quick transaction"
+msgid "Add sub-transaction"
+msgstr "Agregar transacción rápida"
+
#: templates/transactions/widgets/unselectable_income_expense_toggle_buttons.html:11
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:7
msgid "Unchanged"
@@ -4940,6 +5032,9 @@ msgstr "Iniciar sesión con"
msgid "Yearly Overview"
msgstr "Resumen Anual"
+#~ msgid "Invert election"
+#~ msgstr "Invertir Seleccion"
+
#, fuzzy
#~| msgid "Info"
#~ msgid "In"
diff --git a/app/locale/fr/LC_MESSAGES/django.po b/app/locale/fr/LC_MESSAGES/django.po
index 162ce268..0688fd33 100644
--- 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: 2026-11-12 03:24+0000\n"
+"POT-Creation-Date: 2026-11-14 14:06+0000\n"
"PO-Revision-Date: 2026-11-02 18:46+0000\n"
"Last-Translator: sorcierwax \n"
"Language-Team: French Public: Shown for all users. Only editable by the owner."
msgid ""
-"Private: Only shown for the owner and shared users. Only editable by the "
-"owner. Public: Shown for all users. Only editable by the owner."
+"Private: Only shown for the owner and shared users. Public: Shown for "
+"all users. Only the owner can edit, share or delete it."
msgstr ""
"Privé : Visible uniquement pour le propriétaire et les utilisateurs "
"partagés. Seulement modifiable par le propriétaire. Publique : Visible "
"par tous. Seulement modifiable par le propriétaire."
-#: apps/common/forms.py:76 apps/users/forms.py:191
+#: apps/common/forms.py:78 apps/users/forms.py:191
#: templates/bank_sync/fragments/accounts.html:34
#: templates/transactions/fragments/filter_actions.html:5
msgid "Save"
msgstr "Sauvegarder"
-#: apps/common/forms.py:90
+#: apps/common/forms.py:92
msgid "You cannot share this item with its owner."
msgstr "Vous ne pouvez pas partager cet item avec son propriétaire."
@@ -834,6 +851,7 @@ msgid "Now"
msgstr "Maintenant"
#: apps/common/widgets/tom_select.py:14
+#: templates/transactions/widgets/sub_transaction_row.html:9
msgid "Remove"
msgstr "Enlever"
@@ -910,8 +928,8 @@ msgstr "Date et Heure"
msgid "Auto"
msgstr "Auto"
-#: apps/currencies/models.py:91 apps/export_app/forms.py:67
-#: apps/export_app/forms.py:152 templates/exchange_rates/fragments/list.html:10
+#: apps/currencies/models.py:91 apps/export_app/forms.py:73
+#: apps/export_app/forms.py:161 templates/exchange_rates/fragments/list.html:10
#: templates/exchange_rates/pages/index.html:4
#: templates/includes/sidebar.html:204
msgid "Exchange Rates"
@@ -1074,25 +1092,25 @@ msgstr "Services ajouté à la file avec succès"
msgid "Create transaction"
msgstr "Créer une transaction"
-#: apps/dca/forms.py:69 apps/transactions/forms.py:582
+#: apps/dca/forms.py:69 apps/transactions/forms.py:668
msgid "From Account"
msgstr "Compte originateur"
-#: apps/dca/forms.py:75 apps/transactions/forms.py:587
+#: apps/dca/forms.py:75 apps/transactions/forms.py:673
msgid "To Account"
msgstr "Compte bénéficiaire"
#: apps/dca/forms.py:117 apps/dca/forms.py:125 apps/export_app/forms.py:49
-#: apps/export_app/forms.py:143 apps/insights/views.py:57
-#: apps/rules/forms.py:185 apps/rules/forms.py:195 apps/rules/models.py:46
-#: apps/rules/models.py:307 apps/transactions/filters.py:84
-#: apps/transactions/forms.py:78 apps/transactions/forms.py:346
-#: apps/transactions/forms.py:526 apps/transactions/forms.py:640
-#: apps/transactions/forms.py:647 apps/transactions/forms.py:862
-#: apps/transactions/forms.py:1114 apps/transactions/models.py:313
-#: apps/transactions/models.py:369 apps/transactions/models.py:770
-#: apps/transactions/models.py:1028 apps/transactions/models.py:1353
-#: templates/entities/fragments/list.html:9
+#: apps/export_app/forms.py:150 apps/insights/views.py:57
+#: apps/rules/forms.py:185 apps/rules/forms.py:196 apps/rules/models.py:47
+#: apps/rules/models.py:308 apps/transactions/filters.py:100
+#: apps/transactions/filters.py:175 apps/transactions/forms.py:161
+#: apps/transactions/forms.py:431 apps/transactions/forms.py:612
+#: apps/transactions/forms.py:726 apps/transactions/forms.py:733
+#: apps/transactions/forms.py:950 apps/transactions/forms.py:1204
+#: apps/transactions/models.py:315 apps/transactions/models.py:371
+#: apps/transactions/models.py:866 apps/transactions/models.py:1127
+#: apps/transactions/models.py:1500 templates/entities/fragments/list.html:9
#: templates/entities/pages/index.html:4 templates/includes/sidebar.html:168
#: templates/insights/fragments/month_by_month.html:40
#: templates/insights/fragments/month_by_month.html:43
@@ -1128,8 +1146,8 @@ msgstr "Les montants des transactions sont maintenant masqués"
msgid "You must provide an account."
msgstr "Vous devez fournir un compte."
-#: apps/dca/forms.py:322 apps/transactions/forms.py:780
-#: apps/transactions/models.py:978
+#: apps/dca/forms.py:322 apps/transactions/forms.py:866
+#: apps/transactions/models.py:1077
msgid "From and To accounts must be different."
msgstr ""
"Le compte originateur et le compte bénéficiaire doivent être différent."
@@ -1148,10 +1166,10 @@ msgid "Payment Currency"
msgstr "Devise de paiement"
#: apps/dca/models.py:26 apps/dca/models.py:181 apps/rules/forms.py:180
-#: apps/rules/forms.py:196 apps/rules/models.py:43 apps/rules/models.py:295
-#: apps/transactions/forms.py:504 apps/transactions/forms.py:668
-#: apps/transactions/models.py:354 apps/transactions/models.py:774
-#: apps/transactions/models.py:1031 apps/transactions/models.py:1338
+#: apps/rules/forms.py:197 apps/rules/models.py:44 apps/rules/models.py:296
+#: apps/transactions/forms.py:590 apps/transactions/forms.py:754
+#: apps/transactions/models.py:356 apps/transactions/models.py:870
+#: apps/transactions/models.py:1130 apps/transactions/models.py:1485
msgid "Notes"
msgstr "Notes"
@@ -1159,7 +1177,7 @@ msgstr "Notes"
msgid "DCA Strategy"
msgstr "Stratégie DCA"
-#: apps/dca/models.py:35 apps/export_app/forms.py:166
+#: apps/dca/models.py:35 apps/export_app/forms.py:175
msgid "DCA Strategies"
msgstr "Stratégies DCA"
@@ -1179,7 +1197,7 @@ msgstr "Somme reçue"
msgid "DCA Entry"
msgstr "Entrée DCA"
-#: apps/dca/models.py:187 apps/export_app/forms.py:167
+#: apps/dca/models.py:187 apps/export_app/forms.py:176
msgid "DCA Entries"
msgstr "Entrées DCA"
@@ -1207,14 +1225,14 @@ msgstr "Entrée mise à jour avec succès"
msgid "Entry deleted successfully"
msgstr "Entrée supprimée avec succès"
-#: apps/export_app/forms.py:13 apps/export_app/forms.py:137
+#: apps/export_app/forms.py:13 apps/export_app/forms.py:144
#: templates/includes/sidebar.html:247 templates/users/fragments/list.html:10
#: templates/users/pages/index.html:4
msgid "Users"
msgstr "Utilisateurs"
-#: apps/export_app/forms.py:31 apps/export_app/forms.py:144
-#: apps/transactions/models.py:423 templates/includes/sidebar.html:81
+#: apps/export_app/forms.py:31 apps/export_app/forms.py:151
+#: apps/transactions/models.py:425 templates/includes/sidebar.html:81
#: templates/includes/sidebar.html:154
#: templates/recurring_transactions/fragments/list_transactions.html:5
#: templates/recurring_transactions/fragments/table.html:37
@@ -1222,9 +1240,9 @@ msgstr "Utilisateurs"
msgid "Transactions"
msgstr "Transactions"
-#: apps/export_app/forms.py:37 apps/export_app/forms.py:141
-#: apps/insights/views.py:43 apps/transactions/filters.py:74
-#: templates/categories/fragments/list.html:9
+#: apps/export_app/forms.py:37 apps/export_app/forms.py:148
+#: apps/insights/views.py:43 apps/transactions/filters.py:90
+#: apps/transactions/filters.py:165 templates/categories/fragments/list.html:9
#: templates/categories/pages/index.html:4 templates/includes/sidebar.html:156
#: templates/insights/fragments/month_by_month.html:18
#: templates/insights/fragments/month_by_month.html:21
@@ -1233,102 +1251,117 @@ msgstr "Transactions"
msgid "Categories"
msgstr "Catégories"
-#: apps/export_app/forms.py:55 apps/export_app/forms.py:147
-#: apps/transactions/models.py:1068 templates/includes/sidebar.html:110
+#: apps/export_app/forms.py:55 apps/export_app/forms.py:155
+#: apps/transactions/models.py:1167 templates/includes/sidebar.html:110
#: templates/recurring_transactions/fragments/list.html:9
#: templates/recurring_transactions/pages/index.html:4
msgid "Recurring Transactions"
msgstr "Transactions récurrentes"
-#: apps/export_app/forms.py:61 apps/export_app/forms.py:145
-#: apps/transactions/models.py:788 templates/includes/sidebar.html:104
+#: apps/export_app/forms.py:61 apps/export_app/forms.py:153
+#: apps/transactions/models.py:884 templates/includes/sidebar.html:104
#: templates/installment_plans/fragments/list.html:9
#: templates/installment_plans/pages/index.html:4
msgid "Installment Plans"
msgstr "Paiements en plusieurs fois"
-#: apps/export_app/forms.py:73 apps/export_app/forms.py:150
+#: apps/export_app/forms.py:67 apps/export_app/forms.py:157
+#: apps/transactions/models.py:1518 templates/includes/sidebar.html:98
+#: templates/quick_transactions/pages/index.html:5
+#: templates/quick_transactions/pages/index.html:15
+msgid "Quick Transactions"
+msgstr "Transactions rapides"
+
+#: apps/export_app/forms.py:79 apps/export_app/forms.py:159
#: templates/exchange_rates_services/fragments/list.html:10
#: templates/exchange_rates_services/pages/index.html:4
#: templates/includes/sidebar.html:232
msgid "Automatic Exchange Rates"
msgstr "Taux de change automatique"
-#: apps/export_app/forms.py:79 templates/bank_sync/fragments/list.html:8
+#: apps/export_app/forms.py:85 templates/bank_sync/fragments/list.html:8
#: templates/bank_sync/pages/index.html:4 templates/includes/sidebar.html:238
msgid "Bank Sync"
msgstr ""
-#: apps/export_app/forms.py:80
+#: apps/export_app/forms.py:86
msgid "Includes the providers' API keys"
msgstr ""
-#: apps/export_app/forms.py:86 templates/includes/sidebar.html:212
+#: apps/export_app/forms.py:92 templates/includes/sidebar.html:212
#: templates/rules/fragments/list.html:9 templates/rules/pages/index.html:4
msgid "Rules"
msgstr "Règles"
-#: apps/export_app/forms.py:92 templates/cotton/transaction/item.html:66
+#: apps/export_app/forms.py:98 templates/cotton/transaction/item.html:68
msgid "DCA"
msgstr "DCA"
-#: apps/export_app/forms.py:98 apps/export_app/forms.py:168
+#: apps/export_app/forms.py:104 apps/export_app/forms.py:177
#: templates/import_app/fragments/profiles/list.html:21
#: templates/import_app/pages/profiles_index.html:4
msgid "Import Profiles"
msgstr "Importer des profils"
-#: apps/export_app/forms.py:126 templates/export_app/fragments/export.html:5
+#: apps/export_app/forms.py:133 templates/export_app/fragments/export.html:5
#: templates/export_app/pages/index.html:13
msgid "Export"
msgstr "Exporter"
-#: apps/export_app/forms.py:134
+#: apps/export_app/forms.py:141
msgid "Import a ZIP file exported from WYGIWYH"
msgstr "Importer un fichier ZIP exporté de WYGIWYH"
-#: apps/export_app/forms.py:135
+#: apps/export_app/forms.py:142
msgid "ZIP File"
msgstr "Fichier ZIP"
-#: apps/export_app/forms.py:157
+#: apps/export_app/forms.py:152 apps/rules/forms.py:193 apps/rules/models.py:42
+#: apps/rules/models.py:320 apps/transactions/models.py:736
+#: templates/transactions/widgets/sub_transactions.html:39
+#, fuzzy
+#| msgid "transactions"
+msgid "Sub-transactions"
+msgstr "transactions"
+
+#: apps/export_app/forms.py:166
#, fuzzy
#| msgid "By account"
msgid "Bank Sync Accounts"
msgstr "Par comptes"
-#: apps/export_app/forms.py:159 apps/rules/models.py:27
+#: apps/export_app/forms.py:168 apps/rules/models.py:27
msgid "Transaction rules"
msgstr "Règles de transaction"
-#: apps/export_app/forms.py:161 apps/rules/models.py:68
+#: apps/export_app/forms.py:170 apps/rules/models.py:69
msgid "Edit transaction action"
msgstr "Modifier l'action de transaction"
-#: apps/export_app/forms.py:164 apps/rules/models.py:327
+#: apps/export_app/forms.py:173 apps/rules/models.py:332
msgid "Update or create transaction actions"
msgstr "Mettre à jour ou créer des actions de transaction"
-#: apps/export_app/forms.py:199 templates/cotton/transaction/item.html:310
+#: apps/export_app/forms.py:210 templates/cotton/transaction/item.html:327
#: templates/cotton/ui/deleted_transactions_action_bar.html:53
#: templates/export_app/fragments/restore.html:5
#: templates/export_app/pages/index.html:19
msgid "Restore"
msgstr "Restaurer"
-#: apps/export_app/forms.py:209
+#: apps/export_app/forms.py:220
msgid "Please upload either a ZIP file or at least one CSV file"
msgstr "Veuillez charger un fichier ZIP ou au moins un fichier CSV"
-#: apps/export_app/views.py:190
+#: apps/export_app/views.py:216
msgid "You have to select at least one export"
msgstr "Vous devez sélectionner au moins un export"
-#: apps/export_app/views.py:210
+#: apps/export_app/views.py:236
msgid "Data restored successfully"
msgstr "Donnée restaurée avec succès"
-#: apps/export_app/views.py:222
+#: apps/export_app/views.py:248
msgid ""
"There was an error restoring your data. Check the logs for more details."
msgstr ""
@@ -1417,7 +1450,7 @@ msgstr "Exécution supprimé avec succès"
#: apps/insights/forms.py:118 apps/insights/utils/sankey.py:36
#: apps/insights/utils/sankey.py:167 apps/insights/views.py:45
-#: apps/transactions/filters.py:209
+#: apps/transactions/filters.py:294
#: templates/insights/fragments/month_by_month.html:119
#: templates/insights/fragments/year_by_year.html:73
msgid "Uncategorized"
@@ -1474,24 +1507,24 @@ msgstr "Pas de catégories"
msgid "Tag"
msgstr "Etiquette"
-#: apps/insights/views.py:52 apps/transactions/filters.py:215
+#: apps/insights/views.py:52 apps/transactions/filters.py:303
#: templates/insights/fragments/month_by_month.html:121
#: templates/insights/fragments/year_by_year.html:75
msgid "Untagged"
msgstr "Sans étiquettes"
-#: apps/insights/views.py:53 apps/transactions/models.py:611
+#: apps/insights/views.py:53 apps/transactions/models.py:632
#: templates/tags/fragments/table.html:69
msgid "No tags"
msgstr "Aucune étiquette"
-#: apps/insights/views.py:58 apps/transactions/models.py:312
+#: apps/insights/views.py:58 apps/transactions/models.py:314
#: templates/insights/fragments/month_by_month.html:88
#: templates/insights/fragments/year_by_year.html:56
msgid "Entity"
msgstr "Entité"
-#: apps/insights/views.py:59 apps/transactions/filters.py:222
+#: apps/insights/views.py:59 apps/transactions/filters.py:311
#: templates/insights/fragments/month_by_month.html:123
#: templates/insights/fragments/year_by_year.html:77
msgid "No entity"
@@ -1509,19 +1542,19 @@ msgstr ""
msgid "Unclassified"
msgstr ""
-#: apps/investments/views.py:289
+#: apps/investments/views.py:290
#, fuzzy
#| msgid "Installment Plan added successfully"
msgid "Asset class added successfully"
msgstr "Paiement en plusieurs fois ajouté avec succès"
-#: apps/investments/views.py:297
+#: apps/investments/views.py:298
#, fuzzy
#| msgid "Tag updated successfully"
msgid "Asset class updated successfully"
msgstr "Etiquette mise à jour avec succès"
-#: apps/investments/views.py:318
+#: apps/investments/views.py:319
#, fuzzy
#| msgid "Tag deleted successfully"
msgid "Asset class deleted successfully"
@@ -1556,13 +1589,13 @@ msgstr "Vous pouvez ajouter des actions à cette règle dans le prochain écran.
msgid "Set field"
msgstr "Configurer le champ"
-#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:123
+#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:101
msgid "To"
msgstr "A"
#: apps/rules/forms.py:78 apps/rules/forms.py:158 apps/rules/models.py:20
-#: apps/rules/models.py:62 apps/rules/models.py:323
+#: apps/rules/models.py:63 apps/rules/models.py:328
#: templates/rules/fragments/list.html:23
msgid "Order"
msgstr "Trier"
@@ -1580,36 +1613,37 @@ msgid "Operator"
msgstr "Opérateur"
#: apps/rules/forms.py:174 apps/rules/forms.py:188 apps/rules/models.py:36
-#: apps/rules/models.py:271 apps/transactions/forms.py:468
-#: apps/transactions/models.py:337 apps/transactions/models.py:730
-#: apps/transactions/models.py:1009 apps/transactions/models.py:1323
+#: apps/rules/models.py:272 apps/transactions/forms.py:554
+#: apps/transactions/models.py:339 apps/transactions/models.py:826
+#: apps/transactions/models.py:1108 apps/transactions/models.py:1470
#: templates/mini_tools/simulator.html:63
msgid "Type"
msgstr "Type"
#: apps/rules/forms.py:175 apps/rules/forms.py:189 apps/rules/models.py:37
-#: apps/rules/models.py:275 apps/transactions/filters.py:22
-#: apps/transactions/forms.py:472 apps/transactions/forms.py:650
-#: apps/transactions/models.py:339 apps/transactions/models.py:1325
-#: templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/rules/models.py:276 apps/transactions/filters.py:23
+#: apps/transactions/forms.py:558 apps/transactions/forms.py:736
+#: apps/transactions/models.py:341 apps/transactions/models.py:1472
+#: templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/transactions/widgets/paid_toggle_button.html:10
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:13
msgid "Paid"
msgstr "Payé"
#: apps/rules/forms.py:177 apps/rules/forms.py:191 apps/rules/models.py:39
-#: apps/rules/models.py:283 apps/transactions/forms.py:90
-#: apps/transactions/forms.py:488 apps/transactions/forms.py:655
-#: apps/transactions/forms.py:868 apps/transactions/models.py:341
-#: apps/transactions/models.py:748 apps/transactions/models.py:1033
+#: apps/rules/models.py:284 apps/transactions/forms.py:173
+#: apps/transactions/forms.py:574 apps/transactions/forms.py:741
+#: apps/transactions/forms.py:956 apps/transactions/models.py:343
+#: apps/transactions/models.py:844 apps/transactions/models.py:1132
msgid "Reference Date"
msgstr "Date de référence"
#: apps/rules/forms.py:178 apps/rules/forms.py:192 apps/rules/models.py:41
-#: apps/rules/models.py:287 apps/transactions/forms.py:495
-#: apps/transactions/models.py:347 apps/transactions/models.py:1014
-#: apps/transactions/models.py:1331
+#: apps/rules/models.py:288 apps/transactions/forms.py:75
+#: apps/transactions/forms.py:581 apps/transactions/models.py:349
+#: apps/transactions/models.py:730 apps/transactions/models.py:1113
+#: apps/transactions/models.py:1478
#: templates/insights/fragments/sankey.html:102
#: templates/installment_plans/fragments/table.html:18
#: templates/mini_tools/simulator.html:70
@@ -1618,51 +1652,52 @@ msgstr "Date de référence"
msgid "Amount"
msgstr "Montant"
-#: apps/rules/forms.py:179 apps/rules/forms.py:193 apps/rules/models.py:14
-#: apps/rules/models.py:42 apps/rules/models.py:291
-#: apps/transactions/forms.py:499 apps/transactions/forms.py:659
-#: apps/transactions/models.py:352 apps/transactions/models.py:732
-#: apps/transactions/models.py:1017 apps/transactions/models.py:1336
+#: apps/rules/forms.py:179 apps/rules/forms.py:194 apps/rules/models.py:14
+#: apps/rules/models.py:43 apps/rules/models.py:292
+#: apps/transactions/forms.py:585 apps/transactions/forms.py:745
+#: apps/transactions/models.py:354 apps/transactions/models.py:828
+#: apps/transactions/models.py:1116 apps/transactions/models.py:1483
msgid "Description"
msgstr "Description"
-#: apps/rules/forms.py:182 apps/rules/forms.py:198 apps/rules/models.py:47
-#: apps/rules/models.py:299 apps/transactions/models.py:399
-#: apps/transactions/models.py:1358
+#: apps/rules/forms.py:182 apps/rules/forms.py:199 apps/rules/models.py:48
+#: apps/rules/models.py:300 apps/transactions/models.py:401
+#: apps/transactions/models.py:1505
msgid "Internal Note"
msgstr "Note interne"
-#: apps/rules/forms.py:183 apps/rules/forms.py:199 apps/rules/models.py:48
-#: apps/rules/models.py:303 apps/transactions/models.py:401
-#: apps/transactions/models.py:1360
+#: apps/rules/forms.py:183 apps/rules/forms.py:200 apps/rules/models.py:49
+#: apps/rules/models.py:304 apps/transactions/models.py:403
+#: apps/transactions/models.py:1507
msgid "Internal ID"
msgstr "ID interne"
-#: apps/rules/forms.py:186 apps/rules/forms.py:200 apps/rules/models.py:40
-#: apps/rules/models.py:319 apps/transactions/forms.py:672
-#: apps/transactions/models.py:251 apps/transactions/models.py:342
-#: apps/transactions/models.py:1326
+#: apps/rules/forms.py:186 apps/rules/forms.py:201 apps/rules/models.py:40
+#: apps/rules/models.py:324 apps/transactions/forms.py:758
+#: apps/transactions/models.py:253 apps/transactions/models.py:344
+#: apps/transactions/models.py:1473
msgid "Mute"
msgstr "Silencieux"
-#: apps/rules/forms.py:215
+#: apps/rules/forms.py:216
msgid "Search Criteria"
msgstr "Critère de recherche"
-#: apps/rules/forms.py:360
+#: apps/rules/forms.py:361
msgid "Set Values"
msgstr "Configurer les valeurs"
-#: apps/rules/forms.py:407 apps/rules/forms.py:442 apps/rules/forms.py:477
-#: apps/transactions/models.py:422 apps/transactions/models.py:667
+#: apps/rules/forms.py:409 apps/rules/forms.py:444 apps/rules/forms.py:479
+#: apps/transactions/models.py:424 apps/transactions/models.py:703
+#: apps/transactions/models.py:763
msgid "Transaction"
msgstr "Transaction"
-#: apps/rules/forms.py:411 apps/rules/forms.py:446 apps/rules/forms.py:481
+#: apps/rules/forms.py:413 apps/rules/forms.py:448 apps/rules/forms.py:483
msgid "Type to search for a transaction"
msgstr "Saisissez pour rechercher une transaction"
-#: apps/rules/forms.py:422 apps/rules/forms.py:457 apps/rules/forms.py:491
+#: apps/rules/forms.py:424 apps/rules/forms.py:459 apps/rules/forms.py:493
#: templates/rules/fragments/transaction_rule/dry_run/created.html:5
#: templates/rules/fragments/transaction_rule/dry_run/deleted.html:5
#: templates/rules/fragments/transaction_rule/dry_run/updated.html:5
@@ -1682,15 +1717,15 @@ msgstr "Classé"
msgid "Transaction rule"
msgstr "Règle(s) de transaction"
-#: apps/rules/models.py:54 apps/rules/models.py:98
+#: apps/rules/models.py:55 apps/rules/models.py:99
msgid "Rule"
msgstr "Règle"
-#: apps/rules/models.py:59
+#: apps/rules/models.py:60
msgid "Field"
msgstr "Champ"
-#: apps/rules/models.py:61 templates/investments/fragments/charts.html:86
+#: apps/rules/models.py:62 templates/investments/fragments/charts.html:86
#: templates/investments/fragments/detail.html:68
#: templates/investments/fragments/detail.html:127
#: templates/investments/fragments/detail.html:245
@@ -1698,51 +1733,51 @@ msgstr "Champ"
msgid "Value"
msgstr "Valeur"
-#: apps/rules/models.py:69
+#: apps/rules/models.py:70
msgid "Edit transaction actions"
msgstr "Modifier les actions de transaction"
-#: apps/rules/models.py:84
+#: apps/rules/models.py:85
msgid "is exactly"
msgstr "Est exactement"
-#: apps/rules/models.py:85
+#: apps/rules/models.py:86
msgid "contains"
msgstr "Contient"
-#: apps/rules/models.py:86
+#: apps/rules/models.py:87
msgid "starts with"
msgstr "Commence par"
-#: apps/rules/models.py:87
+#: apps/rules/models.py:88
msgid "ends with"
msgstr "Fini par"
-#: apps/rules/models.py:88
+#: apps/rules/models.py:89
msgid "equals"
msgstr "Égal"
-#: apps/rules/models.py:89
+#: apps/rules/models.py:90
msgid "greater than"
msgstr "Supérieur à"
-#: apps/rules/models.py:90
+#: apps/rules/models.py:91
msgid "less than"
msgstr "Inférieur à"
-#: apps/rules/models.py:91
+#: apps/rules/models.py:92
msgid "greater than or equal"
msgstr "Supérieur ou égal à"
-#: apps/rules/models.py:92
+#: apps/rules/models.py:93
msgid "less than or equal"
msgstr "Inférieur ou égal à"
-#: apps/rules/models.py:102
+#: apps/rules/models.py:103
msgid "Filter"
msgstr "Filtre"
-#: apps/rules/models.py:105
+#: apps/rules/models.py:106
msgid ""
"Generic expression to enable or disable execution. Should evaluate to True "
"or False"
@@ -1750,7 +1785,7 @@ msgstr ""
"Expression générique pour activer ou désactiver l’exécution. Doit être Vrai "
"ou Faux"
-#: apps/rules/models.py:326
+#: apps/rules/models.py:331
msgid "Update or create transaction action"
msgstr "Mettre à jour ou créer une action de transaction"
@@ -1796,8 +1831,8 @@ msgid "Update or Create Transaction action deleted successfully"
msgstr ""
"Mis à jour ou Création de l'action de Transaction supprimée avec succès"
-#: apps/transactions/filters.py:23 templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/transactions/filters.py:24 templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/insights/fragments/overview/index.html:68
#: templates/net_worth/net_worth.html:39 templates/net_worth/net_worth.html:43
#: templates/transactions/widgets/paid_toggle_button.html:7
@@ -1805,136 +1840,146 @@ msgstr ""
msgid "Projected"
msgstr "Projeté"
-#: apps/transactions/filters.py:28 templates/categories/fragments/table.html:18
+#: apps/transactions/filters.py:29 templates/categories/fragments/table.html:18
msgid "Muted"
msgstr "Muet"
-#: apps/transactions/filters.py:51
+#: apps/transactions/filters.py:67 apps/transactions/filters.py:144
msgid "Content"
msgstr "Contenu"
-#: apps/transactions/filters.py:57
+#: apps/transactions/filters.py:73
msgid "Transaction Type"
msgstr "Type de transaction"
-#: apps/transactions/filters.py:95
+#: apps/transactions/filters.py:111
msgid "Mute Status"
msgstr "Ignorer le statut"
-#: apps/transactions/filters.py:100
+#: apps/transactions/filters.py:116
msgid "Date from"
msgstr "Date de départ"
-#: apps/transactions/filters.py:105 apps/transactions/filters.py:115
+#: apps/transactions/filters.py:121 apps/transactions/filters.py:131
msgid "Until"
msgstr "Jusqu'au"
-#: apps/transactions/filters.py:110
+#: apps/transactions/filters.py:126
msgid "Reference date from"
msgstr "Référencer une date de"
-#: apps/transactions/filters.py:120
+#: apps/transactions/filters.py:136
msgid "Amount min"
msgstr "Montant min"
-#: apps/transactions/filters.py:125
+#: apps/transactions/filters.py:141
msgid "Amount max"
msgstr "Montant max"
-#: apps/transactions/filters.py:208
+#: apps/transactions/filters.py:240
+msgid "Include"
+msgstr ""
+
+#: apps/transactions/filters.py:245
+msgid "Exclude"
+msgstr ""
+
+#: apps/transactions/filters.py:293
msgid "Categorized"
msgstr "Catégorisé"
-#: apps/transactions/filters.py:215
+#: apps/transactions/filters.py:303
msgid "Tagged"
msgstr "Avec étiquettes"
-#: apps/transactions/filters.py:221
+#: apps/transactions/filters.py:310
msgid "Any entity"
msgstr "N'importe quelle entité"
-#: apps/transactions/forms.py:192
+#: apps/transactions/forms.py:277
msgid "More"
msgstr "Plus"
-#: apps/transactions/forms.py:229
+#: apps/transactions/forms.py:314
msgid "Save and add similar"
msgstr "Enregistrer et ajouter des semblables"
-#: apps/transactions/forms.py:234
+#: apps/transactions/forms.py:319
msgid "Save and add another"
msgstr "Enregistrer et ajouter un autre"
-#: apps/transactions/forms.py:271 templates/cotton/transaction/item.html:184
+#: apps/transactions/forms.py:356 templates/cotton/transaction/item.html:186
#: templates/transactions/fragments/attachments.html:4
msgid "Attachments"
msgstr "Fichiers attachés"
-#: apps/transactions/forms.py:272
+#: apps/transactions/forms.py:357
msgid ""
"Files are private and only visible to users with access to this transaction."
msgstr ""
"Les fichiers sont privés et visibles uniquement pour les utilisateurs "
"autorisés à voir cette transaction."
-#: apps/transactions/forms.py:283
+#: apps/transactions/forms.py:368
msgid "Upload"
msgstr "Envoi"
-#: apps/transactions/forms.py:355 apps/transactions/forms.py:1120
-#: apps/transactions/models.py:947
+#: apps/transactions/forms.py:440 apps/transactions/forms.py:1210
+#: apps/transactions/models.py:1046
#, fuzzy
#| msgid "To Account"
msgid "To account"
msgstr "Compte bénéficiaire"
-#: apps/transactions/forms.py:382 apps/transactions/forms.py:675
+#: apps/transactions/forms.py:467 apps/transactions/forms.py:761
msgid "Muted transactions won't be displayed on monthly summaries"
msgstr ""
"Les transactions silencieuses ne sont pas affichées dans les résumés mensuels"
-#: apps/transactions/forms.py:594
+#: apps/transactions/forms.py:680
msgid "From Amount"
msgstr "Montant de départ"
-#: apps/transactions/forms.py:599
+#: apps/transactions/forms.py:685
msgid "To Amount"
msgstr "Montant d'arrivée"
-#: apps/transactions/forms.py:741 apps/transactions/models.py:992
-#: apps/transactions/models.py:1303 templates/cotton/transaction/item.html:52
-#: templates/cotton/transaction/item.html:60
+#: apps/transactions/forms.py:827 apps/transactions/models.py:1091
+#: apps/transactions/models.py:1450 templates/cotton/transaction/item.html:54
+#: templates/cotton/transaction/item.html:62
+#: templates/cotton/transaction/item.html:272
+#: templates/cotton/transaction/item.html:304
#: templates/cotton/ui/quick_transactions_buttons.html:40
#: templates/cotton/ui/transactions_fab.html:44
msgid "Transfer"
msgstr "Virement"
-#: apps/transactions/forms.py:1005
+#: apps/transactions/forms.py:1095
msgid "Tag name"
msgstr "Libellé de l'étiquette"
-#: apps/transactions/forms.py:1033
+#: apps/transactions/forms.py:1123
msgid "Entity name"
msgstr "Nom d'entité"
-#: apps/transactions/forms.py:1061
+#: apps/transactions/forms.py:1151
msgid "Category name"
msgstr "Nom de catégorie"
-#: apps/transactions/forms.py:1063
+#: apps/transactions/forms.py:1153
msgid "Muted categories won't be displayed on monthly summaries"
msgstr ""
"Les catégories silencieuses ne compteront pas dans votre résumé mensuel"
-#: apps/transactions/forms.py:1228
+#: apps/transactions/forms.py:1319
msgid "future transactions"
msgstr "Transactions à venir"
-#: apps/transactions/forms.py:1255
+#: apps/transactions/forms.py:1346
msgid "End date should be after the start date"
msgstr "La date de fin doit être ultérieure à la date de début"
-#: apps/transactions/models.py:256
+#: apps/transactions/models.py:258
msgid ""
"Deactivated categories won't be able to be selected when creating new "
"transactions"
@@ -1942,26 +1987,26 @@ msgstr ""
"Les catégories désactivées ne seront pas sélectionnable lors de la création "
"de nouvelle transactions"
-#: apps/transactions/models.py:264
+#: apps/transactions/models.py:266
msgid "Transaction Category"
msgstr "Catégorie de transaction"
-#: apps/transactions/models.py:265
+#: apps/transactions/models.py:267
msgid "Transaction Categories"
msgstr "Catégories de transaction"
-#: apps/transactions/models.py:280
+#: apps/transactions/models.py:282
msgid ""
"Deactivated tags won't be able to be selected when creating new transactions"
msgstr ""
"Les étiquettes désactivées ne pourront pas être sélectionnées lors de la "
"création de nouvelles transactions"
-#: apps/transactions/models.py:288 apps/transactions/models.py:289
+#: apps/transactions/models.py:290 apps/transactions/models.py:291
msgid "Transaction Tags"
msgstr "Etiquettes de transaction"
-#: apps/transactions/models.py:304
+#: apps/transactions/models.py:306
msgid ""
"Deactivated entities won't be able to be selected when creating new "
"transactions"
@@ -1969,8 +2014,8 @@ msgstr ""
"Les entités désactivées ne pourront pas être sélectionnées lors de la "
"création de nouvelles transactions"
-#: apps/transactions/models.py:324 apps/transactions/models.py:991
-#: apps/transactions/models.py:1302
+#: apps/transactions/models.py:326 apps/transactions/models.py:1090
+#: apps/transactions/models.py:1449
#: templates/calendar_view/fragments/list.html:42
#: templates/calendar_view/fragments/list.html:44
#: templates/calendar_view/fragments/list.html:52
@@ -1982,14 +2027,14 @@ msgstr ""
#: templates/investments/fragments/detail.html:71
#: templates/investments/fragments/detail.html:175
#: templates/investments/fragments/detail.html:227
-#: templates/investments/fragments/detail.html:318
+#: templates/investments/fragments/detail.html:326
#: templates/mini_tools/simulator.html:66
#: templates/monthly_overview/fragments/monthly_summary.html:42
msgid "Income"
msgstr "Revenus"
-#: apps/transactions/models.py:325 apps/transactions/models.py:993
-#: apps/transactions/models.py:1304
+#: apps/transactions/models.py:327 apps/transactions/models.py:1092
+#: apps/transactions/models.py:1451
#: templates/calendar_view/fragments/list.html:46
#: templates/calendar_view/fragments/list.html:48
#: templates/calendar_view/fragments/list.html:56
@@ -2001,194 +2046,194 @@ msgstr "Revenus"
msgid "Expense"
msgstr "Dépense"
-#: apps/transactions/models.py:380 apps/transactions/models.py:787
-#: templates/cotton/transaction/item.html:260
-#: templates/cotton/transaction/item.html:277
-#: templates/cotton/transaction/item.html:287
+#: apps/transactions/models.py:382 apps/transactions/models.py:883
+#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:289
+#: templates/cotton/transaction/item.html:299
msgid "Installment Plan"
msgstr "Plan d'aménagement"
-#: apps/transactions/models.py:389 apps/transactions/models.py:1067
-#: templates/cotton/transaction/item.html:250
-#: templates/cotton/transaction/item.html:270
+#: apps/transactions/models.py:391 apps/transactions/models.py:1166
+#: templates/cotton/transaction/item.html:252
+#: templates/cotton/transaction/item.html:282
msgid "Recurring Transaction"
msgstr "Transaction récurrente"
-#: apps/transactions/models.py:397
+#: apps/transactions/models.py:399
msgid "Linked Transaction"
msgstr "Transaction liée"
-#: apps/transactions/models.py:405
+#: apps/transactions/models.py:407
msgid "Deleted"
msgstr "Supprimé"
-#: apps/transactions/models.py:410
+#: apps/transactions/models.py:412
msgid "Deleted At"
msgstr "Supprimé à"
-#: apps/transactions/models.py:518
+#: apps/transactions/models.py:521
msgid "A transfer needs one expense and one income."
msgstr ""
-#: apps/transactions/models.py:520
+#: apps/transactions/models.py:523
msgid "A transfer needs two different accounts."
msgstr ""
-#: apps/transactions/models.py:524
+#: apps/transactions/models.py:527
msgid "This transaction is already part of another transfer."
msgstr ""
-#: apps/transactions/models.py:613
+#: apps/transactions/models.py:634
msgid "No category"
msgstr "Pas de catégorie"
-#: apps/transactions/models.py:615
+#: apps/transactions/models.py:636
msgid "No description"
msgstr "Pas de description"
-#: apps/transactions/models.py:672
+#: apps/transactions/models.py:735
+#, fuzzy
+#| msgid "transactions"
+msgid "Sub-transaction"
+msgstr "transactions"
+
+#: apps/transactions/models.py:768
msgid "File"
msgstr "Fichier"
-#: apps/transactions/models.py:674
+#: apps/transactions/models.py:770
msgid "Original Name"
msgstr "Nom initial"
-#: apps/transactions/models.py:676
+#: apps/transactions/models.py:772
msgid "Content Type"
msgstr "Type de contenu"
-#: apps/transactions/models.py:678
+#: apps/transactions/models.py:774
msgid "Size"
msgstr "Taille"
-#: apps/transactions/models.py:683
+#: apps/transactions/models.py:779
msgid "Uploaded By"
msgstr "Envoyer par"
-#: apps/transactions/models.py:688
+#: apps/transactions/models.py:784
msgid "Transaction Attachment"
msgstr "Fichiers de la transaction"
-#: apps/transactions/models.py:689
+#: apps/transactions/models.py:785
msgid "Transaction Attachments"
msgstr "Fichiers de transactions"
-#: apps/transactions/models.py:719 templates/includes/sidebar.html:57
+#: apps/transactions/models.py:815 templates/includes/sidebar.html:57
msgid "Yearly"
msgstr "Annuel"
-#: apps/transactions/models.py:720 apps/users/models.py:469
+#: apps/transactions/models.py:816 apps/users/models.py:469
#: templates/includes/sidebar.html:51
msgid "Monthly"
msgstr "Mensuel"
-#: apps/transactions/models.py:721
+#: apps/transactions/models.py:817
msgid "Weekly"
msgstr "Hebdomadaire"
-#: apps/transactions/models.py:722
+#: apps/transactions/models.py:818
msgid "Daily"
msgstr "Quotidien"
-#: apps/transactions/models.py:735
+#: apps/transactions/models.py:831
msgid "Number of Installments"
msgstr "Nombre d'écheances"
-#: apps/transactions/models.py:740
+#: apps/transactions/models.py:836
msgid "Installment Start"
msgstr "Commencer à l'échéance"
-#: apps/transactions/models.py:741
+#: apps/transactions/models.py:837
msgid "The installment number to start counting from"
msgstr "L'échéance à partir de laquelle compter"
-#: apps/transactions/models.py:746 apps/transactions/models.py:1037
+#: apps/transactions/models.py:842 apps/transactions/models.py:1136
msgid "Start Date"
msgstr "Date de début"
-#: apps/transactions/models.py:750 apps/transactions/models.py:1038
+#: apps/transactions/models.py:846 apps/transactions/models.py:1137
msgid "End Date"
msgstr "Date de fin"
-#: apps/transactions/models.py:755
+#: apps/transactions/models.py:851
msgid "Recurrence"
msgstr "Récurrence"
-#: apps/transactions/models.py:758
+#: apps/transactions/models.py:854
msgid "Installment Amount"
msgstr "Montant des échéances"
-#: apps/transactions/models.py:777 apps/transactions/models.py:1057
+#: apps/transactions/models.py:873 apps/transactions/models.py:1156
msgid "Add description to transactions"
msgstr "Rajouter une description à la transaction"
-#: apps/transactions/models.py:780 apps/transactions/models.py:1060
+#: apps/transactions/models.py:876 apps/transactions/models.py:1159
msgid "Add notes to transactions"
msgstr "Ajouter des notes aux transactions"
-#: apps/transactions/models.py:954
+#: apps/transactions/models.py:1053
#, fuzzy
#| msgid "To Amount"
msgid "To amount"
msgstr "Montant d'arrivée"
-#: apps/transactions/models.py:955
+#: apps/transactions/models.py:1054
msgid "Leave empty to use the same amount"
msgstr "Laisser vide pour garder le même montant"
-#: apps/transactions/models.py:996 templates/mini_tools/simulator.html:129
+#: apps/transactions/models.py:1095 templates/mini_tools/simulator.html:129
msgid "day(s)"
msgstr "jour(s)"
-#: apps/transactions/models.py:997 templates/mini_tools/simulator.html:130
+#: apps/transactions/models.py:1096 templates/mini_tools/simulator.html:130
msgid "week(s)"
msgstr "semaine(s)"
-#: apps/transactions/models.py:998 templates/mini_tools/simulator.html:131
+#: apps/transactions/models.py:1097 templates/mini_tools/simulator.html:131
msgid "month(s)"
msgstr "mois"
-#: apps/transactions/models.py:999 templates/mini_tools/simulator.html:132
+#: apps/transactions/models.py:1098 templates/mini_tools/simulator.html:132
msgid "year(s)"
msgstr "année(s)"
-#: apps/transactions/models.py:1001
+#: apps/transactions/models.py:1100
#: templates/recurring_transactions/fragments/list.html:18
msgid "Paused"
msgstr "Interrompu"
-#: apps/transactions/models.py:1040
+#: apps/transactions/models.py:1139
msgid "Recurrence Type"
msgstr "Type de récurrence"
-#: apps/transactions/models.py:1043
+#: apps/transactions/models.py:1142
msgid "Recurrence Interval"
msgstr "Intervalle de récurrence"
-#: apps/transactions/models.py:1046
+#: apps/transactions/models.py:1145
msgid "Keep at most"
msgstr "Répéter un maximum de"
-#: apps/transactions/models.py:1050
+#: apps/transactions/models.py:1149
msgid "Last Generated Date"
msgstr "Dernière date générée"
-#: apps/transactions/models.py:1053
+#: apps/transactions/models.py:1152
msgid "Last Generated Reference Date"
msgstr "Dernière date de référence générée"
-#: apps/transactions/models.py:1370 templates/cotton/transaction/item.html:243
+#: apps/transactions/models.py:1517 templates/cotton/transaction/item.html:245
#: templates/cotton/ui/transactions_fab.html:59
msgid "Quick Transaction"
msgstr "Transaction rapide"
-#: apps/transactions/models.py:1371 templates/includes/sidebar.html:98
-#: templates/quick_transactions/pages/index.html:5
-#: templates/quick_transactions/pages/index.html:15
-msgid "Quick Transactions"
-msgstr "Transactions rapides"
-
#: apps/transactions/validators.py:8
#, python-format
msgid "%(value)s has too many decimal places. Maximum is 30."
@@ -2199,35 +2244,43 @@ msgstr "%(value)s a trop de décimales. Le maximum est 30."
msgid "%(value)s is not a non-negative number"
msgstr "%(value)s n'est pas un nombre positif"
-#: apps/transactions/views/actions.py:58
+#: apps/transactions/views/actions.py:61
#, python-format
msgid "%(count)s transaction marked as paid"
msgid_plural "%(count)s transactions marked as paid"
msgstr[0] "%(count)s transaction marquée comme payé"
msgstr[1] "%(count)s transactions marquées comme payées"
-#: apps/transactions/views/actions.py:81
+#: apps/transactions/views/actions.py:84
#, python-format
msgid "%(count)s transaction marked as not paid"
msgid_plural "%(count)s transactions marked as not paid"
msgstr[0] "%(count)s transaction marquée comme non payée"
msgstr[1] "%(count)s transactions marquées comme non payées"
-#: apps/transactions/views/actions.py:105
+#: apps/transactions/views/actions.py:108
#, python-format
msgid "%(count)s transaction deleted successfully"
msgid_plural "%(count)s transactions deleted successfully"
msgstr[0] "%(count)s transaction supprimée avec succès"
msgstr[1] "%(count)s transactions supprimées avec succès"
-#: apps/transactions/views/actions.py:139
+#: apps/transactions/views/actions.py:142
#, python-format
msgid "%(count)s transaction restored successfully"
msgid_plural "%(count)s transactions restored successfully"
msgstr[0] "%(count)s transaction restaurée avec succès"
msgstr[1] "%(count)s transactions restaurées avec succès"
-#: apps/transactions/views/actions.py:170
+#: apps/transactions/views/actions.py:174
+#: apps/transactions/views/transactions.py:423
+#, python-format
+msgid "%(count)s transaction updated successfully"
+msgid_plural "%(count)s transactions updated successfully"
+msgstr[0] "%(count)s transaction mise à jour avec succès"
+msgstr[1] "%(count)s transactions mises à jour avec succès"
+
+#: apps/transactions/views/actions.py:247
#, python-format
msgid "%(count)s transaction duplicated successfully"
msgid_plural "%(count)s transactions duplicated successfully"
@@ -2246,33 +2299,43 @@ msgstr "La catégorie a été mise à jour avec succès"
msgid "Category deleted successfully"
msgstr "Catégorie supprimée avec succès"
-#: apps/transactions/views/conversions.py:72
+#: apps/transactions/views/conversions.py:77
#: apps/transactions/views/quick_transactions.py:46 apps/users/views.py:252
msgid "Item added successfully"
msgstr "Item ajouté avec succès"
-#: apps/transactions/views/conversions.py:91
+#: apps/transactions/views/conversions.py:97
msgid "Convert into quick transaction"
msgstr "Transformer en transaction rapide"
-#: apps/transactions/views/conversions.py:108
+#: apps/transactions/views/conversions.py:114
#: apps/transactions/views/recurring_transactions.py:112
msgid "Recurring Transaction added successfully"
msgstr "Transaction récurrente ajoutée avec succès"
-#: apps/transactions/views/conversions.py:129
+#: apps/transactions/views/conversions.py:136
msgid "Convert into recurring transaction"
msgstr "Transformer en transaction récurrente"
-#: apps/transactions/views/conversions.py:148
+#: apps/transactions/views/conversions.py:155
#: apps/transactions/views/installment_plans.py:87
msgid "Installment Plan added successfully"
msgstr "Paiement en plusieurs fois ajouté avec succès"
-#: apps/transactions/views/conversions.py:167
+#: apps/transactions/views/conversions.py:175
msgid "Convert into installment plan"
msgstr "Transformer en paiement en plusieurs fois"
+#: apps/transactions/views/conversions.py:195
+msgid "Transaction converted into a transfer"
+msgstr ""
+
+#: apps/transactions/views/conversions.py:226
+#, fuzzy
+#| msgid "Convert into quick transaction"
+msgid "Convert into transfer"
+msgstr "Transformer en transaction rapide"
+
#: apps/transactions/views/entities.py:72
msgid "Entity added successfully"
msgstr "Entité ajoutée avec succès"
@@ -2305,7 +2368,7 @@ msgstr "Item mis à jour avec succès"
msgid "Item deleted successfully"
msgstr "Item supprimée avec succès"
-#: apps/transactions/views/quick_transactions.py:164
+#: apps/transactions/views/quick_transactions.py:165
#: apps/transactions/views/transactions.py:156
#: apps/transactions/views/transactions.py:343
msgid "Transaction added successfully"
@@ -2355,30 +2418,23 @@ msgstr "Fichier supprimé avec succès"
msgid "Transaction updated successfully"
msgstr "Transaction mise à jour avec succès"
-#: apps/transactions/views/transactions.py:421
-#, python-format
-msgid "%(count)s transaction updated successfully"
-msgid_plural "%(count)s transactions updated successfully"
-msgstr[0] "%(count)s transaction mise à jour avec succès"
-msgstr[1] "%(count)s transactions mises à jour avec succès"
-
-#: apps/transactions/views/transactions.py:448
+#: apps/transactions/views/transactions.py:450
msgid "Transaction duplicated successfully"
msgstr "Transaction dupliquée avec succès"
-#: apps/transactions/views/transactions.py:493
+#: apps/transactions/views/transactions.py:495
msgid "Transaction deleted successfully"
msgstr "Transaction supprimée avec succès"
-#: apps/transactions/views/transactions.py:523
+#: apps/transactions/views/transactions.py:525
msgid "Transaction restored successfully"
msgstr "Transaction restaurée avec succès"
-#: apps/transactions/views/transactions.py:549
+#: apps/transactions/views/transactions.py:551
msgid "Transfer added successfully"
msgstr "Virement ajouté avec succès"
-#: apps/transactions/views/transactions.py:579
+#: apps/transactions/views/transactions.py:581
msgid "Transfer updated successfully"
msgstr "Virement mis à jour avec succès"
@@ -2713,8 +2769,9 @@ msgstr "Actions"
#: templates/accounts/fragments/list.html:37
#: templates/bank_sync/fragments/list.html:33
#: templates/categories/fragments/table.html:29
-#: templates/cotton/transaction/item.html:178
-#: templates/cotton/ui/transactions_action_bar.html:54
+#: templates/cotton/transaction/item.html:180
+#: templates/cotton/ui/transactions_action_bar.html:56
+#: templates/cotton/ui/transactions_action_bar.html:90
#: templates/currencies/fragments/list.html:34
#: templates/dca/fragments/strategy/details.html:63
#: templates/dca/fragments/strategy/list.html:31
@@ -2725,8 +2782,8 @@ msgstr "Actions"
#: templates/import_app/fragments/profiles/list.html:46
#: templates/installment_plans/fragments/table.html:28
#: templates/investment_classes/fragments/list.html:39
-#: templates/investments/fragments/detail.html:302
-#: templates/investments/fragments/detail.html:330
+#: templates/investments/fragments/detail.html:310
+#: templates/investments/fragments/detail.html:338
#: templates/quick_transactions/fragments/list.html:25
#: templates/recurring_transactions/fragments/table.html:30
#: templates/rules/fragments/transaction_rule/view.html:22
@@ -2763,10 +2820,11 @@ msgstr "Partager"
#: templates/accounts/fragments/list.html:71
#: templates/bank_sync/fragments/list.html:50
#: templates/categories/fragments/table.html:51
-#: templates/cotton/transaction/item.html:190
-#: templates/cotton/transaction/item.html:316
+#: templates/cotton/transaction/item.html:192
+#: templates/cotton/transaction/item.html:333
#: templates/cotton/ui/deleted_transactions_action_bar.html:57
-#: templates/cotton/ui/transactions_action_bar.html:82
+#: templates/cotton/ui/transactions_action_bar.html:75
+#: templates/cotton/ui/transactions_action_bar.html:107
#: templates/currencies/fragments/list.html:40
#: templates/dca/fragments/strategy/details.html:70
#: templates/dca/fragments/strategy/list.html:38
@@ -2797,10 +2855,11 @@ msgstr "Supprimer"
#: templates/accounts/fragments/list.html:75
#: templates/bank_sync/fragments/list.html:54
#: templates/categories/fragments/table.html:56
-#: templates/cotton/transaction/item.html:192
-#: templates/cotton/transaction/item.html:322
+#: templates/cotton/transaction/item.html:194
+#: templates/cotton/transaction/item.html:339
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:44
#: templates/dca/fragments/strategy/details.html:75
#: templates/dca/fragments/strategy/list.html:42
@@ -2828,10 +2887,11 @@ msgstr "Êtes-vous sûr ?"
#: templates/account_groups/fragments/list.html:59
#: templates/accounts/fragments/list.html:76
#: templates/categories/fragments/table.html:57
-#: templates/cotton/transaction/item.html:193
-#: templates/cotton/transaction/item.html:323
+#: templates/cotton/transaction/item.html:195
+#: templates/cotton/transaction/item.html:340
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:45
#: templates/dca/fragments/strategy/details.html:76
#: templates/dca/fragments/strategy/list.html:43
@@ -2851,8 +2911,8 @@ msgstr "Cette opération est irréversible, vous ne pourrez pas l'annuler !"
#: templates/accounts/fragments/list.html:77
#: templates/bank_sync/fragments/list.html:56
#: templates/categories/fragments/table.html:58
-#: templates/cotton/transaction/item.html:194
-#: templates/cotton/transaction/item.html:324
+#: templates/cotton/transaction/item.html:196
+#: templates/cotton/transaction/item.html:341
#: templates/currencies/fragments/list.html:46
#: templates/dca/fragments/strategy/details.html:77
#: templates/dca/fragments/strategy/list.html:44
@@ -2932,6 +2992,12 @@ msgstr "Ne plus suivre"
msgid "No accounts"
msgstr "Pas de comptes"
+#: templates/accounts/fragments/share.html:8
+msgid ""
+"Everyone who can see this account can add, edit and delete its transactions, "
+"installment plans and recurring transactions."
+msgstr ""
+
#: templates/bank_sync/fragments/accounts.html:31
#, fuzzy
#| msgid "No transactions for this year"
@@ -3032,65 +3098,78 @@ msgstr "Fermer"
msgid "Search"
msgstr "Rechercher"
-#: templates/cotton/transaction/item.html:12
+#: templates/cotton/transaction/item.html:14
msgid "Select"
msgstr "Sélectionner"
-#: templates/cotton/transaction/item.html:123
+#: templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:100
msgid "From"
msgstr "De"
-#: templates/cotton/transaction/item.html:207
-#: templates/cotton/transaction/item.html:218
-#: templates/cotton/transaction/item.html:228
+#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:230
msgid "Show on summaries"
msgstr "Afficher sur le résumé"
-#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:211
msgid "Controlled by account"
msgstr "Vérifié par compte"
-#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:222
msgid "Controlled by category"
msgstr "Vérifié par catégorie"
-#: templates/cotton/transaction/item.html:233
+#: templates/cotton/transaction/item.html:235
+#: templates/includes/transactions_bulk_actions.html:15
msgid "Hide from summaries"
msgstr "Masquer sur le résumé"
-#: templates/cotton/transaction/item.html:237
+#: templates/cotton/transaction/item.html:239
msgid "Convert"
msgstr "Convertir"
-#: templates/cotton/transaction/item.html:252
-#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:254
+#: templates/cotton/transaction/item.html:264
+#: templates/cotton/transaction/item.html:274
msgid "Already part of a plan or recurrence"
msgstr ""
"Fait déjà partie d'un paiement en plusieurs fois ou d'une transaction "
"récurrente"
-#: templates/cotton/transaction/item.html:279
+#: templates/cotton/transaction/item.html:291
msgid "Not available for transfers"
msgstr "Non disponible pour les virements"
-#: templates/cotton/transaction/item.html:296
+#: templates/cotton/transaction/item.html:313
+#: templates/includes/transactions_bulk_actions.html:22
msgid "Move to previous month"
msgstr "Aller au mois précédent"
-#: templates/cotton/transaction/item.html:300
+#: templates/cotton/transaction/item.html:317
+#: templates/includes/transactions_bulk_actions.html:28
msgid "Move to next month"
msgstr "Aller au mois suivant"
-#: templates/cotton/transaction/item.html:303
+#: templates/cotton/transaction/item.html:320
+#: templates/includes/transactions_bulk_actions.html:33
msgid "Move to today"
msgstr "Aller à aujourd'hui"
-#: templates/cotton/transaction/item.html:307
-#: templates/cotton/ui/transactions_action_bar.html:78
+#: templates/cotton/transaction/item.html:324
+#: templates/cotton/ui/transactions_action_bar.html:71
+#: templates/cotton/ui/transactions_action_bar.html:98
msgid "Duplicate"
msgstr "Dupliquer"
+#: templates/cotton/transaction/item.html:373
+#, python-format
+msgid "%(counter)s item"
+msgid_plural "%(counter)s items"
+msgstr[0] ""
+msgstr[1] ""
+
#: templates/cotton/ui/account_card.html:10
#: templates/cotton/ui/currency_card.html:10
msgid "projected income"
@@ -3126,22 +3205,26 @@ msgstr "Total à date"
msgid "final total"
msgstr "total final"
-#: templates/cotton/ui/deleted_transactions_action_bar.html:34
-#: templates/cotton/ui/transactions_action_bar.html:34
-msgid "Select All"
-msgstr "Tout sélectionner"
-
-#: templates/cotton/ui/deleted_transactions_action_bar.html:40
-#: templates/cotton/ui/transactions_action_bar.html:40
+#: templates/cotton/ui/deleted_transactions_action_bar.html:25
+#: templates/cotton/ui/deleted_transactions_action_bar.html:26
+#: templates/cotton/ui/transactions_action_bar.html:25
+#: templates/cotton/ui/transactions_action_bar.html:26
msgid "Unselect All"
msgstr "Tout désélectionner"
-#: templates/cotton/ui/deleted_transactions_action_bar.html:46
-msgid "Invert election"
+#: templates/cotton/ui/deleted_transactions_action_bar.html:39
+#: templates/cotton/ui/transactions_action_bar.html:39
+msgid "Select All"
+msgstr "Tout sélectionner"
+
+#: templates/cotton/ui/deleted_transactions_action_bar.html:45
+#: templates/cotton/ui/transactions_action_bar.html:45
+msgid "Invert selection"
msgstr "Inverser la sélection"
#: templates/cotton/ui/deleted_transactions_action_bar.html:59
-#: templates/cotton/ui/transactions_action_bar.html:84
+#: templates/cotton/ui/transactions_action_bar.html:77
+#: templates/cotton/ui/transactions_action_bar.html:106
msgid "Yes, delete them!"
msgstr "Oui, supprime !"
@@ -3152,43 +3235,43 @@ msgstr "Oui, supprime !"
#: templates/cotton/ui/deleted_transactions_action_bar.html:166
#: templates/cotton/ui/deleted_transactions_action_bar.html:182
#: templates/cotton/ui/deleted_transactions_action_bar.html:198
-#: templates/cotton/ui/transactions_action_bar.html:128
-#: templates/cotton/ui/transactions_action_bar.html:143
-#: templates/cotton/ui/transactions_action_bar.html:159
-#: templates/cotton/ui/transactions_action_bar.html:175
-#: templates/cotton/ui/transactions_action_bar.html:191
-#: templates/cotton/ui/transactions_action_bar.html:207
-#: templates/cotton/ui/transactions_action_bar.html:223
+#: templates/cotton/ui/transactions_action_bar.html:153
+#: templates/cotton/ui/transactions_action_bar.html:168
+#: templates/cotton/ui/transactions_action_bar.html:184
+#: templates/cotton/ui/transactions_action_bar.html:200
+#: templates/cotton/ui/transactions_action_bar.html:216
+#: templates/cotton/ui/transactions_action_bar.html:232
+#: templates/cotton/ui/transactions_action_bar.html:248
msgid "copied!"
msgstr "Copié !"
#: templates/cotton/ui/deleted_transactions_action_bar.html:123
-#: templates/cotton/ui/transactions_action_bar.html:148
+#: templates/cotton/ui/transactions_action_bar.html:173
msgid "Flat Total"
msgstr "Total brut"
#: templates/cotton/ui/deleted_transactions_action_bar.html:139
-#: templates/cotton/ui/transactions_action_bar.html:164
+#: templates/cotton/ui/transactions_action_bar.html:189
msgid "Real Total"
msgstr "Total net"
#: templates/cotton/ui/deleted_transactions_action_bar.html:155
-#: templates/cotton/ui/transactions_action_bar.html:180
+#: templates/cotton/ui/transactions_action_bar.html:205
msgid "Mean"
msgstr "Moyenne"
#: templates/cotton/ui/deleted_transactions_action_bar.html:171
-#: templates/cotton/ui/transactions_action_bar.html:196
+#: templates/cotton/ui/transactions_action_bar.html:221
msgid "Max"
msgstr "Max"
#: templates/cotton/ui/deleted_transactions_action_bar.html:187
-#: templates/cotton/ui/transactions_action_bar.html:212
+#: templates/cotton/ui/transactions_action_bar.html:237
msgid "Min"
msgstr "Min"
#: templates/cotton/ui/deleted_transactions_action_bar.html:203
-#: templates/cotton/ui/transactions_action_bar.html:228
+#: templates/cotton/ui/transactions_action_bar.html:253
msgid "Count"
msgstr "Compteur"
@@ -3212,17 +3295,11 @@ msgstr "Récurrent"
msgid "Balance"
msgstr "Balance"
-#: templates/cotton/ui/transactions_action_bar.html:46
-msgid "Invert selection"
-msgstr "Inverser la sélection"
-
-#: templates/cotton/ui/transactions_action_bar.html:66
-msgid "Mark as unpaid"
-msgstr "Marqué comme dû"
-
-#: templates/cotton/ui/transactions_action_bar.html:71
-msgid "Mark as paid"
-msgstr "Marqué comme payé"
+#: templates/cotton/ui/transactions_action_bar.html:83
+#, fuzzy
+#| msgid "Transactions"
+msgid "More actions"
+msgstr "Transactions"
#: templates/currencies/fragments/add.html:5
msgid "Add currency"
@@ -3663,6 +3740,14 @@ msgstr "est disponible"
msgid "Calculator"
msgstr "Calculatrice"
+#: templates/includes/transactions_bulk_actions.html:4
+msgid "Mark as unpaid"
+msgstr "Marqué comme dû"
+
+#: templates/includes/transactions_bulk_actions.html:9
+msgid "Mark as paid"
+msgstr "Marqué comme payé"
+
#: templates/insights/fragments/category_explorer/charts/account.html:100
#: templates/insights/fragments/category_explorer/charts/currency.html:92
#: templates/monthly_overview/fragments/monthly_account_summary.html:14
@@ -3728,6 +3813,7 @@ msgstr "Aucune transaction récente"
#: templates/insights/fragments/year_by_year.html:140
#: templates/investment_classes/fragments/list.html:65
#: templates/monthly_overview/fragments/monthly_summary.html:168
+#: templates/transactions/widgets/sub_transactions.html:55
msgid "Total"
msgstr "Total"
@@ -4167,13 +4253,13 @@ msgstr ""
msgid "Loss, tax or fee"
msgstr ""
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
#, fuzzy
#| msgid "No presets yet"
msgid "No movements yet"
msgstr "Pas encore de préréglages"
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
msgid "Use the + button to buy or contribute"
msgstr ""
@@ -4749,6 +4835,12 @@ msgstr "Aucune transaction supprimée à afficher"
msgid "Deleted transactions"
msgstr "Transactions supprimées"
+#: templates/transactions/widgets/sub_transactions.html:53
+#, fuzzy
+#| msgid "Add quick transaction"
+msgid "Add sub-transaction"
+msgstr "Ajouter une transaction rapide"
+
#: templates/transactions/widgets/unselectable_income_expense_toggle_buttons.html:11
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:7
msgid "Unchanged"
@@ -4891,6 +4983,9 @@ msgstr "Se connecter avec"
msgid "Yearly Overview"
msgstr "Aperçu annuel"
+#~ msgid "Invert election"
+#~ msgstr "Inverser la sélection"
+
#, fuzzy
#~| msgid "Info"
#~ msgid "In"
diff --git a/app/locale/hu/LC_MESSAGES/django.po b/app/locale/hu/LC_MESSAGES/django.po
index 6cdef0ac..1ca35a02 100644
--- a/app/locale/hu/LC_MESSAGES/django.po
+++ b/app/locale/hu/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-11-12 03:24+0000\n"
+"POT-Creation-Date: 2026-11-14 14:06+0000\n"
"PO-Revision-Date: 2026-01-10 03:09+0000\n"
"Last-Translator: Herculino Trotta \n"
"Language-Team: Hungarian Public: Shown for all users. Only editable by the owner."
+"Private: Only shown for the owner and shared users. Public: Shown for "
+"all users. Only the owner can edit, share or delete it."
msgstr ""
-#: apps/common/forms.py:76 apps/users/forms.py:191
+#: apps/common/forms.py:78 apps/users/forms.py:191
#: templates/bank_sync/fragments/accounts.html:34
#: templates/transactions/fragments/filter_actions.html:5
msgid "Save"
msgstr "Mentés"
-#: apps/common/forms.py:90
+#: apps/common/forms.py:92
msgid "You cannot share this item with its owner."
msgstr "Nem tudod megosztani ezt az elemet a tulajdonosával."
@@ -819,6 +830,7 @@ msgid "Now"
msgstr "Most"
#: apps/common/widgets/tom_select.py:14
+#: templates/transactions/widgets/sub_transaction_row.html:9
msgid "Remove"
msgstr "Eltávolítás"
@@ -895,8 +907,8 @@ msgstr "Dátum és idő"
msgid "Auto"
msgstr "Automata"
-#: apps/currencies/models.py:91 apps/export_app/forms.py:67
-#: apps/export_app/forms.py:152 templates/exchange_rates/fragments/list.html:10
+#: apps/currencies/models.py:91 apps/export_app/forms.py:73
+#: apps/export_app/forms.py:161 templates/exchange_rates/fragments/list.html:10
#: templates/exchange_rates/pages/index.html:4
#: templates/includes/sidebar.html:204
msgid "Exchange Rates"
@@ -1047,25 +1059,25 @@ msgstr ""
msgid "Create transaction"
msgstr ""
-#: apps/dca/forms.py:69 apps/transactions/forms.py:582
+#: apps/dca/forms.py:69 apps/transactions/forms.py:668
msgid "From Account"
msgstr "Forrás számla"
-#: apps/dca/forms.py:75 apps/transactions/forms.py:587
+#: apps/dca/forms.py:75 apps/transactions/forms.py:673
msgid "To Account"
msgstr "Cél számla"
#: apps/dca/forms.py:117 apps/dca/forms.py:125 apps/export_app/forms.py:49
-#: apps/export_app/forms.py:143 apps/insights/views.py:57
-#: apps/rules/forms.py:185 apps/rules/forms.py:195 apps/rules/models.py:46
-#: apps/rules/models.py:307 apps/transactions/filters.py:84
-#: apps/transactions/forms.py:78 apps/transactions/forms.py:346
-#: apps/transactions/forms.py:526 apps/transactions/forms.py:640
-#: apps/transactions/forms.py:647 apps/transactions/forms.py:862
-#: apps/transactions/forms.py:1114 apps/transactions/models.py:313
-#: apps/transactions/models.py:369 apps/transactions/models.py:770
-#: apps/transactions/models.py:1028 apps/transactions/models.py:1353
-#: templates/entities/fragments/list.html:9
+#: apps/export_app/forms.py:150 apps/insights/views.py:57
+#: apps/rules/forms.py:185 apps/rules/forms.py:196 apps/rules/models.py:47
+#: apps/rules/models.py:308 apps/transactions/filters.py:100
+#: apps/transactions/filters.py:175 apps/transactions/forms.py:161
+#: apps/transactions/forms.py:431 apps/transactions/forms.py:612
+#: apps/transactions/forms.py:726 apps/transactions/forms.py:733
+#: apps/transactions/forms.py:950 apps/transactions/forms.py:1204
+#: apps/transactions/models.py:315 apps/transactions/models.py:371
+#: apps/transactions/models.py:866 apps/transactions/models.py:1127
+#: apps/transactions/models.py:1500 templates/entities/fragments/list.html:9
#: templates/entities/pages/index.html:4 templates/includes/sidebar.html:168
#: templates/insights/fragments/month_by_month.html:40
#: templates/insights/fragments/month_by_month.html:43
@@ -1100,8 +1112,8 @@ msgstr ""
msgid "You must provide an account."
msgstr "Meg kell adnia egy számlát."
-#: apps/dca/forms.py:322 apps/transactions/forms.py:780
-#: apps/transactions/models.py:978
+#: apps/dca/forms.py:322 apps/transactions/forms.py:866
+#: apps/transactions/models.py:1077
msgid "From and To accounts must be different."
msgstr ""
@@ -1119,10 +1131,10 @@ msgid "Payment Currency"
msgstr ""
#: apps/dca/models.py:26 apps/dca/models.py:181 apps/rules/forms.py:180
-#: apps/rules/forms.py:196 apps/rules/models.py:43 apps/rules/models.py:295
-#: apps/transactions/forms.py:504 apps/transactions/forms.py:668
-#: apps/transactions/models.py:354 apps/transactions/models.py:774
-#: apps/transactions/models.py:1031 apps/transactions/models.py:1338
+#: apps/rules/forms.py:197 apps/rules/models.py:44 apps/rules/models.py:296
+#: apps/transactions/forms.py:590 apps/transactions/forms.py:754
+#: apps/transactions/models.py:356 apps/transactions/models.py:870
+#: apps/transactions/models.py:1130 apps/transactions/models.py:1485
msgid "Notes"
msgstr "Megjegyzések"
@@ -1130,7 +1142,7 @@ msgstr "Megjegyzések"
msgid "DCA Strategy"
msgstr ""
-#: apps/dca/models.py:35 apps/export_app/forms.py:166
+#: apps/dca/models.py:35 apps/export_app/forms.py:175
msgid "DCA Strategies"
msgstr ""
@@ -1150,7 +1162,7 @@ msgstr "Érkeztetett összeg"
msgid "DCA Entry"
msgstr ""
-#: apps/dca/models.py:187 apps/export_app/forms.py:167
+#: apps/dca/models.py:187 apps/export_app/forms.py:176
msgid "DCA Entries"
msgstr ""
@@ -1178,14 +1190,14 @@ msgstr ""
msgid "Entry deleted successfully"
msgstr ""
-#: apps/export_app/forms.py:13 apps/export_app/forms.py:137
+#: apps/export_app/forms.py:13 apps/export_app/forms.py:144
#: templates/includes/sidebar.html:247 templates/users/fragments/list.html:10
#: templates/users/pages/index.html:4
msgid "Users"
msgstr "Felhasználók"
-#: apps/export_app/forms.py:31 apps/export_app/forms.py:144
-#: apps/transactions/models.py:423 templates/includes/sidebar.html:81
+#: apps/export_app/forms.py:31 apps/export_app/forms.py:151
+#: apps/transactions/models.py:425 templates/includes/sidebar.html:81
#: templates/includes/sidebar.html:154
#: templates/recurring_transactions/fragments/list_transactions.html:5
#: templates/recurring_transactions/fragments/table.html:37
@@ -1193,9 +1205,9 @@ msgstr "Felhasználók"
msgid "Transactions"
msgstr "Tranzakciók"
-#: apps/export_app/forms.py:37 apps/export_app/forms.py:141
-#: apps/insights/views.py:43 apps/transactions/filters.py:74
-#: templates/categories/fragments/list.html:9
+#: apps/export_app/forms.py:37 apps/export_app/forms.py:148
+#: apps/insights/views.py:43 apps/transactions/filters.py:90
+#: apps/transactions/filters.py:165 templates/categories/fragments/list.html:9
#: templates/categories/pages/index.html:4 templates/includes/sidebar.html:156
#: templates/insights/fragments/month_by_month.html:18
#: templates/insights/fragments/month_by_month.html:21
@@ -1204,102 +1216,117 @@ msgstr "Tranzakciók"
msgid "Categories"
msgstr "Kategóriák"
-#: apps/export_app/forms.py:55 apps/export_app/forms.py:147
-#: apps/transactions/models.py:1068 templates/includes/sidebar.html:110
+#: apps/export_app/forms.py:55 apps/export_app/forms.py:155
+#: apps/transactions/models.py:1167 templates/includes/sidebar.html:110
#: templates/recurring_transactions/fragments/list.html:9
#: templates/recurring_transactions/pages/index.html:4
msgid "Recurring Transactions"
msgstr "Ismétlődő tranzakciók"
-#: apps/export_app/forms.py:61 apps/export_app/forms.py:145
-#: apps/transactions/models.py:788 templates/includes/sidebar.html:104
+#: apps/export_app/forms.py:61 apps/export_app/forms.py:153
+#: apps/transactions/models.py:884 templates/includes/sidebar.html:104
#: templates/installment_plans/fragments/list.html:9
#: templates/installment_plans/pages/index.html:4
msgid "Installment Plans"
msgstr ""
-#: apps/export_app/forms.py:73 apps/export_app/forms.py:150
+#: apps/export_app/forms.py:67 apps/export_app/forms.py:157
+#: apps/transactions/models.py:1518 templates/includes/sidebar.html:98
+#: templates/quick_transactions/pages/index.html:5
+#: templates/quick_transactions/pages/index.html:15
+msgid "Quick Transactions"
+msgstr "Gyors tranzakciók"
+
+#: apps/export_app/forms.py:79 apps/export_app/forms.py:159
#: templates/exchange_rates_services/fragments/list.html:10
#: templates/exchange_rates_services/pages/index.html:4
#: templates/includes/sidebar.html:232
msgid "Automatic Exchange Rates"
msgstr ""
-#: apps/export_app/forms.py:79 templates/bank_sync/fragments/list.html:8
+#: apps/export_app/forms.py:85 templates/bank_sync/fragments/list.html:8
#: templates/bank_sync/pages/index.html:4 templates/includes/sidebar.html:238
msgid "Bank Sync"
msgstr ""
-#: apps/export_app/forms.py:80
+#: apps/export_app/forms.py:86
msgid "Includes the providers' API keys"
msgstr ""
-#: apps/export_app/forms.py:86 templates/includes/sidebar.html:212
+#: apps/export_app/forms.py:92 templates/includes/sidebar.html:212
#: templates/rules/fragments/list.html:9 templates/rules/pages/index.html:4
msgid "Rules"
msgstr "Szabályok"
-#: apps/export_app/forms.py:92 templates/cotton/transaction/item.html:66
+#: apps/export_app/forms.py:98 templates/cotton/transaction/item.html:68
msgid "DCA"
msgstr ""
-#: apps/export_app/forms.py:98 apps/export_app/forms.py:168
+#: apps/export_app/forms.py:104 apps/export_app/forms.py:177
#: templates/import_app/fragments/profiles/list.html:21
#: templates/import_app/pages/profiles_index.html:4
msgid "Import Profiles"
msgstr ""
-#: apps/export_app/forms.py:126 templates/export_app/fragments/export.html:5
+#: apps/export_app/forms.py:133 templates/export_app/fragments/export.html:5
#: templates/export_app/pages/index.html:13
msgid "Export"
msgstr "Exportálás"
-#: apps/export_app/forms.py:134
+#: apps/export_app/forms.py:141
msgid "Import a ZIP file exported from WYGIWYH"
msgstr ""
-#: apps/export_app/forms.py:135
+#: apps/export_app/forms.py:142
msgid "ZIP File"
msgstr "ZIP fájl"
-#: apps/export_app/forms.py:157
+#: apps/export_app/forms.py:152 apps/rules/forms.py:193 apps/rules/models.py:42
+#: apps/rules/models.py:320 apps/transactions/models.py:736
+#: templates/transactions/widgets/sub_transactions.html:39
+#, fuzzy
+#| msgid "Transactions"
+msgid "Sub-transactions"
+msgstr "Tranzakciók"
+
+#: apps/export_app/forms.py:166
#, fuzzy
#| msgid "Accounts"
msgid "Bank Sync Accounts"
msgstr "Számlák"
-#: apps/export_app/forms.py:159 apps/rules/models.py:27
+#: apps/export_app/forms.py:168 apps/rules/models.py:27
msgid "Transaction rules"
msgstr "Tranzakciós szabályok"
-#: apps/export_app/forms.py:161 apps/rules/models.py:68
+#: apps/export_app/forms.py:170 apps/rules/models.py:69
msgid "Edit transaction action"
msgstr ""
-#: apps/export_app/forms.py:164 apps/rules/models.py:327
+#: apps/export_app/forms.py:173 apps/rules/models.py:332
msgid "Update or create transaction actions"
msgstr ""
-#: apps/export_app/forms.py:199 templates/cotton/transaction/item.html:310
+#: apps/export_app/forms.py:210 templates/cotton/transaction/item.html:327
#: templates/cotton/ui/deleted_transactions_action_bar.html:53
#: templates/export_app/fragments/restore.html:5
#: templates/export_app/pages/index.html:19
msgid "Restore"
msgstr "Helyreállítás"
-#: apps/export_app/forms.py:209
+#: apps/export_app/forms.py:220
msgid "Please upload either a ZIP file or at least one CSV file"
msgstr ""
-#: apps/export_app/views.py:190
+#: apps/export_app/views.py:216
msgid "You have to select at least one export"
msgstr ""
-#: apps/export_app/views.py:210
+#: apps/export_app/views.py:236
msgid "Data restored successfully"
msgstr ""
-#: apps/export_app/views.py:222
+#: apps/export_app/views.py:248
msgid ""
"There was an error restoring your data. Check the logs for more details."
msgstr ""
@@ -1386,7 +1413,7 @@ msgstr ""
#: apps/insights/forms.py:118 apps/insights/utils/sankey.py:36
#: apps/insights/utils/sankey.py:167 apps/insights/views.py:45
-#: apps/transactions/filters.py:209
+#: apps/transactions/filters.py:294
#: templates/insights/fragments/month_by_month.html:119
#: templates/insights/fragments/year_by_year.html:73
msgid "Uncategorized"
@@ -1445,24 +1472,24 @@ msgstr ""
msgid "Tag"
msgstr "Tags"
-#: apps/insights/views.py:52 apps/transactions/filters.py:215
+#: apps/insights/views.py:52 apps/transactions/filters.py:303
#: templates/insights/fragments/month_by_month.html:121
#: templates/insights/fragments/year_by_year.html:75
msgid "Untagged"
msgstr ""
-#: apps/insights/views.py:53 apps/transactions/models.py:611
+#: apps/insights/views.py:53 apps/transactions/models.py:632
#: templates/tags/fragments/table.html:69
msgid "No tags"
msgstr ""
-#: apps/insights/views.py:58 apps/transactions/models.py:312
+#: apps/insights/views.py:58 apps/transactions/models.py:314
#: templates/insights/fragments/month_by_month.html:88
#: templates/insights/fragments/year_by_year.html:56
msgid "Entity"
msgstr ""
-#: apps/insights/views.py:59 apps/transactions/filters.py:222
+#: apps/insights/views.py:59 apps/transactions/filters.py:311
#: templates/insights/fragments/month_by_month.html:123
#: templates/insights/fragments/year_by_year.html:77
msgid "No entity"
@@ -1480,19 +1507,19 @@ msgstr ""
msgid "Unclassified"
msgstr ""
-#: apps/investments/views.py:289
+#: apps/investments/views.py:290
#, fuzzy
#| msgid "Account added successfully"
msgid "Asset class added successfully"
msgstr "A számla hozzáadásra került"
-#: apps/investments/views.py:297
+#: apps/investments/views.py:298
#, fuzzy
#| msgid "Account updated successfully"
msgid "Asset class updated successfully"
msgstr "A számla módosítása sikeres volt"
-#: apps/investments/views.py:318
+#: apps/investments/views.py:319
#, fuzzy
#| msgid "Account deleted successfully"
msgid "Asset class deleted successfully"
@@ -1527,13 +1554,13 @@ msgstr ""
msgid "Set field"
msgstr ""
-#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:123
+#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:101
msgid "To"
msgstr ""
#: apps/rules/forms.py:78 apps/rules/forms.py:158 apps/rules/models.py:20
-#: apps/rules/models.py:62 apps/rules/models.py:323
+#: apps/rules/models.py:63 apps/rules/models.py:328
#: templates/rules/fragments/list.html:23
msgid "Order"
msgstr ""
@@ -1551,36 +1578,37 @@ msgid "Operator"
msgstr ""
#: apps/rules/forms.py:174 apps/rules/forms.py:188 apps/rules/models.py:36
-#: apps/rules/models.py:271 apps/transactions/forms.py:468
-#: apps/transactions/models.py:337 apps/transactions/models.py:730
-#: apps/transactions/models.py:1009 apps/transactions/models.py:1323
+#: apps/rules/models.py:272 apps/transactions/forms.py:554
+#: apps/transactions/models.py:339 apps/transactions/models.py:826
+#: apps/transactions/models.py:1108 apps/transactions/models.py:1470
#: templates/mini_tools/simulator.html:63
msgid "Type"
msgstr ""
#: apps/rules/forms.py:175 apps/rules/forms.py:189 apps/rules/models.py:37
-#: apps/rules/models.py:275 apps/transactions/filters.py:22
-#: apps/transactions/forms.py:472 apps/transactions/forms.py:650
-#: apps/transactions/models.py:339 apps/transactions/models.py:1325
-#: templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/rules/models.py:276 apps/transactions/filters.py:23
+#: apps/transactions/forms.py:558 apps/transactions/forms.py:736
+#: apps/transactions/models.py:341 apps/transactions/models.py:1472
+#: templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/transactions/widgets/paid_toggle_button.html:10
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:13
msgid "Paid"
msgstr ""
#: apps/rules/forms.py:177 apps/rules/forms.py:191 apps/rules/models.py:39
-#: apps/rules/models.py:283 apps/transactions/forms.py:90
-#: apps/transactions/forms.py:488 apps/transactions/forms.py:655
-#: apps/transactions/forms.py:868 apps/transactions/models.py:341
-#: apps/transactions/models.py:748 apps/transactions/models.py:1033
+#: apps/rules/models.py:284 apps/transactions/forms.py:173
+#: apps/transactions/forms.py:574 apps/transactions/forms.py:741
+#: apps/transactions/forms.py:956 apps/transactions/models.py:343
+#: apps/transactions/models.py:844 apps/transactions/models.py:1132
msgid "Reference Date"
msgstr ""
#: apps/rules/forms.py:178 apps/rules/forms.py:192 apps/rules/models.py:41
-#: apps/rules/models.py:287 apps/transactions/forms.py:495
-#: apps/transactions/models.py:347 apps/transactions/models.py:1014
-#: apps/transactions/models.py:1331
+#: apps/rules/models.py:288 apps/transactions/forms.py:75
+#: apps/transactions/forms.py:581 apps/transactions/models.py:349
+#: apps/transactions/models.py:730 apps/transactions/models.py:1113
+#: apps/transactions/models.py:1478
#: templates/insights/fragments/sankey.html:102
#: templates/installment_plans/fragments/table.html:18
#: templates/mini_tools/simulator.html:70
@@ -1589,51 +1617,52 @@ msgstr ""
msgid "Amount"
msgstr ""
-#: apps/rules/forms.py:179 apps/rules/forms.py:193 apps/rules/models.py:14
-#: apps/rules/models.py:42 apps/rules/models.py:291
-#: apps/transactions/forms.py:499 apps/transactions/forms.py:659
-#: apps/transactions/models.py:352 apps/transactions/models.py:732
-#: apps/transactions/models.py:1017 apps/transactions/models.py:1336
+#: apps/rules/forms.py:179 apps/rules/forms.py:194 apps/rules/models.py:14
+#: apps/rules/models.py:43 apps/rules/models.py:292
+#: apps/transactions/forms.py:585 apps/transactions/forms.py:745
+#: apps/transactions/models.py:354 apps/transactions/models.py:828
+#: apps/transactions/models.py:1116 apps/transactions/models.py:1483
msgid "Description"
msgstr ""
-#: apps/rules/forms.py:182 apps/rules/forms.py:198 apps/rules/models.py:47
-#: apps/rules/models.py:299 apps/transactions/models.py:399
-#: apps/transactions/models.py:1358
+#: apps/rules/forms.py:182 apps/rules/forms.py:199 apps/rules/models.py:48
+#: apps/rules/models.py:300 apps/transactions/models.py:401
+#: apps/transactions/models.py:1505
msgid "Internal Note"
msgstr ""
-#: apps/rules/forms.py:183 apps/rules/forms.py:199 apps/rules/models.py:48
-#: apps/rules/models.py:303 apps/transactions/models.py:401
-#: apps/transactions/models.py:1360
+#: apps/rules/forms.py:183 apps/rules/forms.py:200 apps/rules/models.py:49
+#: apps/rules/models.py:304 apps/transactions/models.py:403
+#: apps/transactions/models.py:1507
msgid "Internal ID"
msgstr ""
-#: apps/rules/forms.py:186 apps/rules/forms.py:200 apps/rules/models.py:40
-#: apps/rules/models.py:319 apps/transactions/forms.py:672
-#: apps/transactions/models.py:251 apps/transactions/models.py:342
-#: apps/transactions/models.py:1326
+#: apps/rules/forms.py:186 apps/rules/forms.py:201 apps/rules/models.py:40
+#: apps/rules/models.py:324 apps/transactions/forms.py:758
+#: apps/transactions/models.py:253 apps/transactions/models.py:344
+#: apps/transactions/models.py:1473
msgid "Mute"
msgstr ""
-#: apps/rules/forms.py:215
+#: apps/rules/forms.py:216
msgid "Search Criteria"
msgstr ""
-#: apps/rules/forms.py:360
+#: apps/rules/forms.py:361
msgid "Set Values"
msgstr ""
-#: apps/rules/forms.py:407 apps/rules/forms.py:442 apps/rules/forms.py:477
-#: apps/transactions/models.py:422 apps/transactions/models.py:667
+#: apps/rules/forms.py:409 apps/rules/forms.py:444 apps/rules/forms.py:479
+#: apps/transactions/models.py:424 apps/transactions/models.py:703
+#: apps/transactions/models.py:763
msgid "Transaction"
msgstr ""
-#: apps/rules/forms.py:411 apps/rules/forms.py:446 apps/rules/forms.py:481
+#: apps/rules/forms.py:413 apps/rules/forms.py:448 apps/rules/forms.py:483
msgid "Type to search for a transaction"
msgstr ""
-#: apps/rules/forms.py:422 apps/rules/forms.py:457 apps/rules/forms.py:491
+#: apps/rules/forms.py:424 apps/rules/forms.py:459 apps/rules/forms.py:493
#: templates/rules/fragments/transaction_rule/dry_run/created.html:5
#: templates/rules/fragments/transaction_rule/dry_run/deleted.html:5
#: templates/rules/fragments/transaction_rule/dry_run/updated.html:5
@@ -1653,15 +1682,15 @@ msgstr ""
msgid "Transaction rule"
msgstr ""
-#: apps/rules/models.py:54 apps/rules/models.py:98
+#: apps/rules/models.py:55 apps/rules/models.py:99
msgid "Rule"
msgstr ""
-#: apps/rules/models.py:59
+#: apps/rules/models.py:60
msgid "Field"
msgstr ""
-#: apps/rules/models.py:61 templates/investments/fragments/charts.html:86
+#: apps/rules/models.py:62 templates/investments/fragments/charts.html:86
#: templates/investments/fragments/detail.html:68
#: templates/investments/fragments/detail.html:127
#: templates/investments/fragments/detail.html:245
@@ -1669,57 +1698,57 @@ msgstr ""
msgid "Value"
msgstr ""
-#: apps/rules/models.py:69
+#: apps/rules/models.py:70
msgid "Edit transaction actions"
msgstr ""
-#: apps/rules/models.py:84
+#: apps/rules/models.py:85
msgid "is exactly"
msgstr ""
-#: apps/rules/models.py:85
+#: apps/rules/models.py:86
msgid "contains"
msgstr ""
-#: apps/rules/models.py:86
+#: apps/rules/models.py:87
msgid "starts with"
msgstr ""
-#: apps/rules/models.py:87
+#: apps/rules/models.py:88
msgid "ends with"
msgstr ""
-#: apps/rules/models.py:88
+#: apps/rules/models.py:89
msgid "equals"
msgstr ""
-#: apps/rules/models.py:89
+#: apps/rules/models.py:90
msgid "greater than"
msgstr ""
-#: apps/rules/models.py:90
+#: apps/rules/models.py:91
msgid "less than"
msgstr ""
-#: apps/rules/models.py:91
+#: apps/rules/models.py:92
msgid "greater than or equal"
msgstr ""
-#: apps/rules/models.py:92
+#: apps/rules/models.py:93
msgid "less than or equal"
msgstr ""
-#: apps/rules/models.py:102
+#: apps/rules/models.py:103
msgid "Filter"
msgstr ""
-#: apps/rules/models.py:105
+#: apps/rules/models.py:106
msgid ""
"Generic expression to enable or disable execution. Should evaluate to True "
"or False"
msgstr ""
-#: apps/rules/models.py:326
+#: apps/rules/models.py:331
msgid "Update or create transaction action"
msgstr ""
@@ -1763,8 +1792,8 @@ msgstr ""
msgid "Update or Create Transaction action deleted successfully"
msgstr ""
-#: apps/transactions/filters.py:23 templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/transactions/filters.py:24 templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/insights/fragments/overview/index.html:68
#: templates/net_worth/net_worth.html:39 templates/net_worth/net_worth.html:43
#: templates/transactions/widgets/paid_toggle_button.html:7
@@ -1772,162 +1801,172 @@ msgstr ""
msgid "Projected"
msgstr "Várható"
-#: apps/transactions/filters.py:28 templates/categories/fragments/table.html:18
+#: apps/transactions/filters.py:29 templates/categories/fragments/table.html:18
msgid "Muted"
msgstr ""
-#: apps/transactions/filters.py:51
+#: apps/transactions/filters.py:67 apps/transactions/filters.py:144
msgid "Content"
msgstr ""
-#: apps/transactions/filters.py:57
+#: apps/transactions/filters.py:73
msgid "Transaction Type"
msgstr ""
-#: apps/transactions/filters.py:95
+#: apps/transactions/filters.py:111
msgid "Mute Status"
msgstr ""
-#: apps/transactions/filters.py:100
+#: apps/transactions/filters.py:116
msgid "Date from"
msgstr ""
-#: apps/transactions/filters.py:105 apps/transactions/filters.py:115
+#: apps/transactions/filters.py:121 apps/transactions/filters.py:131
msgid "Until"
msgstr ""
-#: apps/transactions/filters.py:110
+#: apps/transactions/filters.py:126
msgid "Reference date from"
msgstr ""
-#: apps/transactions/filters.py:120
+#: apps/transactions/filters.py:136
msgid "Amount min"
msgstr ""
-#: apps/transactions/filters.py:125
+#: apps/transactions/filters.py:141
msgid "Amount max"
msgstr ""
-#: apps/transactions/filters.py:208
+#: apps/transactions/filters.py:240
+msgid "Include"
+msgstr ""
+
+#: apps/transactions/filters.py:245
+msgid "Exclude"
+msgstr ""
+
+#: apps/transactions/filters.py:293
msgid "Categorized"
msgstr ""
-#: apps/transactions/filters.py:215
+#: apps/transactions/filters.py:303
msgid "Tagged"
msgstr ""
-#: apps/transactions/filters.py:221
+#: apps/transactions/filters.py:310
msgid "Any entity"
msgstr ""
-#: apps/transactions/forms.py:192
+#: apps/transactions/forms.py:277
msgid "More"
msgstr ""
-#: apps/transactions/forms.py:229
+#: apps/transactions/forms.py:314
msgid "Save and add similar"
msgstr ""
-#: apps/transactions/forms.py:234
+#: apps/transactions/forms.py:319
msgid "Save and add another"
msgstr ""
-#: apps/transactions/forms.py:271 templates/cotton/transaction/item.html:184
+#: apps/transactions/forms.py:356 templates/cotton/transaction/item.html:186
#: templates/transactions/fragments/attachments.html:4
msgid "Attachments"
msgstr ""
-#: apps/transactions/forms.py:272
+#: apps/transactions/forms.py:357
msgid ""
"Files are private and only visible to users with access to this transaction."
msgstr ""
-#: apps/transactions/forms.py:283
+#: apps/transactions/forms.py:368
msgid "Upload"
msgstr ""
-#: apps/transactions/forms.py:355 apps/transactions/forms.py:1120
-#: apps/transactions/models.py:947
+#: apps/transactions/forms.py:440 apps/transactions/forms.py:1210
+#: apps/transactions/models.py:1046
#, fuzzy
#| msgid "To Account"
msgid "To account"
msgstr "Cél számla"
-#: apps/transactions/forms.py:382 apps/transactions/forms.py:675
+#: apps/transactions/forms.py:467 apps/transactions/forms.py:761
msgid "Muted transactions won't be displayed on monthly summaries"
msgstr ""
-#: apps/transactions/forms.py:594
+#: apps/transactions/forms.py:680
msgid "From Amount"
msgstr ""
-#: apps/transactions/forms.py:599
+#: apps/transactions/forms.py:685
msgid "To Amount"
msgstr ""
-#: apps/transactions/forms.py:741 apps/transactions/models.py:992
-#: apps/transactions/models.py:1303 templates/cotton/transaction/item.html:52
-#: templates/cotton/transaction/item.html:60
+#: apps/transactions/forms.py:827 apps/transactions/models.py:1091
+#: apps/transactions/models.py:1450 templates/cotton/transaction/item.html:54
+#: templates/cotton/transaction/item.html:62
+#: templates/cotton/transaction/item.html:272
+#: templates/cotton/transaction/item.html:304
#: templates/cotton/ui/quick_transactions_buttons.html:40
#: templates/cotton/ui/transactions_fab.html:44
msgid "Transfer"
msgstr ""
-#: apps/transactions/forms.py:1005
+#: apps/transactions/forms.py:1095
msgid "Tag name"
msgstr ""
-#: apps/transactions/forms.py:1033
+#: apps/transactions/forms.py:1123
msgid "Entity name"
msgstr ""
-#: apps/transactions/forms.py:1061
+#: apps/transactions/forms.py:1151
msgid "Category name"
msgstr ""
-#: apps/transactions/forms.py:1063
+#: apps/transactions/forms.py:1153
msgid "Muted categories won't be displayed on monthly summaries"
msgstr ""
-#: apps/transactions/forms.py:1228
+#: apps/transactions/forms.py:1319
msgid "future transactions"
msgstr ""
-#: apps/transactions/forms.py:1255
+#: apps/transactions/forms.py:1346
msgid "End date should be after the start date"
msgstr ""
-#: apps/transactions/models.py:256
+#: apps/transactions/models.py:258
msgid ""
"Deactivated categories won't be able to be selected when creating new "
"transactions"
msgstr ""
-#: apps/transactions/models.py:264
+#: apps/transactions/models.py:266
msgid "Transaction Category"
msgstr ""
-#: apps/transactions/models.py:265
+#: apps/transactions/models.py:267
msgid "Transaction Categories"
msgstr ""
-#: apps/transactions/models.py:280
+#: apps/transactions/models.py:282
msgid ""
"Deactivated tags won't be able to be selected when creating new transactions"
msgstr ""
-#: apps/transactions/models.py:288 apps/transactions/models.py:289
+#: apps/transactions/models.py:290 apps/transactions/models.py:291
msgid "Transaction Tags"
msgstr ""
-#: apps/transactions/models.py:304
+#: apps/transactions/models.py:306
msgid ""
"Deactivated entities won't be able to be selected when creating new "
"transactions"
msgstr ""
-#: apps/transactions/models.py:324 apps/transactions/models.py:991
-#: apps/transactions/models.py:1302
+#: apps/transactions/models.py:326 apps/transactions/models.py:1090
+#: apps/transactions/models.py:1449
#: templates/calendar_view/fragments/list.html:42
#: templates/calendar_view/fragments/list.html:44
#: templates/calendar_view/fragments/list.html:52
@@ -1939,14 +1978,14 @@ msgstr ""
#: templates/investments/fragments/detail.html:71
#: templates/investments/fragments/detail.html:175
#: templates/investments/fragments/detail.html:227
-#: templates/investments/fragments/detail.html:318
+#: templates/investments/fragments/detail.html:326
#: templates/mini_tools/simulator.html:66
#: templates/monthly_overview/fragments/monthly_summary.html:42
msgid "Income"
msgstr ""
-#: apps/transactions/models.py:325 apps/transactions/models.py:993
-#: apps/transactions/models.py:1304
+#: apps/transactions/models.py:327 apps/transactions/models.py:1092
+#: apps/transactions/models.py:1451
#: templates/calendar_view/fragments/list.html:46
#: templates/calendar_view/fragments/list.html:48
#: templates/calendar_view/fragments/list.html:56
@@ -1958,204 +1997,204 @@ msgstr ""
msgid "Expense"
msgstr ""
-#: apps/transactions/models.py:380 apps/transactions/models.py:787
-#: templates/cotton/transaction/item.html:260
-#: templates/cotton/transaction/item.html:277
-#: templates/cotton/transaction/item.html:287
+#: apps/transactions/models.py:382 apps/transactions/models.py:883
+#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:289
+#: templates/cotton/transaction/item.html:299
msgid "Installment Plan"
msgstr ""
-#: apps/transactions/models.py:389 apps/transactions/models.py:1067
-#: templates/cotton/transaction/item.html:250
-#: templates/cotton/transaction/item.html:270
+#: apps/transactions/models.py:391 apps/transactions/models.py:1166
+#: templates/cotton/transaction/item.html:252
+#: templates/cotton/transaction/item.html:282
msgid "Recurring Transaction"
msgstr ""
-#: apps/transactions/models.py:397
+#: apps/transactions/models.py:399
#, fuzzy
#| msgid "Link transaction"
msgid "Linked Transaction"
msgstr "Tranzakció csatolása"
-#: apps/transactions/models.py:405
+#: apps/transactions/models.py:407
msgid "Deleted"
msgstr ""
-#: apps/transactions/models.py:410
+#: apps/transactions/models.py:412
msgid "Deleted At"
msgstr ""
-#: apps/transactions/models.py:518
+#: apps/transactions/models.py:521
msgid "A transfer needs one expense and one income."
msgstr ""
-#: apps/transactions/models.py:520
+#: apps/transactions/models.py:523
msgid "A transfer needs two different accounts."
msgstr ""
-#: apps/transactions/models.py:524
+#: apps/transactions/models.py:527
msgid "This transaction is already part of another transfer."
msgstr ""
-#: apps/transactions/models.py:613
+#: apps/transactions/models.py:634
msgid "No category"
msgstr ""
-#: apps/transactions/models.py:615
+#: apps/transactions/models.py:636
msgid "No description"
msgstr "Nincs leírás"
-#: apps/transactions/models.py:672
+#: apps/transactions/models.py:735
+#, fuzzy
+#| msgid "Transactions"
+msgid "Sub-transaction"
+msgstr "Tranzakciók"
+
+#: apps/transactions/models.py:768
#, fuzzy
#| msgid "ZIP File"
msgid "File"
msgstr "ZIP fájl"
-#: apps/transactions/models.py:674
+#: apps/transactions/models.py:770
msgid "Original Name"
msgstr ""
-#: apps/transactions/models.py:676
+#: apps/transactions/models.py:772
#, fuzzy
#| msgid "Interval Type"
msgid "Content Type"
msgstr "Intervallum típusa"
-#: apps/transactions/models.py:678
+#: apps/transactions/models.py:774
msgid "Size"
msgstr ""
-#: apps/transactions/models.py:683
+#: apps/transactions/models.py:779
msgid "Uploaded By"
msgstr ""
-#: apps/transactions/models.py:688
+#: apps/transactions/models.py:784
#, fuzzy
#| msgid "Transaction rules"
msgid "Transaction Attachment"
msgstr "Tranzakciós szabályok"
-#: apps/transactions/models.py:689
+#: apps/transactions/models.py:785
#, fuzzy
#| msgid "Transaction rules"
msgid "Transaction Attachments"
msgstr "Tranzakciós szabályok"
-#: apps/transactions/models.py:719 templates/includes/sidebar.html:57
+#: apps/transactions/models.py:815 templates/includes/sidebar.html:57
msgid "Yearly"
msgstr "Éves"
-#: apps/transactions/models.py:720 apps/users/models.py:469
+#: apps/transactions/models.py:816 apps/users/models.py:469
#: templates/includes/sidebar.html:51
msgid "Monthly"
msgstr "Havi"
-#: apps/transactions/models.py:721
+#: apps/transactions/models.py:817
msgid "Weekly"
msgstr "Heti"
-#: apps/transactions/models.py:722
+#: apps/transactions/models.py:818
msgid "Daily"
msgstr "Napi"
-#: apps/transactions/models.py:735
+#: apps/transactions/models.py:831
msgid "Number of Installments"
msgstr ""
-#: apps/transactions/models.py:740
+#: apps/transactions/models.py:836
msgid "Installment Start"
msgstr ""
-#: apps/transactions/models.py:741
+#: apps/transactions/models.py:837
msgid "The installment number to start counting from"
msgstr ""
-#: apps/transactions/models.py:746 apps/transactions/models.py:1037
+#: apps/transactions/models.py:842 apps/transactions/models.py:1136
msgid "Start Date"
msgstr ""
-#: apps/transactions/models.py:750 apps/transactions/models.py:1038
+#: apps/transactions/models.py:846 apps/transactions/models.py:1137
msgid "End Date"
msgstr ""
-#: apps/transactions/models.py:755
+#: apps/transactions/models.py:851
msgid "Recurrence"
msgstr ""
-#: apps/transactions/models.py:758
+#: apps/transactions/models.py:854
msgid "Installment Amount"
msgstr ""
-#: apps/transactions/models.py:777 apps/transactions/models.py:1057
+#: apps/transactions/models.py:873 apps/transactions/models.py:1156
msgid "Add description to transactions"
msgstr ""
-#: apps/transactions/models.py:780 apps/transactions/models.py:1060
+#: apps/transactions/models.py:876 apps/transactions/models.py:1159
msgid "Add notes to transactions"
msgstr ""
-#: apps/transactions/models.py:954
+#: apps/transactions/models.py:1053
#, fuzzy
#| msgid "To Account"
msgid "To amount"
msgstr "Cél számla"
-#: apps/transactions/models.py:955
+#: apps/transactions/models.py:1054
msgid "Leave empty to use the same amount"
msgstr ""
-#: apps/transactions/models.py:996 templates/mini_tools/simulator.html:129
+#: apps/transactions/models.py:1095 templates/mini_tools/simulator.html:129
msgid "day(s)"
msgstr "nap"
-#: apps/transactions/models.py:997 templates/mini_tools/simulator.html:130
+#: apps/transactions/models.py:1096 templates/mini_tools/simulator.html:130
msgid "week(s)"
msgstr "hét"
-#: apps/transactions/models.py:998 templates/mini_tools/simulator.html:131
+#: apps/transactions/models.py:1097 templates/mini_tools/simulator.html:131
msgid "month(s)"
msgstr "hónap"
-#: apps/transactions/models.py:999 templates/mini_tools/simulator.html:132
+#: apps/transactions/models.py:1098 templates/mini_tools/simulator.html:132
msgid "year(s)"
msgstr "év"
-#: apps/transactions/models.py:1001
+#: apps/transactions/models.py:1100
#: templates/recurring_transactions/fragments/list.html:18
msgid "Paused"
msgstr "Szüneteltetve"
-#: apps/transactions/models.py:1040
+#: apps/transactions/models.py:1139
msgid "Recurrence Type"
msgstr ""
-#: apps/transactions/models.py:1043
+#: apps/transactions/models.py:1142
msgid "Recurrence Interval"
msgstr ""
-#: apps/transactions/models.py:1046
+#: apps/transactions/models.py:1145
msgid "Keep at most"
msgstr ""
-#: apps/transactions/models.py:1050
+#: apps/transactions/models.py:1149
msgid "Last Generated Date"
msgstr ""
-#: apps/transactions/models.py:1053
+#: apps/transactions/models.py:1152
msgid "Last Generated Reference Date"
msgstr ""
-#: apps/transactions/models.py:1370 templates/cotton/transaction/item.html:243
+#: apps/transactions/models.py:1517 templates/cotton/transaction/item.html:245
#: templates/cotton/ui/transactions_fab.html:59
msgid "Quick Transaction"
msgstr "Gyors tranzakció"
-#: apps/transactions/models.py:1371 templates/includes/sidebar.html:98
-#: templates/quick_transactions/pages/index.html:5
-#: templates/quick_transactions/pages/index.html:15
-msgid "Quick Transactions"
-msgstr "Gyors tranzakciók"
-
#: apps/transactions/validators.py:8
#, python-format
msgid "%(value)s has too many decimal places. Maximum is 30."
@@ -2166,35 +2205,43 @@ msgstr ""
msgid "%(value)s is not a non-negative number"
msgstr ""
-#: apps/transactions/views/actions.py:58
+#: apps/transactions/views/actions.py:61
#, python-format
msgid "%(count)s transaction marked as paid"
msgid_plural "%(count)s transactions marked as paid"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:81
+#: apps/transactions/views/actions.py:84
#, python-format
msgid "%(count)s transaction marked as not paid"
msgid_plural "%(count)s transactions marked as not paid"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:105
+#: apps/transactions/views/actions.py:108
#, python-format
msgid "%(count)s transaction deleted successfully"
msgid_plural "%(count)s transactions deleted successfully"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:139
+#: apps/transactions/views/actions.py:142
#, python-format
msgid "%(count)s transaction restored successfully"
msgid_plural "%(count)s transactions restored successfully"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:170
+#: apps/transactions/views/actions.py:174
+#: apps/transactions/views/transactions.py:423
+#, python-format
+msgid "%(count)s transaction updated successfully"
+msgid_plural "%(count)s transactions updated successfully"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apps/transactions/views/actions.py:247
#, python-format
msgid "%(count)s transaction duplicated successfully"
msgid_plural "%(count)s transactions duplicated successfully"
@@ -2213,37 +2260,47 @@ msgstr ""
msgid "Category deleted successfully"
msgstr ""
-#: apps/transactions/views/conversions.py:72
+#: apps/transactions/views/conversions.py:77
#: apps/transactions/views/quick_transactions.py:46 apps/users/views.py:252
msgid "Item added successfully"
msgstr ""
-#: apps/transactions/views/conversions.py:91
+#: apps/transactions/views/conversions.py:97
#, fuzzy
#| msgid "Link transaction"
msgid "Convert into quick transaction"
msgstr "Tranzakció csatolása"
-#: apps/transactions/views/conversions.py:108
+#: apps/transactions/views/conversions.py:114
#: apps/transactions/views/recurring_transactions.py:112
msgid "Recurring Transaction added successfully"
msgstr ""
-#: apps/transactions/views/conversions.py:129
+#: apps/transactions/views/conversions.py:136
#, fuzzy
#| msgid "Recurring Transactions"
msgid "Convert into recurring transaction"
msgstr "Ismétlődő tranzakciók"
-#: apps/transactions/views/conversions.py:148
+#: apps/transactions/views/conversions.py:155
#: apps/transactions/views/installment_plans.py:87
msgid "Installment Plan added successfully"
msgstr ""
-#: apps/transactions/views/conversions.py:167
+#: apps/transactions/views/conversions.py:175
msgid "Convert into installment plan"
msgstr ""
+#: apps/transactions/views/conversions.py:195
+msgid "Transaction converted into a transfer"
+msgstr ""
+
+#: apps/transactions/views/conversions.py:226
+#, fuzzy
+#| msgid "Link transaction"
+msgid "Convert into transfer"
+msgstr "Tranzakció csatolása"
+
#: apps/transactions/views/entities.py:72
msgid "Entity added successfully"
msgstr ""
@@ -2276,7 +2333,7 @@ msgstr ""
msgid "Item deleted successfully"
msgstr ""
-#: apps/transactions/views/quick_transactions.py:164
+#: apps/transactions/views/quick_transactions.py:165
#: apps/transactions/views/transactions.py:156
#: apps/transactions/views/transactions.py:343
msgid "Transaction added successfully"
@@ -2330,30 +2387,23 @@ msgstr "A számla törlésre került"
msgid "Transaction updated successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:421
-#, python-format
-msgid "%(count)s transaction updated successfully"
-msgid_plural "%(count)s transactions updated successfully"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apps/transactions/views/transactions.py:448
+#: apps/transactions/views/transactions.py:450
msgid "Transaction duplicated successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:493
+#: apps/transactions/views/transactions.py:495
msgid "Transaction deleted successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:523
+#: apps/transactions/views/transactions.py:525
msgid "Transaction restored successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:549
+#: apps/transactions/views/transactions.py:551
msgid "Transfer added successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:579
+#: apps/transactions/views/transactions.py:581
#, fuzzy
#| msgid "Account updated successfully"
msgid "Transfer updated successfully"
@@ -2691,8 +2741,9 @@ msgstr ""
#: templates/accounts/fragments/list.html:37
#: templates/bank_sync/fragments/list.html:33
#: templates/categories/fragments/table.html:29
-#: templates/cotton/transaction/item.html:178
-#: templates/cotton/ui/transactions_action_bar.html:54
+#: templates/cotton/transaction/item.html:180
+#: templates/cotton/ui/transactions_action_bar.html:56
+#: templates/cotton/ui/transactions_action_bar.html:90
#: templates/currencies/fragments/list.html:34
#: templates/dca/fragments/strategy/details.html:63
#: templates/dca/fragments/strategy/list.html:31
@@ -2703,8 +2754,8 @@ msgstr ""
#: templates/import_app/fragments/profiles/list.html:46
#: templates/installment_plans/fragments/table.html:28
#: templates/investment_classes/fragments/list.html:39
-#: templates/investments/fragments/detail.html:302
-#: templates/investments/fragments/detail.html:330
+#: templates/investments/fragments/detail.html:310
+#: templates/investments/fragments/detail.html:338
#: templates/quick_transactions/fragments/list.html:25
#: templates/recurring_transactions/fragments/table.html:30
#: templates/rules/fragments/transaction_rule/view.html:22
@@ -2741,10 +2792,11 @@ msgstr ""
#: templates/accounts/fragments/list.html:71
#: templates/bank_sync/fragments/list.html:50
#: templates/categories/fragments/table.html:51
-#: templates/cotton/transaction/item.html:190
-#: templates/cotton/transaction/item.html:316
+#: templates/cotton/transaction/item.html:192
+#: templates/cotton/transaction/item.html:333
#: templates/cotton/ui/deleted_transactions_action_bar.html:57
-#: templates/cotton/ui/transactions_action_bar.html:82
+#: templates/cotton/ui/transactions_action_bar.html:75
+#: templates/cotton/ui/transactions_action_bar.html:107
#: templates/currencies/fragments/list.html:40
#: templates/dca/fragments/strategy/details.html:70
#: templates/dca/fragments/strategy/list.html:38
@@ -2775,10 +2827,11 @@ msgstr ""
#: templates/accounts/fragments/list.html:75
#: templates/bank_sync/fragments/list.html:54
#: templates/categories/fragments/table.html:56
-#: templates/cotton/transaction/item.html:192
-#: templates/cotton/transaction/item.html:322
+#: templates/cotton/transaction/item.html:194
+#: templates/cotton/transaction/item.html:339
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:44
#: templates/dca/fragments/strategy/details.html:75
#: templates/dca/fragments/strategy/list.html:42
@@ -2806,10 +2859,11 @@ msgstr ""
#: templates/account_groups/fragments/list.html:59
#: templates/accounts/fragments/list.html:76
#: templates/categories/fragments/table.html:57
-#: templates/cotton/transaction/item.html:193
-#: templates/cotton/transaction/item.html:323
+#: templates/cotton/transaction/item.html:195
+#: templates/cotton/transaction/item.html:340
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:45
#: templates/dca/fragments/strategy/details.html:76
#: templates/dca/fragments/strategy/list.html:43
@@ -2829,8 +2883,8 @@ msgstr ""
#: templates/accounts/fragments/list.html:77
#: templates/bank_sync/fragments/list.html:56
#: templates/categories/fragments/table.html:58
-#: templates/cotton/transaction/item.html:194
-#: templates/cotton/transaction/item.html:324
+#: templates/cotton/transaction/item.html:196
+#: templates/cotton/transaction/item.html:341
#: templates/currencies/fragments/list.html:46
#: templates/dca/fragments/strategy/details.html:77
#: templates/dca/fragments/strategy/list.html:44
@@ -2910,6 +2964,12 @@ msgstr ""
msgid "No accounts"
msgstr ""
+#: templates/accounts/fragments/share.html:8
+msgid ""
+"Everyone who can see this account can add, edit and delete its transactions, "
+"installment plans and recurring transactions."
+msgstr ""
+
#: templates/bank_sync/fragments/accounts.html:31
msgid "No accounts found on this service"
msgstr ""
@@ -3004,63 +3064,76 @@ msgstr ""
msgid "Search"
msgstr ""
-#: templates/cotton/transaction/item.html:12
+#: templates/cotton/transaction/item.html:14
msgid "Select"
msgstr ""
-#: templates/cotton/transaction/item.html:123
+#: templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:100
msgid "From"
msgstr ""
-#: templates/cotton/transaction/item.html:207
-#: templates/cotton/transaction/item.html:218
-#: templates/cotton/transaction/item.html:228
+#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:230
msgid "Show on summaries"
msgstr ""
-#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:211
msgid "Controlled by account"
msgstr ""
-#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:222
msgid "Controlled by category"
msgstr ""
-#: templates/cotton/transaction/item.html:233
+#: templates/cotton/transaction/item.html:235
+#: templates/includes/transactions_bulk_actions.html:15
msgid "Hide from summaries"
msgstr ""
-#: templates/cotton/transaction/item.html:237
+#: templates/cotton/transaction/item.html:239
msgid "Convert"
msgstr ""
-#: templates/cotton/transaction/item.html:252
-#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:254
+#: templates/cotton/transaction/item.html:264
+#: templates/cotton/transaction/item.html:274
msgid "Already part of a plan or recurrence"
msgstr ""
-#: templates/cotton/transaction/item.html:279
+#: templates/cotton/transaction/item.html:291
msgid "Not available for transfers"
msgstr ""
-#: templates/cotton/transaction/item.html:296
+#: templates/cotton/transaction/item.html:313
+#: templates/includes/transactions_bulk_actions.html:22
msgid "Move to previous month"
msgstr ""
-#: templates/cotton/transaction/item.html:300
+#: templates/cotton/transaction/item.html:317
+#: templates/includes/transactions_bulk_actions.html:28
msgid "Move to next month"
msgstr ""
-#: templates/cotton/transaction/item.html:303
+#: templates/cotton/transaction/item.html:320
+#: templates/includes/transactions_bulk_actions.html:33
msgid "Move to today"
msgstr ""
-#: templates/cotton/transaction/item.html:307
-#: templates/cotton/ui/transactions_action_bar.html:78
+#: templates/cotton/transaction/item.html:324
+#: templates/cotton/ui/transactions_action_bar.html:71
+#: templates/cotton/ui/transactions_action_bar.html:98
msgid "Duplicate"
msgstr ""
+#: templates/cotton/transaction/item.html:373
+#, python-format
+msgid "%(counter)s item"
+msgid_plural "%(counter)s items"
+msgstr[0] ""
+msgstr[1] ""
+
#: templates/cotton/ui/account_card.html:10
#: templates/cotton/ui/currency_card.html:10
msgid "projected income"
@@ -3096,22 +3169,26 @@ msgstr ""
msgid "final total"
msgstr ""
-#: templates/cotton/ui/deleted_transactions_action_bar.html:34
-#: templates/cotton/ui/transactions_action_bar.html:34
-msgid "Select All"
-msgstr ""
-
-#: templates/cotton/ui/deleted_transactions_action_bar.html:40
-#: templates/cotton/ui/transactions_action_bar.html:40
+#: templates/cotton/ui/deleted_transactions_action_bar.html:25
+#: templates/cotton/ui/deleted_transactions_action_bar.html:26
+#: templates/cotton/ui/transactions_action_bar.html:25
+#: templates/cotton/ui/transactions_action_bar.html:26
msgid "Unselect All"
msgstr ""
-#: templates/cotton/ui/deleted_transactions_action_bar.html:46
-msgid "Invert election"
+#: templates/cotton/ui/deleted_transactions_action_bar.html:39
+#: templates/cotton/ui/transactions_action_bar.html:39
+msgid "Select All"
+msgstr ""
+
+#: templates/cotton/ui/deleted_transactions_action_bar.html:45
+#: templates/cotton/ui/transactions_action_bar.html:45
+msgid "Invert selection"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:59
-#: templates/cotton/ui/transactions_action_bar.html:84
+#: templates/cotton/ui/transactions_action_bar.html:77
+#: templates/cotton/ui/transactions_action_bar.html:106
msgid "Yes, delete them!"
msgstr ""
@@ -3122,43 +3199,43 @@ msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:166
#: templates/cotton/ui/deleted_transactions_action_bar.html:182
#: templates/cotton/ui/deleted_transactions_action_bar.html:198
-#: templates/cotton/ui/transactions_action_bar.html:128
-#: templates/cotton/ui/transactions_action_bar.html:143
-#: templates/cotton/ui/transactions_action_bar.html:159
-#: templates/cotton/ui/transactions_action_bar.html:175
-#: templates/cotton/ui/transactions_action_bar.html:191
-#: templates/cotton/ui/transactions_action_bar.html:207
-#: templates/cotton/ui/transactions_action_bar.html:223
+#: templates/cotton/ui/transactions_action_bar.html:153
+#: templates/cotton/ui/transactions_action_bar.html:168
+#: templates/cotton/ui/transactions_action_bar.html:184
+#: templates/cotton/ui/transactions_action_bar.html:200
+#: templates/cotton/ui/transactions_action_bar.html:216
+#: templates/cotton/ui/transactions_action_bar.html:232
+#: templates/cotton/ui/transactions_action_bar.html:248
msgid "copied!"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:123
-#: templates/cotton/ui/transactions_action_bar.html:148
+#: templates/cotton/ui/transactions_action_bar.html:173
msgid "Flat Total"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:139
-#: templates/cotton/ui/transactions_action_bar.html:164
+#: templates/cotton/ui/transactions_action_bar.html:189
msgid "Real Total"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:155
-#: templates/cotton/ui/transactions_action_bar.html:180
+#: templates/cotton/ui/transactions_action_bar.html:205
msgid "Mean"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:171
-#: templates/cotton/ui/transactions_action_bar.html:196
+#: templates/cotton/ui/transactions_action_bar.html:221
msgid "Max"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:187
-#: templates/cotton/ui/transactions_action_bar.html:212
+#: templates/cotton/ui/transactions_action_bar.html:237
msgid "Min"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:203
-#: templates/cotton/ui/transactions_action_bar.html:228
+#: templates/cotton/ui/transactions_action_bar.html:253
msgid "Count"
msgstr ""
@@ -3182,17 +3259,11 @@ msgstr ""
msgid "Balance"
msgstr ""
-#: templates/cotton/ui/transactions_action_bar.html:46
-msgid "Invert selection"
-msgstr ""
-
-#: templates/cotton/ui/transactions_action_bar.html:66
-msgid "Mark as unpaid"
-msgstr ""
-
-#: templates/cotton/ui/transactions_action_bar.html:71
-msgid "Mark as paid"
-msgstr ""
+#: templates/cotton/ui/transactions_action_bar.html:83
+#, fuzzy
+#| msgid "Transactions"
+msgid "More actions"
+msgstr "Tranzakciók"
#: templates/currencies/fragments/add.html:5
msgid "Add currency"
@@ -3623,6 +3694,14 @@ msgstr ""
msgid "Calculator"
msgstr ""
+#: templates/includes/transactions_bulk_actions.html:4
+msgid "Mark as unpaid"
+msgstr ""
+
+#: templates/includes/transactions_bulk_actions.html:9
+msgid "Mark as paid"
+msgstr ""
+
#: templates/insights/fragments/category_explorer/charts/account.html:100
#: templates/insights/fragments/category_explorer/charts/currency.html:92
#: templates/monthly_overview/fragments/monthly_account_summary.html:14
@@ -3688,6 +3767,7 @@ msgstr ""
#: templates/insights/fragments/year_by_year.html:140
#: templates/investment_classes/fragments/list.html:65
#: templates/monthly_overview/fragments/monthly_summary.html:168
+#: templates/transactions/widgets/sub_transactions.html:55
msgid "Total"
msgstr ""
@@ -4100,11 +4180,11 @@ msgstr ""
msgid "Loss, tax or fee"
msgstr ""
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
msgid "No movements yet"
msgstr ""
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
msgid "Use the + button to buy or contribute"
msgstr ""
@@ -4681,6 +4761,12 @@ msgstr ""
msgid "Deleted transactions"
msgstr ""
+#: templates/transactions/widgets/sub_transactions.html:53
+#, fuzzy
+#| msgid "Link transaction"
+msgid "Add sub-transaction"
+msgstr "Tranzakció csatolása"
+
#: templates/transactions/widgets/unselectable_income_expense_toggle_buttons.html:11
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:7
msgid "Unchanged"
diff --git a/app/locale/id/LC_MESSAGES/django.po b/app/locale/id/LC_MESSAGES/django.po
index 8892c413..f90a3862 100644
--- a/app/locale/id/LC_MESSAGES/django.po
+++ b/app/locale/id/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-11-12 03:24+0000\n"
+"POT-Creation-Date: 2026-11-14 14:06+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -26,11 +26,11 @@ msgstr ""
#: apps/currencies/forms.py:59 apps/currencies/forms.py:93
#: apps/currencies/forms.py:170 apps/dca/forms.py:51 apps/dca/forms.py:216
#: apps/import_app/forms.py:34 apps/rules/forms.py:60 apps/rules/forms.py:100
-#: apps/rules/forms.py:385 apps/transactions/forms.py:219
-#: apps/transactions/forms.py:452 apps/transactions/forms.py:571
-#: apps/transactions/forms.py:741 apps/transactions/forms.py:971
-#: apps/transactions/forms.py:1018 apps/transactions/forms.py:1046
-#: apps/transactions/forms.py:1077 apps/transactions/forms.py:1239
+#: apps/rules/forms.py:387 apps/transactions/forms.py:304
+#: apps/transactions/forms.py:538 apps/transactions/forms.py:657
+#: apps/transactions/forms.py:827 apps/transactions/forms.py:1060
+#: apps/transactions/forms.py:1108 apps/transactions/forms.py:1136
+#: apps/transactions/forms.py:1167 apps/transactions/forms.py:1330
#: apps/users/forms.py:264 apps/users/forms.py:422
#: templates/rules/fragments/transaction_rule/dry_run/updated.html:5
#: templates/rules/fragments/transaction_rule/view.html:128
@@ -42,11 +42,11 @@ msgstr ""
#: apps/common/widgets/tom_select.py:16 apps/currencies/forms.py:65
#: apps/currencies/forms.py:99 apps/currencies/forms.py:176
#: apps/dca/forms.py:57 apps/dca/forms.py:222 apps/import_app/forms.py:40
-#: apps/rules/forms.py:66 apps/rules/forms.py:106 apps/rules/forms.py:391
-#: apps/transactions/forms.py:206 apps/transactions/forms.py:226
-#: apps/transactions/forms.py:459 apps/transactions/forms.py:977
-#: apps/transactions/forms.py:1024 apps/transactions/forms.py:1052
-#: apps/transactions/forms.py:1083 apps/transactions/forms.py:1245
+#: apps/rules/forms.py:66 apps/rules/forms.py:106 apps/rules/forms.py:393
+#: apps/transactions/forms.py:291 apps/transactions/forms.py:311
+#: apps/transactions/forms.py:545 apps/transactions/forms.py:1066
+#: apps/transactions/forms.py:1114 apps/transactions/forms.py:1142
+#: apps/transactions/forms.py:1173 apps/transactions/forms.py:1336
#: apps/users/forms.py:270 apps/users/forms.py:428
#: templates/mini_tools/simulator.html:177
#: templates/mini_tools/unit_price_calculator.html:168
@@ -69,29 +69,29 @@ msgstr ""
#: apps/accounts/forms.py:206 apps/dca/forms.py:84 apps/dca/forms.py:91
#: apps/insights/forms.py:117 apps/insights/views.py:44 apps/rules/forms.py:181
-#: apps/rules/forms.py:197 apps/rules/models.py:44 apps/rules/models.py:311
-#: apps/transactions/forms.py:62 apps/transactions/forms.py:330
-#: apps/transactions/forms.py:510 apps/transactions/forms.py:607
-#: apps/transactions/forms.py:614 apps/transactions/forms.py:854
-#: apps/transactions/forms.py:1106 apps/transactions/models.py:358
-#: apps/transactions/models.py:765 apps/transactions/models.py:1021
-#: apps/transactions/models.py:1342
+#: apps/rules/forms.py:198 apps/rules/models.py:45 apps/rules/models.py:312
+#: apps/transactions/forms.py:145 apps/transactions/forms.py:415
+#: apps/transactions/forms.py:596 apps/transactions/forms.py:693
+#: apps/transactions/forms.py:700 apps/transactions/forms.py:942
+#: apps/transactions/forms.py:1196 apps/transactions/models.py:360
+#: apps/transactions/models.py:861 apps/transactions/models.py:1120
+#: apps/transactions/models.py:1489
#: templates/insights/fragments/month_by_month.html:84
#: templates/insights/fragments/year_by_year.html:52
msgid "Category"
msgstr ""
#: apps/accounts/forms.py:213 apps/dca/forms.py:100 apps/dca/forms.py:108
-#: apps/export_app/forms.py:43 apps/export_app/forms.py:142
-#: apps/insights/views.py:50 apps/rules/forms.py:184 apps/rules/forms.py:194
-#: apps/rules/models.py:45 apps/rules/models.py:315
-#: apps/transactions/filters.py:79 apps/transactions/forms.py:70
-#: apps/transactions/forms.py:338 apps/transactions/forms.py:518
-#: apps/transactions/forms.py:623 apps/transactions/forms.py:631
-#: apps/transactions/forms.py:847 apps/transactions/forms.py:1099
-#: apps/transactions/models.py:364 apps/transactions/models.py:767
-#: apps/transactions/models.py:1025 apps/transactions/models.py:1348
-#: templates/includes/sidebar.html:162
+#: apps/export_app/forms.py:43 apps/export_app/forms.py:149
+#: apps/insights/views.py:50 apps/rules/forms.py:184 apps/rules/forms.py:195
+#: apps/rules/models.py:46 apps/rules/models.py:316
+#: apps/transactions/filters.py:95 apps/transactions/filters.py:170
+#: apps/transactions/forms.py:153 apps/transactions/forms.py:423
+#: apps/transactions/forms.py:604 apps/transactions/forms.py:709
+#: apps/transactions/forms.py:717 apps/transactions/forms.py:935
+#: apps/transactions/forms.py:1189 apps/transactions/models.py:366
+#: apps/transactions/models.py:863 apps/transactions/models.py:1124
+#: apps/transactions/models.py:1495 templates/includes/sidebar.html:162
#: templates/insights/fragments/month_by_month.html:29
#: templates/insights/fragments/month_by_month.html:32
#: templates/insights/fragments/year_by_year.html:24
@@ -118,9 +118,9 @@ msgstr ""
#: apps/accounts/forms.py:266 apps/currencies/forms.py:72
#: apps/dca/models.py:158 apps/rules/forms.py:176 apps/rules/forms.py:190
-#: apps/rules/models.py:38 apps/rules/models.py:279
-#: apps/transactions/forms.py:86 apps/transactions/forms.py:482
-#: apps/transactions/forms.py:652 apps/transactions/models.py:340
+#: apps/rules/models.py:38 apps/rules/models.py:280
+#: apps/transactions/forms.py:169 apps/transactions/forms.py:568
+#: apps/transactions/forms.py:738 apps/transactions/models.py:342
#: templates/dca/fragments/strategy/details.html:49
#: templates/exchange_rates/fragments/table.html:10
#: templates/exchange_rates_services/fragments/table.html:11
@@ -134,8 +134,9 @@ msgstr ""
#: apps/accounts/models.py:19 apps/accounts/models.py:36
#: apps/accounts/models.py:84 apps/bank_sync/models.py:14 apps/dca/models.py:13
#: apps/import_app/models.py:20 apps/rules/models.py:13
-#: apps/transactions/models.py:250 apps/transactions/models.py:275
-#: apps/transactions/models.py:299 apps/transactions/models.py:1310
+#: apps/transactions/forms.py:64 apps/transactions/models.py:252
+#: apps/transactions/models.py:277 apps/transactions/models.py:301
+#: apps/transactions/models.py:726 apps/transactions/models.py:1457
#: apps/users/models.py:577 templates/account_groups/fragments/list.html:22
#: templates/accounts/fragments/list.html:22
#: templates/bank_sync/fragments/list.html:20
@@ -185,7 +186,7 @@ msgid ""
"%(taken)s%%."
msgstr ""
-#: apps/accounts/models.py:74 apps/export_app/forms.py:139
+#: apps/accounts/models.py:74 apps/export_app/forms.py:146
#: templates/includes/sidebar.html:190
#: templates/investment_classes/fragments/list.html:9
#: templates/investment_classes/pages/index.html:4
@@ -292,11 +293,11 @@ msgstr ""
#: apps/accounts/models.py:190 apps/bank_sync/models.py:89
#: apps/import_app/forms.py:50 apps/import_app/models.py:88
#: apps/rules/forms.py:173 apps/rules/forms.py:187 apps/rules/models.py:35
-#: apps/rules/models.py:267 apps/transactions/forms.py:82
-#: apps/transactions/forms.py:350 apps/transactions/forms.py:477
-#: apps/transactions/forms.py:839 apps/transactions/forms.py:1091
-#: apps/transactions/models.py:330 apps/transactions/models.py:725
-#: apps/transactions/models.py:1003 apps/transactions/models.py:1316
+#: apps/rules/models.py:268 apps/transactions/forms.py:165
+#: apps/transactions/forms.py:435 apps/transactions/forms.py:563
+#: apps/transactions/forms.py:927 apps/transactions/forms.py:1181
+#: apps/transactions/models.py:332 apps/transactions/models.py:821
+#: apps/transactions/models.py:1102 apps/transactions/models.py:1463
#: templates/import_app/fragments/runs/list.html:95
#: templates/installment_plans/fragments/table.html:17
#: templates/quick_transactions/fragments/list.html:14
@@ -306,8 +307,8 @@ msgid "Account"
msgstr ""
#: apps/accounts/models.py:191 apps/export_app/forms.py:19
-#: apps/export_app/forms.py:138 apps/transactions/filters.py:63
-#: templates/accounts/fragments/list.html:9
+#: apps/export_app/forms.py:145 apps/transactions/filters.py:79
+#: apps/transactions/filters.py:153 templates/accounts/fragments/list.html:9
#: templates/accounts/pages/index.html:4
#: templates/bank_sync/fragments/accounts.html:5
#: templates/bank_sync/fragments/list.html:22
@@ -386,27 +387,27 @@ msgstr ""
msgid "Account balances have been reconciled successfully"
msgstr ""
-#: apps/api/fields/transactions.py:31
+#: apps/api/fields/transactions.py:32
msgid "Category with this ID does not exist."
msgstr ""
-#: apps/api/fields/transactions.py:41
+#: apps/api/fields/transactions.py:42
msgid "Invalid category data. Provide an ID or name."
msgstr ""
-#: apps/api/fields/transactions.py:74
+#: apps/api/fields/transactions.py:75
msgid "Tag with this ID does not exist."
msgstr ""
-#: apps/api/fields/transactions.py:84
+#: apps/api/fields/transactions.py:85
msgid "Invalid tag data. Provide an ID or name."
msgstr ""
-#: apps/api/fields/transactions.py:109
+#: apps/api/fields/transactions.py:110
msgid "Entity with this ID does not exist."
msgstr ""
-#: apps/api/fields/transactions.py:119
+#: apps/api/fields/transactions.py:120
msgid "Invalid entity data. Provide an ID or name."
msgstr ""
@@ -414,12 +415,22 @@ msgstr ""
msgid "Only transaction imports can use an account."
msgstr ""
-#: apps/api/serializers/transactions.py:141 apps/dca/forms.py:298
-#: apps/transactions/models.py:975
+#: apps/api/serializers/transactions.py:58
+msgid "Transfers can't have sub-transactions."
+msgstr ""
+
+#: apps/api/serializers/transactions.py:68
+msgid ""
+"The amount is the sum of the sub-transactions; send sub_transactions instead."
+msgstr ""
+
+#: apps/api/serializers/transactions.py:74
+#: apps/api/serializers/transactions.py:218 apps/dca/forms.py:298
+#: apps/transactions/models.py:1074
msgid "This field is required."
msgstr ""
-#: apps/api/serializers/transactions.py:205
+#: apps/api/serializers/transactions.py:286
msgid "Either 'date' or 'reference_date' must be provided."
msgstr ""
@@ -430,8 +441,8 @@ msgstr ""
#: apps/bank_sync/forms.py:113 apps/bank_sync/models.py:76
#: apps/currencies/models.py:54 apps/export_app/forms.py:25
-#: apps/export_app/forms.py:140 apps/transactions/filters.py:70
-#: templates/currencies/fragments/list.html:9
+#: apps/export_app/forms.py:147 apps/transactions/filters.py:86
+#: apps/transactions/filters.py:161 templates/currencies/fragments/list.html:9
#: templates/currencies/pages/index.html:4 templates/includes/sidebar.html:196
#: templates/includes/sidebar.html:198
#: templates/monthly_overview/pages/overview.html:63
@@ -456,8 +467,8 @@ msgid "Service Type"
msgstr ""
#: apps/bank_sync/models.py:18 apps/currencies/models.py:130
-#: apps/transactions/filters.py:27 apps/transactions/models.py:254
-#: apps/transactions/models.py:278 apps/transactions/models.py:302
+#: apps/transactions/filters.py:28 apps/transactions/models.py:256
+#: apps/transactions/models.py:280 apps/transactions/models.py:304
#: templates/categories/fragments/list.html:16
#: templates/entities/fragments/list.html:16
#: templates/installment_plans/fragments/list.html:16
@@ -506,7 +517,7 @@ msgstr ""
msgid "Bank Sync Service"
msgstr ""
-#: apps/bank_sync/models.py:51 apps/export_app/forms.py:154
+#: apps/bank_sync/models.py:51 apps/export_app/forms.py:163
msgid "Bank Sync Services"
msgstr ""
@@ -671,17 +682,17 @@ msgstr ""
#: apps/common/forms.py:43
msgid ""
-"Private: Only shown for the owner and shared users. Only editable by the "
-"owner. Public: Shown for all users. Only editable by the owner."
+"Private: Only shown for the owner and shared users. Public: Shown for "
+"all users. Only the owner can edit, share or delete it."
msgstr ""
-#: apps/common/forms.py:76 apps/users/forms.py:191
+#: apps/common/forms.py:78 apps/users/forms.py:191
#: templates/bank_sync/fragments/accounts.html:34
#: templates/transactions/fragments/filter_actions.html:5
msgid "Save"
msgstr ""
-#: apps/common/forms.py:90
+#: apps/common/forms.py:92
msgid "You cannot share this item with its owner."
msgstr ""
@@ -788,6 +799,7 @@ msgid "Now"
msgstr ""
#: apps/common/widgets/tom_select.py:14
+#: templates/transactions/widgets/sub_transaction_row.html:9
msgid "Remove"
msgstr ""
@@ -864,8 +876,8 @@ msgstr ""
msgid "Auto"
msgstr ""
-#: apps/currencies/models.py:91 apps/export_app/forms.py:67
-#: apps/export_app/forms.py:152 templates/exchange_rates/fragments/list.html:10
+#: apps/currencies/models.py:91 apps/export_app/forms.py:73
+#: apps/export_app/forms.py:161 templates/exchange_rates/fragments/list.html:10
#: templates/exchange_rates/pages/index.html:4
#: templates/includes/sidebar.html:204
msgid "Exchange Rates"
@@ -1014,25 +1026,25 @@ msgstr ""
msgid "Create transaction"
msgstr ""
-#: apps/dca/forms.py:69 apps/transactions/forms.py:582
+#: apps/dca/forms.py:69 apps/transactions/forms.py:668
msgid "From Account"
msgstr ""
-#: apps/dca/forms.py:75 apps/transactions/forms.py:587
+#: apps/dca/forms.py:75 apps/transactions/forms.py:673
msgid "To Account"
msgstr ""
#: apps/dca/forms.py:117 apps/dca/forms.py:125 apps/export_app/forms.py:49
-#: apps/export_app/forms.py:143 apps/insights/views.py:57
-#: apps/rules/forms.py:185 apps/rules/forms.py:195 apps/rules/models.py:46
-#: apps/rules/models.py:307 apps/transactions/filters.py:84
-#: apps/transactions/forms.py:78 apps/transactions/forms.py:346
-#: apps/transactions/forms.py:526 apps/transactions/forms.py:640
-#: apps/transactions/forms.py:647 apps/transactions/forms.py:862
-#: apps/transactions/forms.py:1114 apps/transactions/models.py:313
-#: apps/transactions/models.py:369 apps/transactions/models.py:770
-#: apps/transactions/models.py:1028 apps/transactions/models.py:1353
-#: templates/entities/fragments/list.html:9
+#: apps/export_app/forms.py:150 apps/insights/views.py:57
+#: apps/rules/forms.py:185 apps/rules/forms.py:196 apps/rules/models.py:47
+#: apps/rules/models.py:308 apps/transactions/filters.py:100
+#: apps/transactions/filters.py:175 apps/transactions/forms.py:161
+#: apps/transactions/forms.py:431 apps/transactions/forms.py:612
+#: apps/transactions/forms.py:726 apps/transactions/forms.py:733
+#: apps/transactions/forms.py:950 apps/transactions/forms.py:1204
+#: apps/transactions/models.py:315 apps/transactions/models.py:371
+#: apps/transactions/models.py:866 apps/transactions/models.py:1127
+#: apps/transactions/models.py:1500 templates/entities/fragments/list.html:9
#: templates/entities/pages/index.html:4 templates/includes/sidebar.html:168
#: templates/insights/fragments/month_by_month.html:40
#: templates/insights/fragments/month_by_month.html:43
@@ -1067,8 +1079,8 @@ msgstr ""
msgid "You must provide an account."
msgstr ""
-#: apps/dca/forms.py:322 apps/transactions/forms.py:780
-#: apps/transactions/models.py:978
+#: apps/dca/forms.py:322 apps/transactions/forms.py:866
+#: apps/transactions/models.py:1077
msgid "From and To accounts must be different."
msgstr ""
@@ -1086,10 +1098,10 @@ msgid "Payment Currency"
msgstr ""
#: apps/dca/models.py:26 apps/dca/models.py:181 apps/rules/forms.py:180
-#: apps/rules/forms.py:196 apps/rules/models.py:43 apps/rules/models.py:295
-#: apps/transactions/forms.py:504 apps/transactions/forms.py:668
-#: apps/transactions/models.py:354 apps/transactions/models.py:774
-#: apps/transactions/models.py:1031 apps/transactions/models.py:1338
+#: apps/rules/forms.py:197 apps/rules/models.py:44 apps/rules/models.py:296
+#: apps/transactions/forms.py:590 apps/transactions/forms.py:754
+#: apps/transactions/models.py:356 apps/transactions/models.py:870
+#: apps/transactions/models.py:1130 apps/transactions/models.py:1485
msgid "Notes"
msgstr ""
@@ -1097,7 +1109,7 @@ msgstr ""
msgid "DCA Strategy"
msgstr ""
-#: apps/dca/models.py:35 apps/export_app/forms.py:166
+#: apps/dca/models.py:35 apps/export_app/forms.py:175
msgid "DCA Strategies"
msgstr ""
@@ -1117,7 +1129,7 @@ msgstr ""
msgid "DCA Entry"
msgstr ""
-#: apps/dca/models.py:187 apps/export_app/forms.py:167
+#: apps/dca/models.py:187 apps/export_app/forms.py:176
msgid "DCA Entries"
msgstr ""
@@ -1145,14 +1157,14 @@ msgstr ""
msgid "Entry deleted successfully"
msgstr ""
-#: apps/export_app/forms.py:13 apps/export_app/forms.py:137
+#: apps/export_app/forms.py:13 apps/export_app/forms.py:144
#: templates/includes/sidebar.html:247 templates/users/fragments/list.html:10
#: templates/users/pages/index.html:4
msgid "Users"
msgstr ""
-#: apps/export_app/forms.py:31 apps/export_app/forms.py:144
-#: apps/transactions/models.py:423 templates/includes/sidebar.html:81
+#: apps/export_app/forms.py:31 apps/export_app/forms.py:151
+#: apps/transactions/models.py:425 templates/includes/sidebar.html:81
#: templates/includes/sidebar.html:154
#: templates/recurring_transactions/fragments/list_transactions.html:5
#: templates/recurring_transactions/fragments/table.html:37
@@ -1160,9 +1172,9 @@ msgstr ""
msgid "Transactions"
msgstr ""
-#: apps/export_app/forms.py:37 apps/export_app/forms.py:141
-#: apps/insights/views.py:43 apps/transactions/filters.py:74
-#: templates/categories/fragments/list.html:9
+#: apps/export_app/forms.py:37 apps/export_app/forms.py:148
+#: apps/insights/views.py:43 apps/transactions/filters.py:90
+#: apps/transactions/filters.py:165 templates/categories/fragments/list.html:9
#: templates/categories/pages/index.html:4 templates/includes/sidebar.html:156
#: templates/insights/fragments/month_by_month.html:18
#: templates/insights/fragments/month_by_month.html:21
@@ -1171,100 +1183,113 @@ msgstr ""
msgid "Categories"
msgstr ""
-#: apps/export_app/forms.py:55 apps/export_app/forms.py:147
-#: apps/transactions/models.py:1068 templates/includes/sidebar.html:110
+#: apps/export_app/forms.py:55 apps/export_app/forms.py:155
+#: apps/transactions/models.py:1167 templates/includes/sidebar.html:110
#: templates/recurring_transactions/fragments/list.html:9
#: templates/recurring_transactions/pages/index.html:4
msgid "Recurring Transactions"
msgstr ""
-#: apps/export_app/forms.py:61 apps/export_app/forms.py:145
-#: apps/transactions/models.py:788 templates/includes/sidebar.html:104
+#: apps/export_app/forms.py:61 apps/export_app/forms.py:153
+#: apps/transactions/models.py:884 templates/includes/sidebar.html:104
#: templates/installment_plans/fragments/list.html:9
#: templates/installment_plans/pages/index.html:4
msgid "Installment Plans"
msgstr ""
-#: apps/export_app/forms.py:73 apps/export_app/forms.py:150
+#: apps/export_app/forms.py:67 apps/export_app/forms.py:157
+#: apps/transactions/models.py:1518 templates/includes/sidebar.html:98
+#: templates/quick_transactions/pages/index.html:5
+#: templates/quick_transactions/pages/index.html:15
+msgid "Quick Transactions"
+msgstr ""
+
+#: apps/export_app/forms.py:79 apps/export_app/forms.py:159
#: templates/exchange_rates_services/fragments/list.html:10
#: templates/exchange_rates_services/pages/index.html:4
#: templates/includes/sidebar.html:232
msgid "Automatic Exchange Rates"
msgstr ""
-#: apps/export_app/forms.py:79 templates/bank_sync/fragments/list.html:8
+#: apps/export_app/forms.py:85 templates/bank_sync/fragments/list.html:8
#: templates/bank_sync/pages/index.html:4 templates/includes/sidebar.html:238
msgid "Bank Sync"
msgstr ""
-#: apps/export_app/forms.py:80
+#: apps/export_app/forms.py:86
msgid "Includes the providers' API keys"
msgstr ""
-#: apps/export_app/forms.py:86 templates/includes/sidebar.html:212
+#: apps/export_app/forms.py:92 templates/includes/sidebar.html:212
#: templates/rules/fragments/list.html:9 templates/rules/pages/index.html:4
msgid "Rules"
msgstr ""
-#: apps/export_app/forms.py:92 templates/cotton/transaction/item.html:66
+#: apps/export_app/forms.py:98 templates/cotton/transaction/item.html:68
msgid "DCA"
msgstr ""
-#: apps/export_app/forms.py:98 apps/export_app/forms.py:168
+#: apps/export_app/forms.py:104 apps/export_app/forms.py:177
#: templates/import_app/fragments/profiles/list.html:21
#: templates/import_app/pages/profiles_index.html:4
msgid "Import Profiles"
msgstr ""
-#: apps/export_app/forms.py:126 templates/export_app/fragments/export.html:5
+#: apps/export_app/forms.py:133 templates/export_app/fragments/export.html:5
#: templates/export_app/pages/index.html:13
msgid "Export"
msgstr ""
-#: apps/export_app/forms.py:134
+#: apps/export_app/forms.py:141
msgid "Import a ZIP file exported from WYGIWYH"
msgstr ""
-#: apps/export_app/forms.py:135
+#: apps/export_app/forms.py:142
msgid "ZIP File"
msgstr ""
-#: apps/export_app/forms.py:157
+#: apps/export_app/forms.py:152 apps/rules/forms.py:193 apps/rules/models.py:42
+#: apps/rules/models.py:320 apps/transactions/models.py:736
+#: templates/transactions/widgets/sub_transactions.html:39
+msgid "Sub-transactions"
+msgstr ""
+
+#: apps/export_app/forms.py:166
msgid "Bank Sync Accounts"
msgstr ""
-#: apps/export_app/forms.py:159 apps/rules/models.py:27
+#: apps/export_app/forms.py:168 apps/rules/models.py:27
msgid "Transaction rules"
msgstr ""
-#: apps/export_app/forms.py:161 apps/rules/models.py:68
+#: apps/export_app/forms.py:170 apps/rules/models.py:69
msgid "Edit transaction action"
msgstr ""
-#: apps/export_app/forms.py:164 apps/rules/models.py:327
+#: apps/export_app/forms.py:173 apps/rules/models.py:332
msgid "Update or create transaction actions"
msgstr ""
-#: apps/export_app/forms.py:199 templates/cotton/transaction/item.html:310
+#: apps/export_app/forms.py:210 templates/cotton/transaction/item.html:327
#: templates/cotton/ui/deleted_transactions_action_bar.html:53
#: templates/export_app/fragments/restore.html:5
#: templates/export_app/pages/index.html:19
msgid "Restore"
msgstr ""
-#: apps/export_app/forms.py:209
+#: apps/export_app/forms.py:220
msgid "Please upload either a ZIP file or at least one CSV file"
msgstr ""
-#: apps/export_app/views.py:190
+#: apps/export_app/views.py:216
msgid "You have to select at least one export"
msgstr ""
-#: apps/export_app/views.py:210
+#: apps/export_app/views.py:236
msgid "Data restored successfully"
msgstr ""
-#: apps/export_app/views.py:222
+#: apps/export_app/views.py:248
msgid ""
"There was an error restoring your data. Check the logs for more details."
msgstr ""
@@ -1351,7 +1376,7 @@ msgstr ""
#: apps/insights/forms.py:118 apps/insights/utils/sankey.py:36
#: apps/insights/utils/sankey.py:167 apps/insights/views.py:45
-#: apps/transactions/filters.py:209
+#: apps/transactions/filters.py:294
#: templates/insights/fragments/month_by_month.html:119
#: templates/insights/fragments/year_by_year.html:73
msgid "Uncategorized"
@@ -1408,24 +1433,24 @@ msgstr ""
msgid "Tag"
msgstr ""
-#: apps/insights/views.py:52 apps/transactions/filters.py:215
+#: apps/insights/views.py:52 apps/transactions/filters.py:303
#: templates/insights/fragments/month_by_month.html:121
#: templates/insights/fragments/year_by_year.html:75
msgid "Untagged"
msgstr ""
-#: apps/insights/views.py:53 apps/transactions/models.py:611
+#: apps/insights/views.py:53 apps/transactions/models.py:632
#: templates/tags/fragments/table.html:69
msgid "No tags"
msgstr ""
-#: apps/insights/views.py:58 apps/transactions/models.py:312
+#: apps/insights/views.py:58 apps/transactions/models.py:314
#: templates/insights/fragments/month_by_month.html:88
#: templates/insights/fragments/year_by_year.html:56
msgid "Entity"
msgstr ""
-#: apps/insights/views.py:59 apps/transactions/filters.py:222
+#: apps/insights/views.py:59 apps/transactions/filters.py:311
#: templates/insights/fragments/month_by_month.html:123
#: templates/insights/fragments/year_by_year.html:77
msgid "No entity"
@@ -1443,15 +1468,15 @@ msgstr ""
msgid "Unclassified"
msgstr ""
-#: apps/investments/views.py:289
+#: apps/investments/views.py:290
msgid "Asset class added successfully"
msgstr ""
-#: apps/investments/views.py:297
+#: apps/investments/views.py:298
msgid "Asset class updated successfully"
msgstr ""
-#: apps/investments/views.py:318
+#: apps/investments/views.py:319
msgid "Asset class deleted successfully"
msgstr ""
@@ -1484,13 +1509,13 @@ msgstr ""
msgid "Set field"
msgstr ""
-#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:123
+#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:101
msgid "To"
msgstr ""
#: apps/rules/forms.py:78 apps/rules/forms.py:158 apps/rules/models.py:20
-#: apps/rules/models.py:62 apps/rules/models.py:323
+#: apps/rules/models.py:63 apps/rules/models.py:328
#: templates/rules/fragments/list.html:23
msgid "Order"
msgstr ""
@@ -1508,36 +1533,37 @@ msgid "Operator"
msgstr ""
#: apps/rules/forms.py:174 apps/rules/forms.py:188 apps/rules/models.py:36
-#: apps/rules/models.py:271 apps/transactions/forms.py:468
-#: apps/transactions/models.py:337 apps/transactions/models.py:730
-#: apps/transactions/models.py:1009 apps/transactions/models.py:1323
+#: apps/rules/models.py:272 apps/transactions/forms.py:554
+#: apps/transactions/models.py:339 apps/transactions/models.py:826
+#: apps/transactions/models.py:1108 apps/transactions/models.py:1470
#: templates/mini_tools/simulator.html:63
msgid "Type"
msgstr ""
#: apps/rules/forms.py:175 apps/rules/forms.py:189 apps/rules/models.py:37
-#: apps/rules/models.py:275 apps/transactions/filters.py:22
-#: apps/transactions/forms.py:472 apps/transactions/forms.py:650
-#: apps/transactions/models.py:339 apps/transactions/models.py:1325
-#: templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/rules/models.py:276 apps/transactions/filters.py:23
+#: apps/transactions/forms.py:558 apps/transactions/forms.py:736
+#: apps/transactions/models.py:341 apps/transactions/models.py:1472
+#: templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/transactions/widgets/paid_toggle_button.html:10
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:13
msgid "Paid"
msgstr ""
#: apps/rules/forms.py:177 apps/rules/forms.py:191 apps/rules/models.py:39
-#: apps/rules/models.py:283 apps/transactions/forms.py:90
-#: apps/transactions/forms.py:488 apps/transactions/forms.py:655
-#: apps/transactions/forms.py:868 apps/transactions/models.py:341
-#: apps/transactions/models.py:748 apps/transactions/models.py:1033
+#: apps/rules/models.py:284 apps/transactions/forms.py:173
+#: apps/transactions/forms.py:574 apps/transactions/forms.py:741
+#: apps/transactions/forms.py:956 apps/transactions/models.py:343
+#: apps/transactions/models.py:844 apps/transactions/models.py:1132
msgid "Reference Date"
msgstr ""
#: apps/rules/forms.py:178 apps/rules/forms.py:192 apps/rules/models.py:41
-#: apps/rules/models.py:287 apps/transactions/forms.py:495
-#: apps/transactions/models.py:347 apps/transactions/models.py:1014
-#: apps/transactions/models.py:1331
+#: apps/rules/models.py:288 apps/transactions/forms.py:75
+#: apps/transactions/forms.py:581 apps/transactions/models.py:349
+#: apps/transactions/models.py:730 apps/transactions/models.py:1113
+#: apps/transactions/models.py:1478
#: templates/insights/fragments/sankey.html:102
#: templates/installment_plans/fragments/table.html:18
#: templates/mini_tools/simulator.html:70
@@ -1546,51 +1572,52 @@ msgstr ""
msgid "Amount"
msgstr ""
-#: apps/rules/forms.py:179 apps/rules/forms.py:193 apps/rules/models.py:14
-#: apps/rules/models.py:42 apps/rules/models.py:291
-#: apps/transactions/forms.py:499 apps/transactions/forms.py:659
-#: apps/transactions/models.py:352 apps/transactions/models.py:732
-#: apps/transactions/models.py:1017 apps/transactions/models.py:1336
+#: apps/rules/forms.py:179 apps/rules/forms.py:194 apps/rules/models.py:14
+#: apps/rules/models.py:43 apps/rules/models.py:292
+#: apps/transactions/forms.py:585 apps/transactions/forms.py:745
+#: apps/transactions/models.py:354 apps/transactions/models.py:828
+#: apps/transactions/models.py:1116 apps/transactions/models.py:1483
msgid "Description"
msgstr ""
-#: apps/rules/forms.py:182 apps/rules/forms.py:198 apps/rules/models.py:47
-#: apps/rules/models.py:299 apps/transactions/models.py:399
-#: apps/transactions/models.py:1358
+#: apps/rules/forms.py:182 apps/rules/forms.py:199 apps/rules/models.py:48
+#: apps/rules/models.py:300 apps/transactions/models.py:401
+#: apps/transactions/models.py:1505
msgid "Internal Note"
msgstr ""
-#: apps/rules/forms.py:183 apps/rules/forms.py:199 apps/rules/models.py:48
-#: apps/rules/models.py:303 apps/transactions/models.py:401
-#: apps/transactions/models.py:1360
+#: apps/rules/forms.py:183 apps/rules/forms.py:200 apps/rules/models.py:49
+#: apps/rules/models.py:304 apps/transactions/models.py:403
+#: apps/transactions/models.py:1507
msgid "Internal ID"
msgstr ""
-#: apps/rules/forms.py:186 apps/rules/forms.py:200 apps/rules/models.py:40
-#: apps/rules/models.py:319 apps/transactions/forms.py:672
-#: apps/transactions/models.py:251 apps/transactions/models.py:342
-#: apps/transactions/models.py:1326
+#: apps/rules/forms.py:186 apps/rules/forms.py:201 apps/rules/models.py:40
+#: apps/rules/models.py:324 apps/transactions/forms.py:758
+#: apps/transactions/models.py:253 apps/transactions/models.py:344
+#: apps/transactions/models.py:1473
msgid "Mute"
msgstr ""
-#: apps/rules/forms.py:215
+#: apps/rules/forms.py:216
msgid "Search Criteria"
msgstr ""
-#: apps/rules/forms.py:360
+#: apps/rules/forms.py:361
msgid "Set Values"
msgstr ""
-#: apps/rules/forms.py:407 apps/rules/forms.py:442 apps/rules/forms.py:477
-#: apps/transactions/models.py:422 apps/transactions/models.py:667
+#: apps/rules/forms.py:409 apps/rules/forms.py:444 apps/rules/forms.py:479
+#: apps/transactions/models.py:424 apps/transactions/models.py:703
+#: apps/transactions/models.py:763
msgid "Transaction"
msgstr ""
-#: apps/rules/forms.py:411 apps/rules/forms.py:446 apps/rules/forms.py:481
+#: apps/rules/forms.py:413 apps/rules/forms.py:448 apps/rules/forms.py:483
msgid "Type to search for a transaction"
msgstr ""
-#: apps/rules/forms.py:422 apps/rules/forms.py:457 apps/rules/forms.py:491
+#: apps/rules/forms.py:424 apps/rules/forms.py:459 apps/rules/forms.py:493
#: templates/rules/fragments/transaction_rule/dry_run/created.html:5
#: templates/rules/fragments/transaction_rule/dry_run/deleted.html:5
#: templates/rules/fragments/transaction_rule/dry_run/updated.html:5
@@ -1610,15 +1637,15 @@ msgstr ""
msgid "Transaction rule"
msgstr ""
-#: apps/rules/models.py:54 apps/rules/models.py:98
+#: apps/rules/models.py:55 apps/rules/models.py:99
msgid "Rule"
msgstr ""
-#: apps/rules/models.py:59
+#: apps/rules/models.py:60
msgid "Field"
msgstr ""
-#: apps/rules/models.py:61 templates/investments/fragments/charts.html:86
+#: apps/rules/models.py:62 templates/investments/fragments/charts.html:86
#: templates/investments/fragments/detail.html:68
#: templates/investments/fragments/detail.html:127
#: templates/investments/fragments/detail.html:245
@@ -1626,57 +1653,57 @@ msgstr ""
msgid "Value"
msgstr ""
-#: apps/rules/models.py:69
+#: apps/rules/models.py:70
msgid "Edit transaction actions"
msgstr ""
-#: apps/rules/models.py:84
+#: apps/rules/models.py:85
msgid "is exactly"
msgstr ""
-#: apps/rules/models.py:85
+#: apps/rules/models.py:86
msgid "contains"
msgstr ""
-#: apps/rules/models.py:86
+#: apps/rules/models.py:87
msgid "starts with"
msgstr ""
-#: apps/rules/models.py:87
+#: apps/rules/models.py:88
msgid "ends with"
msgstr ""
-#: apps/rules/models.py:88
+#: apps/rules/models.py:89
msgid "equals"
msgstr ""
-#: apps/rules/models.py:89
+#: apps/rules/models.py:90
msgid "greater than"
msgstr ""
-#: apps/rules/models.py:90
+#: apps/rules/models.py:91
msgid "less than"
msgstr ""
-#: apps/rules/models.py:91
+#: apps/rules/models.py:92
msgid "greater than or equal"
msgstr ""
-#: apps/rules/models.py:92
+#: apps/rules/models.py:93
msgid "less than or equal"
msgstr ""
-#: apps/rules/models.py:102
+#: apps/rules/models.py:103
msgid "Filter"
msgstr ""
-#: apps/rules/models.py:105
+#: apps/rules/models.py:106
msgid ""
"Generic expression to enable or disable execution. Should evaluate to True "
"or False"
msgstr ""
-#: apps/rules/models.py:326
+#: apps/rules/models.py:331
msgid "Update or create transaction action"
msgstr ""
@@ -1720,8 +1747,8 @@ msgstr ""
msgid "Update or Create Transaction action deleted successfully"
msgstr ""
-#: apps/transactions/filters.py:23 templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/transactions/filters.py:24 templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/insights/fragments/overview/index.html:68
#: templates/net_worth/net_worth.html:39 templates/net_worth/net_worth.html:43
#: templates/transactions/widgets/paid_toggle_button.html:7
@@ -1729,160 +1756,170 @@ msgstr ""
msgid "Projected"
msgstr ""
-#: apps/transactions/filters.py:28 templates/categories/fragments/table.html:18
+#: apps/transactions/filters.py:29 templates/categories/fragments/table.html:18
msgid "Muted"
msgstr ""
-#: apps/transactions/filters.py:51
+#: apps/transactions/filters.py:67 apps/transactions/filters.py:144
msgid "Content"
msgstr ""
-#: apps/transactions/filters.py:57
+#: apps/transactions/filters.py:73
msgid "Transaction Type"
msgstr ""
-#: apps/transactions/filters.py:95
+#: apps/transactions/filters.py:111
msgid "Mute Status"
msgstr ""
-#: apps/transactions/filters.py:100
+#: apps/transactions/filters.py:116
msgid "Date from"
msgstr ""
-#: apps/transactions/filters.py:105 apps/transactions/filters.py:115
+#: apps/transactions/filters.py:121 apps/transactions/filters.py:131
msgid "Until"
msgstr ""
-#: apps/transactions/filters.py:110
+#: apps/transactions/filters.py:126
msgid "Reference date from"
msgstr ""
-#: apps/transactions/filters.py:120
+#: apps/transactions/filters.py:136
msgid "Amount min"
msgstr ""
-#: apps/transactions/filters.py:125
+#: apps/transactions/filters.py:141
msgid "Amount max"
msgstr ""
-#: apps/transactions/filters.py:208
+#: apps/transactions/filters.py:240
+msgid "Include"
+msgstr ""
+
+#: apps/transactions/filters.py:245
+msgid "Exclude"
+msgstr ""
+
+#: apps/transactions/filters.py:293
msgid "Categorized"
msgstr ""
-#: apps/transactions/filters.py:215
+#: apps/transactions/filters.py:303
msgid "Tagged"
msgstr ""
-#: apps/transactions/filters.py:221
+#: apps/transactions/filters.py:310
msgid "Any entity"
msgstr ""
-#: apps/transactions/forms.py:192
+#: apps/transactions/forms.py:277
msgid "More"
msgstr ""
-#: apps/transactions/forms.py:229
+#: apps/transactions/forms.py:314
msgid "Save and add similar"
msgstr ""
-#: apps/transactions/forms.py:234
+#: apps/transactions/forms.py:319
msgid "Save and add another"
msgstr ""
-#: apps/transactions/forms.py:271 templates/cotton/transaction/item.html:184
+#: apps/transactions/forms.py:356 templates/cotton/transaction/item.html:186
#: templates/transactions/fragments/attachments.html:4
msgid "Attachments"
msgstr ""
-#: apps/transactions/forms.py:272
+#: apps/transactions/forms.py:357
msgid ""
"Files are private and only visible to users with access to this transaction."
msgstr ""
-#: apps/transactions/forms.py:283
+#: apps/transactions/forms.py:368
msgid "Upload"
msgstr ""
-#: apps/transactions/forms.py:355 apps/transactions/forms.py:1120
-#: apps/transactions/models.py:947
+#: apps/transactions/forms.py:440 apps/transactions/forms.py:1210
+#: apps/transactions/models.py:1046
msgid "To account"
msgstr ""
-#: apps/transactions/forms.py:382 apps/transactions/forms.py:675
+#: apps/transactions/forms.py:467 apps/transactions/forms.py:761
msgid "Muted transactions won't be displayed on monthly summaries"
msgstr ""
-#: apps/transactions/forms.py:594
+#: apps/transactions/forms.py:680
msgid "From Amount"
msgstr ""
-#: apps/transactions/forms.py:599
+#: apps/transactions/forms.py:685
msgid "To Amount"
msgstr ""
-#: apps/transactions/forms.py:741 apps/transactions/models.py:992
-#: apps/transactions/models.py:1303 templates/cotton/transaction/item.html:52
-#: templates/cotton/transaction/item.html:60
+#: apps/transactions/forms.py:827 apps/transactions/models.py:1091
+#: apps/transactions/models.py:1450 templates/cotton/transaction/item.html:54
+#: templates/cotton/transaction/item.html:62
+#: templates/cotton/transaction/item.html:272
+#: templates/cotton/transaction/item.html:304
#: templates/cotton/ui/quick_transactions_buttons.html:40
#: templates/cotton/ui/transactions_fab.html:44
msgid "Transfer"
msgstr ""
-#: apps/transactions/forms.py:1005
+#: apps/transactions/forms.py:1095
msgid "Tag name"
msgstr ""
-#: apps/transactions/forms.py:1033
+#: apps/transactions/forms.py:1123
msgid "Entity name"
msgstr ""
-#: apps/transactions/forms.py:1061
+#: apps/transactions/forms.py:1151
msgid "Category name"
msgstr ""
-#: apps/transactions/forms.py:1063
+#: apps/transactions/forms.py:1153
msgid "Muted categories won't be displayed on monthly summaries"
msgstr ""
-#: apps/transactions/forms.py:1228
+#: apps/transactions/forms.py:1319
msgid "future transactions"
msgstr ""
-#: apps/transactions/forms.py:1255
+#: apps/transactions/forms.py:1346
msgid "End date should be after the start date"
msgstr ""
-#: apps/transactions/models.py:256
+#: apps/transactions/models.py:258
msgid ""
"Deactivated categories won't be able to be selected when creating new "
"transactions"
msgstr ""
-#: apps/transactions/models.py:264
+#: apps/transactions/models.py:266
msgid "Transaction Category"
msgstr ""
-#: apps/transactions/models.py:265
+#: apps/transactions/models.py:267
msgid "Transaction Categories"
msgstr ""
-#: apps/transactions/models.py:280
+#: apps/transactions/models.py:282
msgid ""
"Deactivated tags won't be able to be selected when creating new transactions"
msgstr ""
-#: apps/transactions/models.py:288 apps/transactions/models.py:289
+#: apps/transactions/models.py:290 apps/transactions/models.py:291
msgid "Transaction Tags"
msgstr ""
-#: apps/transactions/models.py:304
+#: apps/transactions/models.py:306
msgid ""
"Deactivated entities won't be able to be selected when creating new "
"transactions"
msgstr ""
-#: apps/transactions/models.py:324 apps/transactions/models.py:991
-#: apps/transactions/models.py:1302
+#: apps/transactions/models.py:326 apps/transactions/models.py:1090
+#: apps/transactions/models.py:1449
#: templates/calendar_view/fragments/list.html:42
#: templates/calendar_view/fragments/list.html:44
#: templates/calendar_view/fragments/list.html:52
@@ -1894,14 +1931,14 @@ msgstr ""
#: templates/investments/fragments/detail.html:71
#: templates/investments/fragments/detail.html:175
#: templates/investments/fragments/detail.html:227
-#: templates/investments/fragments/detail.html:318
+#: templates/investments/fragments/detail.html:326
#: templates/mini_tools/simulator.html:66
#: templates/monthly_overview/fragments/monthly_summary.html:42
msgid "Income"
msgstr ""
-#: apps/transactions/models.py:325 apps/transactions/models.py:993
-#: apps/transactions/models.py:1304
+#: apps/transactions/models.py:327 apps/transactions/models.py:1092
+#: apps/transactions/models.py:1451
#: templates/calendar_view/fragments/list.html:46
#: templates/calendar_view/fragments/list.html:48
#: templates/calendar_view/fragments/list.html:56
@@ -1913,192 +1950,190 @@ msgstr ""
msgid "Expense"
msgstr ""
-#: apps/transactions/models.py:380 apps/transactions/models.py:787
-#: templates/cotton/transaction/item.html:260
-#: templates/cotton/transaction/item.html:277
-#: templates/cotton/transaction/item.html:287
+#: apps/transactions/models.py:382 apps/transactions/models.py:883
+#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:289
+#: templates/cotton/transaction/item.html:299
msgid "Installment Plan"
msgstr ""
-#: apps/transactions/models.py:389 apps/transactions/models.py:1067
-#: templates/cotton/transaction/item.html:250
-#: templates/cotton/transaction/item.html:270
+#: apps/transactions/models.py:391 apps/transactions/models.py:1166
+#: templates/cotton/transaction/item.html:252
+#: templates/cotton/transaction/item.html:282
msgid "Recurring Transaction"
msgstr ""
-#: apps/transactions/models.py:397
+#: apps/transactions/models.py:399
msgid "Linked Transaction"
msgstr ""
-#: apps/transactions/models.py:405
+#: apps/transactions/models.py:407
msgid "Deleted"
msgstr ""
-#: apps/transactions/models.py:410
+#: apps/transactions/models.py:412
msgid "Deleted At"
msgstr ""
-#: apps/transactions/models.py:518
+#: apps/transactions/models.py:521
msgid "A transfer needs one expense and one income."
msgstr ""
-#: apps/transactions/models.py:520
+#: apps/transactions/models.py:523
msgid "A transfer needs two different accounts."
msgstr ""
-#: apps/transactions/models.py:524
+#: apps/transactions/models.py:527
msgid "This transaction is already part of another transfer."
msgstr ""
-#: apps/transactions/models.py:613
+#: apps/transactions/models.py:634
msgid "No category"
msgstr ""
-#: apps/transactions/models.py:615
+#: apps/transactions/models.py:636
msgid "No description"
msgstr ""
-#: apps/transactions/models.py:672
+#: apps/transactions/models.py:735
+msgid "Sub-transaction"
+msgstr ""
+
+#: apps/transactions/models.py:768
msgid "File"
msgstr ""
-#: apps/transactions/models.py:674
+#: apps/transactions/models.py:770
msgid "Original Name"
msgstr ""
-#: apps/transactions/models.py:676
+#: apps/transactions/models.py:772
msgid "Content Type"
msgstr ""
-#: apps/transactions/models.py:678
+#: apps/transactions/models.py:774
msgid "Size"
msgstr ""
-#: apps/transactions/models.py:683
+#: apps/transactions/models.py:779
msgid "Uploaded By"
msgstr ""
-#: apps/transactions/models.py:688
+#: apps/transactions/models.py:784
msgid "Transaction Attachment"
msgstr ""
-#: apps/transactions/models.py:689
+#: apps/transactions/models.py:785
msgid "Transaction Attachments"
msgstr ""
-#: apps/transactions/models.py:719 templates/includes/sidebar.html:57
+#: apps/transactions/models.py:815 templates/includes/sidebar.html:57
msgid "Yearly"
msgstr ""
-#: apps/transactions/models.py:720 apps/users/models.py:469
+#: apps/transactions/models.py:816 apps/users/models.py:469
#: templates/includes/sidebar.html:51
msgid "Monthly"
msgstr ""
-#: apps/transactions/models.py:721
+#: apps/transactions/models.py:817
msgid "Weekly"
msgstr ""
-#: apps/transactions/models.py:722
+#: apps/transactions/models.py:818
msgid "Daily"
msgstr ""
-#: apps/transactions/models.py:735
+#: apps/transactions/models.py:831
msgid "Number of Installments"
msgstr ""
-#: apps/transactions/models.py:740
+#: apps/transactions/models.py:836
msgid "Installment Start"
msgstr ""
-#: apps/transactions/models.py:741
+#: apps/transactions/models.py:837
msgid "The installment number to start counting from"
msgstr ""
-#: apps/transactions/models.py:746 apps/transactions/models.py:1037
+#: apps/transactions/models.py:842 apps/transactions/models.py:1136
msgid "Start Date"
msgstr ""
-#: apps/transactions/models.py:750 apps/transactions/models.py:1038
+#: apps/transactions/models.py:846 apps/transactions/models.py:1137
msgid "End Date"
msgstr ""
-#: apps/transactions/models.py:755
+#: apps/transactions/models.py:851
msgid "Recurrence"
msgstr ""
-#: apps/transactions/models.py:758
+#: apps/transactions/models.py:854
msgid "Installment Amount"
msgstr ""
-#: apps/transactions/models.py:777 apps/transactions/models.py:1057
+#: apps/transactions/models.py:873 apps/transactions/models.py:1156
msgid "Add description to transactions"
msgstr ""
-#: apps/transactions/models.py:780 apps/transactions/models.py:1060
+#: apps/transactions/models.py:876 apps/transactions/models.py:1159
msgid "Add notes to transactions"
msgstr ""
-#: apps/transactions/models.py:954
+#: apps/transactions/models.py:1053
msgid "To amount"
msgstr ""
-#: apps/transactions/models.py:955
+#: apps/transactions/models.py:1054
msgid "Leave empty to use the same amount"
msgstr ""
-#: apps/transactions/models.py:996 templates/mini_tools/simulator.html:129
+#: apps/transactions/models.py:1095 templates/mini_tools/simulator.html:129
msgid "day(s)"
msgstr ""
-#: apps/transactions/models.py:997 templates/mini_tools/simulator.html:130
+#: apps/transactions/models.py:1096 templates/mini_tools/simulator.html:130
msgid "week(s)"
msgstr ""
-#: apps/transactions/models.py:998 templates/mini_tools/simulator.html:131
+#: apps/transactions/models.py:1097 templates/mini_tools/simulator.html:131
msgid "month(s)"
msgstr ""
-#: apps/transactions/models.py:999 templates/mini_tools/simulator.html:132
+#: apps/transactions/models.py:1098 templates/mini_tools/simulator.html:132
msgid "year(s)"
msgstr ""
-#: apps/transactions/models.py:1001
+#: apps/transactions/models.py:1100
#: templates/recurring_transactions/fragments/list.html:18
msgid "Paused"
msgstr ""
-#: apps/transactions/models.py:1040
+#: apps/transactions/models.py:1139
msgid "Recurrence Type"
msgstr ""
-#: apps/transactions/models.py:1043
+#: apps/transactions/models.py:1142
msgid "Recurrence Interval"
msgstr ""
-#: apps/transactions/models.py:1046
+#: apps/transactions/models.py:1145
msgid "Keep at most"
msgstr ""
-#: apps/transactions/models.py:1050
+#: apps/transactions/models.py:1149
msgid "Last Generated Date"
msgstr ""
-#: apps/transactions/models.py:1053
+#: apps/transactions/models.py:1152
msgid "Last Generated Reference Date"
msgstr ""
-#: apps/transactions/models.py:1370 templates/cotton/transaction/item.html:243
+#: apps/transactions/models.py:1517 templates/cotton/transaction/item.html:245
#: templates/cotton/ui/transactions_fab.html:59
msgid "Quick Transaction"
msgstr ""
-#: apps/transactions/models.py:1371 templates/includes/sidebar.html:98
-#: templates/quick_transactions/pages/index.html:5
-#: templates/quick_transactions/pages/index.html:15
-msgid "Quick Transactions"
-msgstr ""
-
#: apps/transactions/validators.py:8
#, python-format
msgid "%(value)s has too many decimal places. Maximum is 30."
@@ -2109,35 +2144,43 @@ msgstr ""
msgid "%(value)s is not a non-negative number"
msgstr ""
-#: apps/transactions/views/actions.py:58
+#: apps/transactions/views/actions.py:61
#, python-format
msgid "%(count)s transaction marked as paid"
msgid_plural "%(count)s transactions marked as paid"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:81
+#: apps/transactions/views/actions.py:84
#, python-format
msgid "%(count)s transaction marked as not paid"
msgid_plural "%(count)s transactions marked as not paid"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:105
+#: apps/transactions/views/actions.py:108
#, python-format
msgid "%(count)s transaction deleted successfully"
msgid_plural "%(count)s transactions deleted successfully"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:139
+#: apps/transactions/views/actions.py:142
#, python-format
msgid "%(count)s transaction restored successfully"
msgid_plural "%(count)s transactions restored successfully"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:170
+#: apps/transactions/views/actions.py:174
+#: apps/transactions/views/transactions.py:423
+#, python-format
+msgid "%(count)s transaction updated successfully"
+msgid_plural "%(count)s transactions updated successfully"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apps/transactions/views/actions.py:247
#, python-format
msgid "%(count)s transaction duplicated successfully"
msgid_plural "%(count)s transactions duplicated successfully"
@@ -2156,33 +2199,41 @@ msgstr ""
msgid "Category deleted successfully"
msgstr ""
-#: apps/transactions/views/conversions.py:72
+#: apps/transactions/views/conversions.py:77
#: apps/transactions/views/quick_transactions.py:46 apps/users/views.py:252
msgid "Item added successfully"
msgstr ""
-#: apps/transactions/views/conversions.py:91
+#: apps/transactions/views/conversions.py:97
msgid "Convert into quick transaction"
msgstr ""
-#: apps/transactions/views/conversions.py:108
+#: apps/transactions/views/conversions.py:114
#: apps/transactions/views/recurring_transactions.py:112
msgid "Recurring Transaction added successfully"
msgstr ""
-#: apps/transactions/views/conversions.py:129
+#: apps/transactions/views/conversions.py:136
msgid "Convert into recurring transaction"
msgstr ""
-#: apps/transactions/views/conversions.py:148
+#: apps/transactions/views/conversions.py:155
#: apps/transactions/views/installment_plans.py:87
msgid "Installment Plan added successfully"
msgstr ""
-#: apps/transactions/views/conversions.py:167
+#: apps/transactions/views/conversions.py:175
msgid "Convert into installment plan"
msgstr ""
+#: apps/transactions/views/conversions.py:195
+msgid "Transaction converted into a transfer"
+msgstr ""
+
+#: apps/transactions/views/conversions.py:226
+msgid "Convert into transfer"
+msgstr ""
+
#: apps/transactions/views/entities.py:72
msgid "Entity added successfully"
msgstr ""
@@ -2215,7 +2266,7 @@ msgstr ""
msgid "Item deleted successfully"
msgstr ""
-#: apps/transactions/views/quick_transactions.py:164
+#: apps/transactions/views/quick_transactions.py:165
#: apps/transactions/views/transactions.py:156
#: apps/transactions/views/transactions.py:343
msgid "Transaction added successfully"
@@ -2265,30 +2316,23 @@ msgstr ""
msgid "Transaction updated successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:421
-#, python-format
-msgid "%(count)s transaction updated successfully"
-msgid_plural "%(count)s transactions updated successfully"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apps/transactions/views/transactions.py:448
+#: apps/transactions/views/transactions.py:450
msgid "Transaction duplicated successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:493
+#: apps/transactions/views/transactions.py:495
msgid "Transaction deleted successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:523
+#: apps/transactions/views/transactions.py:525
msgid "Transaction restored successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:549
+#: apps/transactions/views/transactions.py:551
msgid "Transfer added successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:579
+#: apps/transactions/views/transactions.py:581
msgid "Transfer updated successfully"
msgstr ""
@@ -2606,8 +2650,9 @@ msgstr ""
#: templates/accounts/fragments/list.html:37
#: templates/bank_sync/fragments/list.html:33
#: templates/categories/fragments/table.html:29
-#: templates/cotton/transaction/item.html:178
-#: templates/cotton/ui/transactions_action_bar.html:54
+#: templates/cotton/transaction/item.html:180
+#: templates/cotton/ui/transactions_action_bar.html:56
+#: templates/cotton/ui/transactions_action_bar.html:90
#: templates/currencies/fragments/list.html:34
#: templates/dca/fragments/strategy/details.html:63
#: templates/dca/fragments/strategy/list.html:31
@@ -2618,8 +2663,8 @@ msgstr ""
#: templates/import_app/fragments/profiles/list.html:46
#: templates/installment_plans/fragments/table.html:28
#: templates/investment_classes/fragments/list.html:39
-#: templates/investments/fragments/detail.html:302
-#: templates/investments/fragments/detail.html:330
+#: templates/investments/fragments/detail.html:310
+#: templates/investments/fragments/detail.html:338
#: templates/quick_transactions/fragments/list.html:25
#: templates/recurring_transactions/fragments/table.html:30
#: templates/rules/fragments/transaction_rule/view.html:22
@@ -2656,10 +2701,11 @@ msgstr ""
#: templates/accounts/fragments/list.html:71
#: templates/bank_sync/fragments/list.html:50
#: templates/categories/fragments/table.html:51
-#: templates/cotton/transaction/item.html:190
-#: templates/cotton/transaction/item.html:316
+#: templates/cotton/transaction/item.html:192
+#: templates/cotton/transaction/item.html:333
#: templates/cotton/ui/deleted_transactions_action_bar.html:57
-#: templates/cotton/ui/transactions_action_bar.html:82
+#: templates/cotton/ui/transactions_action_bar.html:75
+#: templates/cotton/ui/transactions_action_bar.html:107
#: templates/currencies/fragments/list.html:40
#: templates/dca/fragments/strategy/details.html:70
#: templates/dca/fragments/strategy/list.html:38
@@ -2690,10 +2736,11 @@ msgstr ""
#: templates/accounts/fragments/list.html:75
#: templates/bank_sync/fragments/list.html:54
#: templates/categories/fragments/table.html:56
-#: templates/cotton/transaction/item.html:192
-#: templates/cotton/transaction/item.html:322
+#: templates/cotton/transaction/item.html:194
+#: templates/cotton/transaction/item.html:339
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:44
#: templates/dca/fragments/strategy/details.html:75
#: templates/dca/fragments/strategy/list.html:42
@@ -2721,10 +2768,11 @@ msgstr ""
#: templates/account_groups/fragments/list.html:59
#: templates/accounts/fragments/list.html:76
#: templates/categories/fragments/table.html:57
-#: templates/cotton/transaction/item.html:193
-#: templates/cotton/transaction/item.html:323
+#: templates/cotton/transaction/item.html:195
+#: templates/cotton/transaction/item.html:340
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:45
#: templates/dca/fragments/strategy/details.html:76
#: templates/dca/fragments/strategy/list.html:43
@@ -2744,8 +2792,8 @@ msgstr ""
#: templates/accounts/fragments/list.html:77
#: templates/bank_sync/fragments/list.html:56
#: templates/categories/fragments/table.html:58
-#: templates/cotton/transaction/item.html:194
-#: templates/cotton/transaction/item.html:324
+#: templates/cotton/transaction/item.html:196
+#: templates/cotton/transaction/item.html:341
#: templates/currencies/fragments/list.html:46
#: templates/dca/fragments/strategy/details.html:77
#: templates/dca/fragments/strategy/list.html:44
@@ -2825,6 +2873,12 @@ msgstr ""
msgid "No accounts"
msgstr ""
+#: templates/accounts/fragments/share.html:8
+msgid ""
+"Everyone who can see this account can add, edit and delete its transactions, "
+"installment plans and recurring transactions."
+msgstr ""
+
#: templates/bank_sync/fragments/accounts.html:31
msgid "No accounts found on this service"
msgstr ""
@@ -2919,63 +2973,75 @@ msgstr ""
msgid "Search"
msgstr ""
-#: templates/cotton/transaction/item.html:12
+#: templates/cotton/transaction/item.html:14
msgid "Select"
msgstr ""
-#: templates/cotton/transaction/item.html:123
+#: templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:100
msgid "From"
msgstr ""
-#: templates/cotton/transaction/item.html:207
-#: templates/cotton/transaction/item.html:218
-#: templates/cotton/transaction/item.html:228
+#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:230
msgid "Show on summaries"
msgstr ""
-#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:211
msgid "Controlled by account"
msgstr ""
-#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:222
msgid "Controlled by category"
msgstr ""
-#: templates/cotton/transaction/item.html:233
+#: templates/cotton/transaction/item.html:235
+#: templates/includes/transactions_bulk_actions.html:15
msgid "Hide from summaries"
msgstr ""
-#: templates/cotton/transaction/item.html:237
+#: templates/cotton/transaction/item.html:239
msgid "Convert"
msgstr ""
-#: templates/cotton/transaction/item.html:252
-#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:254
+#: templates/cotton/transaction/item.html:264
+#: templates/cotton/transaction/item.html:274
msgid "Already part of a plan or recurrence"
msgstr ""
-#: templates/cotton/transaction/item.html:279
+#: templates/cotton/transaction/item.html:291
msgid "Not available for transfers"
msgstr ""
-#: templates/cotton/transaction/item.html:296
+#: templates/cotton/transaction/item.html:313
+#: templates/includes/transactions_bulk_actions.html:22
msgid "Move to previous month"
msgstr ""
-#: templates/cotton/transaction/item.html:300
+#: templates/cotton/transaction/item.html:317
+#: templates/includes/transactions_bulk_actions.html:28
msgid "Move to next month"
msgstr ""
-#: templates/cotton/transaction/item.html:303
+#: templates/cotton/transaction/item.html:320
+#: templates/includes/transactions_bulk_actions.html:33
msgid "Move to today"
msgstr ""
-#: templates/cotton/transaction/item.html:307
-#: templates/cotton/ui/transactions_action_bar.html:78
+#: templates/cotton/transaction/item.html:324
+#: templates/cotton/ui/transactions_action_bar.html:71
+#: templates/cotton/ui/transactions_action_bar.html:98
msgid "Duplicate"
msgstr ""
+#: templates/cotton/transaction/item.html:373
+#, python-format
+msgid "%(counter)s item"
+msgid_plural "%(counter)s items"
+msgstr[0] ""
+
#: templates/cotton/ui/account_card.html:10
#: templates/cotton/ui/currency_card.html:10
msgid "projected income"
@@ -3011,22 +3077,26 @@ msgstr ""
msgid "final total"
msgstr ""
-#: templates/cotton/ui/deleted_transactions_action_bar.html:34
-#: templates/cotton/ui/transactions_action_bar.html:34
-msgid "Select All"
-msgstr ""
-
-#: templates/cotton/ui/deleted_transactions_action_bar.html:40
-#: templates/cotton/ui/transactions_action_bar.html:40
+#: templates/cotton/ui/deleted_transactions_action_bar.html:25
+#: templates/cotton/ui/deleted_transactions_action_bar.html:26
+#: templates/cotton/ui/transactions_action_bar.html:25
+#: templates/cotton/ui/transactions_action_bar.html:26
msgid "Unselect All"
msgstr ""
-#: templates/cotton/ui/deleted_transactions_action_bar.html:46
-msgid "Invert election"
+#: templates/cotton/ui/deleted_transactions_action_bar.html:39
+#: templates/cotton/ui/transactions_action_bar.html:39
+msgid "Select All"
+msgstr ""
+
+#: templates/cotton/ui/deleted_transactions_action_bar.html:45
+#: templates/cotton/ui/transactions_action_bar.html:45
+msgid "Invert selection"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:59
-#: templates/cotton/ui/transactions_action_bar.html:84
+#: templates/cotton/ui/transactions_action_bar.html:77
+#: templates/cotton/ui/transactions_action_bar.html:106
msgid "Yes, delete them!"
msgstr ""
@@ -3037,43 +3107,43 @@ msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:166
#: templates/cotton/ui/deleted_transactions_action_bar.html:182
#: templates/cotton/ui/deleted_transactions_action_bar.html:198
-#: templates/cotton/ui/transactions_action_bar.html:128
-#: templates/cotton/ui/transactions_action_bar.html:143
-#: templates/cotton/ui/transactions_action_bar.html:159
-#: templates/cotton/ui/transactions_action_bar.html:175
-#: templates/cotton/ui/transactions_action_bar.html:191
-#: templates/cotton/ui/transactions_action_bar.html:207
-#: templates/cotton/ui/transactions_action_bar.html:223
+#: templates/cotton/ui/transactions_action_bar.html:153
+#: templates/cotton/ui/transactions_action_bar.html:168
+#: templates/cotton/ui/transactions_action_bar.html:184
+#: templates/cotton/ui/transactions_action_bar.html:200
+#: templates/cotton/ui/transactions_action_bar.html:216
+#: templates/cotton/ui/transactions_action_bar.html:232
+#: templates/cotton/ui/transactions_action_bar.html:248
msgid "copied!"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:123
-#: templates/cotton/ui/transactions_action_bar.html:148
+#: templates/cotton/ui/transactions_action_bar.html:173
msgid "Flat Total"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:139
-#: templates/cotton/ui/transactions_action_bar.html:164
+#: templates/cotton/ui/transactions_action_bar.html:189
msgid "Real Total"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:155
-#: templates/cotton/ui/transactions_action_bar.html:180
+#: templates/cotton/ui/transactions_action_bar.html:205
msgid "Mean"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:171
-#: templates/cotton/ui/transactions_action_bar.html:196
+#: templates/cotton/ui/transactions_action_bar.html:221
msgid "Max"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:187
-#: templates/cotton/ui/transactions_action_bar.html:212
+#: templates/cotton/ui/transactions_action_bar.html:237
msgid "Min"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:203
-#: templates/cotton/ui/transactions_action_bar.html:228
+#: templates/cotton/ui/transactions_action_bar.html:253
msgid "Count"
msgstr ""
@@ -3097,16 +3167,8 @@ msgstr ""
msgid "Balance"
msgstr ""
-#: templates/cotton/ui/transactions_action_bar.html:46
-msgid "Invert selection"
-msgstr ""
-
-#: templates/cotton/ui/transactions_action_bar.html:66
-msgid "Mark as unpaid"
-msgstr ""
-
-#: templates/cotton/ui/transactions_action_bar.html:71
-msgid "Mark as paid"
+#: templates/cotton/ui/transactions_action_bar.html:83
+msgid "More actions"
msgstr ""
#: templates/currencies/fragments/add.html:5
@@ -3537,6 +3599,14 @@ msgstr ""
msgid "Calculator"
msgstr ""
+#: templates/includes/transactions_bulk_actions.html:4
+msgid "Mark as unpaid"
+msgstr ""
+
+#: templates/includes/transactions_bulk_actions.html:9
+msgid "Mark as paid"
+msgstr ""
+
#: templates/insights/fragments/category_explorer/charts/account.html:100
#: templates/insights/fragments/category_explorer/charts/currency.html:92
#: templates/monthly_overview/fragments/monthly_account_summary.html:14
@@ -3602,6 +3672,7 @@ msgstr ""
#: templates/insights/fragments/year_by_year.html:140
#: templates/investment_classes/fragments/list.html:65
#: templates/monthly_overview/fragments/monthly_summary.html:168
+#: templates/transactions/widgets/sub_transactions.html:55
msgid "Total"
msgstr ""
@@ -4004,11 +4075,11 @@ msgstr ""
msgid "Loss, tax or fee"
msgstr ""
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
msgid "No movements yet"
msgstr ""
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
msgid "Use the + button to buy or contribute"
msgstr ""
@@ -4563,6 +4634,10 @@ msgstr ""
msgid "Deleted transactions"
msgstr ""
+#: templates/transactions/widgets/sub_transactions.html:53
+msgid "Add sub-transaction"
+msgstr ""
+
#: templates/transactions/widgets/unselectable_income_expense_toggle_buttons.html:11
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:7
msgid "Unchanged"
diff --git a/app/locale/it/LC_MESSAGES/django.po b/app/locale/it/LC_MESSAGES/django.po
index 8b366002..9fd3e258 100644
--- a/app/locale/it/LC_MESSAGES/django.po
+++ b/app/locale/it/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-11-12 03:24+0000\n"
+"POT-Creation-Date: 2026-11-14 14:06+0000\n"
"PO-Revision-Date: 2025-12-28 22:24+0000\n"
"Last-Translator: icovada \n"
"Language-Team: Italian Public: Shown for all users. Only editable by the owner."
msgid ""
-"Private: Only shown for the owner and shared users. Only editable by the "
-"owner. Public: Shown for all users. Only editable by the owner."
+"Private: Only shown for the owner and shared users. Public: Shown for "
+"all users. Only the owner can edit, share or delete it."
msgstr ""
"Privato: visibile solo al proprietario e agli utenti con cui è condiviso. "
"Modificabile solo dal proprietario. Pubblico: visibile da tutti gli "
"utenti. Modificabile solo dal proprietario."
-#: apps/common/forms.py:76 apps/users/forms.py:191
+#: apps/common/forms.py:78 apps/users/forms.py:191
#: templates/bank_sync/fragments/accounts.html:34
#: templates/transactions/fragments/filter_actions.html:5
msgid "Save"
msgstr "Salva"
-#: apps/common/forms.py:90
+#: apps/common/forms.py:92
msgid "You cannot share this item with its owner."
msgstr "Non puoi condividere questo elemento con il suo proprietario."
@@ -844,6 +861,7 @@ msgid "Now"
msgstr "Adesso"
#: apps/common/widgets/tom_select.py:14
+#: templates/transactions/widgets/sub_transaction_row.html:9
msgid "Remove"
msgstr "Rimuovi"
@@ -920,8 +938,8 @@ msgstr "Data e ora"
msgid "Auto"
msgstr "Automatico"
-#: apps/currencies/models.py:91 apps/export_app/forms.py:67
-#: apps/export_app/forms.py:152 templates/exchange_rates/fragments/list.html:10
+#: apps/currencies/models.py:91 apps/export_app/forms.py:73
+#: apps/export_app/forms.py:161 templates/exchange_rates/fragments/list.html:10
#: templates/exchange_rates/pages/index.html:4
#: templates/includes/sidebar.html:204
msgid "Exchange Rates"
@@ -1085,25 +1103,25 @@ msgstr "Servizi accodati con successo"
msgid "Create transaction"
msgstr "Crea transazione"
-#: apps/dca/forms.py:69 apps/transactions/forms.py:582
+#: apps/dca/forms.py:69 apps/transactions/forms.py:668
msgid "From Account"
msgstr "Da conto"
-#: apps/dca/forms.py:75 apps/transactions/forms.py:587
+#: apps/dca/forms.py:75 apps/transactions/forms.py:673
msgid "To Account"
msgstr "A conto"
#: apps/dca/forms.py:117 apps/dca/forms.py:125 apps/export_app/forms.py:49
-#: apps/export_app/forms.py:143 apps/insights/views.py:57
-#: apps/rules/forms.py:185 apps/rules/forms.py:195 apps/rules/models.py:46
-#: apps/rules/models.py:307 apps/transactions/filters.py:84
-#: apps/transactions/forms.py:78 apps/transactions/forms.py:346
-#: apps/transactions/forms.py:526 apps/transactions/forms.py:640
-#: apps/transactions/forms.py:647 apps/transactions/forms.py:862
-#: apps/transactions/forms.py:1114 apps/transactions/models.py:313
-#: apps/transactions/models.py:369 apps/transactions/models.py:770
-#: apps/transactions/models.py:1028 apps/transactions/models.py:1353
-#: templates/entities/fragments/list.html:9
+#: apps/export_app/forms.py:150 apps/insights/views.py:57
+#: apps/rules/forms.py:185 apps/rules/forms.py:196 apps/rules/models.py:47
+#: apps/rules/models.py:308 apps/transactions/filters.py:100
+#: apps/transactions/filters.py:175 apps/transactions/forms.py:161
+#: apps/transactions/forms.py:431 apps/transactions/forms.py:612
+#: apps/transactions/forms.py:726 apps/transactions/forms.py:733
+#: apps/transactions/forms.py:950 apps/transactions/forms.py:1204
+#: apps/transactions/models.py:315 apps/transactions/models.py:371
+#: apps/transactions/models.py:866 apps/transactions/models.py:1127
+#: apps/transactions/models.py:1500 templates/entities/fragments/list.html:9
#: templates/entities/pages/index.html:4 templates/includes/sidebar.html:168
#: templates/insights/fragments/month_by_month.html:40
#: templates/insights/fragments/month_by_month.html:43
@@ -1139,8 +1157,8 @@ msgstr "Gli importi delle transazioni sono nascosti"
msgid "You must provide an account."
msgstr "Devi fornire un conto."
-#: apps/dca/forms.py:322 apps/transactions/forms.py:780
-#: apps/transactions/models.py:978
+#: apps/dca/forms.py:322 apps/transactions/forms.py:866
+#: apps/transactions/models.py:1077
msgid "From and To accounts must be different."
msgstr "I conti di origine e destinazione devono essere diversi."
@@ -1158,10 +1176,10 @@ msgid "Payment Currency"
msgstr "Valuta di pagamento"
#: apps/dca/models.py:26 apps/dca/models.py:181 apps/rules/forms.py:180
-#: apps/rules/forms.py:196 apps/rules/models.py:43 apps/rules/models.py:295
-#: apps/transactions/forms.py:504 apps/transactions/forms.py:668
-#: apps/transactions/models.py:354 apps/transactions/models.py:774
-#: apps/transactions/models.py:1031 apps/transactions/models.py:1338
+#: apps/rules/forms.py:197 apps/rules/models.py:44 apps/rules/models.py:296
+#: apps/transactions/forms.py:590 apps/transactions/forms.py:754
+#: apps/transactions/models.py:356 apps/transactions/models.py:870
+#: apps/transactions/models.py:1130 apps/transactions/models.py:1485
msgid "Notes"
msgstr "Note"
@@ -1169,7 +1187,7 @@ msgstr "Note"
msgid "DCA Strategy"
msgstr "Piano d'Accumulo del Capitale"
-#: apps/dca/models.py:35 apps/export_app/forms.py:166
+#: apps/dca/models.py:35 apps/export_app/forms.py:175
msgid "DCA Strategies"
msgstr "Piani d'Accumulo del Capitale"
@@ -1189,7 +1207,7 @@ msgstr "Importo ricevuto"
msgid "DCA Entry"
msgstr "Rata del PAC"
-#: apps/dca/models.py:187 apps/export_app/forms.py:167
+#: apps/dca/models.py:187 apps/export_app/forms.py:176
msgid "DCA Entries"
msgstr "Rate del PAC"
@@ -1217,14 +1235,14 @@ msgstr "Voce aggiornata con successo"
msgid "Entry deleted successfully"
msgstr "Voce eliminata con successo"
-#: apps/export_app/forms.py:13 apps/export_app/forms.py:137
+#: apps/export_app/forms.py:13 apps/export_app/forms.py:144
#: templates/includes/sidebar.html:247 templates/users/fragments/list.html:10
#: templates/users/pages/index.html:4
msgid "Users"
msgstr "Utenti"
-#: apps/export_app/forms.py:31 apps/export_app/forms.py:144
-#: apps/transactions/models.py:423 templates/includes/sidebar.html:81
+#: apps/export_app/forms.py:31 apps/export_app/forms.py:151
+#: apps/transactions/models.py:425 templates/includes/sidebar.html:81
#: templates/includes/sidebar.html:154
#: templates/recurring_transactions/fragments/list_transactions.html:5
#: templates/recurring_transactions/fragments/table.html:37
@@ -1232,9 +1250,9 @@ msgstr "Utenti"
msgid "Transactions"
msgstr "Transazioni"
-#: apps/export_app/forms.py:37 apps/export_app/forms.py:141
-#: apps/insights/views.py:43 apps/transactions/filters.py:74
-#: templates/categories/fragments/list.html:9
+#: apps/export_app/forms.py:37 apps/export_app/forms.py:148
+#: apps/insights/views.py:43 apps/transactions/filters.py:90
+#: apps/transactions/filters.py:165 templates/categories/fragments/list.html:9
#: templates/categories/pages/index.html:4 templates/includes/sidebar.html:156
#: templates/insights/fragments/month_by_month.html:18
#: templates/insights/fragments/month_by_month.html:21
@@ -1243,102 +1261,117 @@ msgstr "Transazioni"
msgid "Categories"
msgstr "Categorie"
-#: apps/export_app/forms.py:55 apps/export_app/forms.py:147
-#: apps/transactions/models.py:1068 templates/includes/sidebar.html:110
+#: apps/export_app/forms.py:55 apps/export_app/forms.py:155
+#: apps/transactions/models.py:1167 templates/includes/sidebar.html:110
#: templates/recurring_transactions/fragments/list.html:9
#: templates/recurring_transactions/pages/index.html:4
msgid "Recurring Transactions"
msgstr "Pagamenti ricorrenti"
-#: apps/export_app/forms.py:61 apps/export_app/forms.py:145
-#: apps/transactions/models.py:788 templates/includes/sidebar.html:104
+#: apps/export_app/forms.py:61 apps/export_app/forms.py:153
+#: apps/transactions/models.py:884 templates/includes/sidebar.html:104
#: templates/installment_plans/fragments/list.html:9
#: templates/installment_plans/pages/index.html:4
msgid "Installment Plans"
msgstr "Pagamenti a rate"
-#: apps/export_app/forms.py:73 apps/export_app/forms.py:150
+#: apps/export_app/forms.py:67 apps/export_app/forms.py:157
+#: apps/transactions/models.py:1518 templates/includes/sidebar.html:98
+#: templates/quick_transactions/pages/index.html:5
+#: templates/quick_transactions/pages/index.html:15
+msgid "Quick Transactions"
+msgstr "Transazioni rapide"
+
+#: apps/export_app/forms.py:79 apps/export_app/forms.py:159
#: templates/exchange_rates_services/fragments/list.html:10
#: templates/exchange_rates_services/pages/index.html:4
#: templates/includes/sidebar.html:232
msgid "Automatic Exchange Rates"
msgstr "Cambio valuta automatico"
-#: apps/export_app/forms.py:79 templates/bank_sync/fragments/list.html:8
+#: apps/export_app/forms.py:85 templates/bank_sync/fragments/list.html:8
#: templates/bank_sync/pages/index.html:4 templates/includes/sidebar.html:238
msgid "Bank Sync"
msgstr ""
-#: apps/export_app/forms.py:80
+#: apps/export_app/forms.py:86
msgid "Includes the providers' API keys"
msgstr ""
-#: apps/export_app/forms.py:86 templates/includes/sidebar.html:212
+#: apps/export_app/forms.py:92 templates/includes/sidebar.html:212
#: templates/rules/fragments/list.html:9 templates/rules/pages/index.html:4
msgid "Rules"
msgstr "Regole"
-#: apps/export_app/forms.py:92 templates/cotton/transaction/item.html:66
+#: apps/export_app/forms.py:98 templates/cotton/transaction/item.html:68
msgid "DCA"
msgstr "Piano d'Accumulo del Capitale"
-#: apps/export_app/forms.py:98 apps/export_app/forms.py:168
+#: apps/export_app/forms.py:104 apps/export_app/forms.py:177
#: templates/import_app/fragments/profiles/list.html:21
#: templates/import_app/pages/profiles_index.html:4
msgid "Import Profiles"
msgstr "Importa Profili"
-#: apps/export_app/forms.py:126 templates/export_app/fragments/export.html:5
+#: apps/export_app/forms.py:133 templates/export_app/fragments/export.html:5
#: templates/export_app/pages/index.html:13
msgid "Export"
msgstr "Esporta"
-#: apps/export_app/forms.py:134
+#: apps/export_app/forms.py:141
msgid "Import a ZIP file exported from WYGIWYH"
msgstr "Importa un file ZIP esportato da WYGIWYH"
-#: apps/export_app/forms.py:135
+#: apps/export_app/forms.py:142
msgid "ZIP File"
msgstr "File ZIP"
-#: apps/export_app/forms.py:157
+#: apps/export_app/forms.py:152 apps/rules/forms.py:193 apps/rules/models.py:42
+#: apps/rules/models.py:320 apps/transactions/models.py:736
+#: templates/transactions/widgets/sub_transactions.html:39
+#, fuzzy
+#| msgid "transactions"
+msgid "Sub-transactions"
+msgstr "transazioni"
+
+#: apps/export_app/forms.py:166
#, fuzzy
#| msgid "By account"
msgid "Bank Sync Accounts"
msgstr "Per conto"
-#: apps/export_app/forms.py:159 apps/rules/models.py:27
+#: apps/export_app/forms.py:168 apps/rules/models.py:27
msgid "Transaction rules"
msgstr "Regole di transazione"
-#: apps/export_app/forms.py:161 apps/rules/models.py:68
+#: apps/export_app/forms.py:170 apps/rules/models.py:69
msgid "Edit transaction action"
msgstr "Modifica azione transazione"
-#: apps/export_app/forms.py:164 apps/rules/models.py:327
+#: apps/export_app/forms.py:173 apps/rules/models.py:332
msgid "Update or create transaction actions"
msgstr "Aggiorna o crea azioni di transazione"
-#: apps/export_app/forms.py:199 templates/cotton/transaction/item.html:310
+#: apps/export_app/forms.py:210 templates/cotton/transaction/item.html:327
#: templates/cotton/ui/deleted_transactions_action_bar.html:53
#: templates/export_app/fragments/restore.html:5
#: templates/export_app/pages/index.html:19
msgid "Restore"
msgstr "Ripristina"
-#: apps/export_app/forms.py:209
+#: apps/export_app/forms.py:220
msgid "Please upload either a ZIP file or at least one CSV file"
msgstr "Carica un file ZIP o CSV"
-#: apps/export_app/views.py:190
+#: apps/export_app/views.py:216
msgid "You have to select at least one export"
msgstr "Devi selezionare almeno un export"
-#: apps/export_app/views.py:210
+#: apps/export_app/views.py:236
msgid "Data restored successfully"
msgstr "Dati ripristinati con successo"
-#: apps/export_app/views.py:222
+#: apps/export_app/views.py:248
msgid ""
"There was an error restoring your data. Check the logs for more details."
msgstr ""
@@ -1427,7 +1460,7 @@ msgstr "Esecuzione eliminata con successo"
#: apps/insights/forms.py:118 apps/insights/utils/sankey.py:36
#: apps/insights/utils/sankey.py:167 apps/insights/views.py:45
-#: apps/transactions/filters.py:209
+#: apps/transactions/filters.py:294
#: templates/insights/fragments/month_by_month.html:119
#: templates/insights/fragments/year_by_year.html:73
msgid "Uncategorized"
@@ -1486,24 +1519,24 @@ msgstr "Nessuna categoria"
msgid "Tag"
msgstr "Tag"
-#: apps/insights/views.py:52 apps/transactions/filters.py:215
+#: apps/insights/views.py:52 apps/transactions/filters.py:303
#: templates/insights/fragments/month_by_month.html:121
#: templates/insights/fragments/year_by_year.html:75
msgid "Untagged"
msgstr "Senza tag"
-#: apps/insights/views.py:53 apps/transactions/models.py:611
+#: apps/insights/views.py:53 apps/transactions/models.py:632
#: templates/tags/fragments/table.html:69
msgid "No tags"
msgstr "Nessun tag"
-#: apps/insights/views.py:58 apps/transactions/models.py:312
+#: apps/insights/views.py:58 apps/transactions/models.py:314
#: templates/insights/fragments/month_by_month.html:88
#: templates/insights/fragments/year_by_year.html:56
msgid "Entity"
msgstr "Beneficiari"
-#: apps/insights/views.py:59 apps/transactions/filters.py:222
+#: apps/insights/views.py:59 apps/transactions/filters.py:311
#: templates/insights/fragments/month_by_month.html:123
#: templates/insights/fragments/year_by_year.html:77
msgid "No entity"
@@ -1521,19 +1554,19 @@ msgstr ""
msgid "Unclassified"
msgstr ""
-#: apps/investments/views.py:289
+#: apps/investments/views.py:290
#, fuzzy
#| msgid "Installment Plan added successfully"
msgid "Asset class added successfully"
msgstr "Piano di rateizzazione aggiunto correttamente"
-#: apps/investments/views.py:297
+#: apps/investments/views.py:298
#, fuzzy
#| msgid "Tag updated successfully"
msgid "Asset class updated successfully"
msgstr "Tag aggiornato con successo"
-#: apps/investments/views.py:318
+#: apps/investments/views.py:319
#, fuzzy
#| msgid "Tag deleted successfully"
msgid "Asset class deleted successfully"
@@ -1569,13 +1602,13 @@ msgstr ""
msgid "Set field"
msgstr "Imposta campo"
-#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:123
+#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:101
msgid "To"
msgstr "A"
#: apps/rules/forms.py:78 apps/rules/forms.py:158 apps/rules/models.py:20
-#: apps/rules/models.py:62 apps/rules/models.py:323
+#: apps/rules/models.py:63 apps/rules/models.py:328
#: templates/rules/fragments/list.html:23
msgid "Order"
msgstr "Ordine"
@@ -1593,36 +1626,37 @@ msgid "Operator"
msgstr "Operatore"
#: apps/rules/forms.py:174 apps/rules/forms.py:188 apps/rules/models.py:36
-#: apps/rules/models.py:271 apps/transactions/forms.py:468
-#: apps/transactions/models.py:337 apps/transactions/models.py:730
-#: apps/transactions/models.py:1009 apps/transactions/models.py:1323
+#: apps/rules/models.py:272 apps/transactions/forms.py:554
+#: apps/transactions/models.py:339 apps/transactions/models.py:826
+#: apps/transactions/models.py:1108 apps/transactions/models.py:1470
#: templates/mini_tools/simulator.html:63
msgid "Type"
msgstr "Tipo"
#: apps/rules/forms.py:175 apps/rules/forms.py:189 apps/rules/models.py:37
-#: apps/rules/models.py:275 apps/transactions/filters.py:22
-#: apps/transactions/forms.py:472 apps/transactions/forms.py:650
-#: apps/transactions/models.py:339 apps/transactions/models.py:1325
-#: templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/rules/models.py:276 apps/transactions/filters.py:23
+#: apps/transactions/forms.py:558 apps/transactions/forms.py:736
+#: apps/transactions/models.py:341 apps/transactions/models.py:1472
+#: templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/transactions/widgets/paid_toggle_button.html:10
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:13
msgid "Paid"
msgstr "Pagato"
#: apps/rules/forms.py:177 apps/rules/forms.py:191 apps/rules/models.py:39
-#: apps/rules/models.py:283 apps/transactions/forms.py:90
-#: apps/transactions/forms.py:488 apps/transactions/forms.py:655
-#: apps/transactions/forms.py:868 apps/transactions/models.py:341
-#: apps/transactions/models.py:748 apps/transactions/models.py:1033
+#: apps/rules/models.py:284 apps/transactions/forms.py:173
+#: apps/transactions/forms.py:574 apps/transactions/forms.py:741
+#: apps/transactions/forms.py:956 apps/transactions/models.py:343
+#: apps/transactions/models.py:844 apps/transactions/models.py:1132
msgid "Reference Date"
msgstr "Data di riferimento"
#: apps/rules/forms.py:178 apps/rules/forms.py:192 apps/rules/models.py:41
-#: apps/rules/models.py:287 apps/transactions/forms.py:495
-#: apps/transactions/models.py:347 apps/transactions/models.py:1014
-#: apps/transactions/models.py:1331
+#: apps/rules/models.py:288 apps/transactions/forms.py:75
+#: apps/transactions/forms.py:581 apps/transactions/models.py:349
+#: apps/transactions/models.py:730 apps/transactions/models.py:1113
+#: apps/transactions/models.py:1478
#: templates/insights/fragments/sankey.html:102
#: templates/installment_plans/fragments/table.html:18
#: templates/mini_tools/simulator.html:70
@@ -1631,51 +1665,52 @@ msgstr "Data di riferimento"
msgid "Amount"
msgstr "Importo"
-#: apps/rules/forms.py:179 apps/rules/forms.py:193 apps/rules/models.py:14
-#: apps/rules/models.py:42 apps/rules/models.py:291
-#: apps/transactions/forms.py:499 apps/transactions/forms.py:659
-#: apps/transactions/models.py:352 apps/transactions/models.py:732
-#: apps/transactions/models.py:1017 apps/transactions/models.py:1336
+#: apps/rules/forms.py:179 apps/rules/forms.py:194 apps/rules/models.py:14
+#: apps/rules/models.py:43 apps/rules/models.py:292
+#: apps/transactions/forms.py:585 apps/transactions/forms.py:745
+#: apps/transactions/models.py:354 apps/transactions/models.py:828
+#: apps/transactions/models.py:1116 apps/transactions/models.py:1483
msgid "Description"
msgstr "Descrizione"
-#: apps/rules/forms.py:182 apps/rules/forms.py:198 apps/rules/models.py:47
-#: apps/rules/models.py:299 apps/transactions/models.py:399
-#: apps/transactions/models.py:1358
+#: apps/rules/forms.py:182 apps/rules/forms.py:199 apps/rules/models.py:48
+#: apps/rules/models.py:300 apps/transactions/models.py:401
+#: apps/transactions/models.py:1505
msgid "Internal Note"
msgstr "Note interne"
-#: apps/rules/forms.py:183 apps/rules/forms.py:199 apps/rules/models.py:48
-#: apps/rules/models.py:303 apps/transactions/models.py:401
-#: apps/transactions/models.py:1360
+#: apps/rules/forms.py:183 apps/rules/forms.py:200 apps/rules/models.py:49
+#: apps/rules/models.py:304 apps/transactions/models.py:403
+#: apps/transactions/models.py:1507
msgid "Internal ID"
msgstr "ID Interno"
-#: apps/rules/forms.py:186 apps/rules/forms.py:200 apps/rules/models.py:40
-#: apps/rules/models.py:319 apps/transactions/forms.py:672
-#: apps/transactions/models.py:251 apps/transactions/models.py:342
-#: apps/transactions/models.py:1326
+#: apps/rules/forms.py:186 apps/rules/forms.py:201 apps/rules/models.py:40
+#: apps/rules/models.py:324 apps/transactions/forms.py:758
+#: apps/transactions/models.py:253 apps/transactions/models.py:344
+#: apps/transactions/models.py:1473
msgid "Mute"
msgstr "Silenzia"
-#: apps/rules/forms.py:215
+#: apps/rules/forms.py:216
msgid "Search Criteria"
msgstr "Criteri di ricerca"
-#: apps/rules/forms.py:360
+#: apps/rules/forms.py:361
msgid "Set Values"
msgstr "Imposta Valori"
-#: apps/rules/forms.py:407 apps/rules/forms.py:442 apps/rules/forms.py:477
-#: apps/transactions/models.py:422 apps/transactions/models.py:667
+#: apps/rules/forms.py:409 apps/rules/forms.py:444 apps/rules/forms.py:479
+#: apps/transactions/models.py:424 apps/transactions/models.py:703
+#: apps/transactions/models.py:763
msgid "Transaction"
msgstr "Transazione"
-#: apps/rules/forms.py:411 apps/rules/forms.py:446 apps/rules/forms.py:481
+#: apps/rules/forms.py:413 apps/rules/forms.py:448 apps/rules/forms.py:483
msgid "Type to search for a transaction"
msgstr "Digita per cercare una transazione"
-#: apps/rules/forms.py:422 apps/rules/forms.py:457 apps/rules/forms.py:491
+#: apps/rules/forms.py:424 apps/rules/forms.py:459 apps/rules/forms.py:493
#: templates/rules/fragments/transaction_rule/dry_run/created.html:5
#: templates/rules/fragments/transaction_rule/dry_run/deleted.html:5
#: templates/rules/fragments/transaction_rule/dry_run/updated.html:5
@@ -1695,15 +1730,15 @@ msgstr "Sequenziato"
msgid "Transaction rule"
msgstr "Regola di transazione"
-#: apps/rules/models.py:54 apps/rules/models.py:98
+#: apps/rules/models.py:55 apps/rules/models.py:99
msgid "Rule"
msgstr "Regola"
-#: apps/rules/models.py:59
+#: apps/rules/models.py:60
msgid "Field"
msgstr "Campo"
-#: apps/rules/models.py:61 templates/investments/fragments/charts.html:86
+#: apps/rules/models.py:62 templates/investments/fragments/charts.html:86
#: templates/investments/fragments/detail.html:68
#: templates/investments/fragments/detail.html:127
#: templates/investments/fragments/detail.html:245
@@ -1711,51 +1746,51 @@ msgstr "Campo"
msgid "Value"
msgstr "Valore"
-#: apps/rules/models.py:69
+#: apps/rules/models.py:70
msgid "Edit transaction actions"
msgstr "Modifica le azioni di transazione"
-#: apps/rules/models.py:84
+#: apps/rules/models.py:85
msgid "is exactly"
msgstr "è esattamente"
-#: apps/rules/models.py:85
+#: apps/rules/models.py:86
msgid "contains"
msgstr "contiene"
-#: apps/rules/models.py:86
+#: apps/rules/models.py:87
msgid "starts with"
msgstr "inizia con"
-#: apps/rules/models.py:87
+#: apps/rules/models.py:88
msgid "ends with"
msgstr "finisce con"
-#: apps/rules/models.py:88
+#: apps/rules/models.py:89
msgid "equals"
msgstr "è uguale a"
-#: apps/rules/models.py:89
+#: apps/rules/models.py:90
msgid "greater than"
msgstr "è maggiore di"
-#: apps/rules/models.py:90
+#: apps/rules/models.py:91
msgid "less than"
msgstr "è inferiore di"
-#: apps/rules/models.py:91
+#: apps/rules/models.py:92
msgid "greater than or equal"
msgstr "è maggiore di o uguale a"
-#: apps/rules/models.py:92
+#: apps/rules/models.py:93
msgid "less than or equal"
msgstr "è inferiore di o uguale a"
-#: apps/rules/models.py:102
+#: apps/rules/models.py:103
msgid "Filter"
msgstr "Filtro"
-#: apps/rules/models.py:105
+#: apps/rules/models.py:106
msgid ""
"Generic expression to enable or disable execution. Should evaluate to True "
"or False"
@@ -1763,7 +1798,7 @@ msgstr ""
"Espressione generica per abilitare o disabilitare l'esecuzione. Dovrebbe "
"restituire Vero o Falso"
-#: apps/rules/models.py:326
+#: apps/rules/models.py:331
msgid "Update or create transaction action"
msgstr "Aggiorna o crea un'azione di transazione"
@@ -1807,8 +1842,8 @@ msgstr "Azione Aggiornamento o Creazione transazione aggiornata correttamente"
msgid "Update or Create Transaction action deleted successfully"
msgstr "Azione Aggiornamento o Creazione transazione eliminata correttamente"
-#: apps/transactions/filters.py:23 templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/transactions/filters.py:24 templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/insights/fragments/overview/index.html:68
#: templates/net_worth/net_worth.html:39 templates/net_worth/net_worth.html:43
#: templates/transactions/widgets/paid_toggle_button.html:7
@@ -1816,138 +1851,148 @@ msgstr "Azione Aggiornamento o Creazione transazione eliminata correttamente"
msgid "Projected"
msgstr "Previsto"
-#: apps/transactions/filters.py:28 templates/categories/fragments/table.html:18
+#: apps/transactions/filters.py:29 templates/categories/fragments/table.html:18
msgid "Muted"
msgstr "Silenziato"
-#: apps/transactions/filters.py:51
+#: apps/transactions/filters.py:67 apps/transactions/filters.py:144
msgid "Content"
msgstr "Contenuto"
-#: apps/transactions/filters.py:57
+#: apps/transactions/filters.py:73
msgid "Transaction Type"
msgstr "Tipo di transazione"
-#: apps/transactions/filters.py:95
+#: apps/transactions/filters.py:111
#, fuzzy
#| msgid "Status"
msgid "Mute Status"
msgstr "Stato"
-#: apps/transactions/filters.py:100
+#: apps/transactions/filters.py:116
msgid "Date from"
msgstr "Data da"
-#: apps/transactions/filters.py:105 apps/transactions/filters.py:115
+#: apps/transactions/filters.py:121 apps/transactions/filters.py:131
msgid "Until"
msgstr "Fino a"
-#: apps/transactions/filters.py:110
+#: apps/transactions/filters.py:126
msgid "Reference date from"
msgstr "Data di riferimento da"
-#: apps/transactions/filters.py:120
+#: apps/transactions/filters.py:136
msgid "Amount min"
msgstr "Importo minimo"
-#: apps/transactions/filters.py:125
+#: apps/transactions/filters.py:141
msgid "Amount max"
msgstr "Importo massimo"
-#: apps/transactions/filters.py:208
+#: apps/transactions/filters.py:240
+msgid "Include"
+msgstr ""
+
+#: apps/transactions/filters.py:245
+msgid "Exclude"
+msgstr ""
+
+#: apps/transactions/filters.py:293
msgid "Categorized"
msgstr "Categorizzato"
-#: apps/transactions/filters.py:215
+#: apps/transactions/filters.py:303
msgid "Tagged"
msgstr "Taggato"
-#: apps/transactions/filters.py:221
+#: apps/transactions/filters.py:310
msgid "Any entity"
msgstr "Qualsiasi beneficiario"
-#: apps/transactions/forms.py:192
+#: apps/transactions/forms.py:277
msgid "More"
msgstr "Di più"
-#: apps/transactions/forms.py:229
+#: apps/transactions/forms.py:314
msgid "Save and add similar"
msgstr "Salva e aggiungi simile"
-#: apps/transactions/forms.py:234
+#: apps/transactions/forms.py:319
msgid "Save and add another"
msgstr "Salva e aggiungi un'altra"
-#: apps/transactions/forms.py:271 templates/cotton/transaction/item.html:184
+#: apps/transactions/forms.py:356 templates/cotton/transaction/item.html:186
#: templates/transactions/fragments/attachments.html:4
#, fuzzy
#| msgid "Installments"
msgid "Attachments"
msgstr "Rate"
-#: apps/transactions/forms.py:272
+#: apps/transactions/forms.py:357
msgid ""
"Files are private and only visible to users with access to this transaction."
msgstr ""
-#: apps/transactions/forms.py:283
+#: apps/transactions/forms.py:368
msgid "Upload"
msgstr ""
-#: apps/transactions/forms.py:355 apps/transactions/forms.py:1120
-#: apps/transactions/models.py:947
+#: apps/transactions/forms.py:440 apps/transactions/forms.py:1210
+#: apps/transactions/models.py:1046
#, fuzzy
#| msgid "To Account"
msgid "To account"
msgstr "A conto"
-#: apps/transactions/forms.py:382 apps/transactions/forms.py:675
+#: apps/transactions/forms.py:467 apps/transactions/forms.py:761
msgid "Muted transactions won't be displayed on monthly summaries"
msgstr ""
"Le transazioni silenziate non verranno visualizzate nei riepiloghi mensili"
-#: apps/transactions/forms.py:594
+#: apps/transactions/forms.py:680
msgid "From Amount"
msgstr "Da importo"
-#: apps/transactions/forms.py:599
+#: apps/transactions/forms.py:685
msgid "To Amount"
msgstr "A importo"
-#: apps/transactions/forms.py:741 apps/transactions/models.py:992
-#: apps/transactions/models.py:1303 templates/cotton/transaction/item.html:52
-#: templates/cotton/transaction/item.html:60
+#: apps/transactions/forms.py:827 apps/transactions/models.py:1091
+#: apps/transactions/models.py:1450 templates/cotton/transaction/item.html:54
+#: templates/cotton/transaction/item.html:62
+#: templates/cotton/transaction/item.html:272
+#: templates/cotton/transaction/item.html:304
#: templates/cotton/ui/quick_transactions_buttons.html:40
#: templates/cotton/ui/transactions_fab.html:44
msgid "Transfer"
msgstr "Trasferimento"
-#: apps/transactions/forms.py:1005
+#: apps/transactions/forms.py:1095
msgid "Tag name"
msgstr "Nome tag"
-#: apps/transactions/forms.py:1033
+#: apps/transactions/forms.py:1123
msgid "Entity name"
msgstr "Nome beneficiario"
-#: apps/transactions/forms.py:1061
+#: apps/transactions/forms.py:1151
msgid "Category name"
msgstr "Nome categoria"
-#: apps/transactions/forms.py:1063
+#: apps/transactions/forms.py:1153
msgid "Muted categories won't be displayed on monthly summaries"
msgstr ""
"Le categorie silenziate non verranno visualizzate nei riepiloghi mensili"
-#: apps/transactions/forms.py:1228
+#: apps/transactions/forms.py:1319
msgid "future transactions"
msgstr "transazioni future"
-#: apps/transactions/forms.py:1255
+#: apps/transactions/forms.py:1346
msgid "End date should be after the start date"
msgstr "La data di fine deve essere dopo la data d'inizio"
-#: apps/transactions/models.py:256
+#: apps/transactions/models.py:258
msgid ""
"Deactivated categories won't be able to be selected when creating new "
"transactions"
@@ -1955,26 +2000,26 @@ msgstr ""
"Le categorie disattivate non potranno essere selezionate durante la "
"creazione di nuove transazioni"
-#: apps/transactions/models.py:264
+#: apps/transactions/models.py:266
msgid "Transaction Category"
msgstr "Categoria transazione"
-#: apps/transactions/models.py:265
+#: apps/transactions/models.py:267
msgid "Transaction Categories"
msgstr "Categorie transazione"
-#: apps/transactions/models.py:280
+#: apps/transactions/models.py:282
msgid ""
"Deactivated tags won't be able to be selected when creating new transactions"
msgstr ""
"I tag disattivati non potranno essere selezionati durante la creazione di "
"nuove transazioni"
-#: apps/transactions/models.py:288 apps/transactions/models.py:289
+#: apps/transactions/models.py:290 apps/transactions/models.py:291
msgid "Transaction Tags"
msgstr "Tag di transazione"
-#: apps/transactions/models.py:304
+#: apps/transactions/models.py:306
msgid ""
"Deactivated entities won't be able to be selected when creating new "
"transactions"
@@ -1982,8 +2027,8 @@ msgstr ""
"I beneficiari disattivati non potranno essere selezionati durante la "
"creazione di nuove transazioni"
-#: apps/transactions/models.py:324 apps/transactions/models.py:991
-#: apps/transactions/models.py:1302
+#: apps/transactions/models.py:326 apps/transactions/models.py:1090
+#: apps/transactions/models.py:1449
#: templates/calendar_view/fragments/list.html:42
#: templates/calendar_view/fragments/list.html:44
#: templates/calendar_view/fragments/list.html:52
@@ -1995,14 +2040,14 @@ msgstr ""
#: templates/investments/fragments/detail.html:71
#: templates/investments/fragments/detail.html:175
#: templates/investments/fragments/detail.html:227
-#: templates/investments/fragments/detail.html:318
+#: templates/investments/fragments/detail.html:326
#: templates/mini_tools/simulator.html:66
#: templates/monthly_overview/fragments/monthly_summary.html:42
msgid "Income"
msgstr "Entrate"
-#: apps/transactions/models.py:325 apps/transactions/models.py:993
-#: apps/transactions/models.py:1304
+#: apps/transactions/models.py:327 apps/transactions/models.py:1092
+#: apps/transactions/models.py:1451
#: templates/calendar_view/fragments/list.html:46
#: templates/calendar_view/fragments/list.html:48
#: templates/calendar_view/fragments/list.html:56
@@ -2014,204 +2059,204 @@ msgstr "Entrate"
msgid "Expense"
msgstr "Spesa"
-#: apps/transactions/models.py:380 apps/transactions/models.py:787
-#: templates/cotton/transaction/item.html:260
-#: templates/cotton/transaction/item.html:277
-#: templates/cotton/transaction/item.html:287
+#: apps/transactions/models.py:382 apps/transactions/models.py:883
+#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:289
+#: templates/cotton/transaction/item.html:299
msgid "Installment Plan"
msgstr "Piano di rateizzazione"
-#: apps/transactions/models.py:389 apps/transactions/models.py:1067
-#: templates/cotton/transaction/item.html:250
-#: templates/cotton/transaction/item.html:270
+#: apps/transactions/models.py:391 apps/transactions/models.py:1166
+#: templates/cotton/transaction/item.html:252
+#: templates/cotton/transaction/item.html:282
msgid "Recurring Transaction"
msgstr "Transazione ricorrente"
-#: apps/transactions/models.py:397
+#: apps/transactions/models.py:399
#, fuzzy
#| msgid "Link transaction"
msgid "Linked Transaction"
msgstr "Collega transazione"
-#: apps/transactions/models.py:405
+#: apps/transactions/models.py:407
msgid "Deleted"
msgstr "Eliminato"
-#: apps/transactions/models.py:410
+#: apps/transactions/models.py:412
msgid "Deleted At"
msgstr "Eliminato alle"
-#: apps/transactions/models.py:518
+#: apps/transactions/models.py:521
msgid "A transfer needs one expense and one income."
msgstr ""
-#: apps/transactions/models.py:520
+#: apps/transactions/models.py:523
msgid "A transfer needs two different accounts."
msgstr ""
-#: apps/transactions/models.py:524
+#: apps/transactions/models.py:527
msgid "This transaction is already part of another transfer."
msgstr ""
-#: apps/transactions/models.py:613
+#: apps/transactions/models.py:634
msgid "No category"
msgstr "Nessuna categoria"
-#: apps/transactions/models.py:615
+#: apps/transactions/models.py:636
msgid "No description"
msgstr "Nessuna descrizione"
-#: apps/transactions/models.py:672
+#: apps/transactions/models.py:735
+#, fuzzy
+#| msgid "transactions"
+msgid "Sub-transaction"
+msgstr "transazioni"
+
+#: apps/transactions/models.py:768
#, fuzzy
#| msgid "ZIP File"
msgid "File"
msgstr "File ZIP"
-#: apps/transactions/models.py:674
+#: apps/transactions/models.py:770
msgid "Original Name"
msgstr ""
-#: apps/transactions/models.py:676
+#: apps/transactions/models.py:772
#, fuzzy
#| msgid "Content"
msgid "Content Type"
msgstr "Contenuto"
-#: apps/transactions/models.py:678
+#: apps/transactions/models.py:774
msgid "Size"
msgstr ""
-#: apps/transactions/models.py:683
+#: apps/transactions/models.py:779
msgid "Uploaded By"
msgstr ""
-#: apps/transactions/models.py:688
+#: apps/transactions/models.py:784
#, fuzzy
#| msgid "Transactions on"
msgid "Transaction Attachment"
msgstr "Transazioni del"
-#: apps/transactions/models.py:689
+#: apps/transactions/models.py:785
#, fuzzy
#| msgid "Transaction Tags"
msgid "Transaction Attachments"
msgstr "Tag di transazione"
-#: apps/transactions/models.py:719 templates/includes/sidebar.html:57
+#: apps/transactions/models.py:815 templates/includes/sidebar.html:57
msgid "Yearly"
msgstr "Annuale"
-#: apps/transactions/models.py:720 apps/users/models.py:469
+#: apps/transactions/models.py:816 apps/users/models.py:469
#: templates/includes/sidebar.html:51
msgid "Monthly"
msgstr "Mensile"
-#: apps/transactions/models.py:721
+#: apps/transactions/models.py:817
msgid "Weekly"
msgstr "Settimanale"
-#: apps/transactions/models.py:722
+#: apps/transactions/models.py:818
msgid "Daily"
msgstr "Quotidiana"
-#: apps/transactions/models.py:735
+#: apps/transactions/models.py:831
msgid "Number of Installments"
msgstr "Numero di rate"
-#: apps/transactions/models.py:740
+#: apps/transactions/models.py:836
msgid "Installment Start"
msgstr "Inizio rata"
-#: apps/transactions/models.py:741
+#: apps/transactions/models.py:837
msgid "The installment number to start counting from"
msgstr "Il numero di rata da cui iniziare il conteggio"
-#: apps/transactions/models.py:746 apps/transactions/models.py:1037
+#: apps/transactions/models.py:842 apps/transactions/models.py:1136
msgid "Start Date"
msgstr "Data di inizio"
-#: apps/transactions/models.py:750 apps/transactions/models.py:1038
+#: apps/transactions/models.py:846 apps/transactions/models.py:1137
msgid "End Date"
msgstr "Data di fine"
-#: apps/transactions/models.py:755
+#: apps/transactions/models.py:851
msgid "Recurrence"
msgstr "Ricorrenza"
-#: apps/transactions/models.py:758
+#: apps/transactions/models.py:854
msgid "Installment Amount"
msgstr "Importo della rata"
-#: apps/transactions/models.py:777 apps/transactions/models.py:1057
+#: apps/transactions/models.py:873 apps/transactions/models.py:1156
msgid "Add description to transactions"
msgstr "Aggiungi una descrizione alle transazioni"
-#: apps/transactions/models.py:780 apps/transactions/models.py:1060
+#: apps/transactions/models.py:876 apps/transactions/models.py:1159
msgid "Add notes to transactions"
msgstr "Aggiungi note alle transazioni"
-#: apps/transactions/models.py:954
+#: apps/transactions/models.py:1053
#, fuzzy
#| msgid "To Amount"
msgid "To amount"
msgstr "A importo"
-#: apps/transactions/models.py:955
+#: apps/transactions/models.py:1054
msgid "Leave empty to use the same amount"
msgstr ""
-#: apps/transactions/models.py:996 templates/mini_tools/simulator.html:129
+#: apps/transactions/models.py:1095 templates/mini_tools/simulator.html:129
msgid "day(s)"
msgstr "giorno/i"
-#: apps/transactions/models.py:997 templates/mini_tools/simulator.html:130
+#: apps/transactions/models.py:1096 templates/mini_tools/simulator.html:130
msgid "week(s)"
msgstr "settimana/e"
-#: apps/transactions/models.py:998 templates/mini_tools/simulator.html:131
+#: apps/transactions/models.py:1097 templates/mini_tools/simulator.html:131
msgid "month(s)"
msgstr "mese/i"
-#: apps/transactions/models.py:999 templates/mini_tools/simulator.html:132
+#: apps/transactions/models.py:1098 templates/mini_tools/simulator.html:132
msgid "year(s)"
msgstr "anno/i"
-#: apps/transactions/models.py:1001
+#: apps/transactions/models.py:1100
#: templates/recurring_transactions/fragments/list.html:18
msgid "Paused"
msgstr "In pausa"
-#: apps/transactions/models.py:1040
+#: apps/transactions/models.py:1139
msgid "Recurrence Type"
msgstr "Tipo di ricorrenza"
-#: apps/transactions/models.py:1043
+#: apps/transactions/models.py:1142
msgid "Recurrence Interval"
msgstr "Frequenza"
-#: apps/transactions/models.py:1046
+#: apps/transactions/models.py:1145
msgid "Keep at most"
msgstr "Tieni al massimo"
-#: apps/transactions/models.py:1050
+#: apps/transactions/models.py:1149
msgid "Last Generated Date"
msgstr "Data dell'ultima generazione"
-#: apps/transactions/models.py:1053
+#: apps/transactions/models.py:1152
msgid "Last Generated Reference Date"
msgstr "Data dell'ultimo riferimento generato"
-#: apps/transactions/models.py:1370 templates/cotton/transaction/item.html:243
+#: apps/transactions/models.py:1517 templates/cotton/transaction/item.html:245
#: templates/cotton/ui/transactions_fab.html:59
msgid "Quick Transaction"
msgstr "Transazione rapida"
-#: apps/transactions/models.py:1371 templates/includes/sidebar.html:98
-#: templates/quick_transactions/pages/index.html:5
-#: templates/quick_transactions/pages/index.html:15
-msgid "Quick Transactions"
-msgstr "Transazioni rapide"
-
#: apps/transactions/validators.py:8
#, python-format
msgid "%(value)s has too many decimal places. Maximum is 30."
@@ -2222,35 +2267,43 @@ msgstr "%(value)s ha troppe cifre decimali. Il massimo è 30."
msgid "%(value)s is not a non-negative number"
msgstr "%(value)s non è un numero non negativo"
-#: apps/transactions/views/actions.py:58
+#: apps/transactions/views/actions.py:61
#, python-format
msgid "%(count)s transaction marked as paid"
msgid_plural "%(count)s transactions marked as paid"
msgstr[0] "%(count)s transazione contrassegnata come pagata"
msgstr[1] "%(count)s transazioni contrassegnate come pagate"
-#: apps/transactions/views/actions.py:81
+#: apps/transactions/views/actions.py:84
#, python-format
msgid "%(count)s transaction marked as not paid"
msgid_plural "%(count)s transactions marked as not paid"
msgstr[0] "%(count)s transazione contrassegnata come non pagata"
msgstr[1] "%(count)s transazioni contrassegnate come non pagate"
-#: apps/transactions/views/actions.py:105
+#: apps/transactions/views/actions.py:108
#, python-format
msgid "%(count)s transaction deleted successfully"
msgid_plural "%(count)s transactions deleted successfully"
msgstr[0] "%(count)s transazione eliminata con successo"
msgstr[1] "%(count)s transazioni eliminate con successo"
-#: apps/transactions/views/actions.py:139
+#: apps/transactions/views/actions.py:142
#, python-format
msgid "%(count)s transaction restored successfully"
msgid_plural "%(count)s transactions restored successfully"
msgstr[0] "%(count)s transazione ripristinata con successo"
msgstr[1] "%(count)s transazioni ripristinate con successo"
-#: apps/transactions/views/actions.py:170
+#: apps/transactions/views/actions.py:174
+#: apps/transactions/views/transactions.py:423
+#, python-format
+msgid "%(count)s transaction updated successfully"
+msgid_plural "%(count)s transactions updated successfully"
+msgstr[0] "%(count)s transazione aggiornata correttamente"
+msgstr[1] "%(count)s transazioni aggiornate correttamente"
+
+#: apps/transactions/views/actions.py:247
#, python-format
msgid "%(count)s transaction duplicated successfully"
msgid_plural "%(count)s transactions duplicated successfully"
@@ -2269,39 +2322,49 @@ msgstr "Categoria aggiornata con successo"
msgid "Category deleted successfully"
msgstr "Categoria eliminata con successo"
-#: apps/transactions/views/conversions.py:72
+#: apps/transactions/views/conversions.py:77
#: apps/transactions/views/quick_transactions.py:46 apps/users/views.py:252
msgid "Item added successfully"
msgstr "Elemento aggiunto con successo"
-#: apps/transactions/views/conversions.py:91
+#: apps/transactions/views/conversions.py:97
#, fuzzy
#| msgid "Edit quick transaction"
msgid "Convert into quick transaction"
msgstr "Modifica transazione rapida"
-#: apps/transactions/views/conversions.py:108
+#: apps/transactions/views/conversions.py:114
#: apps/transactions/views/recurring_transactions.py:112
msgid "Recurring Transaction added successfully"
msgstr "Transazione ricorrente aggiunta con successo"
-#: apps/transactions/views/conversions.py:129
+#: apps/transactions/views/conversions.py:136
#, fuzzy
#| msgid "Edit recurring transaction"
msgid "Convert into recurring transaction"
msgstr "Modifica transazione ricorrente"
-#: apps/transactions/views/conversions.py:148
+#: apps/transactions/views/conversions.py:155
#: apps/transactions/views/installment_plans.py:87
msgid "Installment Plan added successfully"
msgstr "Piano di rateizzazione aggiunto correttamente"
-#: apps/transactions/views/conversions.py:167
+#: apps/transactions/views/conversions.py:175
#, fuzzy
#| msgid "Edit installment plan"
msgid "Convert into installment plan"
msgstr "Modifica piano di rateizzazione"
+#: apps/transactions/views/conversions.py:195
+msgid "Transaction converted into a transfer"
+msgstr ""
+
+#: apps/transactions/views/conversions.py:226
+#, fuzzy
+#| msgid "Edit quick transaction"
+msgid "Convert into transfer"
+msgstr "Modifica transazione rapida"
+
#: apps/transactions/views/entities.py:72
msgid "Entity added successfully"
msgstr "Beneficiario aggiunto con successo"
@@ -2334,7 +2397,7 @@ msgstr "Elemento aggiornato con successo"
msgid "Item deleted successfully"
msgstr "Elemento eliminato con successo"
-#: apps/transactions/views/quick_transactions.py:164
+#: apps/transactions/views/quick_transactions.py:165
#: apps/transactions/views/transactions.py:156
#: apps/transactions/views/transactions.py:343
msgid "Transaction added successfully"
@@ -2388,30 +2451,23 @@ msgstr "Conto eliminato con successo"
msgid "Transaction updated successfully"
msgstr "Transazione aggiornata con successo"
-#: apps/transactions/views/transactions.py:421
-#, python-format
-msgid "%(count)s transaction updated successfully"
-msgid_plural "%(count)s transactions updated successfully"
-msgstr[0] "%(count)s transazione aggiornata correttamente"
-msgstr[1] "%(count)s transazioni aggiornate correttamente"
-
-#: apps/transactions/views/transactions.py:448
+#: apps/transactions/views/transactions.py:450
msgid "Transaction duplicated successfully"
msgstr "Transazione duplicata con successo"
-#: apps/transactions/views/transactions.py:493
+#: apps/transactions/views/transactions.py:495
msgid "Transaction deleted successfully"
msgstr "Transazione eliminata con successo"
-#: apps/transactions/views/transactions.py:523
+#: apps/transactions/views/transactions.py:525
msgid "Transaction restored successfully"
msgstr "Transazione ripristinata con successo"
-#: apps/transactions/views/transactions.py:549
+#: apps/transactions/views/transactions.py:551
msgid "Transfer added successfully"
msgstr "Trasferimento aggiunto con successo"
-#: apps/transactions/views/transactions.py:579
+#: apps/transactions/views/transactions.py:581
#, fuzzy
#| msgid "Transfer added successfully"
msgid "Transfer updated successfully"
@@ -2773,8 +2829,9 @@ msgstr "Azioni"
#: templates/accounts/fragments/list.html:37
#: templates/bank_sync/fragments/list.html:33
#: templates/categories/fragments/table.html:29
-#: templates/cotton/transaction/item.html:178
-#: templates/cotton/ui/transactions_action_bar.html:54
+#: templates/cotton/transaction/item.html:180
+#: templates/cotton/ui/transactions_action_bar.html:56
+#: templates/cotton/ui/transactions_action_bar.html:90
#: templates/currencies/fragments/list.html:34
#: templates/dca/fragments/strategy/details.html:63
#: templates/dca/fragments/strategy/list.html:31
@@ -2785,8 +2842,8 @@ msgstr "Azioni"
#: templates/import_app/fragments/profiles/list.html:46
#: templates/installment_plans/fragments/table.html:28
#: templates/investment_classes/fragments/list.html:39
-#: templates/investments/fragments/detail.html:302
-#: templates/investments/fragments/detail.html:330
+#: templates/investments/fragments/detail.html:310
+#: templates/investments/fragments/detail.html:338
#: templates/quick_transactions/fragments/list.html:25
#: templates/recurring_transactions/fragments/table.html:30
#: templates/rules/fragments/transaction_rule/view.html:22
@@ -2823,10 +2880,11 @@ msgstr "Condividi"
#: templates/accounts/fragments/list.html:71
#: templates/bank_sync/fragments/list.html:50
#: templates/categories/fragments/table.html:51
-#: templates/cotton/transaction/item.html:190
-#: templates/cotton/transaction/item.html:316
+#: templates/cotton/transaction/item.html:192
+#: templates/cotton/transaction/item.html:333
#: templates/cotton/ui/deleted_transactions_action_bar.html:57
-#: templates/cotton/ui/transactions_action_bar.html:82
+#: templates/cotton/ui/transactions_action_bar.html:75
+#: templates/cotton/ui/transactions_action_bar.html:107
#: templates/currencies/fragments/list.html:40
#: templates/dca/fragments/strategy/details.html:70
#: templates/dca/fragments/strategy/list.html:38
@@ -2857,10 +2915,11 @@ msgstr "Elimina"
#: templates/accounts/fragments/list.html:75
#: templates/bank_sync/fragments/list.html:54
#: templates/categories/fragments/table.html:56
-#: templates/cotton/transaction/item.html:192
-#: templates/cotton/transaction/item.html:322
+#: templates/cotton/transaction/item.html:194
+#: templates/cotton/transaction/item.html:339
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:44
#: templates/dca/fragments/strategy/details.html:75
#: templates/dca/fragments/strategy/list.html:42
@@ -2888,10 +2947,11 @@ msgstr "Sei sicuro?"
#: templates/account_groups/fragments/list.html:59
#: templates/accounts/fragments/list.html:76
#: templates/categories/fragments/table.html:57
-#: templates/cotton/transaction/item.html:193
-#: templates/cotton/transaction/item.html:323
+#: templates/cotton/transaction/item.html:195
+#: templates/cotton/transaction/item.html:340
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:45
#: templates/dca/fragments/strategy/details.html:76
#: templates/dca/fragments/strategy/list.html:43
@@ -2911,8 +2971,8 @@ msgstr "Non sarà possibile annullare questa operazione!"
#: templates/accounts/fragments/list.html:77
#: templates/bank_sync/fragments/list.html:56
#: templates/categories/fragments/table.html:58
-#: templates/cotton/transaction/item.html:194
-#: templates/cotton/transaction/item.html:324
+#: templates/cotton/transaction/item.html:196
+#: templates/cotton/transaction/item.html:341
#: templates/currencies/fragments/list.html:46
#: templates/dca/fragments/strategy/details.html:77
#: templates/dca/fragments/strategy/list.html:44
@@ -2992,6 +3052,12 @@ msgstr "Smetti di tracciare"
msgid "No accounts"
msgstr "Nessun conto"
+#: templates/accounts/fragments/share.html:8
+msgid ""
+"Everyone who can see this account can add, edit and delete its transactions, "
+"installment plans and recurring transactions."
+msgstr ""
+
#: templates/bank_sync/fragments/accounts.html:31
#, fuzzy
#| msgid "No transactions on this date"
@@ -3092,65 +3158,78 @@ msgstr "Chiudi"
msgid "Search"
msgstr "Cerca"
-#: templates/cotton/transaction/item.html:12
+#: templates/cotton/transaction/item.html:14
msgid "Select"
msgstr "Seleziona"
-#: templates/cotton/transaction/item.html:123
+#: templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:100
msgid "From"
msgstr "Da"
-#: templates/cotton/transaction/item.html:207
-#: templates/cotton/transaction/item.html:218
-#: templates/cotton/transaction/item.html:228
+#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:230
msgid "Show on summaries"
msgstr "Mostra nei riepiloghi"
-#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:211
msgid "Controlled by account"
msgstr "Controllato dall'account"
-#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:222
msgid "Controlled by category"
msgstr "Controllato dalla categoria"
-#: templates/cotton/transaction/item.html:233
+#: templates/cotton/transaction/item.html:235
+#: templates/includes/transactions_bulk_actions.html:15
msgid "Hide from summaries"
msgstr "Nascondi dai riepiloghi"
-#: templates/cotton/transaction/item.html:237
+#: templates/cotton/transaction/item.html:239
#, fuzzy
#| msgid "Invert"
msgid "Convert"
msgstr "Investi"
-#: templates/cotton/transaction/item.html:252
-#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:254
+#: templates/cotton/transaction/item.html:264
+#: templates/cotton/transaction/item.html:274
msgid "Already part of a plan or recurrence"
msgstr ""
-#: templates/cotton/transaction/item.html:279
+#: templates/cotton/transaction/item.html:291
msgid "Not available for transfers"
msgstr ""
-#: templates/cotton/transaction/item.html:296
+#: templates/cotton/transaction/item.html:313
+#: templates/includes/transactions_bulk_actions.html:22
msgid "Move to previous month"
msgstr "Vai al mese precedente"
-#: templates/cotton/transaction/item.html:300
+#: templates/cotton/transaction/item.html:317
+#: templates/includes/transactions_bulk_actions.html:28
msgid "Move to next month"
msgstr "Vai al mese successivo"
-#: templates/cotton/transaction/item.html:303
+#: templates/cotton/transaction/item.html:320
+#: templates/includes/transactions_bulk_actions.html:33
msgid "Move to today"
msgstr "Vai a oggi"
-#: templates/cotton/transaction/item.html:307
-#: templates/cotton/ui/transactions_action_bar.html:78
+#: templates/cotton/transaction/item.html:324
+#: templates/cotton/ui/transactions_action_bar.html:71
+#: templates/cotton/ui/transactions_action_bar.html:98
msgid "Duplicate"
msgstr "Duplica"
+#: templates/cotton/transaction/item.html:373
+#, python-format
+msgid "%(counter)s item"
+msgid_plural "%(counter)s items"
+msgstr[0] ""
+msgstr[1] ""
+
#: templates/cotton/ui/account_card.html:10
#: templates/cotton/ui/currency_card.html:10
msgid "projected income"
@@ -3186,22 +3265,26 @@ msgstr "totale attuale"
msgid "final total"
msgstr "totale finale"
-#: templates/cotton/ui/deleted_transactions_action_bar.html:34
-#: templates/cotton/ui/transactions_action_bar.html:34
-msgid "Select All"
-msgstr "Seleziona tutto"
-
-#: templates/cotton/ui/deleted_transactions_action_bar.html:40
-#: templates/cotton/ui/transactions_action_bar.html:40
+#: templates/cotton/ui/deleted_transactions_action_bar.html:25
+#: templates/cotton/ui/deleted_transactions_action_bar.html:26
+#: templates/cotton/ui/transactions_action_bar.html:25
+#: templates/cotton/ui/transactions_action_bar.html:26
msgid "Unselect All"
msgstr "Deseleziona tutto"
-#: templates/cotton/ui/deleted_transactions_action_bar.html:46
-msgid "Invert election"
-msgstr ""
+#: templates/cotton/ui/deleted_transactions_action_bar.html:39
+#: templates/cotton/ui/transactions_action_bar.html:39
+msgid "Select All"
+msgstr "Seleziona tutto"
+
+#: templates/cotton/ui/deleted_transactions_action_bar.html:45
+#: templates/cotton/ui/transactions_action_bar.html:45
+msgid "Invert selection"
+msgstr "Inverti selezione"
#: templates/cotton/ui/deleted_transactions_action_bar.html:59
-#: templates/cotton/ui/transactions_action_bar.html:84
+#: templates/cotton/ui/transactions_action_bar.html:77
+#: templates/cotton/ui/transactions_action_bar.html:106
msgid "Yes, delete them!"
msgstr "Sì, cancella!"
@@ -3212,45 +3295,45 @@ msgstr "Sì, cancella!"
#: templates/cotton/ui/deleted_transactions_action_bar.html:166
#: templates/cotton/ui/deleted_transactions_action_bar.html:182
#: templates/cotton/ui/deleted_transactions_action_bar.html:198
-#: templates/cotton/ui/transactions_action_bar.html:128
-#: templates/cotton/ui/transactions_action_bar.html:143
-#: templates/cotton/ui/transactions_action_bar.html:159
-#: templates/cotton/ui/transactions_action_bar.html:175
-#: templates/cotton/ui/transactions_action_bar.html:191
-#: templates/cotton/ui/transactions_action_bar.html:207
-#: templates/cotton/ui/transactions_action_bar.html:223
+#: templates/cotton/ui/transactions_action_bar.html:153
+#: templates/cotton/ui/transactions_action_bar.html:168
+#: templates/cotton/ui/transactions_action_bar.html:184
+#: templates/cotton/ui/transactions_action_bar.html:200
+#: templates/cotton/ui/transactions_action_bar.html:216
+#: templates/cotton/ui/transactions_action_bar.html:232
+#: templates/cotton/ui/transactions_action_bar.html:248
#, fuzzy
#| msgid "copied!"
msgid "copied!"
msgstr "copiate!"
#: templates/cotton/ui/deleted_transactions_action_bar.html:123
-#: templates/cotton/ui/transactions_action_bar.html:148
+#: templates/cotton/ui/transactions_action_bar.html:173
msgid "Flat Total"
msgstr "Totale fisso"
#: templates/cotton/ui/deleted_transactions_action_bar.html:139
-#: templates/cotton/ui/transactions_action_bar.html:164
+#: templates/cotton/ui/transactions_action_bar.html:189
msgid "Real Total"
msgstr "Totale reale"
#: templates/cotton/ui/deleted_transactions_action_bar.html:155
-#: templates/cotton/ui/transactions_action_bar.html:180
+#: templates/cotton/ui/transactions_action_bar.html:205
msgid "Mean"
msgstr "Mezzo"
#: templates/cotton/ui/deleted_transactions_action_bar.html:171
-#: templates/cotton/ui/transactions_action_bar.html:196
+#: templates/cotton/ui/transactions_action_bar.html:221
msgid "Max"
msgstr "Massimo"
#: templates/cotton/ui/deleted_transactions_action_bar.html:187
-#: templates/cotton/ui/transactions_action_bar.html:212
+#: templates/cotton/ui/transactions_action_bar.html:237
msgid "Min"
msgstr "Minimo"
#: templates/cotton/ui/deleted_transactions_action_bar.html:203
-#: templates/cotton/ui/transactions_action_bar.html:228
+#: templates/cotton/ui/transactions_action_bar.html:253
msgid "Count"
msgstr "Conteggio"
@@ -3274,17 +3357,11 @@ msgstr "Ricorrente"
msgid "Balance"
msgstr "Saldo"
-#: templates/cotton/ui/transactions_action_bar.html:46
-msgid "Invert selection"
-msgstr "Inverti selezione"
-
-#: templates/cotton/ui/transactions_action_bar.html:66
-msgid "Mark as unpaid"
-msgstr "Contrassegna come non pagato"
-
-#: templates/cotton/ui/transactions_action_bar.html:71
-msgid "Mark as paid"
-msgstr "Contrassegna come pagato"
+#: templates/cotton/ui/transactions_action_bar.html:83
+#, fuzzy
+#| msgid "Transactions"
+msgid "More actions"
+msgstr "Transazioni"
#: templates/currencies/fragments/add.html:5
msgid "Add currency"
@@ -3727,6 +3804,14 @@ msgstr "è disponibile"
msgid "Calculator"
msgstr "Calcolatrice"
+#: templates/includes/transactions_bulk_actions.html:4
+msgid "Mark as unpaid"
+msgstr "Contrassegna come non pagato"
+
+#: templates/includes/transactions_bulk_actions.html:9
+msgid "Mark as paid"
+msgstr "Contrassegna come pagato"
+
#: templates/insights/fragments/category_explorer/charts/account.html:100
#: templates/insights/fragments/category_explorer/charts/currency.html:92
#: templates/monthly_overview/fragments/monthly_account_summary.html:14
@@ -3792,6 +3877,7 @@ msgstr "Nessuna transazione recente"
#: templates/insights/fragments/year_by_year.html:140
#: templates/investment_classes/fragments/list.html:65
#: templates/monthly_overview/fragments/monthly_summary.html:168
+#: templates/transactions/widgets/sub_transactions.html:55
msgid "Total"
msgstr "Totale"
@@ -4244,13 +4330,13 @@ msgstr ""
msgid "Loss, tax or fee"
msgstr ""
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
#, fuzzy
#| msgid "No presets yet"
msgid "No movements yet"
msgstr "Ancora nessun preset"
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
msgid "Use the + button to buy or contribute"
msgstr ""
@@ -4850,6 +4936,12 @@ msgstr "Nessuna transazione eliminata da mostrare"
msgid "Deleted transactions"
msgstr "Transazioni eliminate"
+#: templates/transactions/widgets/sub_transactions.html:53
+#, fuzzy
+#| msgid "Add quick transaction"
+msgid "Add sub-transaction"
+msgstr "Aggiungi transazione rapida"
+
#: templates/transactions/widgets/unselectable_income_expense_toggle_buttons.html:11
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:7
msgid "Unchanged"
diff --git a/app/locale/nl/LC_MESSAGES/django.po b/app/locale/nl/LC_MESSAGES/django.po
index d37c6ada..dfad74b5 100644
--- a/app/locale/nl/LC_MESSAGES/django.po
+++ b/app/locale/nl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-11-12 03:24+0000\n"
+"POT-Creation-Date: 2026-11-14 14:06+0000\n"
"PO-Revision-Date: 2026-11-02 17:58+0000\n"
"Last-Translator: Dimitri Decrock \n"
"Language-Team: Dutch Public: Shown for all users. Only editable by the owner."
msgid ""
-"Private: Only shown for the owner and shared users. Only editable by the "
-"owner. Public: Shown for all users. Only editable by the owner."
+"Private: Only shown for the owner and shared users. Public: Shown for "
+"all users. Only the owner can edit, share or delete it."
msgstr ""
"Privé: Alleen weergegeven voor de eigenaar en gedeelde gebruikers. Alleen "
"bewerkbaar door de eigenaar. Publiek: Weergegeven voor alle gebruikers. "
"Alleen bewerkbaar door de eigenaar."
-#: apps/common/forms.py:76 apps/users/forms.py:191
+#: apps/common/forms.py:78 apps/users/forms.py:191
#: templates/bank_sync/fragments/accounts.html:34
#: templates/transactions/fragments/filter_actions.html:5
msgid "Save"
msgstr "Opslaan"
-#: apps/common/forms.py:90
+#: apps/common/forms.py:92
msgid "You cannot share this item with its owner."
msgstr "Je kunt dit item niet delen met zijn eigenaar."
@@ -834,6 +851,7 @@ msgid "Now"
msgstr "Nu"
#: apps/common/widgets/tom_select.py:14
+#: templates/transactions/widgets/sub_transaction_row.html:9
msgid "Remove"
msgstr "Verwijder"
@@ -910,8 +928,8 @@ msgstr "Datum en Tijd"
msgid "Auto"
msgstr "Automatisch"
-#: apps/currencies/models.py:91 apps/export_app/forms.py:67
-#: apps/export_app/forms.py:152 templates/exchange_rates/fragments/list.html:10
+#: apps/currencies/models.py:91 apps/export_app/forms.py:73
+#: apps/export_app/forms.py:161 templates/exchange_rates/fragments/list.html:10
#: templates/exchange_rates/pages/index.html:4
#: templates/includes/sidebar.html:204
msgid "Exchange Rates"
@@ -1075,25 +1093,25 @@ msgstr "Diensten succesvol in de wachtrij geplaatst"
msgid "Create transaction"
msgstr "Maak verrichtingen"
-#: apps/dca/forms.py:69 apps/transactions/forms.py:582
+#: apps/dca/forms.py:69 apps/transactions/forms.py:668
msgid "From Account"
msgstr "Van rekening"
-#: apps/dca/forms.py:75 apps/transactions/forms.py:587
+#: apps/dca/forms.py:75 apps/transactions/forms.py:673
msgid "To Account"
msgstr "Naar Rekening"
#: apps/dca/forms.py:117 apps/dca/forms.py:125 apps/export_app/forms.py:49
-#: apps/export_app/forms.py:143 apps/insights/views.py:57
-#: apps/rules/forms.py:185 apps/rules/forms.py:195 apps/rules/models.py:46
-#: apps/rules/models.py:307 apps/transactions/filters.py:84
-#: apps/transactions/forms.py:78 apps/transactions/forms.py:346
-#: apps/transactions/forms.py:526 apps/transactions/forms.py:640
-#: apps/transactions/forms.py:647 apps/transactions/forms.py:862
-#: apps/transactions/forms.py:1114 apps/transactions/models.py:313
-#: apps/transactions/models.py:369 apps/transactions/models.py:770
-#: apps/transactions/models.py:1028 apps/transactions/models.py:1353
-#: templates/entities/fragments/list.html:9
+#: apps/export_app/forms.py:150 apps/insights/views.py:57
+#: apps/rules/forms.py:185 apps/rules/forms.py:196 apps/rules/models.py:47
+#: apps/rules/models.py:308 apps/transactions/filters.py:100
+#: apps/transactions/filters.py:175 apps/transactions/forms.py:161
+#: apps/transactions/forms.py:431 apps/transactions/forms.py:612
+#: apps/transactions/forms.py:726 apps/transactions/forms.py:733
+#: apps/transactions/forms.py:950 apps/transactions/forms.py:1204
+#: apps/transactions/models.py:315 apps/transactions/models.py:371
+#: apps/transactions/models.py:866 apps/transactions/models.py:1127
+#: apps/transactions/models.py:1500 templates/entities/fragments/list.html:9
#: templates/entities/pages/index.html:4 templates/includes/sidebar.html:168
#: templates/insights/fragments/month_by_month.html:40
#: templates/insights/fragments/month_by_month.html:43
@@ -1130,8 +1148,8 @@ msgstr "Verrichtingsbedragen worden nu verborgen"
msgid "You must provide an account."
msgstr "Je moet een account opgeven."
-#: apps/dca/forms.py:322 apps/transactions/forms.py:780
-#: apps/transactions/models.py:978
+#: apps/dca/forms.py:322 apps/transactions/forms.py:866
+#: apps/transactions/models.py:1077
msgid "From and To accounts must be different."
msgstr "Van en Naar rekening moeten verschillend zijn."
@@ -1149,10 +1167,10 @@ msgid "Payment Currency"
msgstr "Betaal Munteenheid"
#: apps/dca/models.py:26 apps/dca/models.py:181 apps/rules/forms.py:180
-#: apps/rules/forms.py:196 apps/rules/models.py:43 apps/rules/models.py:295
-#: apps/transactions/forms.py:504 apps/transactions/forms.py:668
-#: apps/transactions/models.py:354 apps/transactions/models.py:774
-#: apps/transactions/models.py:1031 apps/transactions/models.py:1338
+#: apps/rules/forms.py:197 apps/rules/models.py:44 apps/rules/models.py:296
+#: apps/transactions/forms.py:590 apps/transactions/forms.py:754
+#: apps/transactions/models.py:356 apps/transactions/models.py:870
+#: apps/transactions/models.py:1130 apps/transactions/models.py:1485
msgid "Notes"
msgstr "Opmerkingen"
@@ -1160,7 +1178,7 @@ msgstr "Opmerkingen"
msgid "DCA Strategy"
msgstr "DCA Strategie"
-#: apps/dca/models.py:35 apps/export_app/forms.py:166
+#: apps/dca/models.py:35 apps/export_app/forms.py:175
msgid "DCA Strategies"
msgstr "DCA Strategieën"
@@ -1180,7 +1198,7 @@ msgstr "Ontvangen bedrag"
msgid "DCA Entry"
msgstr "DCA Instap"
-#: apps/dca/models.py:187 apps/export_app/forms.py:167
+#: apps/dca/models.py:187 apps/export_app/forms.py:176
msgid "DCA Entries"
msgstr "DCA Idems"
@@ -1208,14 +1226,14 @@ msgstr "Invoer succesvol bijgewerkt"
msgid "Entry deleted successfully"
msgstr "Invoer succesvol verwijderd"
-#: apps/export_app/forms.py:13 apps/export_app/forms.py:137
+#: apps/export_app/forms.py:13 apps/export_app/forms.py:144
#: templates/includes/sidebar.html:247 templates/users/fragments/list.html:10
#: templates/users/pages/index.html:4
msgid "Users"
msgstr "Gebruikers"
-#: apps/export_app/forms.py:31 apps/export_app/forms.py:144
-#: apps/transactions/models.py:423 templates/includes/sidebar.html:81
+#: apps/export_app/forms.py:31 apps/export_app/forms.py:151
+#: apps/transactions/models.py:425 templates/includes/sidebar.html:81
#: templates/includes/sidebar.html:154
#: templates/recurring_transactions/fragments/list_transactions.html:5
#: templates/recurring_transactions/fragments/table.html:37
@@ -1223,9 +1241,9 @@ msgstr "Gebruikers"
msgid "Transactions"
msgstr "Verrichtingen"
-#: apps/export_app/forms.py:37 apps/export_app/forms.py:141
-#: apps/insights/views.py:43 apps/transactions/filters.py:74
-#: templates/categories/fragments/list.html:9
+#: apps/export_app/forms.py:37 apps/export_app/forms.py:148
+#: apps/insights/views.py:43 apps/transactions/filters.py:90
+#: apps/transactions/filters.py:165 templates/categories/fragments/list.html:9
#: templates/categories/pages/index.html:4 templates/includes/sidebar.html:156
#: templates/insights/fragments/month_by_month.html:18
#: templates/insights/fragments/month_by_month.html:21
@@ -1234,102 +1252,117 @@ msgstr "Verrichtingen"
msgid "Categories"
msgstr "Categorieën"
-#: apps/export_app/forms.py:55 apps/export_app/forms.py:147
-#: apps/transactions/models.py:1068 templates/includes/sidebar.html:110
+#: apps/export_app/forms.py:55 apps/export_app/forms.py:155
+#: apps/transactions/models.py:1167 templates/includes/sidebar.html:110
#: templates/recurring_transactions/fragments/list.html:9
#: templates/recurring_transactions/pages/index.html:4
msgid "Recurring Transactions"
msgstr "Terugkerende Verrichtingen"
-#: apps/export_app/forms.py:61 apps/export_app/forms.py:145
-#: apps/transactions/models.py:788 templates/includes/sidebar.html:104
+#: apps/export_app/forms.py:61 apps/export_app/forms.py:153
+#: apps/transactions/models.py:884 templates/includes/sidebar.html:104
#: templates/installment_plans/fragments/list.html:9
#: templates/installment_plans/pages/index.html:4
msgid "Installment Plans"
msgstr "Afbetalingsplannen"
-#: apps/export_app/forms.py:73 apps/export_app/forms.py:150
+#: apps/export_app/forms.py:67 apps/export_app/forms.py:157
+#: apps/transactions/models.py:1518 templates/includes/sidebar.html:98
+#: templates/quick_transactions/pages/index.html:5
+#: templates/quick_transactions/pages/index.html:15
+msgid "Quick Transactions"
+msgstr "Snelle Verrichtingen"
+
+#: apps/export_app/forms.py:79 apps/export_app/forms.py:159
#: templates/exchange_rates_services/fragments/list.html:10
#: templates/exchange_rates_services/pages/index.html:4
#: templates/includes/sidebar.html:232
msgid "Automatic Exchange Rates"
msgstr "Automatische Wisselkoersen"
-#: apps/export_app/forms.py:79 templates/bank_sync/fragments/list.html:8
+#: apps/export_app/forms.py:85 templates/bank_sync/fragments/list.html:8
#: templates/bank_sync/pages/index.html:4 templates/includes/sidebar.html:238
msgid "Bank Sync"
msgstr ""
-#: apps/export_app/forms.py:80
+#: apps/export_app/forms.py:86
msgid "Includes the providers' API keys"
msgstr ""
-#: apps/export_app/forms.py:86 templates/includes/sidebar.html:212
+#: apps/export_app/forms.py:92 templates/includes/sidebar.html:212
#: templates/rules/fragments/list.html:9 templates/rules/pages/index.html:4
msgid "Rules"
msgstr "Regels"
-#: apps/export_app/forms.py:92 templates/cotton/transaction/item.html:66
+#: apps/export_app/forms.py:98 templates/cotton/transaction/item.html:68
msgid "DCA"
msgstr "DCA"
-#: apps/export_app/forms.py:98 apps/export_app/forms.py:168
+#: apps/export_app/forms.py:104 apps/export_app/forms.py:177
#: templates/import_app/fragments/profiles/list.html:21
#: templates/import_app/pages/profiles_index.html:4
msgid "Import Profiles"
msgstr "Profielen importeren"
-#: apps/export_app/forms.py:126 templates/export_app/fragments/export.html:5
+#: apps/export_app/forms.py:133 templates/export_app/fragments/export.html:5
#: templates/export_app/pages/index.html:13
msgid "Export"
msgstr "Exporteer"
-#: apps/export_app/forms.py:134
+#: apps/export_app/forms.py:141
msgid "Import a ZIP file exported from WYGIWYH"
msgstr "Importeer een ZIP-bestand geëxporteerd vanuit WYGIWYH"
-#: apps/export_app/forms.py:135
+#: apps/export_app/forms.py:142
msgid "ZIP File"
msgstr "ZIP-bestand"
-#: apps/export_app/forms.py:157
+#: apps/export_app/forms.py:152 apps/rules/forms.py:193 apps/rules/models.py:42
+#: apps/rules/models.py:320 apps/transactions/models.py:736
+#: templates/transactions/widgets/sub_transactions.html:39
+#, fuzzy
+#| msgid "transactions"
+msgid "Sub-transactions"
+msgstr "verrichtingen"
+
+#: apps/export_app/forms.py:166
#, fuzzy
#| msgid "By account"
msgid "Bank Sync Accounts"
msgstr "Op rekening"
-#: apps/export_app/forms.py:159 apps/rules/models.py:27
+#: apps/export_app/forms.py:168 apps/rules/models.py:27
msgid "Transaction rules"
msgstr "Verrichtingsregels"
-#: apps/export_app/forms.py:161 apps/rules/models.py:68
+#: apps/export_app/forms.py:170 apps/rules/models.py:69
msgid "Edit transaction action"
msgstr "Bewerk verrichtingsactie"
-#: apps/export_app/forms.py:164 apps/rules/models.py:327
+#: apps/export_app/forms.py:173 apps/rules/models.py:332
msgid "Update or create transaction actions"
msgstr "Bewerk of maak verrichtingsregel acties"
-#: apps/export_app/forms.py:199 templates/cotton/transaction/item.html:310
+#: apps/export_app/forms.py:210 templates/cotton/transaction/item.html:327
#: templates/cotton/ui/deleted_transactions_action_bar.html:53
#: templates/export_app/fragments/restore.html:5
#: templates/export_app/pages/index.html:19
msgid "Restore"
msgstr "Herstel"
-#: apps/export_app/forms.py:209
+#: apps/export_app/forms.py:220
msgid "Please upload either a ZIP file or at least one CSV file"
msgstr "Upload een ZIP-bestand of ten minste één CSV-bestand"
-#: apps/export_app/views.py:190
+#: apps/export_app/views.py:216
msgid "You have to select at least one export"
msgstr "U moet ten minste één export selecteren"
-#: apps/export_app/views.py:210
+#: apps/export_app/views.py:236
msgid "Data restored successfully"
msgstr "Gegevens succesvol hersteld"
-#: apps/export_app/views.py:222
+#: apps/export_app/views.py:248
msgid ""
"There was an error restoring your data. Check the logs for more details."
msgstr ""
@@ -1418,7 +1451,7 @@ msgstr "Run met succes verwijderd"
#: apps/insights/forms.py:118 apps/insights/utils/sankey.py:36
#: apps/insights/utils/sankey.py:167 apps/insights/views.py:45
-#: apps/transactions/filters.py:209
+#: apps/transactions/filters.py:294
#: templates/insights/fragments/month_by_month.html:119
#: templates/insights/fragments/year_by_year.html:73
msgid "Uncategorized"
@@ -1475,24 +1508,24 @@ msgstr "Geen categorieën"
msgid "Tag"
msgstr "Label"
-#: apps/insights/views.py:52 apps/transactions/filters.py:215
+#: apps/insights/views.py:52 apps/transactions/filters.py:303
#: templates/insights/fragments/month_by_month.html:121
#: templates/insights/fragments/year_by_year.html:75
msgid "Untagged"
msgstr "Niet gelabeld"
-#: apps/insights/views.py:53 apps/transactions/models.py:611
+#: apps/insights/views.py:53 apps/transactions/models.py:632
#: templates/tags/fragments/table.html:69
msgid "No tags"
msgstr "Geen labels"
-#: apps/insights/views.py:58 apps/transactions/models.py:312
+#: apps/insights/views.py:58 apps/transactions/models.py:314
#: templates/insights/fragments/month_by_month.html:88
#: templates/insights/fragments/year_by_year.html:56
msgid "Entity"
msgstr "Bedrijf"
-#: apps/insights/views.py:59 apps/transactions/filters.py:222
+#: apps/insights/views.py:59 apps/transactions/filters.py:311
#: templates/insights/fragments/month_by_month.html:123
#: templates/insights/fragments/year_by_year.html:77
msgid "No entity"
@@ -1510,19 +1543,19 @@ msgstr ""
msgid "Unclassified"
msgstr ""
-#: apps/investments/views.py:289
+#: apps/investments/views.py:290
#, fuzzy
#| msgid "Installment Plan added successfully"
msgid "Asset class added successfully"
msgstr "Afbetalingsplan succesvol toegevoegd"
-#: apps/investments/views.py:297
+#: apps/investments/views.py:298
#, fuzzy
#| msgid "Tag updated successfully"
msgid "Asset class updated successfully"
msgstr "Label succesvol bijgewerkt"
-#: apps/investments/views.py:318
+#: apps/investments/views.py:319
#, fuzzy
#| msgid "Tag deleted successfully"
msgid "Asset class deleted successfully"
@@ -1557,13 +1590,13 @@ msgstr "U kunt in het volgende scherm acties aan deze regel toevoegen."
msgid "Set field"
msgstr "Veld instellen"
-#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:123
+#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:101
msgid "To"
msgstr "Naar"
#: apps/rules/forms.py:78 apps/rules/forms.py:158 apps/rules/models.py:20
-#: apps/rules/models.py:62 apps/rules/models.py:323
+#: apps/rules/models.py:63 apps/rules/models.py:328
#: templates/rules/fragments/list.html:23
msgid "Order"
msgstr "Sorteer"
@@ -1581,36 +1614,37 @@ msgid "Operator"
msgstr "Operator"
#: apps/rules/forms.py:174 apps/rules/forms.py:188 apps/rules/models.py:36
-#: apps/rules/models.py:271 apps/transactions/forms.py:468
-#: apps/transactions/models.py:337 apps/transactions/models.py:730
-#: apps/transactions/models.py:1009 apps/transactions/models.py:1323
+#: apps/rules/models.py:272 apps/transactions/forms.py:554
+#: apps/transactions/models.py:339 apps/transactions/models.py:826
+#: apps/transactions/models.py:1108 apps/transactions/models.py:1470
#: templates/mini_tools/simulator.html:63
msgid "Type"
msgstr "Soort"
#: apps/rules/forms.py:175 apps/rules/forms.py:189 apps/rules/models.py:37
-#: apps/rules/models.py:275 apps/transactions/filters.py:22
-#: apps/transactions/forms.py:472 apps/transactions/forms.py:650
-#: apps/transactions/models.py:339 apps/transactions/models.py:1325
-#: templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/rules/models.py:276 apps/transactions/filters.py:23
+#: apps/transactions/forms.py:558 apps/transactions/forms.py:736
+#: apps/transactions/models.py:341 apps/transactions/models.py:1472
+#: templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/transactions/widgets/paid_toggle_button.html:10
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:13
msgid "Paid"
msgstr "Betaald"
#: apps/rules/forms.py:177 apps/rules/forms.py:191 apps/rules/models.py:39
-#: apps/rules/models.py:283 apps/transactions/forms.py:90
-#: apps/transactions/forms.py:488 apps/transactions/forms.py:655
-#: apps/transactions/forms.py:868 apps/transactions/models.py:341
-#: apps/transactions/models.py:748 apps/transactions/models.py:1033
+#: apps/rules/models.py:284 apps/transactions/forms.py:173
+#: apps/transactions/forms.py:574 apps/transactions/forms.py:741
+#: apps/transactions/forms.py:956 apps/transactions/models.py:343
+#: apps/transactions/models.py:844 apps/transactions/models.py:1132
msgid "Reference Date"
msgstr "Referentiedatum"
#: apps/rules/forms.py:178 apps/rules/forms.py:192 apps/rules/models.py:41
-#: apps/rules/models.py:287 apps/transactions/forms.py:495
-#: apps/transactions/models.py:347 apps/transactions/models.py:1014
-#: apps/transactions/models.py:1331
+#: apps/rules/models.py:288 apps/transactions/forms.py:75
+#: apps/transactions/forms.py:581 apps/transactions/models.py:349
+#: apps/transactions/models.py:730 apps/transactions/models.py:1113
+#: apps/transactions/models.py:1478
#: templates/insights/fragments/sankey.html:102
#: templates/installment_plans/fragments/table.html:18
#: templates/mini_tools/simulator.html:70
@@ -1619,51 +1653,52 @@ msgstr "Referentiedatum"
msgid "Amount"
msgstr "Bedrag"
-#: apps/rules/forms.py:179 apps/rules/forms.py:193 apps/rules/models.py:14
-#: apps/rules/models.py:42 apps/rules/models.py:291
-#: apps/transactions/forms.py:499 apps/transactions/forms.py:659
-#: apps/transactions/models.py:352 apps/transactions/models.py:732
-#: apps/transactions/models.py:1017 apps/transactions/models.py:1336
+#: apps/rules/forms.py:179 apps/rules/forms.py:194 apps/rules/models.py:14
+#: apps/rules/models.py:43 apps/rules/models.py:292
+#: apps/transactions/forms.py:585 apps/transactions/forms.py:745
+#: apps/transactions/models.py:354 apps/transactions/models.py:828
+#: apps/transactions/models.py:1116 apps/transactions/models.py:1483
msgid "Description"
msgstr "Beschrijving"
-#: apps/rules/forms.py:182 apps/rules/forms.py:198 apps/rules/models.py:47
-#: apps/rules/models.py:299 apps/transactions/models.py:399
-#: apps/transactions/models.py:1358
+#: apps/rules/forms.py:182 apps/rules/forms.py:199 apps/rules/models.py:48
+#: apps/rules/models.py:300 apps/transactions/models.py:401
+#: apps/transactions/models.py:1505
msgid "Internal Note"
msgstr "Interne opmerking"
-#: apps/rules/forms.py:183 apps/rules/forms.py:199 apps/rules/models.py:48
-#: apps/rules/models.py:303 apps/transactions/models.py:401
-#: apps/transactions/models.py:1360
+#: apps/rules/forms.py:183 apps/rules/forms.py:200 apps/rules/models.py:49
+#: apps/rules/models.py:304 apps/transactions/models.py:403
+#: apps/transactions/models.py:1507
msgid "Internal ID"
msgstr "Interne ID"
-#: apps/rules/forms.py:186 apps/rules/forms.py:200 apps/rules/models.py:40
-#: apps/rules/models.py:319 apps/transactions/forms.py:672
-#: apps/transactions/models.py:251 apps/transactions/models.py:342
-#: apps/transactions/models.py:1326
+#: apps/rules/forms.py:186 apps/rules/forms.py:201 apps/rules/models.py:40
+#: apps/rules/models.py:324 apps/transactions/forms.py:758
+#: apps/transactions/models.py:253 apps/transactions/models.py:344
+#: apps/transactions/models.py:1473
msgid "Mute"
msgstr "Dempen"
-#: apps/rules/forms.py:215
+#: apps/rules/forms.py:216
msgid "Search Criteria"
msgstr "Zoek Vereisten"
-#: apps/rules/forms.py:360
+#: apps/rules/forms.py:361
msgid "Set Values"
msgstr "Waarden Instellen"
-#: apps/rules/forms.py:407 apps/rules/forms.py:442 apps/rules/forms.py:477
-#: apps/transactions/models.py:422 apps/transactions/models.py:667
+#: apps/rules/forms.py:409 apps/rules/forms.py:444 apps/rules/forms.py:479
+#: apps/transactions/models.py:424 apps/transactions/models.py:703
+#: apps/transactions/models.py:763
msgid "Transaction"
msgstr "Verrichting"
-#: apps/rules/forms.py:411 apps/rules/forms.py:446 apps/rules/forms.py:481
+#: apps/rules/forms.py:413 apps/rules/forms.py:448 apps/rules/forms.py:483
msgid "Type to search for a transaction"
msgstr "Type om een transactie te zoeken"
-#: apps/rules/forms.py:422 apps/rules/forms.py:457 apps/rules/forms.py:491
+#: apps/rules/forms.py:424 apps/rules/forms.py:459 apps/rules/forms.py:493
#: templates/rules/fragments/transaction_rule/dry_run/created.html:5
#: templates/rules/fragments/transaction_rule/dry_run/deleted.html:5
#: templates/rules/fragments/transaction_rule/dry_run/updated.html:5
@@ -1683,15 +1718,15 @@ msgstr "Opeenvolgend"
msgid "Transaction rule"
msgstr "Verrichtingsregel"
-#: apps/rules/models.py:54 apps/rules/models.py:98
+#: apps/rules/models.py:55 apps/rules/models.py:99
msgid "Rule"
msgstr "Regel"
-#: apps/rules/models.py:59
+#: apps/rules/models.py:60
msgid "Field"
msgstr "Veld"
-#: apps/rules/models.py:61 templates/investments/fragments/charts.html:86
+#: apps/rules/models.py:62 templates/investments/fragments/charts.html:86
#: templates/investments/fragments/detail.html:68
#: templates/investments/fragments/detail.html:127
#: templates/investments/fragments/detail.html:245
@@ -1699,51 +1734,51 @@ msgstr "Veld"
msgid "Value"
msgstr "Waarde"
-#: apps/rules/models.py:69
+#: apps/rules/models.py:70
msgid "Edit transaction actions"
msgstr "Bewerk verrichtingsregel acties"
-#: apps/rules/models.py:84
+#: apps/rules/models.py:85
msgid "is exactly"
msgstr "is precies"
-#: apps/rules/models.py:85
+#: apps/rules/models.py:86
msgid "contains"
msgstr "bevat"
-#: apps/rules/models.py:86
+#: apps/rules/models.py:87
msgid "starts with"
msgstr "begint met"
-#: apps/rules/models.py:87
+#: apps/rules/models.py:88
msgid "ends with"
msgstr "eindigd op"
-#: apps/rules/models.py:88
+#: apps/rules/models.py:89
msgid "equals"
msgstr "gelijk aan"
-#: apps/rules/models.py:89
+#: apps/rules/models.py:90
msgid "greater than"
msgstr "groter dan"
-#: apps/rules/models.py:90
+#: apps/rules/models.py:91
msgid "less than"
msgstr "kleiner dan"
-#: apps/rules/models.py:91
+#: apps/rules/models.py:92
msgid "greater than or equal"
msgstr "groter dan of gelijk aan"
-#: apps/rules/models.py:92
+#: apps/rules/models.py:93
msgid "less than or equal"
msgstr "kleiner dan of gelijk aan"
-#: apps/rules/models.py:102
+#: apps/rules/models.py:103
msgid "Filter"
msgstr "Filter"
-#: apps/rules/models.py:105
+#: apps/rules/models.py:106
msgid ""
"Generic expression to enable or disable execution. Should evaluate to True "
"or False"
@@ -1751,7 +1786,7 @@ msgstr ""
"Generieke expressie om uitvoering in of uit te schakelen. Moet evalueren "
"naar Waar of Onwaar"
-#: apps/rules/models.py:326
+#: apps/rules/models.py:331
msgid "Update or create transaction action"
msgstr "Bewerk of maak verrichtingsregel actie"
@@ -1795,8 +1830,8 @@ msgstr "Verrichting Bijwerken Of Maken succesvol bijgewerkt"
msgid "Update or Create Transaction action deleted successfully"
msgstr "Verrichting Bijwerken Of Maken succesvol verwijderd"
-#: apps/transactions/filters.py:23 templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/transactions/filters.py:24 templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/insights/fragments/overview/index.html:68
#: templates/net_worth/net_worth.html:39 templates/net_worth/net_worth.html:43
#: templates/transactions/widgets/paid_toggle_button.html:7
@@ -1804,132 +1839,142 @@ msgstr "Verrichting Bijwerken Of Maken succesvol verwijderd"
msgid "Projected"
msgstr "Ingepland"
-#: apps/transactions/filters.py:28 templates/categories/fragments/table.html:18
+#: apps/transactions/filters.py:29 templates/categories/fragments/table.html:18
msgid "Muted"
msgstr "Gedempt"
-#: apps/transactions/filters.py:51
+#: apps/transactions/filters.py:67 apps/transactions/filters.py:144
msgid "Content"
msgstr "Inhoud"
-#: apps/transactions/filters.py:57
+#: apps/transactions/filters.py:73
msgid "Transaction Type"
msgstr "Soort transactie"
-#: apps/transactions/filters.py:95
+#: apps/transactions/filters.py:111
msgid "Mute Status"
msgstr "Demp Status"
-#: apps/transactions/filters.py:100
+#: apps/transactions/filters.py:116
msgid "Date from"
msgstr "Datum vanaf"
-#: apps/transactions/filters.py:105 apps/transactions/filters.py:115
+#: apps/transactions/filters.py:121 apps/transactions/filters.py:131
msgid "Until"
msgstr "Tot"
-#: apps/transactions/filters.py:110
+#: apps/transactions/filters.py:126
msgid "Reference date from"
msgstr "Referentiedatum vanaf"
-#: apps/transactions/filters.py:120
+#: apps/transactions/filters.py:136
msgid "Amount min"
msgstr "Minimum bedrag"
-#: apps/transactions/filters.py:125
+#: apps/transactions/filters.py:141
msgid "Amount max"
msgstr "Maximaal bedrag"
-#: apps/transactions/filters.py:208
+#: apps/transactions/filters.py:240
+msgid "Include"
+msgstr ""
+
+#: apps/transactions/filters.py:245
+msgid "Exclude"
+msgstr ""
+
+#: apps/transactions/filters.py:293
msgid "Categorized"
msgstr "Gecategoriseerd"
-#: apps/transactions/filters.py:215
+#: apps/transactions/filters.py:303
msgid "Tagged"
msgstr "Gelabeld"
-#: apps/transactions/filters.py:221
+#: apps/transactions/filters.py:310
msgid "Any entity"
msgstr "Elk bedrijf"
-#: apps/transactions/forms.py:192
+#: apps/transactions/forms.py:277
msgid "More"
msgstr "Meer"
-#: apps/transactions/forms.py:229
+#: apps/transactions/forms.py:314
msgid "Save and add similar"
msgstr "Opslaan en vergelijkbaar toevoegen"
-#: apps/transactions/forms.py:234
+#: apps/transactions/forms.py:319
msgid "Save and add another"
msgstr "Opslaan en een andere toevoegen"
-#: apps/transactions/forms.py:271 templates/cotton/transaction/item.html:184
+#: apps/transactions/forms.py:356 templates/cotton/transaction/item.html:186
#: templates/transactions/fragments/attachments.html:4
msgid "Attachments"
msgstr "Bijlagen"
-#: apps/transactions/forms.py:272
+#: apps/transactions/forms.py:357
msgid ""
"Files are private and only visible to users with access to this transaction."
msgstr ""
"Bestanden zijn privé en alleen zichtbaar voor gebruikers die toegang hebben "
"tot deze transactie."
-#: apps/transactions/forms.py:283
+#: apps/transactions/forms.py:368
msgid "Upload"
msgstr "Uploaden"
-#: apps/transactions/forms.py:355 apps/transactions/forms.py:1120
-#: apps/transactions/models.py:947
+#: apps/transactions/forms.py:440 apps/transactions/forms.py:1210
+#: apps/transactions/models.py:1046
msgid "To account"
msgstr "Naar rekening"
-#: apps/transactions/forms.py:382 apps/transactions/forms.py:675
+#: apps/transactions/forms.py:467 apps/transactions/forms.py:761
msgid "Muted transactions won't be displayed on monthly summaries"
msgstr "Gedempte transacties worden niet weergegeven in maandoverzichten"
-#: apps/transactions/forms.py:594
+#: apps/transactions/forms.py:680
msgid "From Amount"
msgstr "Van Bedrag"
-#: apps/transactions/forms.py:599
+#: apps/transactions/forms.py:685
msgid "To Amount"
msgstr "Naar Bedrag"
-#: apps/transactions/forms.py:741 apps/transactions/models.py:992
-#: apps/transactions/models.py:1303 templates/cotton/transaction/item.html:52
-#: templates/cotton/transaction/item.html:60
+#: apps/transactions/forms.py:827 apps/transactions/models.py:1091
+#: apps/transactions/models.py:1450 templates/cotton/transaction/item.html:54
+#: templates/cotton/transaction/item.html:62
+#: templates/cotton/transaction/item.html:272
+#: templates/cotton/transaction/item.html:304
#: templates/cotton/ui/quick_transactions_buttons.html:40
#: templates/cotton/ui/transactions_fab.html:44
msgid "Transfer"
msgstr "Overschrijving"
-#: apps/transactions/forms.py:1005
+#: apps/transactions/forms.py:1095
msgid "Tag name"
msgstr "Labelnaam"
-#: apps/transactions/forms.py:1033
+#: apps/transactions/forms.py:1123
msgid "Entity name"
msgstr "Naam van bedrijf"
-#: apps/transactions/forms.py:1061
+#: apps/transactions/forms.py:1151
msgid "Category name"
msgstr "Naam van categorie"
-#: apps/transactions/forms.py:1063
+#: apps/transactions/forms.py:1153
msgid "Muted categories won't be displayed on monthly summaries"
msgstr "Gedempte categorieën worden niet weergegeven in maandoverzichten"
-#: apps/transactions/forms.py:1228
+#: apps/transactions/forms.py:1319
msgid "future transactions"
msgstr "toekomstige verrichtingen"
-#: apps/transactions/forms.py:1255
+#: apps/transactions/forms.py:1346
msgid "End date should be after the start date"
msgstr "De einddatum moet na de begindatum vallen"
-#: apps/transactions/models.py:256
+#: apps/transactions/models.py:258
msgid ""
"Deactivated categories won't be able to be selected when creating new "
"transactions"
@@ -1937,26 +1982,26 @@ msgstr ""
"Gedeactiveerde categorieën kunnen niet worden geselecteerd bij het maken van "
"nieuwe transacties"
-#: apps/transactions/models.py:264
+#: apps/transactions/models.py:266
msgid "Transaction Category"
msgstr "Transactie categorie"
-#: apps/transactions/models.py:265
+#: apps/transactions/models.py:267
msgid "Transaction Categories"
msgstr "Transactie categorieën"
-#: apps/transactions/models.py:280
+#: apps/transactions/models.py:282
msgid ""
"Deactivated tags won't be able to be selected when creating new transactions"
msgstr ""
"Gedeactiveerde labels kunnen niet worden geselecteerd bij het maken van "
"nieuwe verrichtingen"
-#: apps/transactions/models.py:288 apps/transactions/models.py:289
+#: apps/transactions/models.py:290 apps/transactions/models.py:291
msgid "Transaction Tags"
msgstr "Verrichting Labels"
-#: apps/transactions/models.py:304
+#: apps/transactions/models.py:306
msgid ""
"Deactivated entities won't be able to be selected when creating new "
"transactions"
@@ -1964,8 +2009,8 @@ msgstr ""
"Gedeactiveerde bedrijven kunnen niet worden geselecteerd bij het maken van "
"nieuwe verrichtingen"
-#: apps/transactions/models.py:324 apps/transactions/models.py:991
-#: apps/transactions/models.py:1302
+#: apps/transactions/models.py:326 apps/transactions/models.py:1090
+#: apps/transactions/models.py:1449
#: templates/calendar_view/fragments/list.html:42
#: templates/calendar_view/fragments/list.html:44
#: templates/calendar_view/fragments/list.html:52
@@ -1977,14 +2022,14 @@ msgstr ""
#: templates/investments/fragments/detail.html:71
#: templates/investments/fragments/detail.html:175
#: templates/investments/fragments/detail.html:227
-#: templates/investments/fragments/detail.html:318
+#: templates/investments/fragments/detail.html:326
#: templates/mini_tools/simulator.html:66
#: templates/monthly_overview/fragments/monthly_summary.html:42
msgid "Income"
msgstr "Ontvangsten Transactie"
-#: apps/transactions/models.py:325 apps/transactions/models.py:993
-#: apps/transactions/models.py:1304
+#: apps/transactions/models.py:327 apps/transactions/models.py:1092
+#: apps/transactions/models.py:1451
#: templates/calendar_view/fragments/list.html:46
#: templates/calendar_view/fragments/list.html:48
#: templates/calendar_view/fragments/list.html:56
@@ -1996,192 +2041,192 @@ msgstr "Ontvangsten Transactie"
msgid "Expense"
msgstr "Uitgave"
-#: apps/transactions/models.py:380 apps/transactions/models.py:787
-#: templates/cotton/transaction/item.html:260
-#: templates/cotton/transaction/item.html:277
-#: templates/cotton/transaction/item.html:287
+#: apps/transactions/models.py:382 apps/transactions/models.py:883
+#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:289
+#: templates/cotton/transaction/item.html:299
msgid "Installment Plan"
msgstr "Afbetalingsplan"
-#: apps/transactions/models.py:389 apps/transactions/models.py:1067
-#: templates/cotton/transaction/item.html:250
-#: templates/cotton/transaction/item.html:270
+#: apps/transactions/models.py:391 apps/transactions/models.py:1166
+#: templates/cotton/transaction/item.html:252
+#: templates/cotton/transaction/item.html:282
msgid "Recurring Transaction"
msgstr "Terugkerende verrichting"
-#: apps/transactions/models.py:397
+#: apps/transactions/models.py:399
msgid "Linked Transaction"
msgstr "Gekoppelde verrichting"
-#: apps/transactions/models.py:405
+#: apps/transactions/models.py:407
msgid "Deleted"
msgstr "Verwijderd"
-#: apps/transactions/models.py:410
+#: apps/transactions/models.py:412
msgid "Deleted At"
msgstr "Verwijderd Op"
-#: apps/transactions/models.py:518
+#: apps/transactions/models.py:521
msgid "A transfer needs one expense and one income."
msgstr ""
-#: apps/transactions/models.py:520
+#: apps/transactions/models.py:523
msgid "A transfer needs two different accounts."
msgstr ""
-#: apps/transactions/models.py:524
+#: apps/transactions/models.py:527
msgid "This transaction is already part of another transfer."
msgstr ""
-#: apps/transactions/models.py:613
+#: apps/transactions/models.py:634
msgid "No category"
msgstr "Geen categorie"
-#: apps/transactions/models.py:615
+#: apps/transactions/models.py:636
msgid "No description"
msgstr "Geen Beschrijving"
-#: apps/transactions/models.py:672
+#: apps/transactions/models.py:735
+#, fuzzy
+#| msgid "transactions"
+msgid "Sub-transaction"
+msgstr "verrichtingen"
+
+#: apps/transactions/models.py:768
msgid "File"
msgstr "Bestand"
-#: apps/transactions/models.py:674
+#: apps/transactions/models.py:770
msgid "Original Name"
msgstr "Originele Naam"
-#: apps/transactions/models.py:676
+#: apps/transactions/models.py:772
msgid "Content Type"
msgstr "Inhoudstype"
-#: apps/transactions/models.py:678
+#: apps/transactions/models.py:774
msgid "Size"
msgstr "Grootte"
-#: apps/transactions/models.py:683
+#: apps/transactions/models.py:779
msgid "Uploaded By"
msgstr "Geüpload Door"
-#: apps/transactions/models.py:688
+#: apps/transactions/models.py:784
msgid "Transaction Attachment"
msgstr "Transactiebijlage"
-#: apps/transactions/models.py:689
+#: apps/transactions/models.py:785
msgid "Transaction Attachments"
msgstr "Transactiebijlages"
-#: apps/transactions/models.py:719 templates/includes/sidebar.html:57
+#: apps/transactions/models.py:815 templates/includes/sidebar.html:57
msgid "Yearly"
msgstr "Jaarlijks"
-#: apps/transactions/models.py:720 apps/users/models.py:469
+#: apps/transactions/models.py:816 apps/users/models.py:469
#: templates/includes/sidebar.html:51
msgid "Monthly"
msgstr "Maandelijks"
-#: apps/transactions/models.py:721
+#: apps/transactions/models.py:817
msgid "Weekly"
msgstr "Wekelijks"
-#: apps/transactions/models.py:722
+#: apps/transactions/models.py:818
msgid "Daily"
msgstr "Dagelijks"
-#: apps/transactions/models.py:735
+#: apps/transactions/models.py:831
msgid "Number of Installments"
msgstr "Aantal aflossingen"
-#: apps/transactions/models.py:740
+#: apps/transactions/models.py:836
msgid "Installment Start"
msgstr "Begin afbetaling"
-#: apps/transactions/models.py:741
+#: apps/transactions/models.py:837
msgid "The installment number to start counting from"
msgstr "Het nummer van de aflevering om mee te beginnen"
-#: apps/transactions/models.py:746 apps/transactions/models.py:1037
+#: apps/transactions/models.py:842 apps/transactions/models.py:1136
msgid "Start Date"
msgstr "Startdatum"
-#: apps/transactions/models.py:750 apps/transactions/models.py:1038
+#: apps/transactions/models.py:846 apps/transactions/models.py:1137
msgid "End Date"
msgstr "Einddatum"
-#: apps/transactions/models.py:755
+#: apps/transactions/models.py:851
msgid "Recurrence"
msgstr "Terugkeerpatroon"
-#: apps/transactions/models.py:758
+#: apps/transactions/models.py:854
msgid "Installment Amount"
msgstr "Termijnbedrag"
-#: apps/transactions/models.py:777 apps/transactions/models.py:1057
+#: apps/transactions/models.py:873 apps/transactions/models.py:1156
msgid "Add description to transactions"
msgstr "Beschrijving toevoegen aan verrichting"
-#: apps/transactions/models.py:780 apps/transactions/models.py:1060
+#: apps/transactions/models.py:876 apps/transactions/models.py:1159
msgid "Add notes to transactions"
msgstr "Notities toevoegen aan verrichting"
-#: apps/transactions/models.py:954
+#: apps/transactions/models.py:1053
msgid "To amount"
msgstr "Naar bedrag"
-#: apps/transactions/models.py:955
+#: apps/transactions/models.py:1054
msgid "Leave empty to use the same amount"
msgstr "Laat leeg om dezelfde hoeveelheid te gebruiken"
-#: apps/transactions/models.py:996 templates/mini_tools/simulator.html:129
+#: apps/transactions/models.py:1095 templates/mini_tools/simulator.html:129
msgid "day(s)"
msgstr "dag(en)"
-#: apps/transactions/models.py:997 templates/mini_tools/simulator.html:130
+#: apps/transactions/models.py:1096 templates/mini_tools/simulator.html:130
msgid "week(s)"
msgstr "we(e)k(en)"
-#: apps/transactions/models.py:998 templates/mini_tools/simulator.html:131
+#: apps/transactions/models.py:1097 templates/mini_tools/simulator.html:131
msgid "month(s)"
msgstr "maand(en)"
-#: apps/transactions/models.py:999 templates/mini_tools/simulator.html:132
+#: apps/transactions/models.py:1098 templates/mini_tools/simulator.html:132
msgid "year(s)"
msgstr "ja(a)r(en)"
-#: apps/transactions/models.py:1001
+#: apps/transactions/models.py:1100
#: templates/recurring_transactions/fragments/list.html:18
msgid "Paused"
msgstr "Gepauzeerd"
-#: apps/transactions/models.py:1040
+#: apps/transactions/models.py:1139
msgid "Recurrence Type"
msgstr "Type Terugkeerpatroon"
-#: apps/transactions/models.py:1043
+#: apps/transactions/models.py:1142
msgid "Recurrence Interval"
msgstr "Terugkeer Interval"
-#: apps/transactions/models.py:1046
+#: apps/transactions/models.py:1145
msgid "Keep at most"
msgstr "Bewaar maximaal"
-#: apps/transactions/models.py:1050
+#: apps/transactions/models.py:1149
msgid "Last Generated Date"
msgstr "Laatste Gegenereerde Datum"
-#: apps/transactions/models.py:1053
+#: apps/transactions/models.py:1152
msgid "Last Generated Reference Date"
msgstr "Laatste Gegenereerde Referentiedatum"
-#: apps/transactions/models.py:1370 templates/cotton/transaction/item.html:243
+#: apps/transactions/models.py:1517 templates/cotton/transaction/item.html:245
#: templates/cotton/ui/transactions_fab.html:59
msgid "Quick Transaction"
msgstr "Snelle verrichting"
-#: apps/transactions/models.py:1371 templates/includes/sidebar.html:98
-#: templates/quick_transactions/pages/index.html:5
-#: templates/quick_transactions/pages/index.html:15
-msgid "Quick Transactions"
-msgstr "Snelle Verrichtingen"
-
#: apps/transactions/validators.py:8
#, python-format
msgid "%(value)s has too many decimal places. Maximum is 30."
@@ -2192,35 +2237,43 @@ msgstr "%(value)s heeft te veel decimalen. Het maximum is 30."
msgid "%(value)s is not a non-negative number"
msgstr "%(value)s is geen niet-negatief getal"
-#: apps/transactions/views/actions.py:58
+#: apps/transactions/views/actions.py:61
#, python-format
msgid "%(count)s transaction marked as paid"
msgid_plural "%(count)s transactions marked as paid"
msgstr[0] "%(count)s verrichting gemarkeerd als betaald"
msgstr[1] "%(count)s verrichtingen gemarkeerd als betaald"
-#: apps/transactions/views/actions.py:81
+#: apps/transactions/views/actions.py:84
#, python-format
msgid "%(count)s transaction marked as not paid"
msgid_plural "%(count)s transactions marked as not paid"
msgstr[0] "%(count)s verrichting gemarkeerd als niet betaald"
msgstr[1] "%(count)s verrichtingen gemarkeerd als niet betaald"
-#: apps/transactions/views/actions.py:105
+#: apps/transactions/views/actions.py:108
#, python-format
msgid "%(count)s transaction deleted successfully"
msgid_plural "%(count)s transactions deleted successfully"
msgstr[0] "%(count)s verrichting succesvol verwijderd"
msgstr[1] "%(count)s verrichtingen succesvol verwijderd"
-#: apps/transactions/views/actions.py:139
+#: apps/transactions/views/actions.py:142
#, python-format
msgid "%(count)s transaction restored successfully"
msgid_plural "%(count)s transactions restored successfully"
msgstr[0] "%(count)s verrichting succesvol hersteld"
msgstr[1] "%(count)s verrichtingen succesvol hersteld"
-#: apps/transactions/views/actions.py:170
+#: apps/transactions/views/actions.py:174
+#: apps/transactions/views/transactions.py:423
+#, python-format
+msgid "%(count)s transaction updated successfully"
+msgid_plural "%(count)s transactions updated successfully"
+msgstr[0] "%(count)s verrichting succesvol bijgewerkt"
+msgstr[1] "%(count)s verrichtingen succesvol bijgewerkt"
+
+#: apps/transactions/views/actions.py:247
#, python-format
msgid "%(count)s transaction duplicated successfully"
msgid_plural "%(count)s transactions duplicated successfully"
@@ -2239,33 +2292,43 @@ msgstr "Categorie succesvol bijgewerkt"
msgid "Category deleted successfully"
msgstr "Categorie succesvol verwijderd"
-#: apps/transactions/views/conversions.py:72
+#: apps/transactions/views/conversions.py:77
#: apps/transactions/views/quick_transactions.py:46 apps/users/views.py:252
msgid "Item added successfully"
msgstr "Item succesvol toegevoegd"
-#: apps/transactions/views/conversions.py:91
+#: apps/transactions/views/conversions.py:97
msgid "Convert into quick transaction"
msgstr "Omzetten in een snelle verrichting"
-#: apps/transactions/views/conversions.py:108
+#: apps/transactions/views/conversions.py:114
#: apps/transactions/views/recurring_transactions.py:112
msgid "Recurring Transaction added successfully"
msgstr "Terugkerende Verrichting succesvol toegevoegd"
-#: apps/transactions/views/conversions.py:129
+#: apps/transactions/views/conversions.py:136
msgid "Convert into recurring transaction"
msgstr "Omzetten in een terugkerende verrichtingen"
-#: apps/transactions/views/conversions.py:148
+#: apps/transactions/views/conversions.py:155
#: apps/transactions/views/installment_plans.py:87
msgid "Installment Plan added successfully"
msgstr "Afbetalingsplan succesvol toegevoegd"
-#: apps/transactions/views/conversions.py:167
+#: apps/transactions/views/conversions.py:175
msgid "Convert into installment plan"
msgstr "Omzetten in een Afbetalingsplan"
+#: apps/transactions/views/conversions.py:195
+msgid "Transaction converted into a transfer"
+msgstr ""
+
+#: apps/transactions/views/conversions.py:226
+#, fuzzy
+#| msgid "Convert into quick transaction"
+msgid "Convert into transfer"
+msgstr "Omzetten in een snelle verrichting"
+
#: apps/transactions/views/entities.py:72
msgid "Entity added successfully"
msgstr "Bedrijf succesvol toegevoegd"
@@ -2298,7 +2361,7 @@ msgstr "Item succesvol bijgewerkt"
msgid "Item deleted successfully"
msgstr "Item succesvol verwijderd"
-#: apps/transactions/views/quick_transactions.py:164
+#: apps/transactions/views/quick_transactions.py:165
#: apps/transactions/views/transactions.py:156
#: apps/transactions/views/transactions.py:343
msgid "Transaction added successfully"
@@ -2348,30 +2411,23 @@ msgstr "Bijlage succesvol verwijderd"
msgid "Transaction updated successfully"
msgstr "Verrichting succesvol bijgewerkt"
-#: apps/transactions/views/transactions.py:421
-#, python-format
-msgid "%(count)s transaction updated successfully"
-msgid_plural "%(count)s transactions updated successfully"
-msgstr[0] "%(count)s verrichting succesvol bijgewerkt"
-msgstr[1] "%(count)s verrichtingen succesvol bijgewerkt"
-
-#: apps/transactions/views/transactions.py:448
+#: apps/transactions/views/transactions.py:450
msgid "Transaction duplicated successfully"
msgstr "Verrichting succesvol gedupliceerd"
-#: apps/transactions/views/transactions.py:493
+#: apps/transactions/views/transactions.py:495
msgid "Transaction deleted successfully"
msgstr "Verrichting succesvol verwijderd"
-#: apps/transactions/views/transactions.py:523
+#: apps/transactions/views/transactions.py:525
msgid "Transaction restored successfully"
msgstr "Verrichting succesvol hersteld"
-#: apps/transactions/views/transactions.py:549
+#: apps/transactions/views/transactions.py:551
msgid "Transfer added successfully"
msgstr "Transactie succesvol toegevoegd"
-#: apps/transactions/views/transactions.py:579
+#: apps/transactions/views/transactions.py:581
msgid "Transfer updated successfully"
msgstr "Transactie succesvol bijgewerkt"
@@ -2698,8 +2754,9 @@ msgstr "Acties"
#: templates/accounts/fragments/list.html:37
#: templates/bank_sync/fragments/list.html:33
#: templates/categories/fragments/table.html:29
-#: templates/cotton/transaction/item.html:178
-#: templates/cotton/ui/transactions_action_bar.html:54
+#: templates/cotton/transaction/item.html:180
+#: templates/cotton/ui/transactions_action_bar.html:56
+#: templates/cotton/ui/transactions_action_bar.html:90
#: templates/currencies/fragments/list.html:34
#: templates/dca/fragments/strategy/details.html:63
#: templates/dca/fragments/strategy/list.html:31
@@ -2710,8 +2767,8 @@ msgstr "Acties"
#: templates/import_app/fragments/profiles/list.html:46
#: templates/installment_plans/fragments/table.html:28
#: templates/investment_classes/fragments/list.html:39
-#: templates/investments/fragments/detail.html:302
-#: templates/investments/fragments/detail.html:330
+#: templates/investments/fragments/detail.html:310
+#: templates/investments/fragments/detail.html:338
#: templates/quick_transactions/fragments/list.html:25
#: templates/recurring_transactions/fragments/table.html:30
#: templates/rules/fragments/transaction_rule/view.html:22
@@ -2748,10 +2805,11 @@ msgstr "Deel"
#: templates/accounts/fragments/list.html:71
#: templates/bank_sync/fragments/list.html:50
#: templates/categories/fragments/table.html:51
-#: templates/cotton/transaction/item.html:190
-#: templates/cotton/transaction/item.html:316
+#: templates/cotton/transaction/item.html:192
+#: templates/cotton/transaction/item.html:333
#: templates/cotton/ui/deleted_transactions_action_bar.html:57
-#: templates/cotton/ui/transactions_action_bar.html:82
+#: templates/cotton/ui/transactions_action_bar.html:75
+#: templates/cotton/ui/transactions_action_bar.html:107
#: templates/currencies/fragments/list.html:40
#: templates/dca/fragments/strategy/details.html:70
#: templates/dca/fragments/strategy/list.html:38
@@ -2782,10 +2840,11 @@ msgstr "Verwijderen"
#: templates/accounts/fragments/list.html:75
#: templates/bank_sync/fragments/list.html:54
#: templates/categories/fragments/table.html:56
-#: templates/cotton/transaction/item.html:192
-#: templates/cotton/transaction/item.html:322
+#: templates/cotton/transaction/item.html:194
+#: templates/cotton/transaction/item.html:339
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:44
#: templates/dca/fragments/strategy/details.html:75
#: templates/dca/fragments/strategy/list.html:42
@@ -2813,10 +2872,11 @@ msgstr "Weet je het zeker?"
#: templates/account_groups/fragments/list.html:59
#: templates/accounts/fragments/list.html:76
#: templates/categories/fragments/table.html:57
-#: templates/cotton/transaction/item.html:193
-#: templates/cotton/transaction/item.html:323
+#: templates/cotton/transaction/item.html:195
+#: templates/cotton/transaction/item.html:340
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:45
#: templates/dca/fragments/strategy/details.html:76
#: templates/dca/fragments/strategy/list.html:43
@@ -2836,8 +2896,8 @@ msgstr "Je kunt dit niet meer terugdraaien!"
#: templates/accounts/fragments/list.html:77
#: templates/bank_sync/fragments/list.html:56
#: templates/categories/fragments/table.html:58
-#: templates/cotton/transaction/item.html:194
-#: templates/cotton/transaction/item.html:324
+#: templates/cotton/transaction/item.html:196
+#: templates/cotton/transaction/item.html:341
#: templates/currencies/fragments/list.html:46
#: templates/dca/fragments/strategy/details.html:77
#: templates/dca/fragments/strategy/list.html:44
@@ -2917,6 +2977,12 @@ msgstr "Niet gevolgd"
msgid "No accounts"
msgstr "Geen rekeningen"
+#: templates/accounts/fragments/share.html:8
+msgid ""
+"Everyone who can see this account can add, edit and delete its transactions, "
+"installment plans and recurring transactions."
+msgstr ""
+
#: templates/bank_sync/fragments/accounts.html:31
#, fuzzy
#| msgid "No transactions for this year"
@@ -3017,63 +3083,76 @@ msgstr "Sluiten"
msgid "Search"
msgstr "Zoeken"
-#: templates/cotton/transaction/item.html:12
+#: templates/cotton/transaction/item.html:14
msgid "Select"
msgstr "Selecteer"
-#: templates/cotton/transaction/item.html:123
+#: templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:100
msgid "From"
msgstr "Van"
-#: templates/cotton/transaction/item.html:207
-#: templates/cotton/transaction/item.html:218
-#: templates/cotton/transaction/item.html:228
+#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:230
msgid "Show on summaries"
msgstr "Toon op samenvattingen"
-#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:211
msgid "Controlled by account"
msgstr "Gecontroleerd door account"
-#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:222
msgid "Controlled by category"
msgstr "Gecontroleerd door categorie"
-#: templates/cotton/transaction/item.html:233
+#: templates/cotton/transaction/item.html:235
+#: templates/includes/transactions_bulk_actions.html:15
msgid "Hide from summaries"
msgstr "Verbergen in samenvattingen"
-#: templates/cotton/transaction/item.html:237
+#: templates/cotton/transaction/item.html:239
msgid "Convert"
msgstr "Omzetten"
-#: templates/cotton/transaction/item.html:252
-#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:254
+#: templates/cotton/transaction/item.html:264
+#: templates/cotton/transaction/item.html:274
msgid "Already part of a plan or recurrence"
msgstr "Reeds onderdeel van een plan of terugkerende verrichting"
-#: templates/cotton/transaction/item.html:279
+#: templates/cotton/transaction/item.html:291
msgid "Not available for transfers"
msgstr "Niet beschikbaar voor overboekingen"
-#: templates/cotton/transaction/item.html:296
+#: templates/cotton/transaction/item.html:313
+#: templates/includes/transactions_bulk_actions.html:22
msgid "Move to previous month"
msgstr "Ga naar vorige maand"
-#: templates/cotton/transaction/item.html:300
+#: templates/cotton/transaction/item.html:317
+#: templates/includes/transactions_bulk_actions.html:28
msgid "Move to next month"
msgstr "Ga naar volgende maand"
-#: templates/cotton/transaction/item.html:303
+#: templates/cotton/transaction/item.html:320
+#: templates/includes/transactions_bulk_actions.html:33
msgid "Move to today"
msgstr "Ga naar vandaag"
-#: templates/cotton/transaction/item.html:307
-#: templates/cotton/ui/transactions_action_bar.html:78
+#: templates/cotton/transaction/item.html:324
+#: templates/cotton/ui/transactions_action_bar.html:71
+#: templates/cotton/ui/transactions_action_bar.html:98
msgid "Duplicate"
msgstr "Dupliceren"
+#: templates/cotton/transaction/item.html:373
+#, python-format
+msgid "%(counter)s item"
+msgid_plural "%(counter)s items"
+msgstr[0] ""
+msgstr[1] ""
+
#: templates/cotton/ui/account_card.html:10
#: templates/cotton/ui/currency_card.html:10
msgid "projected income"
@@ -3109,22 +3188,26 @@ msgstr "huidige totaal"
msgid "final total"
msgstr "eindtotaal"
-#: templates/cotton/ui/deleted_transactions_action_bar.html:34
-#: templates/cotton/ui/transactions_action_bar.html:34
-msgid "Select All"
-msgstr "Alles selecteren"
-
-#: templates/cotton/ui/deleted_transactions_action_bar.html:40
-#: templates/cotton/ui/transactions_action_bar.html:40
+#: templates/cotton/ui/deleted_transactions_action_bar.html:25
+#: templates/cotton/ui/deleted_transactions_action_bar.html:26
+#: templates/cotton/ui/transactions_action_bar.html:25
+#: templates/cotton/ui/transactions_action_bar.html:26
msgid "Unselect All"
msgstr "Alles deselecteren"
-#: templates/cotton/ui/deleted_transactions_action_bar.html:46
-msgid "Invert election"
-msgstr "Electie omkeren"
+#: templates/cotton/ui/deleted_transactions_action_bar.html:39
+#: templates/cotton/ui/transactions_action_bar.html:39
+msgid "Select All"
+msgstr "Alles selecteren"
+
+#: templates/cotton/ui/deleted_transactions_action_bar.html:45
+#: templates/cotton/ui/transactions_action_bar.html:45
+msgid "Invert selection"
+msgstr "Selectie omkeren"
#: templates/cotton/ui/deleted_transactions_action_bar.html:59
-#: templates/cotton/ui/transactions_action_bar.html:84
+#: templates/cotton/ui/transactions_action_bar.html:77
+#: templates/cotton/ui/transactions_action_bar.html:106
msgid "Yes, delete them!"
msgstr "Ja, verwijder ze!"
@@ -3135,43 +3218,43 @@ msgstr "Ja, verwijder ze!"
#: templates/cotton/ui/deleted_transactions_action_bar.html:166
#: templates/cotton/ui/deleted_transactions_action_bar.html:182
#: templates/cotton/ui/deleted_transactions_action_bar.html:198
-#: templates/cotton/ui/transactions_action_bar.html:128
-#: templates/cotton/ui/transactions_action_bar.html:143
-#: templates/cotton/ui/transactions_action_bar.html:159
-#: templates/cotton/ui/transactions_action_bar.html:175
-#: templates/cotton/ui/transactions_action_bar.html:191
-#: templates/cotton/ui/transactions_action_bar.html:207
-#: templates/cotton/ui/transactions_action_bar.html:223
+#: templates/cotton/ui/transactions_action_bar.html:153
+#: templates/cotton/ui/transactions_action_bar.html:168
+#: templates/cotton/ui/transactions_action_bar.html:184
+#: templates/cotton/ui/transactions_action_bar.html:200
+#: templates/cotton/ui/transactions_action_bar.html:216
+#: templates/cotton/ui/transactions_action_bar.html:232
+#: templates/cotton/ui/transactions_action_bar.html:248
msgid "copied!"
msgstr "gekopieerd!"
#: templates/cotton/ui/deleted_transactions_action_bar.html:123
-#: templates/cotton/ui/transactions_action_bar.html:148
+#: templates/cotton/ui/transactions_action_bar.html:173
msgid "Flat Total"
msgstr "Vast Totaal"
#: templates/cotton/ui/deleted_transactions_action_bar.html:139
-#: templates/cotton/ui/transactions_action_bar.html:164
+#: templates/cotton/ui/transactions_action_bar.html:189
msgid "Real Total"
msgstr "Werkelijk Totaal"
#: templates/cotton/ui/deleted_transactions_action_bar.html:155
-#: templates/cotton/ui/transactions_action_bar.html:180
+#: templates/cotton/ui/transactions_action_bar.html:205
msgid "Mean"
msgstr "Gemiddelde"
#: templates/cotton/ui/deleted_transactions_action_bar.html:171
-#: templates/cotton/ui/transactions_action_bar.html:196
+#: templates/cotton/ui/transactions_action_bar.html:221
msgid "Max"
msgstr "Maximaal"
#: templates/cotton/ui/deleted_transactions_action_bar.html:187
-#: templates/cotton/ui/transactions_action_bar.html:212
+#: templates/cotton/ui/transactions_action_bar.html:237
msgid "Min"
msgstr "Minimaal"
#: templates/cotton/ui/deleted_transactions_action_bar.html:203
-#: templates/cotton/ui/transactions_action_bar.html:228
+#: templates/cotton/ui/transactions_action_bar.html:253
msgid "Count"
msgstr "Rekenen"
@@ -3195,17 +3278,11 @@ msgstr "Terugkerende"
msgid "Balance"
msgstr "Saldo"
-#: templates/cotton/ui/transactions_action_bar.html:46
-msgid "Invert selection"
-msgstr "Selectie omkeren"
-
-#: templates/cotton/ui/transactions_action_bar.html:66
-msgid "Mark as unpaid"
-msgstr "Markeren als niet betaald"
-
-#: templates/cotton/ui/transactions_action_bar.html:71
-msgid "Mark as paid"
-msgstr "Markeren als betaald"
+#: templates/cotton/ui/transactions_action_bar.html:83
+#, fuzzy
+#| msgid "Transactions"
+msgid "More actions"
+msgstr "Verrichtingen"
#: templates/currencies/fragments/add.html:5
msgid "Add currency"
@@ -3643,6 +3720,14 @@ msgstr "is beschikbaar"
msgid "Calculator"
msgstr "Rekenmachine"
+#: templates/includes/transactions_bulk_actions.html:4
+msgid "Mark as unpaid"
+msgstr "Markeren als niet betaald"
+
+#: templates/includes/transactions_bulk_actions.html:9
+msgid "Mark as paid"
+msgstr "Markeren als betaald"
+
#: templates/insights/fragments/category_explorer/charts/account.html:100
#: templates/insights/fragments/category_explorer/charts/currency.html:92
#: templates/monthly_overview/fragments/monthly_account_summary.html:14
@@ -3708,6 +3793,7 @@ msgstr "Geen recente betalingen"
#: templates/insights/fragments/year_by_year.html:140
#: templates/investment_classes/fragments/list.html:65
#: templates/monthly_overview/fragments/monthly_summary.html:168
+#: templates/transactions/widgets/sub_transactions.html:55
msgid "Total"
msgstr "Totaal"
@@ -4145,13 +4231,13 @@ msgstr ""
msgid "Loss, tax or fee"
msgstr ""
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
#, fuzzy
#| msgid "No presets yet"
msgid "No movements yet"
msgstr "Nog geen voorinstellingen"
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
msgid "Use the + button to buy or contribute"
msgstr ""
@@ -4730,6 +4816,12 @@ msgstr "Geen verwijderde verrichtingen om te tonen"
msgid "Deleted transactions"
msgstr "Verwijderde verrichtingen"
+#: templates/transactions/widgets/sub_transactions.html:53
+#, fuzzy
+#| msgid "Add quick transaction"
+msgid "Add sub-transaction"
+msgstr "Voeg snelle verrichtingen toe"
+
#: templates/transactions/widgets/unselectable_income_expense_toggle_buttons.html:11
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:7
msgid "Unchanged"
@@ -4872,6 +4964,9 @@ msgstr "Aanmelden met"
msgid "Yearly Overview"
msgstr "Jaaroverzicht"
+#~ msgid "Invert election"
+#~ msgstr "Electie omkeren"
+
#, fuzzy
#~| msgid "Info"
#~ msgid "In"
diff --git a/app/locale/pl/LC_MESSAGES/django.po b/app/locale/pl/LC_MESSAGES/django.po
index 1906c58e..81556228 100644
--- a/app/locale/pl/LC_MESSAGES/django.po
+++ b/app/locale/pl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-11-12 03:24+0000\n"
+"POT-Creation-Date: 2026-11-14 14:06+0000\n"
"PO-Revision-Date: 2026-06-08 07:57+0000\n"
"Last-Translator: Pawel Augustyn \n"
"Language-Team: Polish Public: Shown for all users. Only editable by the owner."
msgid ""
-"Private: Only shown for the owner and shared users. Only editable by the "
-"owner. Public: Shown for all users. Only editable by the owner."
+"Private: Only shown for the owner and shared users. Public: Shown for "
+"all users. Only the owner can edit, share or delete it."
msgstr ""
"Prywatny: Widoczne tylko dla właściciela oraz osób, którym wpis został "
"udostępnione. Tylko właściciel może dokonywać zmian. Publiczny: "
"Widoczne dla wszystkich. Tylko właściciel może dokonywać zmian."
-#: apps/common/forms.py:76 apps/users/forms.py:191
+#: apps/common/forms.py:78 apps/users/forms.py:191
#: templates/bank_sync/fragments/accounts.html:34
#: templates/transactions/fragments/filter_actions.html:5
msgid "Save"
msgstr "Zapisz"
-#: apps/common/forms.py:90
+#: apps/common/forms.py:92
msgid "You cannot share this item with its owner."
msgstr "Nie możesz udostępniać tego wpisu obecnemu właścicielowi."
@@ -844,6 +861,7 @@ msgid "Now"
msgstr "Teraz"
#: apps/common/widgets/tom_select.py:14
+#: templates/transactions/widgets/sub_transaction_row.html:9
msgid "Remove"
msgstr "Usuń"
@@ -920,8 +938,8 @@ msgstr "Data i godzina"
msgid "Auto"
msgstr "Automatycznie"
-#: apps/currencies/models.py:91 apps/export_app/forms.py:67
-#: apps/export_app/forms.py:152 templates/exchange_rates/fragments/list.html:10
+#: apps/currencies/models.py:91 apps/export_app/forms.py:73
+#: apps/export_app/forms.py:161 templates/exchange_rates/fragments/list.html:10
#: templates/exchange_rates/pages/index.html:4
#: templates/includes/sidebar.html:204
msgid "Exchange Rates"
@@ -1082,25 +1100,25 @@ msgstr "Pomyślnie zakolejkowano serwisy"
msgid "Create transaction"
msgstr "Stwórz transakcję"
-#: apps/dca/forms.py:69 apps/transactions/forms.py:582
+#: apps/dca/forms.py:69 apps/transactions/forms.py:668
msgid "From Account"
msgstr "Z konta"
-#: apps/dca/forms.py:75 apps/transactions/forms.py:587
+#: apps/dca/forms.py:75 apps/transactions/forms.py:673
msgid "To Account"
msgstr "Na konto"
#: apps/dca/forms.py:117 apps/dca/forms.py:125 apps/export_app/forms.py:49
-#: apps/export_app/forms.py:143 apps/insights/views.py:57
-#: apps/rules/forms.py:185 apps/rules/forms.py:195 apps/rules/models.py:46
-#: apps/rules/models.py:307 apps/transactions/filters.py:84
-#: apps/transactions/forms.py:78 apps/transactions/forms.py:346
-#: apps/transactions/forms.py:526 apps/transactions/forms.py:640
-#: apps/transactions/forms.py:647 apps/transactions/forms.py:862
-#: apps/transactions/forms.py:1114 apps/transactions/models.py:313
-#: apps/transactions/models.py:369 apps/transactions/models.py:770
-#: apps/transactions/models.py:1028 apps/transactions/models.py:1353
-#: templates/entities/fragments/list.html:9
+#: apps/export_app/forms.py:150 apps/insights/views.py:57
+#: apps/rules/forms.py:185 apps/rules/forms.py:196 apps/rules/models.py:47
+#: apps/rules/models.py:308 apps/transactions/filters.py:100
+#: apps/transactions/filters.py:175 apps/transactions/forms.py:161
+#: apps/transactions/forms.py:431 apps/transactions/forms.py:612
+#: apps/transactions/forms.py:726 apps/transactions/forms.py:733
+#: apps/transactions/forms.py:950 apps/transactions/forms.py:1204
+#: apps/transactions/models.py:315 apps/transactions/models.py:371
+#: apps/transactions/models.py:866 apps/transactions/models.py:1127
+#: apps/transactions/models.py:1500 templates/entities/fragments/list.html:9
#: templates/entities/pages/index.html:4 templates/includes/sidebar.html:168
#: templates/insights/fragments/month_by_month.html:40
#: templates/insights/fragments/month_by_month.html:43
@@ -1136,8 +1154,8 @@ msgstr "Kwoty transakcji są od teraz ukryte"
msgid "You must provide an account."
msgstr "Należy wybrać konto."
-#: apps/dca/forms.py:322 apps/transactions/forms.py:780
-#: apps/transactions/models.py:978
+#: apps/dca/forms.py:322 apps/transactions/forms.py:866
+#: apps/transactions/models.py:1077
msgid "From and To accounts must be different."
msgstr "Konta \"Z\" oraz \"Do\" muszą się różnić."
@@ -1155,10 +1173,10 @@ msgid "Payment Currency"
msgstr "Waluta dla płatności"
#: apps/dca/models.py:26 apps/dca/models.py:181 apps/rules/forms.py:180
-#: apps/rules/forms.py:196 apps/rules/models.py:43 apps/rules/models.py:295
-#: apps/transactions/forms.py:504 apps/transactions/forms.py:668
-#: apps/transactions/models.py:354 apps/transactions/models.py:774
-#: apps/transactions/models.py:1031 apps/transactions/models.py:1338
+#: apps/rules/forms.py:197 apps/rules/models.py:44 apps/rules/models.py:296
+#: apps/transactions/forms.py:590 apps/transactions/forms.py:754
+#: apps/transactions/models.py:356 apps/transactions/models.py:870
+#: apps/transactions/models.py:1130 apps/transactions/models.py:1485
msgid "Notes"
msgstr "Notatki"
@@ -1166,7 +1184,7 @@ msgstr "Notatki"
msgid "DCA Strategy"
msgstr ""
-#: apps/dca/models.py:35 apps/export_app/forms.py:166
+#: apps/dca/models.py:35 apps/export_app/forms.py:175
msgid "DCA Strategies"
msgstr ""
@@ -1186,7 +1204,7 @@ msgstr ""
msgid "DCA Entry"
msgstr ""
-#: apps/dca/models.py:187 apps/export_app/forms.py:167
+#: apps/dca/models.py:187 apps/export_app/forms.py:176
msgid "DCA Entries"
msgstr ""
@@ -1214,14 +1232,14 @@ msgstr "Pomyślnie zaktualizowano wpis"
msgid "Entry deleted successfully"
msgstr "Pomyślnie usunięto wpis"
-#: apps/export_app/forms.py:13 apps/export_app/forms.py:137
+#: apps/export_app/forms.py:13 apps/export_app/forms.py:144
#: templates/includes/sidebar.html:247 templates/users/fragments/list.html:10
#: templates/users/pages/index.html:4
msgid "Users"
msgstr "Użytkownicy"
-#: apps/export_app/forms.py:31 apps/export_app/forms.py:144
-#: apps/transactions/models.py:423 templates/includes/sidebar.html:81
+#: apps/export_app/forms.py:31 apps/export_app/forms.py:151
+#: apps/transactions/models.py:425 templates/includes/sidebar.html:81
#: templates/includes/sidebar.html:154
#: templates/recurring_transactions/fragments/list_transactions.html:5
#: templates/recurring_transactions/fragments/table.html:37
@@ -1229,9 +1247,9 @@ msgstr "Użytkownicy"
msgid "Transactions"
msgstr "Transakcje"
-#: apps/export_app/forms.py:37 apps/export_app/forms.py:141
-#: apps/insights/views.py:43 apps/transactions/filters.py:74
-#: templates/categories/fragments/list.html:9
+#: apps/export_app/forms.py:37 apps/export_app/forms.py:148
+#: apps/insights/views.py:43 apps/transactions/filters.py:90
+#: apps/transactions/filters.py:165 templates/categories/fragments/list.html:9
#: templates/categories/pages/index.html:4 templates/includes/sidebar.html:156
#: templates/insights/fragments/month_by_month.html:18
#: templates/insights/fragments/month_by_month.html:21
@@ -1240,102 +1258,117 @@ msgstr "Transakcje"
msgid "Categories"
msgstr "Kategorie"
-#: apps/export_app/forms.py:55 apps/export_app/forms.py:147
-#: apps/transactions/models.py:1068 templates/includes/sidebar.html:110
+#: apps/export_app/forms.py:55 apps/export_app/forms.py:155
+#: apps/transactions/models.py:1167 templates/includes/sidebar.html:110
#: templates/recurring_transactions/fragments/list.html:9
#: templates/recurring_transactions/pages/index.html:4
msgid "Recurring Transactions"
msgstr "Zlecenia stałe"
-#: apps/export_app/forms.py:61 apps/export_app/forms.py:145
-#: apps/transactions/models.py:788 templates/includes/sidebar.html:104
+#: apps/export_app/forms.py:61 apps/export_app/forms.py:153
+#: apps/transactions/models.py:884 templates/includes/sidebar.html:104
#: templates/installment_plans/fragments/list.html:9
#: templates/installment_plans/pages/index.html:4
msgid "Installment Plans"
msgstr "Plany ratalne"
-#: apps/export_app/forms.py:73 apps/export_app/forms.py:150
+#: apps/export_app/forms.py:67 apps/export_app/forms.py:157
+#: apps/transactions/models.py:1518 templates/includes/sidebar.html:98
+#: templates/quick_transactions/pages/index.html:5
+#: templates/quick_transactions/pages/index.html:15
+msgid "Quick Transactions"
+msgstr "Szablony transakcji"
+
+#: apps/export_app/forms.py:79 apps/export_app/forms.py:159
#: templates/exchange_rates_services/fragments/list.html:10
#: templates/exchange_rates_services/pages/index.html:4
#: templates/includes/sidebar.html:232
msgid "Automatic Exchange Rates"
msgstr "Automatyczne kursy walut"
-#: apps/export_app/forms.py:79 templates/bank_sync/fragments/list.html:8
+#: apps/export_app/forms.py:85 templates/bank_sync/fragments/list.html:8
#: templates/bank_sync/pages/index.html:4 templates/includes/sidebar.html:238
msgid "Bank Sync"
msgstr ""
-#: apps/export_app/forms.py:80
+#: apps/export_app/forms.py:86
msgid "Includes the providers' API keys"
msgstr ""
-#: apps/export_app/forms.py:86 templates/includes/sidebar.html:212
+#: apps/export_app/forms.py:92 templates/includes/sidebar.html:212
#: templates/rules/fragments/list.html:9 templates/rules/pages/index.html:4
msgid "Rules"
msgstr "Reguły"
-#: apps/export_app/forms.py:92 templates/cotton/transaction/item.html:66
+#: apps/export_app/forms.py:98 templates/cotton/transaction/item.html:68
msgid "DCA"
msgstr "DCA"
-#: apps/export_app/forms.py:98 apps/export_app/forms.py:168
+#: apps/export_app/forms.py:104 apps/export_app/forms.py:177
#: templates/import_app/fragments/profiles/list.html:21
#: templates/import_app/pages/profiles_index.html:4
msgid "Import Profiles"
msgstr "Profile importu"
-#: apps/export_app/forms.py:126 templates/export_app/fragments/export.html:5
+#: apps/export_app/forms.py:133 templates/export_app/fragments/export.html:5
#: templates/export_app/pages/index.html:13
msgid "Export"
msgstr "Eksport"
-#: apps/export_app/forms.py:134
+#: apps/export_app/forms.py:141
msgid "Import a ZIP file exported from WYGIWYH"
msgstr "Zaimportuj plik ZIP wyeksportowany z instancji WYGIWYH"
-#: apps/export_app/forms.py:135
+#: apps/export_app/forms.py:142
msgid "ZIP File"
msgstr "Plik ZIP"
-#: apps/export_app/forms.py:157
+#: apps/export_app/forms.py:152 apps/rules/forms.py:193 apps/rules/models.py:42
+#: apps/rules/models.py:320 apps/transactions/models.py:736
+#: templates/transactions/widgets/sub_transactions.html:39
+#, fuzzy
+#| msgid "Transactions"
+msgid "Sub-transactions"
+msgstr "Transakcje"
+
+#: apps/export_app/forms.py:166
#, fuzzy
#| msgid "By account"
msgid "Bank Sync Accounts"
msgstr "Wg konta"
-#: apps/export_app/forms.py:159 apps/rules/models.py:27
+#: apps/export_app/forms.py:168 apps/rules/models.py:27
msgid "Transaction rules"
msgstr "Reguły transakcji"
-#: apps/export_app/forms.py:161 apps/rules/models.py:68
+#: apps/export_app/forms.py:170 apps/rules/models.py:69
msgid "Edit transaction action"
msgstr "Edycja akcji transakcyjnych"
-#: apps/export_app/forms.py:164 apps/rules/models.py:327
+#: apps/export_app/forms.py:173 apps/rules/models.py:332
msgid "Update or create transaction actions"
msgstr "Stwórz lub uaktualnij akcje transakcyjne"
-#: apps/export_app/forms.py:199 templates/cotton/transaction/item.html:310
+#: apps/export_app/forms.py:210 templates/cotton/transaction/item.html:327
#: templates/cotton/ui/deleted_transactions_action_bar.html:53
#: templates/export_app/fragments/restore.html:5
#: templates/export_app/pages/index.html:19
msgid "Restore"
msgstr "Importuj"
-#: apps/export_app/forms.py:209
+#: apps/export_app/forms.py:220
msgid "Please upload either a ZIP file or at least one CSV file"
msgstr "Wrzuć plik ZIP lub przynajmniej jeden plik CSV"
-#: apps/export_app/views.py:190
+#: apps/export_app/views.py:216
msgid "You have to select at least one export"
msgstr "Musisz wybrać co najmniej jedną opcję do eksportu"
-#: apps/export_app/views.py:210
+#: apps/export_app/views.py:236
msgid "Data restored successfully"
msgstr "Pomyślnie odtworzono dane"
-#: apps/export_app/views.py:222
+#: apps/export_app/views.py:248
msgid ""
"There was an error restoring your data. Check the logs for more details."
msgstr ""
@@ -1424,7 +1457,7 @@ msgstr "Usunięto import"
#: apps/insights/forms.py:118 apps/insights/utils/sankey.py:36
#: apps/insights/utils/sankey.py:167 apps/insights/views.py:45
-#: apps/transactions/filters.py:209
+#: apps/transactions/filters.py:294
#: templates/insights/fragments/month_by_month.html:119
#: templates/insights/fragments/year_by_year.html:73
msgid "Uncategorized"
@@ -1481,24 +1514,24 @@ msgstr "Brak kategorii"
msgid "Tag"
msgstr "Tag"
-#: apps/insights/views.py:52 apps/transactions/filters.py:215
+#: apps/insights/views.py:52 apps/transactions/filters.py:303
#: templates/insights/fragments/month_by_month.html:121
#: templates/insights/fragments/year_by_year.html:75
msgid "Untagged"
msgstr "Nieotagowane"
-#: apps/insights/views.py:53 apps/transactions/models.py:611
+#: apps/insights/views.py:53 apps/transactions/models.py:632
#: templates/tags/fragments/table.html:69
msgid "No tags"
msgstr "Brak tagów"
-#: apps/insights/views.py:58 apps/transactions/models.py:312
+#: apps/insights/views.py:58 apps/transactions/models.py:314
#: templates/insights/fragments/month_by_month.html:88
#: templates/insights/fragments/year_by_year.html:56
msgid "Entity"
msgstr "Encja"
-#: apps/insights/views.py:59 apps/transactions/filters.py:222
+#: apps/insights/views.py:59 apps/transactions/filters.py:311
#: templates/insights/fragments/month_by_month.html:123
#: templates/insights/fragments/year_by_year.html:77
msgid "No entity"
@@ -1516,19 +1549,19 @@ msgstr ""
msgid "Unclassified"
msgstr ""
-#: apps/investments/views.py:289
+#: apps/investments/views.py:290
#, fuzzy
#| msgid "Installment Plan added successfully"
msgid "Asset class added successfully"
msgstr "Dodano plan ratalny"
-#: apps/investments/views.py:297
+#: apps/investments/views.py:298
#, fuzzy
#| msgid "Tag updated successfully"
msgid "Asset class updated successfully"
msgstr "Zaktualizowano tag"
-#: apps/investments/views.py:318
+#: apps/investments/views.py:319
#, fuzzy
#| msgid "Tag deleted successfully"
msgid "Asset class deleted successfully"
@@ -1563,13 +1596,13 @@ msgstr "Na następnym ekranie dodasz akcje dla tej reguły."
msgid "Set field"
msgstr "Ustaw pole"
-#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:123
+#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:101
msgid "To"
msgstr "Na"
#: apps/rules/forms.py:78 apps/rules/forms.py:158 apps/rules/models.py:20
-#: apps/rules/models.py:62 apps/rules/models.py:323
+#: apps/rules/models.py:63 apps/rules/models.py:328
#: templates/rules/fragments/list.html:23
msgid "Order"
msgstr "Kolejność"
@@ -1587,36 +1620,37 @@ msgid "Operator"
msgstr "Operator"
#: apps/rules/forms.py:174 apps/rules/forms.py:188 apps/rules/models.py:36
-#: apps/rules/models.py:271 apps/transactions/forms.py:468
-#: apps/transactions/models.py:337 apps/transactions/models.py:730
-#: apps/transactions/models.py:1009 apps/transactions/models.py:1323
+#: apps/rules/models.py:272 apps/transactions/forms.py:554
+#: apps/transactions/models.py:339 apps/transactions/models.py:826
+#: apps/transactions/models.py:1108 apps/transactions/models.py:1470
#: templates/mini_tools/simulator.html:63
msgid "Type"
msgstr "Typ"
#: apps/rules/forms.py:175 apps/rules/forms.py:189 apps/rules/models.py:37
-#: apps/rules/models.py:275 apps/transactions/filters.py:22
-#: apps/transactions/forms.py:472 apps/transactions/forms.py:650
-#: apps/transactions/models.py:339 apps/transactions/models.py:1325
-#: templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/rules/models.py:276 apps/transactions/filters.py:23
+#: apps/transactions/forms.py:558 apps/transactions/forms.py:736
+#: apps/transactions/models.py:341 apps/transactions/models.py:1472
+#: templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/transactions/widgets/paid_toggle_button.html:10
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:13
msgid "Paid"
msgstr "Zapłacono"
#: apps/rules/forms.py:177 apps/rules/forms.py:191 apps/rules/models.py:39
-#: apps/rules/models.py:283 apps/transactions/forms.py:90
-#: apps/transactions/forms.py:488 apps/transactions/forms.py:655
-#: apps/transactions/forms.py:868 apps/transactions/models.py:341
-#: apps/transactions/models.py:748 apps/transactions/models.py:1033
+#: apps/rules/models.py:284 apps/transactions/forms.py:173
+#: apps/transactions/forms.py:574 apps/transactions/forms.py:741
+#: apps/transactions/forms.py:956 apps/transactions/models.py:343
+#: apps/transactions/models.py:844 apps/transactions/models.py:1132
msgid "Reference Date"
msgstr "Data referencyjna"
#: apps/rules/forms.py:178 apps/rules/forms.py:192 apps/rules/models.py:41
-#: apps/rules/models.py:287 apps/transactions/forms.py:495
-#: apps/transactions/models.py:347 apps/transactions/models.py:1014
-#: apps/transactions/models.py:1331
+#: apps/rules/models.py:288 apps/transactions/forms.py:75
+#: apps/transactions/forms.py:581 apps/transactions/models.py:349
+#: apps/transactions/models.py:730 apps/transactions/models.py:1113
+#: apps/transactions/models.py:1478
#: templates/insights/fragments/sankey.html:102
#: templates/installment_plans/fragments/table.html:18
#: templates/mini_tools/simulator.html:70
@@ -1625,51 +1659,52 @@ msgstr "Data referencyjna"
msgid "Amount"
msgstr "Kwota"
-#: apps/rules/forms.py:179 apps/rules/forms.py:193 apps/rules/models.py:14
-#: apps/rules/models.py:42 apps/rules/models.py:291
-#: apps/transactions/forms.py:499 apps/transactions/forms.py:659
-#: apps/transactions/models.py:352 apps/transactions/models.py:732
-#: apps/transactions/models.py:1017 apps/transactions/models.py:1336
+#: apps/rules/forms.py:179 apps/rules/forms.py:194 apps/rules/models.py:14
+#: apps/rules/models.py:43 apps/rules/models.py:292
+#: apps/transactions/forms.py:585 apps/transactions/forms.py:745
+#: apps/transactions/models.py:354 apps/transactions/models.py:828
+#: apps/transactions/models.py:1116 apps/transactions/models.py:1483
msgid "Description"
msgstr "Opis"
-#: apps/rules/forms.py:182 apps/rules/forms.py:198 apps/rules/models.py:47
-#: apps/rules/models.py:299 apps/transactions/models.py:399
-#: apps/transactions/models.py:1358
+#: apps/rules/forms.py:182 apps/rules/forms.py:199 apps/rules/models.py:48
+#: apps/rules/models.py:300 apps/transactions/models.py:401
+#: apps/transactions/models.py:1505
msgid "Internal Note"
msgstr "Notatka"
-#: apps/rules/forms.py:183 apps/rules/forms.py:199 apps/rules/models.py:48
-#: apps/rules/models.py:303 apps/transactions/models.py:401
-#: apps/transactions/models.py:1360
+#: apps/rules/forms.py:183 apps/rules/forms.py:200 apps/rules/models.py:49
+#: apps/rules/models.py:304 apps/transactions/models.py:403
+#: apps/transactions/models.py:1507
msgid "Internal ID"
msgstr "Wewnętrzne ID"
-#: apps/rules/forms.py:186 apps/rules/forms.py:200 apps/rules/models.py:40
-#: apps/rules/models.py:319 apps/transactions/forms.py:672
-#: apps/transactions/models.py:251 apps/transactions/models.py:342
-#: apps/transactions/models.py:1326
+#: apps/rules/forms.py:186 apps/rules/forms.py:201 apps/rules/models.py:40
+#: apps/rules/models.py:324 apps/transactions/forms.py:758
+#: apps/transactions/models.py:253 apps/transactions/models.py:344
+#: apps/transactions/models.py:1473
msgid "Mute"
msgstr "Wycisz"
-#: apps/rules/forms.py:215
+#: apps/rules/forms.py:216
msgid "Search Criteria"
msgstr "Kryteria wyszukiwania"
-#: apps/rules/forms.py:360
+#: apps/rules/forms.py:361
msgid "Set Values"
msgstr "Ustaw wartości"
-#: apps/rules/forms.py:407 apps/rules/forms.py:442 apps/rules/forms.py:477
-#: apps/transactions/models.py:422 apps/transactions/models.py:667
+#: apps/rules/forms.py:409 apps/rules/forms.py:444 apps/rules/forms.py:479
+#: apps/transactions/models.py:424 apps/transactions/models.py:703
+#: apps/transactions/models.py:763
msgid "Transaction"
msgstr "Transakcja"
-#: apps/rules/forms.py:411 apps/rules/forms.py:446 apps/rules/forms.py:481
+#: apps/rules/forms.py:413 apps/rules/forms.py:448 apps/rules/forms.py:483
msgid "Type to search for a transaction"
msgstr "Typ wyszukiwanych transakcji"
-#: apps/rules/forms.py:422 apps/rules/forms.py:457 apps/rules/forms.py:491
+#: apps/rules/forms.py:424 apps/rules/forms.py:459 apps/rules/forms.py:493
#: templates/rules/fragments/transaction_rule/dry_run/created.html:5
#: templates/rules/fragments/transaction_rule/dry_run/deleted.html:5
#: templates/rules/fragments/transaction_rule/dry_run/updated.html:5
@@ -1689,15 +1724,15 @@ msgstr "Sekwencjonowane"
msgid "Transaction rule"
msgstr "Reguła transakcji"
-#: apps/rules/models.py:54 apps/rules/models.py:98
+#: apps/rules/models.py:55 apps/rules/models.py:99
msgid "Rule"
msgstr "Reguła"
-#: apps/rules/models.py:59
+#: apps/rules/models.py:60
msgid "Field"
msgstr "Pole"
-#: apps/rules/models.py:61 templates/investments/fragments/charts.html:86
+#: apps/rules/models.py:62 templates/investments/fragments/charts.html:86
#: templates/investments/fragments/detail.html:68
#: templates/investments/fragments/detail.html:127
#: templates/investments/fragments/detail.html:245
@@ -1705,51 +1740,51 @@ msgstr "Pole"
msgid "Value"
msgstr "Wartość"
-#: apps/rules/models.py:69
+#: apps/rules/models.py:70
msgid "Edit transaction actions"
msgstr "Edytuj akcje transakcji"
-#: apps/rules/models.py:84
+#: apps/rules/models.py:85
msgid "is exactly"
msgstr "jest równe"
-#: apps/rules/models.py:85
+#: apps/rules/models.py:86
msgid "contains"
msgstr "zawiera"
-#: apps/rules/models.py:86
+#: apps/rules/models.py:87
msgid "starts with"
msgstr "zaczyna się od"
-#: apps/rules/models.py:87
+#: apps/rules/models.py:88
msgid "ends with"
msgstr "kończy się"
-#: apps/rules/models.py:88
+#: apps/rules/models.py:89
msgid "equals"
msgstr "jest równe"
-#: apps/rules/models.py:89
+#: apps/rules/models.py:90
msgid "greater than"
msgstr "większe niż"
-#: apps/rules/models.py:90
+#: apps/rules/models.py:91
msgid "less than"
msgstr "mniejsze niż"
-#: apps/rules/models.py:91
+#: apps/rules/models.py:92
msgid "greater than or equal"
msgstr "większe lub równe"
-#: apps/rules/models.py:92
+#: apps/rules/models.py:93
msgid "less than or equal"
msgstr "mniejsze lub równe"
-#: apps/rules/models.py:102
+#: apps/rules/models.py:103
msgid "Filter"
msgstr "Filtr"
-#: apps/rules/models.py:105
+#: apps/rules/models.py:106
msgid ""
"Generic expression to enable or disable execution. Should evaluate to True "
"or False"
@@ -1757,7 +1792,7 @@ msgstr ""
"Wyrażenie pozwalające na aktywację lub dezaktywację wywołania. Powinno "
"wykonać się do True lub False"
-#: apps/rules/models.py:326
+#: apps/rules/models.py:331
msgid "Update or create transaction action"
msgstr "Zaktualizuj lub utwórz akcję transakcji"
@@ -1801,8 +1836,8 @@ msgstr "Akcja stworzenia lub aktualizacji transakcji zmodyfikowana"
msgid "Update or Create Transaction action deleted successfully"
msgstr "Usunięto akcję stworzenia lub aktualizacji transakcji"
-#: apps/transactions/filters.py:23 templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/transactions/filters.py:24 templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/insights/fragments/overview/index.html:68
#: templates/net_worth/net_worth.html:39 templates/net_worth/net_worth.html:43
#: templates/transactions/widgets/paid_toggle_button.html:7
@@ -1810,134 +1845,144 @@ msgstr "Usunięto akcję stworzenia lub aktualizacji transakcji"
msgid "Projected"
msgstr "Przewidywane"
-#: apps/transactions/filters.py:28 templates/categories/fragments/table.html:18
+#: apps/transactions/filters.py:29 templates/categories/fragments/table.html:18
msgid "Muted"
msgstr "Wyciszone"
-#: apps/transactions/filters.py:51
+#: apps/transactions/filters.py:67 apps/transactions/filters.py:144
msgid "Content"
msgstr "Zawartość"
-#: apps/transactions/filters.py:57
+#: apps/transactions/filters.py:73
msgid "Transaction Type"
msgstr "Typ transakcji"
-#: apps/transactions/filters.py:95
+#: apps/transactions/filters.py:111
msgid "Mute Status"
msgstr "Wycisz status"
-#: apps/transactions/filters.py:100
+#: apps/transactions/filters.py:116
msgid "Date from"
msgstr "Data od"
-#: apps/transactions/filters.py:105 apps/transactions/filters.py:115
+#: apps/transactions/filters.py:121 apps/transactions/filters.py:131
msgid "Until"
msgstr "Data do"
-#: apps/transactions/filters.py:110
+#: apps/transactions/filters.py:126
msgid "Reference date from"
msgstr "Data referencyjna od"
-#: apps/transactions/filters.py:120
+#: apps/transactions/filters.py:136
msgid "Amount min"
msgstr "Kwota od"
-#: apps/transactions/filters.py:125
+#: apps/transactions/filters.py:141
msgid "Amount max"
msgstr "Kwota do"
-#: apps/transactions/filters.py:208
+#: apps/transactions/filters.py:240
+msgid "Include"
+msgstr ""
+
+#: apps/transactions/filters.py:245
+msgid "Exclude"
+msgstr ""
+
+#: apps/transactions/filters.py:293
msgid "Categorized"
msgstr "Skategoryzowane"
-#: apps/transactions/filters.py:215
+#: apps/transactions/filters.py:303
msgid "Tagged"
msgstr "Otagowane"
-#: apps/transactions/filters.py:221
+#: apps/transactions/filters.py:310
msgid "Any entity"
msgstr "Dowolna encja"
-#: apps/transactions/forms.py:192
+#: apps/transactions/forms.py:277
msgid "More"
msgstr "Więcej"
-#: apps/transactions/forms.py:229
+#: apps/transactions/forms.py:314
msgid "Save and add similar"
msgstr "Zapisz i dodaj podobne"
-#: apps/transactions/forms.py:234
+#: apps/transactions/forms.py:319
msgid "Save and add another"
msgstr "Zapisz i dodaj kolejne"
-#: apps/transactions/forms.py:271 templates/cotton/transaction/item.html:184
+#: apps/transactions/forms.py:356 templates/cotton/transaction/item.html:186
#: templates/transactions/fragments/attachments.html:4
msgid "Attachments"
msgstr "Załączniki"
-#: apps/transactions/forms.py:272
+#: apps/transactions/forms.py:357
msgid ""
"Files are private and only visible to users with access to this transaction."
msgstr ""
-#: apps/transactions/forms.py:283
+#: apps/transactions/forms.py:368
#, fuzzy
#| msgid "Reload"
msgid "Upload"
msgstr "Odśwież"
-#: apps/transactions/forms.py:355 apps/transactions/forms.py:1120
-#: apps/transactions/models.py:947
+#: apps/transactions/forms.py:440 apps/transactions/forms.py:1210
+#: apps/transactions/models.py:1046
#, fuzzy
#| msgid "To Account"
msgid "To account"
msgstr "Na konto"
-#: apps/transactions/forms.py:382 apps/transactions/forms.py:675
+#: apps/transactions/forms.py:467 apps/transactions/forms.py:761
msgid "Muted transactions won't be displayed on monthly summaries"
msgstr "Wyciszone transakcje nie będą pokazywane w miesięcznych podsumowaniach"
-#: apps/transactions/forms.py:594
+#: apps/transactions/forms.py:680
msgid "From Amount"
msgstr "Od kwoty"
-#: apps/transactions/forms.py:599
+#: apps/transactions/forms.py:685
msgid "To Amount"
msgstr "Do kwoty"
-#: apps/transactions/forms.py:741 apps/transactions/models.py:992
-#: apps/transactions/models.py:1303 templates/cotton/transaction/item.html:52
-#: templates/cotton/transaction/item.html:60
+#: apps/transactions/forms.py:827 apps/transactions/models.py:1091
+#: apps/transactions/models.py:1450 templates/cotton/transaction/item.html:54
+#: templates/cotton/transaction/item.html:62
+#: templates/cotton/transaction/item.html:272
+#: templates/cotton/transaction/item.html:304
#: templates/cotton/ui/quick_transactions_buttons.html:40
#: templates/cotton/ui/transactions_fab.html:44
msgid "Transfer"
msgstr "Przelew"
-#: apps/transactions/forms.py:1005
+#: apps/transactions/forms.py:1095
msgid "Tag name"
msgstr "Nazwa taga"
-#: apps/transactions/forms.py:1033
+#: apps/transactions/forms.py:1123
msgid "Entity name"
msgstr "Nazwa encji"
-#: apps/transactions/forms.py:1061
+#: apps/transactions/forms.py:1151
msgid "Category name"
msgstr "Nazwa kategorii"
-#: apps/transactions/forms.py:1063
+#: apps/transactions/forms.py:1153
msgid "Muted categories won't be displayed on monthly summaries"
msgstr "Wyciszone kategorie nie będą wyświetlane w miesięcznych podsumowaniach"
-#: apps/transactions/forms.py:1228
+#: apps/transactions/forms.py:1319
msgid "future transactions"
msgstr "przyszłe transakcje"
-#: apps/transactions/forms.py:1255
+#: apps/transactions/forms.py:1346
msgid "End date should be after the start date"
msgstr "Data końcowa powinna być po dacie startowej"
-#: apps/transactions/models.py:256
+#: apps/transactions/models.py:258
msgid ""
"Deactivated categories won't be able to be selected when creating new "
"transactions"
@@ -1945,26 +1990,26 @@ msgstr ""
"Zdezaktywowanych kategorii nie da się wykorzystać przy tworzeniu nowych "
"transakcji"
-#: apps/transactions/models.py:264
+#: apps/transactions/models.py:266
msgid "Transaction Category"
msgstr "Kategoria transakcji"
-#: apps/transactions/models.py:265
+#: apps/transactions/models.py:267
msgid "Transaction Categories"
msgstr "Kategorie transakcji"
-#: apps/transactions/models.py:280
+#: apps/transactions/models.py:282
msgid ""
"Deactivated tags won't be able to be selected when creating new transactions"
msgstr ""
"Zdezaktywowanych tagów nie da się wykorzystać przy tworzeniu nowych "
"transakcji"
-#: apps/transactions/models.py:288 apps/transactions/models.py:289
+#: apps/transactions/models.py:290 apps/transactions/models.py:291
msgid "Transaction Tags"
msgstr "Tagi transakcji"
-#: apps/transactions/models.py:304
+#: apps/transactions/models.py:306
msgid ""
"Deactivated entities won't be able to be selected when creating new "
"transactions"
@@ -1972,8 +2017,8 @@ msgstr ""
"Zdezaktywowanych encji nie da się wykorzystać przy tworzeniu nowych "
"transakcji"
-#: apps/transactions/models.py:324 apps/transactions/models.py:991
-#: apps/transactions/models.py:1302
+#: apps/transactions/models.py:326 apps/transactions/models.py:1090
+#: apps/transactions/models.py:1449
#: templates/calendar_view/fragments/list.html:42
#: templates/calendar_view/fragments/list.html:44
#: templates/calendar_view/fragments/list.html:52
@@ -1985,14 +2030,14 @@ msgstr ""
#: templates/investments/fragments/detail.html:71
#: templates/investments/fragments/detail.html:175
#: templates/investments/fragments/detail.html:227
-#: templates/investments/fragments/detail.html:318
+#: templates/investments/fragments/detail.html:326
#: templates/mini_tools/simulator.html:66
#: templates/monthly_overview/fragments/monthly_summary.html:42
msgid "Income"
msgstr "Przychody"
-#: apps/transactions/models.py:325 apps/transactions/models.py:993
-#: apps/transactions/models.py:1304
+#: apps/transactions/models.py:327 apps/transactions/models.py:1092
+#: apps/transactions/models.py:1451
#: templates/calendar_view/fragments/list.html:46
#: templates/calendar_view/fragments/list.html:48
#: templates/calendar_view/fragments/list.html:56
@@ -2004,200 +2049,200 @@ msgstr "Przychody"
msgid "Expense"
msgstr "Wydatek"
-#: apps/transactions/models.py:380 apps/transactions/models.py:787
-#: templates/cotton/transaction/item.html:260
-#: templates/cotton/transaction/item.html:277
-#: templates/cotton/transaction/item.html:287
+#: apps/transactions/models.py:382 apps/transactions/models.py:883
+#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:289
+#: templates/cotton/transaction/item.html:299
msgid "Installment Plan"
msgstr ""
-#: apps/transactions/models.py:389 apps/transactions/models.py:1067
-#: templates/cotton/transaction/item.html:250
-#: templates/cotton/transaction/item.html:270
+#: apps/transactions/models.py:391 apps/transactions/models.py:1166
+#: templates/cotton/transaction/item.html:252
+#: templates/cotton/transaction/item.html:282
msgid "Recurring Transaction"
msgstr "Zlecenie stałe"
-#: apps/transactions/models.py:397
+#: apps/transactions/models.py:399
#, fuzzy
#| msgid "Quick Transaction"
msgid "Linked Transaction"
msgstr "Szablon transakcji"
-#: apps/transactions/models.py:405
+#: apps/transactions/models.py:407
msgid "Deleted"
msgstr "Usunięte"
-#: apps/transactions/models.py:410
+#: apps/transactions/models.py:412
msgid "Deleted At"
msgstr ""
-#: apps/transactions/models.py:518
+#: apps/transactions/models.py:521
msgid "A transfer needs one expense and one income."
msgstr ""
-#: apps/transactions/models.py:520
+#: apps/transactions/models.py:523
msgid "A transfer needs two different accounts."
msgstr ""
-#: apps/transactions/models.py:524
+#: apps/transactions/models.py:527
msgid "This transaction is already part of another transfer."
msgstr ""
-#: apps/transactions/models.py:613
+#: apps/transactions/models.py:634
msgid "No category"
msgstr "Brak kategorii"
-#: apps/transactions/models.py:615
+#: apps/transactions/models.py:636
msgid "No description"
msgstr "Brak opisu"
-#: apps/transactions/models.py:672
+#: apps/transactions/models.py:735
+#, fuzzy
+#| msgid "Transaction"
+msgid "Sub-transaction"
+msgstr "Transakcja"
+
+#: apps/transactions/models.py:768
#, fuzzy
#| msgid "ZIP File"
msgid "File"
msgstr "Plik ZIP"
-#: apps/transactions/models.py:674
+#: apps/transactions/models.py:770
msgid "Original Name"
msgstr ""
-#: apps/transactions/models.py:676
+#: apps/transactions/models.py:772
#, fuzzy
#| msgid "Content"
msgid "Content Type"
msgstr "Zawartość"
-#: apps/transactions/models.py:678
+#: apps/transactions/models.py:774
msgid "Size"
msgstr ""
-#: apps/transactions/models.py:683
+#: apps/transactions/models.py:779
msgid "Uploaded By"
msgstr ""
-#: apps/transactions/models.py:688
+#: apps/transactions/models.py:784
msgid "Transaction Attachment"
msgstr "Załącznik transakcji"
-#: apps/transactions/models.py:689
+#: apps/transactions/models.py:785
msgid "Transaction Attachments"
msgstr "Załączniki transakcji"
-#: apps/transactions/models.py:719 templates/includes/sidebar.html:57
+#: apps/transactions/models.py:815 templates/includes/sidebar.html:57
msgid "Yearly"
msgstr "Rocznie"
-#: apps/transactions/models.py:720 apps/users/models.py:469
+#: apps/transactions/models.py:816 apps/users/models.py:469
#: templates/includes/sidebar.html:51
msgid "Monthly"
msgstr "Miesięcznie"
-#: apps/transactions/models.py:721
+#: apps/transactions/models.py:817
msgid "Weekly"
msgstr "Tygodniowo"
-#: apps/transactions/models.py:722
+#: apps/transactions/models.py:818
msgid "Daily"
msgstr "Dziennie"
-#: apps/transactions/models.py:735
+#: apps/transactions/models.py:831
msgid "Number of Installments"
msgstr ""
-#: apps/transactions/models.py:740
+#: apps/transactions/models.py:836
msgid "Installment Start"
msgstr ""
-#: apps/transactions/models.py:741
+#: apps/transactions/models.py:837
msgid "The installment number to start counting from"
msgstr ""
-#: apps/transactions/models.py:746 apps/transactions/models.py:1037
+#: apps/transactions/models.py:842 apps/transactions/models.py:1136
msgid "Start Date"
msgstr "Data startowa"
-#: apps/transactions/models.py:750 apps/transactions/models.py:1038
+#: apps/transactions/models.py:846 apps/transactions/models.py:1137
msgid "End Date"
msgstr "Data końcowa"
-#: apps/transactions/models.py:755
+#: apps/transactions/models.py:851
msgid "Recurrence"
msgstr "Zlecenie stałe"
-#: apps/transactions/models.py:758
+#: apps/transactions/models.py:854
msgid "Installment Amount"
msgstr ""
-#: apps/transactions/models.py:777 apps/transactions/models.py:1057
+#: apps/transactions/models.py:873 apps/transactions/models.py:1156
msgid "Add description to transactions"
msgstr "Dodaj opis dla transakcji"
-#: apps/transactions/models.py:780 apps/transactions/models.py:1060
+#: apps/transactions/models.py:876 apps/transactions/models.py:1159
msgid "Add notes to transactions"
msgstr "Dodaj notatki do transakcji"
-#: apps/transactions/models.py:954
+#: apps/transactions/models.py:1053
#, fuzzy
#| msgid "To Amount"
msgid "To amount"
msgstr "Do kwoty"
-#: apps/transactions/models.py:955
+#: apps/transactions/models.py:1054
msgid "Leave empty to use the same amount"
msgstr ""
-#: apps/transactions/models.py:996 templates/mini_tools/simulator.html:129
+#: apps/transactions/models.py:1095 templates/mini_tools/simulator.html:129
msgid "day(s)"
msgstr "dni"
-#: apps/transactions/models.py:997 templates/mini_tools/simulator.html:130
+#: apps/transactions/models.py:1096 templates/mini_tools/simulator.html:130
msgid "week(s)"
msgstr "tygodni"
-#: apps/transactions/models.py:998 templates/mini_tools/simulator.html:131
+#: apps/transactions/models.py:1097 templates/mini_tools/simulator.html:131
msgid "month(s)"
msgstr "miesięcy"
-#: apps/transactions/models.py:999 templates/mini_tools/simulator.html:132
+#: apps/transactions/models.py:1098 templates/mini_tools/simulator.html:132
msgid "year(s)"
msgstr "lat"
-#: apps/transactions/models.py:1001
+#: apps/transactions/models.py:1100
#: templates/recurring_transactions/fragments/list.html:18
msgid "Paused"
msgstr "Zapauzowane"
-#: apps/transactions/models.py:1040
+#: apps/transactions/models.py:1139
msgid "Recurrence Type"
msgstr "Typ powtarzania"
-#: apps/transactions/models.py:1043
+#: apps/transactions/models.py:1142
msgid "Recurrence Interval"
msgstr "Co ile powtarzać"
-#: apps/transactions/models.py:1046
+#: apps/transactions/models.py:1145
msgid "Keep at most"
msgstr "Zachowuj co najwyżej"
-#: apps/transactions/models.py:1050
+#: apps/transactions/models.py:1149
msgid "Last Generated Date"
msgstr ""
-#: apps/transactions/models.py:1053
+#: apps/transactions/models.py:1152
msgid "Last Generated Reference Date"
msgstr ""
-#: apps/transactions/models.py:1370 templates/cotton/transaction/item.html:243
+#: apps/transactions/models.py:1517 templates/cotton/transaction/item.html:245
#: templates/cotton/ui/transactions_fab.html:59
msgid "Quick Transaction"
msgstr "Szablon transakcji"
-#: apps/transactions/models.py:1371 templates/includes/sidebar.html:98
-#: templates/quick_transactions/pages/index.html:5
-#: templates/quick_transactions/pages/index.html:15
-msgid "Quick Transactions"
-msgstr "Szablony transakcji"
-
#: apps/transactions/validators.py:8
#, python-format
msgid "%(value)s has too many decimal places. Maximum is 30."
@@ -2208,7 +2253,7 @@ msgstr "%(value)s ma zbyt wiele cyfr po przecinku, max to 30."
msgid "%(value)s is not a non-negative number"
msgstr "%(value)s nie może być liczbą ujemną"
-#: apps/transactions/views/actions.py:58
+#: apps/transactions/views/actions.py:61
#, python-format
msgid "%(count)s transaction marked as paid"
msgid_plural "%(count)s transactions marked as paid"
@@ -2216,7 +2261,7 @@ msgstr[0] "Oznaczono %(count)s transakcję jako opłaconą"
msgstr[1] "Oznaczono %(count)s transakcje jako opłacone"
msgstr[2] "Oznaczono %(count)s transakcji jako opłaconych"
-#: apps/transactions/views/actions.py:81
+#: apps/transactions/views/actions.py:84
#, python-format
msgid "%(count)s transaction marked as not paid"
msgid_plural "%(count)s transactions marked as not paid"
@@ -2224,7 +2269,7 @@ msgstr[0] "Oznaczono %(count)s transakcję jako nieopłaconą"
msgstr[1] "Oznaczono %(count)s transakcje jako nieopłacone"
msgstr[2] "Oznaczono %(count)s transakcji jako nieopłaconych"
-#: apps/transactions/views/actions.py:105
+#: apps/transactions/views/actions.py:108
#, python-format
msgid "%(count)s transaction deleted successfully"
msgid_plural "%(count)s transactions deleted successfully"
@@ -2232,7 +2277,7 @@ msgstr[0] "Usunięto %(count)s transakcję"
msgstr[1] "Usunięto %(count)s transakcje"
msgstr[2] "Usunięto %(count)s transakcji"
-#: apps/transactions/views/actions.py:139
+#: apps/transactions/views/actions.py:142
#, python-format
msgid "%(count)s transaction restored successfully"
msgid_plural "%(count)s transactions restored successfully"
@@ -2240,7 +2285,16 @@ msgstr[0] "Odtworzono %(count)s transakcję"
msgstr[1] "Odtworzono %(count)s transakcje"
msgstr[2] "Odtworzono %(count)s transakcji"
-#: apps/transactions/views/actions.py:170
+#: apps/transactions/views/actions.py:174
+#: apps/transactions/views/transactions.py:423
+#, python-format
+msgid "%(count)s transaction updated successfully"
+msgid_plural "%(count)s transactions updated successfully"
+msgstr[0] "Zaktualizowano %(count)s transakcję"
+msgstr[1] "Zaktualizowano %(count)s transakcje"
+msgstr[2] "Zaktualizowano %(count)s transakcji"
+
+#: apps/transactions/views/actions.py:247
#, python-format
msgid "%(count)s transaction duplicated successfully"
msgid_plural "%(count)s transactions duplicated successfully"
@@ -2260,39 +2314,49 @@ msgstr "Zaktualizowano kategorię"
msgid "Category deleted successfully"
msgstr "Usunięto kategorię"
-#: apps/transactions/views/conversions.py:72
+#: apps/transactions/views/conversions.py:77
#: apps/transactions/views/quick_transactions.py:46 apps/users/views.py:252
msgid "Item added successfully"
msgstr "Pomyślnie dodano"
-#: apps/transactions/views/conversions.py:91
+#: apps/transactions/views/conversions.py:97
#, fuzzy
#| msgid "Edit quick transaction"
msgid "Convert into quick transaction"
msgstr "Edytuj szablon transakcji"
-#: apps/transactions/views/conversions.py:108
+#: apps/transactions/views/conversions.py:114
#: apps/transactions/views/recurring_transactions.py:112
msgid "Recurring Transaction added successfully"
msgstr "Dodano zlecenie stałe"
-#: apps/transactions/views/conversions.py:129
+#: apps/transactions/views/conversions.py:136
#, fuzzy
#| msgid "Edit recurring transaction"
msgid "Convert into recurring transaction"
msgstr "Edytuj zlecenie stałe"
-#: apps/transactions/views/conversions.py:148
+#: apps/transactions/views/conversions.py:155
#: apps/transactions/views/installment_plans.py:87
msgid "Installment Plan added successfully"
msgstr "Dodano plan ratalny"
-#: apps/transactions/views/conversions.py:167
+#: apps/transactions/views/conversions.py:175
#, fuzzy
#| msgid "No installment plans"
msgid "Convert into installment plan"
msgstr "Brak planów ratalnych"
+#: apps/transactions/views/conversions.py:195
+msgid "Transaction converted into a transfer"
+msgstr ""
+
+#: apps/transactions/views/conversions.py:226
+#, fuzzy
+#| msgid "Edit quick transaction"
+msgid "Convert into transfer"
+msgstr "Edytuj szablon transakcji"
+
#: apps/transactions/views/entities.py:72
msgid "Entity added successfully"
msgstr "Dodano encję"
@@ -2325,7 +2389,7 @@ msgstr "Pomyślnie zaktualizowano"
msgid "Item deleted successfully"
msgstr "Pomyślnie usunięto"
-#: apps/transactions/views/quick_transactions.py:164
+#: apps/transactions/views/quick_transactions.py:165
#: apps/transactions/views/transactions.py:156
#: apps/transactions/views/transactions.py:343
msgid "Transaction added successfully"
@@ -2375,31 +2439,23 @@ msgstr "Usunięto załącznik"
msgid "Transaction updated successfully"
msgstr "Zaktualizowano transakcję"
-#: apps/transactions/views/transactions.py:421
-#, python-format
-msgid "%(count)s transaction updated successfully"
-msgid_plural "%(count)s transactions updated successfully"
-msgstr[0] "Zaktualizowano %(count)s transakcję"
-msgstr[1] "Zaktualizowano %(count)s transakcje"
-msgstr[2] "Zaktualizowano %(count)s transakcji"
-
-#: apps/transactions/views/transactions.py:448
+#: apps/transactions/views/transactions.py:450
msgid "Transaction duplicated successfully"
msgstr "Zduplikowano transakcję"
-#: apps/transactions/views/transactions.py:493
+#: apps/transactions/views/transactions.py:495
msgid "Transaction deleted successfully"
msgstr "Usunięto transakcję"
-#: apps/transactions/views/transactions.py:523
+#: apps/transactions/views/transactions.py:525
msgid "Transaction restored successfully"
msgstr "Odtworzono transakcję"
-#: apps/transactions/views/transactions.py:549
+#: apps/transactions/views/transactions.py:551
msgid "Transfer added successfully"
msgstr "Dodano przelew"
-#: apps/transactions/views/transactions.py:579
+#: apps/transactions/views/transactions.py:581
#, fuzzy
#| msgid "Transfer added successfully"
msgid "Transfer updated successfully"
@@ -2745,8 +2801,9 @@ msgstr "Akcje"
#: templates/accounts/fragments/list.html:37
#: templates/bank_sync/fragments/list.html:33
#: templates/categories/fragments/table.html:29
-#: templates/cotton/transaction/item.html:178
-#: templates/cotton/ui/transactions_action_bar.html:54
+#: templates/cotton/transaction/item.html:180
+#: templates/cotton/ui/transactions_action_bar.html:56
+#: templates/cotton/ui/transactions_action_bar.html:90
#: templates/currencies/fragments/list.html:34
#: templates/dca/fragments/strategy/details.html:63
#: templates/dca/fragments/strategy/list.html:31
@@ -2757,8 +2814,8 @@ msgstr "Akcje"
#: templates/import_app/fragments/profiles/list.html:46
#: templates/installment_plans/fragments/table.html:28
#: templates/investment_classes/fragments/list.html:39
-#: templates/investments/fragments/detail.html:302
-#: templates/investments/fragments/detail.html:330
+#: templates/investments/fragments/detail.html:310
+#: templates/investments/fragments/detail.html:338
#: templates/quick_transactions/fragments/list.html:25
#: templates/recurring_transactions/fragments/table.html:30
#: templates/rules/fragments/transaction_rule/view.html:22
@@ -2795,10 +2852,11 @@ msgstr "Udostępnij"
#: templates/accounts/fragments/list.html:71
#: templates/bank_sync/fragments/list.html:50
#: templates/categories/fragments/table.html:51
-#: templates/cotton/transaction/item.html:190
-#: templates/cotton/transaction/item.html:316
+#: templates/cotton/transaction/item.html:192
+#: templates/cotton/transaction/item.html:333
#: templates/cotton/ui/deleted_transactions_action_bar.html:57
-#: templates/cotton/ui/transactions_action_bar.html:82
+#: templates/cotton/ui/transactions_action_bar.html:75
+#: templates/cotton/ui/transactions_action_bar.html:107
#: templates/currencies/fragments/list.html:40
#: templates/dca/fragments/strategy/details.html:70
#: templates/dca/fragments/strategy/list.html:38
@@ -2829,10 +2887,11 @@ msgstr "Usuń"
#: templates/accounts/fragments/list.html:75
#: templates/bank_sync/fragments/list.html:54
#: templates/categories/fragments/table.html:56
-#: templates/cotton/transaction/item.html:192
-#: templates/cotton/transaction/item.html:322
+#: templates/cotton/transaction/item.html:194
+#: templates/cotton/transaction/item.html:339
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:44
#: templates/dca/fragments/strategy/details.html:75
#: templates/dca/fragments/strategy/list.html:42
@@ -2860,10 +2919,11 @@ msgstr "Czy na pewno?"
#: templates/account_groups/fragments/list.html:59
#: templates/accounts/fragments/list.html:76
#: templates/categories/fragments/table.html:57
-#: templates/cotton/transaction/item.html:193
-#: templates/cotton/transaction/item.html:323
+#: templates/cotton/transaction/item.html:195
+#: templates/cotton/transaction/item.html:340
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:45
#: templates/dca/fragments/strategy/details.html:76
#: templates/dca/fragments/strategy/list.html:43
@@ -2883,8 +2943,8 @@ msgstr "Tej akcji nie da się odwrócić!"
#: templates/accounts/fragments/list.html:77
#: templates/bank_sync/fragments/list.html:56
#: templates/categories/fragments/table.html:58
-#: templates/cotton/transaction/item.html:194
-#: templates/cotton/transaction/item.html:324
+#: templates/cotton/transaction/item.html:196
+#: templates/cotton/transaction/item.html:341
#: templates/currencies/fragments/list.html:46
#: templates/dca/fragments/strategy/details.html:77
#: templates/dca/fragments/strategy/list.html:44
@@ -2964,6 +3024,12 @@ msgstr "Przestań śledzić"
msgid "No accounts"
msgstr "Brak kont"
+#: templates/accounts/fragments/share.html:8
+msgid ""
+"Everyone who can see this account can add, edit and delete its transactions, "
+"installment plans and recurring transactions."
+msgstr ""
+
#: templates/bank_sync/fragments/accounts.html:31
#, fuzzy
#| msgid "No transactions for this year"
@@ -3062,65 +3128,79 @@ msgstr "Zamknij"
msgid "Search"
msgstr "Szukaj"
-#: templates/cotton/transaction/item.html:12
+#: templates/cotton/transaction/item.html:14
msgid "Select"
msgstr "Wybierz"
-#: templates/cotton/transaction/item.html:123
+#: templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:100
msgid "From"
msgstr "Od"
-#: templates/cotton/transaction/item.html:207
-#: templates/cotton/transaction/item.html:218
-#: templates/cotton/transaction/item.html:228
+#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:230
msgid "Show on summaries"
msgstr "Pokaż w podsumowaniach"
-#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:211
msgid "Controlled by account"
msgstr ""
-#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:222
msgid "Controlled by category"
msgstr ""
-#: templates/cotton/transaction/item.html:233
+#: templates/cotton/transaction/item.html:235
+#: templates/includes/transactions_bulk_actions.html:15
msgid "Hide from summaries"
msgstr ""
-#: templates/cotton/transaction/item.html:237
+#: templates/cotton/transaction/item.html:239
#, fuzzy
#| msgid "Invert"
msgid "Convert"
msgstr "Zamień"
-#: templates/cotton/transaction/item.html:252
-#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:254
+#: templates/cotton/transaction/item.html:264
+#: templates/cotton/transaction/item.html:274
msgid "Already part of a plan or recurrence"
msgstr ""
-#: templates/cotton/transaction/item.html:279
+#: templates/cotton/transaction/item.html:291
msgid "Not available for transfers"
msgstr ""
-#: templates/cotton/transaction/item.html:296
+#: templates/cotton/transaction/item.html:313
+#: templates/includes/transactions_bulk_actions.html:22
msgid "Move to previous month"
msgstr ""
-#: templates/cotton/transaction/item.html:300
+#: templates/cotton/transaction/item.html:317
+#: templates/includes/transactions_bulk_actions.html:28
msgid "Move to next month"
msgstr ""
-#: templates/cotton/transaction/item.html:303
+#: templates/cotton/transaction/item.html:320
+#: templates/includes/transactions_bulk_actions.html:33
msgid "Move to today"
msgstr ""
-#: templates/cotton/transaction/item.html:307
-#: templates/cotton/ui/transactions_action_bar.html:78
+#: templates/cotton/transaction/item.html:324
+#: templates/cotton/ui/transactions_action_bar.html:71
+#: templates/cotton/ui/transactions_action_bar.html:98
msgid "Duplicate"
msgstr "Zduplikuj"
+#: templates/cotton/transaction/item.html:373
+#, python-format
+msgid "%(counter)s item"
+msgid_plural "%(counter)s items"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
#: templates/cotton/ui/account_card.html:10
#: templates/cotton/ui/currency_card.html:10
msgid "projected income"
@@ -3156,22 +3236,26 @@ msgstr "obecne saldo"
msgid "final total"
msgstr "finalne saldo"
-#: templates/cotton/ui/deleted_transactions_action_bar.html:34
-#: templates/cotton/ui/transactions_action_bar.html:34
-msgid "Select All"
-msgstr "Zaznacz wszystkie"
-
-#: templates/cotton/ui/deleted_transactions_action_bar.html:40
-#: templates/cotton/ui/transactions_action_bar.html:40
+#: templates/cotton/ui/deleted_transactions_action_bar.html:25
+#: templates/cotton/ui/deleted_transactions_action_bar.html:26
+#: templates/cotton/ui/transactions_action_bar.html:25
+#: templates/cotton/ui/transactions_action_bar.html:26
msgid "Unselect All"
msgstr "Odznacz wszystkie"
-#: templates/cotton/ui/deleted_transactions_action_bar.html:46
-msgid "Invert election"
-msgstr "Odwróć wybór"
+#: templates/cotton/ui/deleted_transactions_action_bar.html:39
+#: templates/cotton/ui/transactions_action_bar.html:39
+msgid "Select All"
+msgstr "Zaznacz wszystkie"
+
+#: templates/cotton/ui/deleted_transactions_action_bar.html:45
+#: templates/cotton/ui/transactions_action_bar.html:45
+msgid "Invert selection"
+msgstr "Odwróć zaznaczenie"
#: templates/cotton/ui/deleted_transactions_action_bar.html:59
-#: templates/cotton/ui/transactions_action_bar.html:84
+#: templates/cotton/ui/transactions_action_bar.html:77
+#: templates/cotton/ui/transactions_action_bar.html:106
msgid "Yes, delete them!"
msgstr "Tak, usuń!"
@@ -3182,43 +3266,43 @@ msgstr "Tak, usuń!"
#: templates/cotton/ui/deleted_transactions_action_bar.html:166
#: templates/cotton/ui/deleted_transactions_action_bar.html:182
#: templates/cotton/ui/deleted_transactions_action_bar.html:198
-#: templates/cotton/ui/transactions_action_bar.html:128
-#: templates/cotton/ui/transactions_action_bar.html:143
-#: templates/cotton/ui/transactions_action_bar.html:159
-#: templates/cotton/ui/transactions_action_bar.html:175
-#: templates/cotton/ui/transactions_action_bar.html:191
-#: templates/cotton/ui/transactions_action_bar.html:207
-#: templates/cotton/ui/transactions_action_bar.html:223
+#: templates/cotton/ui/transactions_action_bar.html:153
+#: templates/cotton/ui/transactions_action_bar.html:168
+#: templates/cotton/ui/transactions_action_bar.html:184
+#: templates/cotton/ui/transactions_action_bar.html:200
+#: templates/cotton/ui/transactions_action_bar.html:216
+#: templates/cotton/ui/transactions_action_bar.html:232
+#: templates/cotton/ui/transactions_action_bar.html:248
msgid "copied!"
msgstr "skopiowano!"
#: templates/cotton/ui/deleted_transactions_action_bar.html:123
-#: templates/cotton/ui/transactions_action_bar.html:148
+#: templates/cotton/ui/transactions_action_bar.html:173
msgid "Flat Total"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:139
-#: templates/cotton/ui/transactions_action_bar.html:164
+#: templates/cotton/ui/transactions_action_bar.html:189
msgid "Real Total"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:155
-#: templates/cotton/ui/transactions_action_bar.html:180
+#: templates/cotton/ui/transactions_action_bar.html:205
msgid "Mean"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:171
-#: templates/cotton/ui/transactions_action_bar.html:196
+#: templates/cotton/ui/transactions_action_bar.html:221
msgid "Max"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:187
-#: templates/cotton/ui/transactions_action_bar.html:212
+#: templates/cotton/ui/transactions_action_bar.html:237
msgid "Min"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:203
-#: templates/cotton/ui/transactions_action_bar.html:228
+#: templates/cotton/ui/transactions_action_bar.html:253
msgid "Count"
msgstr ""
@@ -3242,17 +3326,11 @@ msgstr "Zlecenie stałe"
msgid "Balance"
msgstr ""
-#: templates/cotton/ui/transactions_action_bar.html:46
-msgid "Invert selection"
-msgstr "Odwróć zaznaczenie"
-
-#: templates/cotton/ui/transactions_action_bar.html:66
-msgid "Mark as unpaid"
-msgstr ""
-
-#: templates/cotton/ui/transactions_action_bar.html:71
-msgid "Mark as paid"
-msgstr ""
+#: templates/cotton/ui/transactions_action_bar.html:83
+#, fuzzy
+#| msgid "Transactions"
+msgid "More actions"
+msgstr "Transakcje"
#: templates/currencies/fragments/add.html:5
msgid "Add currency"
@@ -3691,6 +3769,14 @@ msgstr ""
msgid "Calculator"
msgstr "Kalkulator"
+#: templates/includes/transactions_bulk_actions.html:4
+msgid "Mark as unpaid"
+msgstr ""
+
+#: templates/includes/transactions_bulk_actions.html:9
+msgid "Mark as paid"
+msgstr ""
+
#: templates/insights/fragments/category_explorer/charts/account.html:100
#: templates/insights/fragments/category_explorer/charts/currency.html:92
#: templates/monthly_overview/fragments/monthly_account_summary.html:14
@@ -3756,6 +3842,7 @@ msgstr "Brak ostatnich transakcji"
#: templates/insights/fragments/year_by_year.html:140
#: templates/investment_classes/fragments/list.html:65
#: templates/monthly_overview/fragments/monthly_summary.html:168
+#: templates/transactions/widgets/sub_transactions.html:55
msgid "Total"
msgstr "Łącznie"
@@ -4176,13 +4263,13 @@ msgstr ""
msgid "Loss, tax or fee"
msgstr ""
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
#, fuzzy
#| msgid "No attachments yet"
msgid "No movements yet"
msgstr "Brak załączników"
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
msgid "Use the + button to buy or contribute"
msgstr ""
@@ -4771,6 +4858,12 @@ msgstr ""
msgid "Deleted transactions"
msgstr ""
+#: templates/transactions/widgets/sub_transactions.html:53
+#, fuzzy
+#| msgid "Add quick transaction"
+msgid "Add sub-transaction"
+msgstr "Dodaj szablon transakcji"
+
#: templates/transactions/widgets/unselectable_income_expense_toggle_buttons.html:11
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:7
msgid "Unchanged"
@@ -4913,6 +5006,9 @@ msgstr "Zaloguj za pomocą"
msgid "Yearly Overview"
msgstr "Podsumowanie roczne"
+#~ msgid "Invert election"
+#~ msgstr "Odwróć wybór"
+
#, fuzzy
#~| msgid "Info"
#~ msgid "In"
diff --git a/app/locale/pt_BR/LC_MESSAGES/django.po b/app/locale/pt_BR/LC_MESSAGES/django.po
index 702266db..de3f81f4 100644
--- 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: 2026-11-12 03:24+0000\n"
+"POT-Creation-Date: 2026-11-14 14:06+0000\n"
"PO-Revision-Date: 2026-11-08 19:40+0000\n"
"Last-Translator: Herculino Trotta \n"
"Language-Team: Portuguese (Brazil) Public: Shown for all users. Only editable by the owner."
msgid ""
-"Private: Only shown for the owner and shared users. Only editable by the "
-"owner. Public: Shown for all users. Only editable by the owner."
+"Private: Only shown for the owner and shared users. Public: Shown for "
+"all users. Only the owner can edit, share or delete it."
msgstr ""
"Privado: Exibido somente para o proprietário e usuários compartilhados. "
"Somente editável pelo proprietário. Público: Exibido para todos os "
"usuários. Somente editável pelo proprietário."
-#: apps/common/forms.py:76 apps/users/forms.py:191
+#: apps/common/forms.py:78 apps/users/forms.py:191
#: templates/bank_sync/fragments/accounts.html:34
#: templates/transactions/fragments/filter_actions.html:5
msgid "Save"
msgstr "Salvar"
-#: apps/common/forms.py:90
+#: apps/common/forms.py:92
msgid "You cannot share this item with its owner."
msgstr "Você não pode compartilhar este item com o seu proprietário."
@@ -839,6 +856,7 @@ msgid "Now"
msgstr "Agora"
#: apps/common/widgets/tom_select.py:14
+#: templates/transactions/widgets/sub_transaction_row.html:9
msgid "Remove"
msgstr "Remover"
@@ -917,8 +935,8 @@ msgstr "Data e Tempo"
msgid "Auto"
msgstr "Automático"
-#: apps/currencies/models.py:91 apps/export_app/forms.py:67
-#: apps/export_app/forms.py:152 templates/exchange_rates/fragments/list.html:10
+#: apps/currencies/models.py:91 apps/export_app/forms.py:73
+#: apps/export_app/forms.py:161 templates/exchange_rates/fragments/list.html:10
#: templates/exchange_rates/pages/index.html:4
#: templates/includes/sidebar.html:204
msgid "Exchange Rates"
@@ -1080,25 +1098,25 @@ msgstr "Serviços marcados para execução com sucesso"
msgid "Create transaction"
msgstr "Criar transação"
-#: apps/dca/forms.py:69 apps/transactions/forms.py:582
+#: apps/dca/forms.py:69 apps/transactions/forms.py:668
msgid "From Account"
msgstr "Conta de origem"
-#: apps/dca/forms.py:75 apps/transactions/forms.py:587
+#: apps/dca/forms.py:75 apps/transactions/forms.py:673
msgid "To Account"
msgstr "Conta de destino"
#: apps/dca/forms.py:117 apps/dca/forms.py:125 apps/export_app/forms.py:49
-#: apps/export_app/forms.py:143 apps/insights/views.py:57
-#: apps/rules/forms.py:185 apps/rules/forms.py:195 apps/rules/models.py:46
-#: apps/rules/models.py:307 apps/transactions/filters.py:84
-#: apps/transactions/forms.py:78 apps/transactions/forms.py:346
-#: apps/transactions/forms.py:526 apps/transactions/forms.py:640
-#: apps/transactions/forms.py:647 apps/transactions/forms.py:862
-#: apps/transactions/forms.py:1114 apps/transactions/models.py:313
-#: apps/transactions/models.py:369 apps/transactions/models.py:770
-#: apps/transactions/models.py:1028 apps/transactions/models.py:1353
-#: templates/entities/fragments/list.html:9
+#: apps/export_app/forms.py:150 apps/insights/views.py:57
+#: apps/rules/forms.py:185 apps/rules/forms.py:196 apps/rules/models.py:47
+#: apps/rules/models.py:308 apps/transactions/filters.py:100
+#: apps/transactions/filters.py:175 apps/transactions/forms.py:161
+#: apps/transactions/forms.py:431 apps/transactions/forms.py:612
+#: apps/transactions/forms.py:726 apps/transactions/forms.py:733
+#: apps/transactions/forms.py:950 apps/transactions/forms.py:1204
+#: apps/transactions/models.py:315 apps/transactions/models.py:371
+#: apps/transactions/models.py:866 apps/transactions/models.py:1127
+#: apps/transactions/models.py:1500 templates/entities/fragments/list.html:9
#: templates/entities/pages/index.html:4 templates/includes/sidebar.html:168
#: templates/insights/fragments/month_by_month.html:40
#: templates/insights/fragments/month_by_month.html:43
@@ -1134,8 +1152,8 @@ msgstr "Os valores das transações agora estão ocultos"
msgid "You must provide an account."
msgstr "Você deve informar uma conta."
-#: apps/dca/forms.py:322 apps/transactions/forms.py:780
-#: apps/transactions/models.py:978
+#: apps/dca/forms.py:322 apps/transactions/forms.py:866
+#: apps/transactions/models.py:1077
msgid "From and To accounts must be different."
msgstr "As contas De e Para devem ser diferentes."
@@ -1153,10 +1171,10 @@ msgid "Payment Currency"
msgstr "Moeda de pagamento"
#: apps/dca/models.py:26 apps/dca/models.py:181 apps/rules/forms.py:180
-#: apps/rules/forms.py:196 apps/rules/models.py:43 apps/rules/models.py:295
-#: apps/transactions/forms.py:504 apps/transactions/forms.py:668
-#: apps/transactions/models.py:354 apps/transactions/models.py:774
-#: apps/transactions/models.py:1031 apps/transactions/models.py:1338
+#: apps/rules/forms.py:197 apps/rules/models.py:44 apps/rules/models.py:296
+#: apps/transactions/forms.py:590 apps/transactions/forms.py:754
+#: apps/transactions/models.py:356 apps/transactions/models.py:870
+#: apps/transactions/models.py:1130 apps/transactions/models.py:1485
msgid "Notes"
msgstr "Notas"
@@ -1164,7 +1182,7 @@ msgstr "Notas"
msgid "DCA Strategy"
msgstr "Estratégia CMP"
-#: apps/dca/models.py:35 apps/export_app/forms.py:166
+#: apps/dca/models.py:35 apps/export_app/forms.py:175
msgid "DCA Strategies"
msgstr "Estratégias CMP"
@@ -1184,7 +1202,7 @@ msgstr "Quantia recebida"
msgid "DCA Entry"
msgstr "Entrada CMP"
-#: apps/dca/models.py:187 apps/export_app/forms.py:167
+#: apps/dca/models.py:187 apps/export_app/forms.py:176
msgid "DCA Entries"
msgstr "Entradas CMP"
@@ -1212,14 +1230,14 @@ msgstr "Entrada atualizada com sucesso"
msgid "Entry deleted successfully"
msgstr "Entrada apagada com sucesso"
-#: apps/export_app/forms.py:13 apps/export_app/forms.py:137
+#: apps/export_app/forms.py:13 apps/export_app/forms.py:144
#: templates/includes/sidebar.html:247 templates/users/fragments/list.html:10
#: templates/users/pages/index.html:4
msgid "Users"
msgstr "Usuários"
-#: apps/export_app/forms.py:31 apps/export_app/forms.py:144
-#: apps/transactions/models.py:423 templates/includes/sidebar.html:81
+#: apps/export_app/forms.py:31 apps/export_app/forms.py:151
+#: apps/transactions/models.py:425 templates/includes/sidebar.html:81
#: templates/includes/sidebar.html:154
#: templates/recurring_transactions/fragments/list_transactions.html:5
#: templates/recurring_transactions/fragments/table.html:37
@@ -1227,9 +1245,9 @@ msgstr "Usuários"
msgid "Transactions"
msgstr "Transações"
-#: apps/export_app/forms.py:37 apps/export_app/forms.py:141
-#: apps/insights/views.py:43 apps/transactions/filters.py:74
-#: templates/categories/fragments/list.html:9
+#: apps/export_app/forms.py:37 apps/export_app/forms.py:148
+#: apps/insights/views.py:43 apps/transactions/filters.py:90
+#: apps/transactions/filters.py:165 templates/categories/fragments/list.html:9
#: templates/categories/pages/index.html:4 templates/includes/sidebar.html:156
#: templates/insights/fragments/month_by_month.html:18
#: templates/insights/fragments/month_by_month.html:21
@@ -1238,100 +1256,115 @@ msgstr "Transações"
msgid "Categories"
msgstr "Categorias"
-#: apps/export_app/forms.py:55 apps/export_app/forms.py:147
-#: apps/transactions/models.py:1068 templates/includes/sidebar.html:110
+#: apps/export_app/forms.py:55 apps/export_app/forms.py:155
+#: apps/transactions/models.py:1167 templates/includes/sidebar.html:110
#: templates/recurring_transactions/fragments/list.html:9
#: templates/recurring_transactions/pages/index.html:4
msgid "Recurring Transactions"
msgstr "Transações Recorrentes"
-#: apps/export_app/forms.py:61 apps/export_app/forms.py:145
-#: apps/transactions/models.py:788 templates/includes/sidebar.html:104
+#: apps/export_app/forms.py:61 apps/export_app/forms.py:153
+#: apps/transactions/models.py:884 templates/includes/sidebar.html:104
#: templates/installment_plans/fragments/list.html:9
#: templates/installment_plans/pages/index.html:4
msgid "Installment Plans"
msgstr "Parcelamentos"
-#: apps/export_app/forms.py:73 apps/export_app/forms.py:150
+#: apps/export_app/forms.py:67 apps/export_app/forms.py:157
+#: apps/transactions/models.py:1518 templates/includes/sidebar.html:98
+#: templates/quick_transactions/pages/index.html:5
+#: templates/quick_transactions/pages/index.html:15
+msgid "Quick Transactions"
+msgstr "Transações Rápidas"
+
+#: apps/export_app/forms.py:79 apps/export_app/forms.py:159
#: templates/exchange_rates_services/fragments/list.html:10
#: templates/exchange_rates_services/pages/index.html:4
#: templates/includes/sidebar.html:232
msgid "Automatic Exchange Rates"
msgstr "Taxas de Câmbio Automáticas"
-#: apps/export_app/forms.py:79 templates/bank_sync/fragments/list.html:8
+#: apps/export_app/forms.py:85 templates/bank_sync/fragments/list.html:8
#: templates/bank_sync/pages/index.html:4 templates/includes/sidebar.html:238
msgid "Bank Sync"
msgstr "Sincronização Bancária"
-#: apps/export_app/forms.py:80
+#: apps/export_app/forms.py:86
msgid "Includes the providers' API keys"
msgstr "Inclui as chaves de API dos provedores"
-#: apps/export_app/forms.py:86 templates/includes/sidebar.html:212
+#: apps/export_app/forms.py:92 templates/includes/sidebar.html:212
#: templates/rules/fragments/list.html:9 templates/rules/pages/index.html:4
msgid "Rules"
msgstr "Regras"
-#: apps/export_app/forms.py:92 templates/cotton/transaction/item.html:66
+#: apps/export_app/forms.py:98 templates/cotton/transaction/item.html:68
msgid "DCA"
msgstr "CMP"
-#: apps/export_app/forms.py:98 apps/export_app/forms.py:168
+#: apps/export_app/forms.py:104 apps/export_app/forms.py:177
#: templates/import_app/fragments/profiles/list.html:21
#: templates/import_app/pages/profiles_index.html:4
msgid "Import Profiles"
msgstr "Perfis de Importação"
-#: apps/export_app/forms.py:126 templates/export_app/fragments/export.html:5
+#: apps/export_app/forms.py:133 templates/export_app/fragments/export.html:5
#: templates/export_app/pages/index.html:13
msgid "Export"
msgstr "Exportar"
-#: apps/export_app/forms.py:134
+#: apps/export_app/forms.py:141
msgid "Import a ZIP file exported from WYGIWYH"
msgstr "Importe um arquivo ZIP exportado do WYGIWYH"
-#: apps/export_app/forms.py:135
+#: apps/export_app/forms.py:142
msgid "ZIP File"
msgstr "Arquivo ZIP"
-#: apps/export_app/forms.py:157
+#: apps/export_app/forms.py:152 apps/rules/forms.py:193 apps/rules/models.py:42
+#: apps/rules/models.py:320 apps/transactions/models.py:736
+#: templates/transactions/widgets/sub_transactions.html:39
+#, fuzzy
+#| msgid "transactions"
+msgid "Sub-transactions"
+msgstr "transações"
+
+#: apps/export_app/forms.py:166
msgid "Bank Sync Accounts"
msgstr "Contas de Sincronização Bancária"
-#: apps/export_app/forms.py:159 apps/rules/models.py:27
+#: apps/export_app/forms.py:168 apps/rules/models.py:27
msgid "Transaction rules"
msgstr "Regra da transação"
-#: apps/export_app/forms.py:161 apps/rules/models.py:68
+#: apps/export_app/forms.py:170 apps/rules/models.py:69
msgid "Edit transaction action"
msgstr "Ação de editar de transação"
-#: apps/export_app/forms.py:164 apps/rules/models.py:327
+#: apps/export_app/forms.py:173 apps/rules/models.py:332
msgid "Update or create transaction actions"
msgstr "Ações de atualizar ou criar transação"
-#: apps/export_app/forms.py:199 templates/cotton/transaction/item.html:310
+#: apps/export_app/forms.py:210 templates/cotton/transaction/item.html:327
#: templates/cotton/ui/deleted_transactions_action_bar.html:53
#: templates/export_app/fragments/restore.html:5
#: templates/export_app/pages/index.html:19
msgid "Restore"
msgstr "Restaurar"
-#: apps/export_app/forms.py:209
+#: apps/export_app/forms.py:220
msgid "Please upload either a ZIP file or at least one CSV file"
msgstr "Carregue um arquivo ZIP ou pelo menos um arquivo CSV"
-#: apps/export_app/views.py:190
+#: apps/export_app/views.py:216
msgid "You have to select at least one export"
msgstr "É necessário selecionar pelo menos uma exportação"
-#: apps/export_app/views.py:210
+#: apps/export_app/views.py:236
msgid "Data restored successfully"
msgstr "Dados restaurados com sucesso"
-#: apps/export_app/views.py:222
+#: apps/export_app/views.py:248
msgid ""
"There was an error restoring your data. Check the logs for more details."
msgstr ""
@@ -1420,7 +1453,7 @@ msgstr "Importação apagada com sucesso"
#: apps/insights/forms.py:118 apps/insights/utils/sankey.py:36
#: apps/insights/utils/sankey.py:167 apps/insights/views.py:45
-#: apps/transactions/filters.py:209
+#: apps/transactions/filters.py:294
#: templates/insights/fragments/month_by_month.html:119
#: templates/insights/fragments/year_by_year.html:73
msgid "Uncategorized"
@@ -1477,24 +1510,24 @@ msgstr "Nenhum categoria"
msgid "Tag"
msgstr "Tag"
-#: apps/insights/views.py:52 apps/transactions/filters.py:215
+#: apps/insights/views.py:52 apps/transactions/filters.py:303
#: templates/insights/fragments/month_by_month.html:121
#: templates/insights/fragments/year_by_year.html:75
msgid "Untagged"
msgstr "Sem tag"
-#: apps/insights/views.py:53 apps/transactions/models.py:611
+#: apps/insights/views.py:53 apps/transactions/models.py:632
#: templates/tags/fragments/table.html:69
msgid "No tags"
msgstr "Nenhuma tag"
-#: apps/insights/views.py:58 apps/transactions/models.py:312
+#: apps/insights/views.py:58 apps/transactions/models.py:314
#: templates/insights/fragments/month_by_month.html:88
#: templates/insights/fragments/year_by_year.html:56
msgid "Entity"
msgstr "Entidade"
-#: apps/insights/views.py:59 apps/transactions/filters.py:222
+#: apps/insights/views.py:59 apps/transactions/filters.py:311
#: templates/insights/fragments/month_by_month.html:123
#: templates/insights/fragments/year_by_year.html:77
msgid "No entity"
@@ -1512,15 +1545,15 @@ msgstr "Outros"
msgid "Unclassified"
msgstr "Sem classificação"
-#: apps/investments/views.py:289
+#: apps/investments/views.py:290
msgid "Asset class added successfully"
msgstr "Classe de ativo adicionada com sucesso"
-#: apps/investments/views.py:297
+#: apps/investments/views.py:298
msgid "Asset class updated successfully"
msgstr "Classe de ativo atualizada com sucesso"
-#: apps/investments/views.py:318
+#: apps/investments/views.py:319
msgid "Asset class deleted successfully"
msgstr "Classe de ativo apagada com sucesso"
@@ -1553,13 +1586,13 @@ msgstr "Você pode adicionar ações à esta regra na próxima tela."
msgid "Set field"
msgstr "Definir campo"
-#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:123
+#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:101
msgid "To"
msgstr "Para"
#: apps/rules/forms.py:78 apps/rules/forms.py:158 apps/rules/models.py:20
-#: apps/rules/models.py:62 apps/rules/models.py:323
+#: apps/rules/models.py:63 apps/rules/models.py:328
#: templates/rules/fragments/list.html:23
msgid "Order"
msgstr "Ordem"
@@ -1577,36 +1610,37 @@ msgid "Operator"
msgstr "Operador"
#: apps/rules/forms.py:174 apps/rules/forms.py:188 apps/rules/models.py:36
-#: apps/rules/models.py:271 apps/transactions/forms.py:468
-#: apps/transactions/models.py:337 apps/transactions/models.py:730
-#: apps/transactions/models.py:1009 apps/transactions/models.py:1323
+#: apps/rules/models.py:272 apps/transactions/forms.py:554
+#: apps/transactions/models.py:339 apps/transactions/models.py:826
+#: apps/transactions/models.py:1108 apps/transactions/models.py:1470
#: templates/mini_tools/simulator.html:63
msgid "Type"
msgstr "Tipo"
#: apps/rules/forms.py:175 apps/rules/forms.py:189 apps/rules/models.py:37
-#: apps/rules/models.py:275 apps/transactions/filters.py:22
-#: apps/transactions/forms.py:472 apps/transactions/forms.py:650
-#: apps/transactions/models.py:339 apps/transactions/models.py:1325
-#: templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/rules/models.py:276 apps/transactions/filters.py:23
+#: apps/transactions/forms.py:558 apps/transactions/forms.py:736
+#: apps/transactions/models.py:341 apps/transactions/models.py:1472
+#: templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/transactions/widgets/paid_toggle_button.html:10
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:13
msgid "Paid"
msgstr "Pago"
#: apps/rules/forms.py:177 apps/rules/forms.py:191 apps/rules/models.py:39
-#: apps/rules/models.py:283 apps/transactions/forms.py:90
-#: apps/transactions/forms.py:488 apps/transactions/forms.py:655
-#: apps/transactions/forms.py:868 apps/transactions/models.py:341
-#: apps/transactions/models.py:748 apps/transactions/models.py:1033
+#: apps/rules/models.py:284 apps/transactions/forms.py:173
+#: apps/transactions/forms.py:574 apps/transactions/forms.py:741
+#: apps/transactions/forms.py:956 apps/transactions/models.py:343
+#: apps/transactions/models.py:844 apps/transactions/models.py:1132
msgid "Reference Date"
msgstr "Data de Referência"
#: apps/rules/forms.py:178 apps/rules/forms.py:192 apps/rules/models.py:41
-#: apps/rules/models.py:287 apps/transactions/forms.py:495
-#: apps/transactions/models.py:347 apps/transactions/models.py:1014
-#: apps/transactions/models.py:1331
+#: apps/rules/models.py:288 apps/transactions/forms.py:75
+#: apps/transactions/forms.py:581 apps/transactions/models.py:349
+#: apps/transactions/models.py:730 apps/transactions/models.py:1113
+#: apps/transactions/models.py:1478
#: templates/insights/fragments/sankey.html:102
#: templates/installment_plans/fragments/table.html:18
#: templates/mini_tools/simulator.html:70
@@ -1615,51 +1649,52 @@ msgstr "Data de Referência"
msgid "Amount"
msgstr "Quantia"
-#: apps/rules/forms.py:179 apps/rules/forms.py:193 apps/rules/models.py:14
-#: apps/rules/models.py:42 apps/rules/models.py:291
-#: apps/transactions/forms.py:499 apps/transactions/forms.py:659
-#: apps/transactions/models.py:352 apps/transactions/models.py:732
-#: apps/transactions/models.py:1017 apps/transactions/models.py:1336
+#: apps/rules/forms.py:179 apps/rules/forms.py:194 apps/rules/models.py:14
+#: apps/rules/models.py:43 apps/rules/models.py:292
+#: apps/transactions/forms.py:585 apps/transactions/forms.py:745
+#: apps/transactions/models.py:354 apps/transactions/models.py:828
+#: apps/transactions/models.py:1116 apps/transactions/models.py:1483
msgid "Description"
msgstr "Descrição"
-#: apps/rules/forms.py:182 apps/rules/forms.py:198 apps/rules/models.py:47
-#: apps/rules/models.py:299 apps/transactions/models.py:399
-#: apps/transactions/models.py:1358
+#: apps/rules/forms.py:182 apps/rules/forms.py:199 apps/rules/models.py:48
+#: apps/rules/models.py:300 apps/transactions/models.py:401
+#: apps/transactions/models.py:1505
msgid "Internal Note"
msgstr "Nota Interna"
-#: apps/rules/forms.py:183 apps/rules/forms.py:199 apps/rules/models.py:48
-#: apps/rules/models.py:303 apps/transactions/models.py:401
-#: apps/transactions/models.py:1360
+#: apps/rules/forms.py:183 apps/rules/forms.py:200 apps/rules/models.py:49
+#: apps/rules/models.py:304 apps/transactions/models.py:403
+#: apps/transactions/models.py:1507
msgid "Internal ID"
msgstr "ID Interna"
-#: apps/rules/forms.py:186 apps/rules/forms.py:200 apps/rules/models.py:40
-#: apps/rules/models.py:319 apps/transactions/forms.py:672
-#: apps/transactions/models.py:251 apps/transactions/models.py:342
-#: apps/transactions/models.py:1326
+#: apps/rules/forms.py:186 apps/rules/forms.py:201 apps/rules/models.py:40
+#: apps/rules/models.py:324 apps/transactions/forms.py:758
+#: apps/transactions/models.py:253 apps/transactions/models.py:344
+#: apps/transactions/models.py:1473
msgid "Mute"
msgstr "Silenciada"
-#: apps/rules/forms.py:215
+#: apps/rules/forms.py:216
msgid "Search Criteria"
msgstr "Critério de Busca"
-#: apps/rules/forms.py:360
+#: apps/rules/forms.py:361
msgid "Set Values"
msgstr "Definir valores"
-#: apps/rules/forms.py:407 apps/rules/forms.py:442 apps/rules/forms.py:477
-#: apps/transactions/models.py:422 apps/transactions/models.py:667
+#: apps/rules/forms.py:409 apps/rules/forms.py:444 apps/rules/forms.py:479
+#: apps/transactions/models.py:424 apps/transactions/models.py:703
+#: apps/transactions/models.py:763
msgid "Transaction"
msgstr "Transação"
-#: apps/rules/forms.py:411 apps/rules/forms.py:446 apps/rules/forms.py:481
+#: apps/rules/forms.py:413 apps/rules/forms.py:448 apps/rules/forms.py:483
msgid "Type to search for a transaction"
msgstr "Digite para buscar uma transação"
-#: apps/rules/forms.py:422 apps/rules/forms.py:457 apps/rules/forms.py:491
+#: apps/rules/forms.py:424 apps/rules/forms.py:459 apps/rules/forms.py:493
#: templates/rules/fragments/transaction_rule/dry_run/created.html:5
#: templates/rules/fragments/transaction_rule/dry_run/deleted.html:5
#: templates/rules/fragments/transaction_rule/dry_run/updated.html:5
@@ -1679,15 +1714,15 @@ msgstr "Sequencial"
msgid "Transaction rule"
msgstr "Regra da transação"
-#: apps/rules/models.py:54 apps/rules/models.py:98
+#: apps/rules/models.py:55 apps/rules/models.py:99
msgid "Rule"
msgstr "Regra"
-#: apps/rules/models.py:59
+#: apps/rules/models.py:60
msgid "Field"
msgstr "Campo"
-#: apps/rules/models.py:61 templates/investments/fragments/charts.html:86
+#: apps/rules/models.py:62 templates/investments/fragments/charts.html:86
#: templates/investments/fragments/detail.html:68
#: templates/investments/fragments/detail.html:127
#: templates/investments/fragments/detail.html:245
@@ -1695,51 +1730,51 @@ msgstr "Campo"
msgid "Value"
msgstr "Valor"
-#: apps/rules/models.py:69
+#: apps/rules/models.py:70
msgid "Edit transaction actions"
msgstr "Ações de editar de transação"
-#: apps/rules/models.py:84
+#: apps/rules/models.py:85
msgid "is exactly"
msgstr "é exatamete"
-#: apps/rules/models.py:85
+#: apps/rules/models.py:86
msgid "contains"
msgstr "contém"
-#: apps/rules/models.py:86
+#: apps/rules/models.py:87
msgid "starts with"
msgstr "começa com"
-#: apps/rules/models.py:87
+#: apps/rules/models.py:88
msgid "ends with"
msgstr "termina em"
-#: apps/rules/models.py:88
+#: apps/rules/models.py:89
msgid "equals"
msgstr "igual"
-#: apps/rules/models.py:89
+#: apps/rules/models.py:90
msgid "greater than"
msgstr "maior que"
-#: apps/rules/models.py:90
+#: apps/rules/models.py:91
msgid "less than"
msgstr "menos de"
-#: apps/rules/models.py:91
+#: apps/rules/models.py:92
msgid "greater than or equal"
msgstr "maior ou igual"
-#: apps/rules/models.py:92
+#: apps/rules/models.py:93
msgid "less than or equal"
msgstr "menor ou igual"
-#: apps/rules/models.py:102
+#: apps/rules/models.py:103
msgid "Filter"
msgstr "Filtro"
-#: apps/rules/models.py:105
+#: apps/rules/models.py:106
msgid ""
"Generic expression to enable or disable execution. Should evaluate to True "
"or False"
@@ -1747,7 +1782,7 @@ msgstr ""
"Expressão genérica para ativar ou desativar a execução. Deve retornar True "
"ou False"
-#: apps/rules/models.py:326
+#: apps/rules/models.py:331
msgid "Update or create transaction action"
msgstr "Ação de atualizar ou criar transação"
@@ -1791,8 +1826,8 @@ msgstr "Ação Atualizar ou Criar Transação atualizada com sucesso"
msgid "Update or Create Transaction action deleted successfully"
msgstr "Ação Atualizar ou Criar Transação apagada com sucesso"
-#: apps/transactions/filters.py:23 templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/transactions/filters.py:24 templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/insights/fragments/overview/index.html:68
#: templates/net_worth/net_worth.html:39 templates/net_worth/net_worth.html:43
#: templates/transactions/widgets/paid_toggle_button.html:7
@@ -1800,132 +1835,142 @@ msgstr "Ação Atualizar ou Criar Transação apagada com sucesso"
msgid "Projected"
msgstr "Previsto"
-#: apps/transactions/filters.py:28 templates/categories/fragments/table.html:18
+#: apps/transactions/filters.py:29 templates/categories/fragments/table.html:18
msgid "Muted"
msgstr "Silenciada"
-#: apps/transactions/filters.py:51
+#: apps/transactions/filters.py:67 apps/transactions/filters.py:144
msgid "Content"
msgstr "Conteúdo"
-#: apps/transactions/filters.py:57
+#: apps/transactions/filters.py:73
msgid "Transaction Type"
msgstr "Tipo de Transação"
-#: apps/transactions/filters.py:95
+#: apps/transactions/filters.py:111
msgid "Mute Status"
msgstr "Status de silenciamento"
-#: apps/transactions/filters.py:100
+#: apps/transactions/filters.py:116
msgid "Date from"
msgstr "Data de"
-#: apps/transactions/filters.py:105 apps/transactions/filters.py:115
+#: apps/transactions/filters.py:121 apps/transactions/filters.py:131
msgid "Until"
msgstr "Até"
-#: apps/transactions/filters.py:110
+#: apps/transactions/filters.py:126
msgid "Reference date from"
msgstr "Data de Referência de"
-#: apps/transactions/filters.py:120
+#: apps/transactions/filters.py:136
msgid "Amount min"
msgstr "Quantia miníma"
-#: apps/transactions/filters.py:125
+#: apps/transactions/filters.py:141
msgid "Amount max"
msgstr "Quantia máxima"
-#: apps/transactions/filters.py:208
+#: apps/transactions/filters.py:240
+msgid "Include"
+msgstr ""
+
+#: apps/transactions/filters.py:245
+msgid "Exclude"
+msgstr ""
+
+#: apps/transactions/filters.py:293
msgid "Categorized"
msgstr "Categorizada"
-#: apps/transactions/filters.py:215
+#: apps/transactions/filters.py:303
msgid "Tagged"
msgstr "Com tag"
-#: apps/transactions/filters.py:221
+#: apps/transactions/filters.py:310
msgid "Any entity"
msgstr "Qualquer entidade"
-#: apps/transactions/forms.py:192
+#: apps/transactions/forms.py:277
msgid "More"
msgstr "Mais"
-#: apps/transactions/forms.py:229
+#: apps/transactions/forms.py:314
msgid "Save and add similar"
msgstr "Salvar e adicionar similar"
-#: apps/transactions/forms.py:234
+#: apps/transactions/forms.py:319
msgid "Save and add another"
msgstr "Salvar e adicionar outra"
-#: apps/transactions/forms.py:271 templates/cotton/transaction/item.html:184
+#: apps/transactions/forms.py:356 templates/cotton/transaction/item.html:186
#: templates/transactions/fragments/attachments.html:4
msgid "Attachments"
msgstr "Anexos"
-#: apps/transactions/forms.py:272
+#: apps/transactions/forms.py:357
msgid ""
"Files are private and only visible to users with access to this transaction."
msgstr ""
"Os arquivos são privados e só podem ser visualizados por usuários com acesso "
"a esta transação."
-#: apps/transactions/forms.py:283
+#: apps/transactions/forms.py:368
msgid "Upload"
msgstr "Upload"
-#: apps/transactions/forms.py:355 apps/transactions/forms.py:1120
-#: apps/transactions/models.py:947
+#: apps/transactions/forms.py:440 apps/transactions/forms.py:1210
+#: apps/transactions/models.py:1046
msgid "To account"
msgstr "Conta de destino"
-#: apps/transactions/forms.py:382 apps/transactions/forms.py:675
+#: apps/transactions/forms.py:467 apps/transactions/forms.py:761
msgid "Muted transactions won't be displayed on monthly summaries"
msgstr "Transações silenciadas não apareceram nos sumários mensais"
-#: apps/transactions/forms.py:594
+#: apps/transactions/forms.py:680
msgid "From Amount"
msgstr "Quantia de origem"
-#: apps/transactions/forms.py:599
+#: apps/transactions/forms.py:685
msgid "To Amount"
msgstr "Quantia de destino"
-#: apps/transactions/forms.py:741 apps/transactions/models.py:992
-#: apps/transactions/models.py:1303 templates/cotton/transaction/item.html:52
-#: templates/cotton/transaction/item.html:60
+#: apps/transactions/forms.py:827 apps/transactions/models.py:1091
+#: apps/transactions/models.py:1450 templates/cotton/transaction/item.html:54
+#: templates/cotton/transaction/item.html:62
+#: templates/cotton/transaction/item.html:272
+#: templates/cotton/transaction/item.html:304
#: templates/cotton/ui/quick_transactions_buttons.html:40
#: templates/cotton/ui/transactions_fab.html:44
msgid "Transfer"
msgstr "Transferir"
-#: apps/transactions/forms.py:1005
+#: apps/transactions/forms.py:1095
msgid "Tag name"
msgstr "Nome da Tag"
-#: apps/transactions/forms.py:1033
+#: apps/transactions/forms.py:1123
msgid "Entity name"
msgstr "Nome da entidade"
-#: apps/transactions/forms.py:1061
+#: apps/transactions/forms.py:1151
msgid "Category name"
msgstr "Nome da Categoria"
-#: apps/transactions/forms.py:1063
+#: apps/transactions/forms.py:1153
msgid "Muted categories won't be displayed on monthly summaries"
msgstr "Categorias silenciadas não apareceram nos sumários mensais"
-#: apps/transactions/forms.py:1228
+#: apps/transactions/forms.py:1319
msgid "future transactions"
msgstr "transações futuras"
-#: apps/transactions/forms.py:1255
+#: apps/transactions/forms.py:1346
msgid "End date should be after the start date"
msgstr "Data final deve ser após data inicial"
-#: apps/transactions/models.py:256
+#: apps/transactions/models.py:258
msgid ""
"Deactivated categories won't be able to be selected when creating new "
"transactions"
@@ -1933,25 +1978,25 @@ msgstr ""
"As categorias desativadas não poderão ser selecionadas ao criar novas "
"transações"
-#: apps/transactions/models.py:264
+#: apps/transactions/models.py:266
msgid "Transaction Category"
msgstr "Categoria da Transação"
-#: apps/transactions/models.py:265
+#: apps/transactions/models.py:267
msgid "Transaction Categories"
msgstr "Categorias da Trasanção"
-#: apps/transactions/models.py:280
+#: apps/transactions/models.py:282
msgid ""
"Deactivated tags won't be able to be selected when creating new transactions"
msgstr ""
"As tags desativadas não poderão ser selecionadas ao criar novas transações"
-#: apps/transactions/models.py:288 apps/transactions/models.py:289
+#: apps/transactions/models.py:290 apps/transactions/models.py:291
msgid "Transaction Tags"
msgstr "Tags da Transação"
-#: apps/transactions/models.py:304
+#: apps/transactions/models.py:306
msgid ""
"Deactivated entities won't be able to be selected when creating new "
"transactions"
@@ -1959,8 +2004,8 @@ msgstr ""
"As entidades desativadas não poderão ser selecionadas ao criar novas "
"transações"
-#: apps/transactions/models.py:324 apps/transactions/models.py:991
-#: apps/transactions/models.py:1302
+#: apps/transactions/models.py:326 apps/transactions/models.py:1090
+#: apps/transactions/models.py:1449
#: templates/calendar_view/fragments/list.html:42
#: templates/calendar_view/fragments/list.html:44
#: templates/calendar_view/fragments/list.html:52
@@ -1972,14 +2017,14 @@ msgstr ""
#: templates/investments/fragments/detail.html:71
#: templates/investments/fragments/detail.html:175
#: templates/investments/fragments/detail.html:227
-#: templates/investments/fragments/detail.html:318
+#: templates/investments/fragments/detail.html:326
#: templates/mini_tools/simulator.html:66
#: templates/monthly_overview/fragments/monthly_summary.html:42
msgid "Income"
msgstr "Renda"
-#: apps/transactions/models.py:325 apps/transactions/models.py:993
-#: apps/transactions/models.py:1304
+#: apps/transactions/models.py:327 apps/transactions/models.py:1092
+#: apps/transactions/models.py:1451
#: templates/calendar_view/fragments/list.html:46
#: templates/calendar_view/fragments/list.html:48
#: templates/calendar_view/fragments/list.html:56
@@ -1991,192 +2036,192 @@ msgstr "Renda"
msgid "Expense"
msgstr "Despesa"
-#: apps/transactions/models.py:380 apps/transactions/models.py:787
-#: templates/cotton/transaction/item.html:260
-#: templates/cotton/transaction/item.html:277
-#: templates/cotton/transaction/item.html:287
+#: apps/transactions/models.py:382 apps/transactions/models.py:883
+#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:289
+#: templates/cotton/transaction/item.html:299
msgid "Installment Plan"
msgstr "Parcelamento"
-#: apps/transactions/models.py:389 apps/transactions/models.py:1067
-#: templates/cotton/transaction/item.html:250
-#: templates/cotton/transaction/item.html:270
+#: apps/transactions/models.py:391 apps/transactions/models.py:1166
+#: templates/cotton/transaction/item.html:252
+#: templates/cotton/transaction/item.html:282
msgid "Recurring Transaction"
msgstr "Transação Recorrente"
-#: apps/transactions/models.py:397
+#: apps/transactions/models.py:399
msgid "Linked Transaction"
msgstr "Transação vinculada"
-#: apps/transactions/models.py:405
+#: apps/transactions/models.py:407
msgid "Deleted"
msgstr "Apagado"
-#: apps/transactions/models.py:410
+#: apps/transactions/models.py:412
msgid "Deleted At"
msgstr "Apagado Em"
-#: apps/transactions/models.py:518
+#: apps/transactions/models.py:521
msgid "A transfer needs one expense and one income."
msgstr "Uma transferência precisa de uma despesa e uma receita."
-#: apps/transactions/models.py:520
+#: apps/transactions/models.py:523
msgid "A transfer needs two different accounts."
msgstr "Uma transferência precisa de duas contas diferentes."
-#: apps/transactions/models.py:524
+#: apps/transactions/models.py:527
msgid "This transaction is already part of another transfer."
msgstr "Esta transação já faz parte de outra transferência."
-#: apps/transactions/models.py:613
+#: apps/transactions/models.py:634
msgid "No category"
msgstr "Sem categoria"
-#: apps/transactions/models.py:615
+#: apps/transactions/models.py:636
msgid "No description"
msgstr "Sem descrição"
-#: apps/transactions/models.py:672
+#: apps/transactions/models.py:735
+#, fuzzy
+#| msgid "transactions"
+msgid "Sub-transaction"
+msgstr "transações"
+
+#: apps/transactions/models.py:768
msgid "File"
msgstr "Arquivo"
-#: apps/transactions/models.py:674
+#: apps/transactions/models.py:770
msgid "Original Name"
msgstr "Nome Original"
-#: apps/transactions/models.py:676
+#: apps/transactions/models.py:772
msgid "Content Type"
msgstr "Tipo de Conteúdo"
-#: apps/transactions/models.py:678
+#: apps/transactions/models.py:774
msgid "Size"
msgstr "Tamanho"
-#: apps/transactions/models.py:683
+#: apps/transactions/models.py:779
msgid "Uploaded By"
msgstr "Enviado por"
-#: apps/transactions/models.py:688
+#: apps/transactions/models.py:784
msgid "Transaction Attachment"
msgstr "Anexo de transação"
-#: apps/transactions/models.py:689
+#: apps/transactions/models.py:785
msgid "Transaction Attachments"
msgstr "Anexo de transações"
-#: apps/transactions/models.py:719 templates/includes/sidebar.html:57
+#: apps/transactions/models.py:815 templates/includes/sidebar.html:57
msgid "Yearly"
msgstr "Anual"
-#: apps/transactions/models.py:720 apps/users/models.py:469
+#: apps/transactions/models.py:816 apps/users/models.py:469
#: templates/includes/sidebar.html:51
msgid "Monthly"
msgstr "Mensal"
-#: apps/transactions/models.py:721
+#: apps/transactions/models.py:817
msgid "Weekly"
msgstr "Semanal"
-#: apps/transactions/models.py:722
+#: apps/transactions/models.py:818
msgid "Daily"
msgstr "Diária"
-#: apps/transactions/models.py:735
+#: apps/transactions/models.py:831
msgid "Number of Installments"
msgstr "Número de Parcelas"
-#: apps/transactions/models.py:740
+#: apps/transactions/models.py:836
msgid "Installment Start"
msgstr "Parcela inicial"
-#: apps/transactions/models.py:741
+#: apps/transactions/models.py:837
msgid "The installment number to start counting from"
msgstr "O número da parcela a partir do qual se inicia a contagem"
-#: apps/transactions/models.py:746 apps/transactions/models.py:1037
+#: apps/transactions/models.py:842 apps/transactions/models.py:1136
msgid "Start Date"
msgstr "Data de Início"
-#: apps/transactions/models.py:750 apps/transactions/models.py:1038
+#: apps/transactions/models.py:846 apps/transactions/models.py:1137
msgid "End Date"
msgstr "Data Final"
-#: apps/transactions/models.py:755
+#: apps/transactions/models.py:851
msgid "Recurrence"
msgstr "Recorrência"
-#: apps/transactions/models.py:758
+#: apps/transactions/models.py:854
msgid "Installment Amount"
msgstr "Valor da Parcela"
-#: apps/transactions/models.py:777 apps/transactions/models.py:1057
+#: apps/transactions/models.py:873 apps/transactions/models.py:1156
msgid "Add description to transactions"
msgstr "Adicionar descrição às transações"
-#: apps/transactions/models.py:780 apps/transactions/models.py:1060
+#: apps/transactions/models.py:876 apps/transactions/models.py:1159
msgid "Add notes to transactions"
msgstr "Adicionar notas às transações"
-#: apps/transactions/models.py:954
+#: apps/transactions/models.py:1053
msgid "To amount"
msgstr "Quantia de destino"
-#: apps/transactions/models.py:955
+#: apps/transactions/models.py:1054
msgid "Leave empty to use the same amount"
msgstr "Deixe em branco para usar a mesma quantia"
-#: apps/transactions/models.py:996 templates/mini_tools/simulator.html:129
+#: apps/transactions/models.py:1095 templates/mini_tools/simulator.html:129
msgid "day(s)"
msgstr "dia(s)"
-#: apps/transactions/models.py:997 templates/mini_tools/simulator.html:130
+#: apps/transactions/models.py:1096 templates/mini_tools/simulator.html:130
msgid "week(s)"
msgstr "semana(s)"
-#: apps/transactions/models.py:998 templates/mini_tools/simulator.html:131
+#: apps/transactions/models.py:1097 templates/mini_tools/simulator.html:131
msgid "month(s)"
msgstr "mês(es)"
-#: apps/transactions/models.py:999 templates/mini_tools/simulator.html:132
+#: apps/transactions/models.py:1098 templates/mini_tools/simulator.html:132
msgid "year(s)"
msgstr "ano(s)"
-#: apps/transactions/models.py:1001
+#: apps/transactions/models.py:1100
#: templates/recurring_transactions/fragments/list.html:18
msgid "Paused"
msgstr "Pausado"
-#: apps/transactions/models.py:1040
+#: apps/transactions/models.py:1139
msgid "Recurrence Type"
msgstr "Tipo de recorrência"
-#: apps/transactions/models.py:1043
+#: apps/transactions/models.py:1142
msgid "Recurrence Interval"
msgstr "Intervalo de recorrência"
-#: apps/transactions/models.py:1046
+#: apps/transactions/models.py:1145
msgid "Keep at most"
msgstr "Manter no máximo"
-#: apps/transactions/models.py:1050
+#: apps/transactions/models.py:1149
msgid "Last Generated Date"
msgstr "Última data gerada"
-#: apps/transactions/models.py:1053
+#: apps/transactions/models.py:1152
msgid "Last Generated Reference Date"
msgstr "Última data de referência gerada"
-#: apps/transactions/models.py:1370 templates/cotton/transaction/item.html:243
+#: apps/transactions/models.py:1517 templates/cotton/transaction/item.html:245
#: templates/cotton/ui/transactions_fab.html:59
msgid "Quick Transaction"
msgstr "Transação Rápida"
-#: apps/transactions/models.py:1371 templates/includes/sidebar.html:98
-#: templates/quick_transactions/pages/index.html:5
-#: templates/quick_transactions/pages/index.html:15
-msgid "Quick Transactions"
-msgstr "Transações Rápidas"
-
#: apps/transactions/validators.py:8
#, python-format
msgid "%(value)s has too many decimal places. Maximum is 30."
@@ -2187,35 +2232,43 @@ msgstr "%(value)s tem muitas casas decimais. O máximo é 30."
msgid "%(value)s is not a non-negative number"
msgstr "%(value)s não é um número positivo"
-#: apps/transactions/views/actions.py:58
+#: apps/transactions/views/actions.py:61
#, python-format
msgid "%(count)s transaction marked as paid"
msgid_plural "%(count)s transactions marked as paid"
msgstr[0] "%(count)s transação marcada como paga"
msgstr[1] "%(count)s transações marcadas como paga"
-#: apps/transactions/views/actions.py:81
+#: apps/transactions/views/actions.py:84
#, python-format
msgid "%(count)s transaction marked as not paid"
msgid_plural "%(count)s transactions marked as not paid"
msgstr[0] "%(count)s transação marcada como não paga"
msgstr[1] "%(count)s transações marcadas como não paga"
-#: apps/transactions/views/actions.py:105
+#: apps/transactions/views/actions.py:108
#, python-format
msgid "%(count)s transaction deleted successfully"
msgid_plural "%(count)s transactions deleted successfully"
msgstr[0] "%(count)s transação apagada com sucesso"
msgstr[1] "%(count)s transações apagadas com sucesso"
-#: apps/transactions/views/actions.py:139
+#: apps/transactions/views/actions.py:142
#, python-format
msgid "%(count)s transaction restored successfully"
msgid_plural "%(count)s transactions restored successfully"
msgstr[0] "%(count)s transação restaurada com sucesso"
msgstr[1] "%(count)s transações restauradas com sucesso"
-#: apps/transactions/views/actions.py:170
+#: apps/transactions/views/actions.py:174
+#: apps/transactions/views/transactions.py:423
+#, python-format
+msgid "%(count)s transaction updated successfully"
+msgid_plural "%(count)s transactions updated successfully"
+msgstr[0] "%(count)s transação atualizada com sucesso"
+msgstr[1] "%(count)s transações atualizadas com sucesso"
+
+#: apps/transactions/views/actions.py:247
#, python-format
msgid "%(count)s transaction duplicated successfully"
msgid_plural "%(count)s transactions duplicated successfully"
@@ -2234,33 +2287,45 @@ msgstr "Categoria atualizada com sucesso"
msgid "Category deleted successfully"
msgstr "Categoria apagada com sucesso"
-#: apps/transactions/views/conversions.py:72
+#: apps/transactions/views/conversions.py:77
#: apps/transactions/views/quick_transactions.py:46 apps/users/views.py:252
msgid "Item added successfully"
msgstr "Item adicionado com sucesso"
-#: apps/transactions/views/conversions.py:91
+#: apps/transactions/views/conversions.py:97
msgid "Convert into quick transaction"
msgstr "Converter em transação rápida"
-#: apps/transactions/views/conversions.py:108
+#: apps/transactions/views/conversions.py:114
#: apps/transactions/views/recurring_transactions.py:112
msgid "Recurring Transaction added successfully"
msgstr "Transação Recorrente adicionada com sucesso"
-#: apps/transactions/views/conversions.py:129
+#: apps/transactions/views/conversions.py:136
msgid "Convert into recurring transaction"
msgstr "Converter em transação recorrente"
-#: apps/transactions/views/conversions.py:148
+#: apps/transactions/views/conversions.py:155
#: apps/transactions/views/installment_plans.py:87
msgid "Installment Plan added successfully"
msgstr "Parcelamento adicionado com sucesso"
-#: apps/transactions/views/conversions.py:167
+#: apps/transactions/views/conversions.py:175
msgid "Convert into installment plan"
msgstr "Converter em parcelamento"
+#: apps/transactions/views/conversions.py:195
+#, fuzzy
+#| msgid "This transaction is already part of another transfer."
+msgid "Transaction converted into a transfer"
+msgstr "Esta transação já faz parte de outra transferência."
+
+#: apps/transactions/views/conversions.py:226
+#, fuzzy
+#| msgid "Convert into quick transaction"
+msgid "Convert into transfer"
+msgstr "Converter em transação rápida"
+
#: apps/transactions/views/entities.py:72
msgid "Entity added successfully"
msgstr "Entidade adicionada com sucesso"
@@ -2293,7 +2358,7 @@ msgstr "Item atualizado com sucesso"
msgid "Item deleted successfully"
msgstr "Item apagado com sucesso"
-#: apps/transactions/views/quick_transactions.py:164
+#: apps/transactions/views/quick_transactions.py:165
#: apps/transactions/views/transactions.py:156
#: apps/transactions/views/transactions.py:343
msgid "Transaction added successfully"
@@ -2343,30 +2408,23 @@ msgstr "Anexo apagado com sucesso"
msgid "Transaction updated successfully"
msgstr "Transação atualizada com sucesso"
-#: apps/transactions/views/transactions.py:421
-#, python-format
-msgid "%(count)s transaction updated successfully"
-msgid_plural "%(count)s transactions updated successfully"
-msgstr[0] "%(count)s transação atualizada com sucesso"
-msgstr[1] "%(count)s transações atualizadas com sucesso"
-
-#: apps/transactions/views/transactions.py:448
+#: apps/transactions/views/transactions.py:450
msgid "Transaction duplicated successfully"
msgstr "Transação duplicada com sucesso"
-#: apps/transactions/views/transactions.py:493
+#: apps/transactions/views/transactions.py:495
msgid "Transaction deleted successfully"
msgstr "Transação apagada com sucesso"
-#: apps/transactions/views/transactions.py:523
+#: apps/transactions/views/transactions.py:525
msgid "Transaction restored successfully"
msgstr "Transação restaurada com sucesso"
-#: apps/transactions/views/transactions.py:549
+#: apps/transactions/views/transactions.py:551
msgid "Transfer added successfully"
msgstr "Transferência adicionada com sucesso"
-#: apps/transactions/views/transactions.py:579
+#: apps/transactions/views/transactions.py:581
msgid "Transfer updated successfully"
msgstr "Transferência atualizada com sucesso"
@@ -2693,8 +2751,9 @@ msgstr "Ações"
#: templates/accounts/fragments/list.html:37
#: templates/bank_sync/fragments/list.html:33
#: templates/categories/fragments/table.html:29
-#: templates/cotton/transaction/item.html:178
-#: templates/cotton/ui/transactions_action_bar.html:54
+#: templates/cotton/transaction/item.html:180
+#: templates/cotton/ui/transactions_action_bar.html:56
+#: templates/cotton/ui/transactions_action_bar.html:90
#: templates/currencies/fragments/list.html:34
#: templates/dca/fragments/strategy/details.html:63
#: templates/dca/fragments/strategy/list.html:31
@@ -2705,8 +2764,8 @@ msgstr "Ações"
#: templates/import_app/fragments/profiles/list.html:46
#: templates/installment_plans/fragments/table.html:28
#: templates/investment_classes/fragments/list.html:39
-#: templates/investments/fragments/detail.html:302
-#: templates/investments/fragments/detail.html:330
+#: templates/investments/fragments/detail.html:310
+#: templates/investments/fragments/detail.html:338
#: templates/quick_transactions/fragments/list.html:25
#: templates/recurring_transactions/fragments/table.html:30
#: templates/rules/fragments/transaction_rule/view.html:22
@@ -2743,10 +2802,11 @@ msgstr "Compartilhar"
#: templates/accounts/fragments/list.html:71
#: templates/bank_sync/fragments/list.html:50
#: templates/categories/fragments/table.html:51
-#: templates/cotton/transaction/item.html:190
-#: templates/cotton/transaction/item.html:316
+#: templates/cotton/transaction/item.html:192
+#: templates/cotton/transaction/item.html:333
#: templates/cotton/ui/deleted_transactions_action_bar.html:57
-#: templates/cotton/ui/transactions_action_bar.html:82
+#: templates/cotton/ui/transactions_action_bar.html:75
+#: templates/cotton/ui/transactions_action_bar.html:107
#: templates/currencies/fragments/list.html:40
#: templates/dca/fragments/strategy/details.html:70
#: templates/dca/fragments/strategy/list.html:38
@@ -2777,10 +2837,11 @@ msgstr "Apagar"
#: templates/accounts/fragments/list.html:75
#: templates/bank_sync/fragments/list.html:54
#: templates/categories/fragments/table.html:56
-#: templates/cotton/transaction/item.html:192
-#: templates/cotton/transaction/item.html:322
+#: templates/cotton/transaction/item.html:194
+#: templates/cotton/transaction/item.html:339
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:44
#: templates/dca/fragments/strategy/details.html:75
#: templates/dca/fragments/strategy/list.html:42
@@ -2808,10 +2869,11 @@ msgstr "Tem certeza?"
#: templates/account_groups/fragments/list.html:59
#: templates/accounts/fragments/list.html:76
#: templates/categories/fragments/table.html:57
-#: templates/cotton/transaction/item.html:193
-#: templates/cotton/transaction/item.html:323
+#: templates/cotton/transaction/item.html:195
+#: templates/cotton/transaction/item.html:340
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:45
#: templates/dca/fragments/strategy/details.html:76
#: templates/dca/fragments/strategy/list.html:43
@@ -2831,8 +2893,8 @@ msgstr "Você não será capaz de reverter isso!"
#: templates/accounts/fragments/list.html:77
#: templates/bank_sync/fragments/list.html:56
#: templates/categories/fragments/table.html:58
-#: templates/cotton/transaction/item.html:194
-#: templates/cotton/transaction/item.html:324
+#: templates/cotton/transaction/item.html:196
+#: templates/cotton/transaction/item.html:341
#: templates/currencies/fragments/list.html:46
#: templates/dca/fragments/strategy/details.html:77
#: templates/dca/fragments/strategy/list.html:44
@@ -2912,6 +2974,12 @@ msgstr "Parar de acompanhar"
msgid "No accounts"
msgstr "Nenhuma conta"
+#: templates/accounts/fragments/share.html:8
+msgid ""
+"Everyone who can see this account can add, edit and delete its transactions, "
+"installment plans and recurring transactions."
+msgstr ""
+
#: templates/bank_sync/fragments/accounts.html:31
msgid "No accounts found on this service"
msgstr "Nenhuma conta encontrada neste serviço"
@@ -3006,63 +3074,76 @@ msgstr "Fechar"
msgid "Search"
msgstr "Buscar"
-#: templates/cotton/transaction/item.html:12
+#: templates/cotton/transaction/item.html:14
msgid "Select"
msgstr "Selecionar"
-#: templates/cotton/transaction/item.html:123
+#: templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:100
msgid "From"
msgstr "De"
-#: templates/cotton/transaction/item.html:207
-#: templates/cotton/transaction/item.html:218
-#: templates/cotton/transaction/item.html:228
+#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:230
msgid "Show on summaries"
msgstr "Mostrar nos sumários"
-#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:211
msgid "Controlled by account"
msgstr "Controlado pela conta"
-#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:222
msgid "Controlled by category"
msgstr "Controlado pela categoria"
-#: templates/cotton/transaction/item.html:233
+#: templates/cotton/transaction/item.html:235
+#: templates/includes/transactions_bulk_actions.html:15
msgid "Hide from summaries"
msgstr "Esconder dos sumários"
-#: templates/cotton/transaction/item.html:237
+#: templates/cotton/transaction/item.html:239
msgid "Convert"
msgstr "Converter"
-#: templates/cotton/transaction/item.html:252
-#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:254
+#: templates/cotton/transaction/item.html:264
+#: templates/cotton/transaction/item.html:274
msgid "Already part of a plan or recurrence"
msgstr "Já faz parte de um parcelamento ou de uma recorrência"
-#: templates/cotton/transaction/item.html:279
+#: templates/cotton/transaction/item.html:291
msgid "Not available for transfers"
msgstr "Não disponível para transferências"
-#: templates/cotton/transaction/item.html:296
+#: templates/cotton/transaction/item.html:313
+#: templates/includes/transactions_bulk_actions.html:22
msgid "Move to previous month"
msgstr "Mover para o mês anterior"
-#: templates/cotton/transaction/item.html:300
+#: templates/cotton/transaction/item.html:317
+#: templates/includes/transactions_bulk_actions.html:28
msgid "Move to next month"
msgstr "Mover para o mês seguinte"
-#: templates/cotton/transaction/item.html:303
+#: templates/cotton/transaction/item.html:320
+#: templates/includes/transactions_bulk_actions.html:33
msgid "Move to today"
msgstr "Mover para hoje"
-#: templates/cotton/transaction/item.html:307
-#: templates/cotton/ui/transactions_action_bar.html:78
+#: templates/cotton/transaction/item.html:324
+#: templates/cotton/ui/transactions_action_bar.html:71
+#: templates/cotton/ui/transactions_action_bar.html:98
msgid "Duplicate"
msgstr "Duplicar"
+#: templates/cotton/transaction/item.html:373
+#, python-format
+msgid "%(counter)s item"
+msgid_plural "%(counter)s items"
+msgstr[0] ""
+msgstr[1] ""
+
#: templates/cotton/ui/account_card.html:10
#: templates/cotton/ui/currency_card.html:10
msgid "projected income"
@@ -3098,22 +3179,26 @@ msgstr "total atual"
msgid "final total"
msgstr "total final"
-#: templates/cotton/ui/deleted_transactions_action_bar.html:34
-#: templates/cotton/ui/transactions_action_bar.html:34
-msgid "Select All"
-msgstr "Selecionar todos"
-
-#: templates/cotton/ui/deleted_transactions_action_bar.html:40
-#: templates/cotton/ui/transactions_action_bar.html:40
+#: templates/cotton/ui/deleted_transactions_action_bar.html:25
+#: templates/cotton/ui/deleted_transactions_action_bar.html:26
+#: templates/cotton/ui/transactions_action_bar.html:25
+#: templates/cotton/ui/transactions_action_bar.html:26
msgid "Unselect All"
msgstr "Desmarcar todos"
-#: templates/cotton/ui/deleted_transactions_action_bar.html:46
-msgid "Invert election"
+#: templates/cotton/ui/deleted_transactions_action_bar.html:39
+#: templates/cotton/ui/transactions_action_bar.html:39
+msgid "Select All"
+msgstr "Selecionar todos"
+
+#: templates/cotton/ui/deleted_transactions_action_bar.html:45
+#: templates/cotton/ui/transactions_action_bar.html:45
+msgid "Invert selection"
msgstr "Inverter seleção"
#: templates/cotton/ui/deleted_transactions_action_bar.html:59
-#: templates/cotton/ui/transactions_action_bar.html:84
+#: templates/cotton/ui/transactions_action_bar.html:77
+#: templates/cotton/ui/transactions_action_bar.html:106
msgid "Yes, delete them!"
msgstr "Sim, apague!"
@@ -3124,43 +3209,43 @@ msgstr "Sim, apague!"
#: templates/cotton/ui/deleted_transactions_action_bar.html:166
#: templates/cotton/ui/deleted_transactions_action_bar.html:182
#: templates/cotton/ui/deleted_transactions_action_bar.html:198
-#: templates/cotton/ui/transactions_action_bar.html:128
-#: templates/cotton/ui/transactions_action_bar.html:143
-#: templates/cotton/ui/transactions_action_bar.html:159
-#: templates/cotton/ui/transactions_action_bar.html:175
-#: templates/cotton/ui/transactions_action_bar.html:191
-#: templates/cotton/ui/transactions_action_bar.html:207
-#: templates/cotton/ui/transactions_action_bar.html:223
+#: templates/cotton/ui/transactions_action_bar.html:153
+#: templates/cotton/ui/transactions_action_bar.html:168
+#: templates/cotton/ui/transactions_action_bar.html:184
+#: templates/cotton/ui/transactions_action_bar.html:200
+#: templates/cotton/ui/transactions_action_bar.html:216
+#: templates/cotton/ui/transactions_action_bar.html:232
+#: templates/cotton/ui/transactions_action_bar.html:248
msgid "copied!"
msgstr "copiado!"
#: templates/cotton/ui/deleted_transactions_action_bar.html:123
-#: templates/cotton/ui/transactions_action_bar.html:148
+#: templates/cotton/ui/transactions_action_bar.html:173
msgid "Flat Total"
msgstr "Total Fixo"
#: templates/cotton/ui/deleted_transactions_action_bar.html:139
-#: templates/cotton/ui/transactions_action_bar.html:164
+#: templates/cotton/ui/transactions_action_bar.html:189
msgid "Real Total"
msgstr "Total Real"
#: templates/cotton/ui/deleted_transactions_action_bar.html:155
-#: templates/cotton/ui/transactions_action_bar.html:180
+#: templates/cotton/ui/transactions_action_bar.html:205
msgid "Mean"
msgstr "Média"
#: templates/cotton/ui/deleted_transactions_action_bar.html:171
-#: templates/cotton/ui/transactions_action_bar.html:196
+#: templates/cotton/ui/transactions_action_bar.html:221
msgid "Max"
msgstr "Máximo"
#: templates/cotton/ui/deleted_transactions_action_bar.html:187
-#: templates/cotton/ui/transactions_action_bar.html:212
+#: templates/cotton/ui/transactions_action_bar.html:237
msgid "Min"
msgstr "Minímo"
#: templates/cotton/ui/deleted_transactions_action_bar.html:203
-#: templates/cotton/ui/transactions_action_bar.html:228
+#: templates/cotton/ui/transactions_action_bar.html:253
msgid "Count"
msgstr "Contagem"
@@ -3184,17 +3269,11 @@ msgstr "Recorrência"
msgid "Balance"
msgstr "Balancear"
-#: templates/cotton/ui/transactions_action_bar.html:46
-msgid "Invert selection"
-msgstr "Inverter seleção"
-
-#: templates/cotton/ui/transactions_action_bar.html:66
-msgid "Mark as unpaid"
-msgstr "Marcar como não pago"
-
-#: templates/cotton/ui/transactions_action_bar.html:71
-msgid "Mark as paid"
-msgstr "Marcar como pago"
+#: templates/cotton/ui/transactions_action_bar.html:83
+#, fuzzy
+#| msgid "Transactions"
+msgid "More actions"
+msgstr "Transações"
#: templates/currencies/fragments/add.html:5
msgid "Add currency"
@@ -3630,6 +3709,14 @@ msgstr "está disponível"
msgid "Calculator"
msgstr "Calculadora"
+#: templates/includes/transactions_bulk_actions.html:4
+msgid "Mark as unpaid"
+msgstr "Marcar como não pago"
+
+#: templates/includes/transactions_bulk_actions.html:9
+msgid "Mark as paid"
+msgstr "Marcar como pago"
+
#: templates/insights/fragments/category_explorer/charts/account.html:100
#: templates/insights/fragments/category_explorer/charts/currency.html:92
#: templates/monthly_overview/fragments/monthly_account_summary.html:14
@@ -3695,6 +3782,7 @@ msgstr "Nenhuma transação recente"
#: templates/insights/fragments/year_by_year.html:140
#: templates/investment_classes/fragments/list.html:65
#: templates/monthly_overview/fragments/monthly_summary.html:168
+#: templates/transactions/widgets/sub_transactions.html:55
msgid "Total"
msgstr "Total"
@@ -4116,11 +4204,11 @@ msgstr "Ganho"
msgid "Loss, tax or fee"
msgstr "Perda, imposto ou taxa"
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
msgid "No movements yet"
msgstr "Nenhuma movimentação ainda"
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
msgid "Use the + button to buy or contribute"
msgstr "Use o botão + para comprar ou aportar"
@@ -4690,6 +4778,12 @@ msgstr "Nenhuma transação apagada para mostrar"
msgid "Deleted transactions"
msgstr "Transações apagadas"
+#: templates/transactions/widgets/sub_transactions.html:53
+#, fuzzy
+#| msgid "Add quick transaction"
+msgid "Add sub-transaction"
+msgstr "Adicionar transação rápida"
+
#: templates/transactions/widgets/unselectable_income_expense_toggle_buttons.html:11
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:7
msgid "Unchanged"
@@ -4832,6 +4926,9 @@ msgstr "Login com"
msgid "Yearly Overview"
msgstr "Visão Anual"
+#~ msgid "Invert election"
+#~ msgstr "Inverter seleção"
+
#, python-format
#~ msgid ""
#~ "%(share)s%% of your investments with a target, against a target of "
diff --git a/app/locale/ru/LC_MESSAGES/django.po b/app/locale/ru/LC_MESSAGES/django.po
index e8ab4f9b..7b52a2bd 100644
--- a/app/locale/ru/LC_MESSAGES/django.po
+++ b/app/locale/ru/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-11-12 03:24+0000\n"
+"POT-Creation-Date: 2026-11-14 14:06+0000\n"
"PO-Revision-Date: 2026-11-10 07:58+0000\n"
"Last-Translator: masttera \n"
"Language-Team: Russian Public: Shown for all users. Only editable by the owner."
msgid ""
-"Private: Only shown for the owner and shared users. Only editable by the "
-"owner. Public: Shown for all users. Only editable by the owner."
+"Private: Only shown for the owner and shared users. Public: Shown for "
+"all users. Only the owner can edit, share or delete it."
msgstr ""
"Приватный: Отображается только для владельца и общих пользователей. Может "
"быть изменено только владельцем Публичный: Отображается для всех "
"пользователей. Может быть изменено только владельцем."
-#: apps/common/forms.py:76 apps/users/forms.py:191
+#: apps/common/forms.py:78 apps/users/forms.py:191
#: templates/bank_sync/fragments/accounts.html:34
#: templates/transactions/fragments/filter_actions.html:5
msgid "Save"
msgstr "Сохранить"
-#: apps/common/forms.py:90
+#: apps/common/forms.py:92
msgid "You cannot share this item with its owner."
msgstr "Вы не можете поделиться этим элементом с его владельцем."
@@ -830,6 +847,7 @@ msgid "Now"
msgstr "Сейчас"
#: apps/common/widgets/tom_select.py:14
+#: templates/transactions/widgets/sub_transaction_row.html:9
msgid "Remove"
msgstr "Снять"
@@ -906,8 +924,8 @@ msgstr "Дата и время"
msgid "Auto"
msgstr "Авто"
-#: apps/currencies/models.py:91 apps/export_app/forms.py:67
-#: apps/export_app/forms.py:152 templates/exchange_rates/fragments/list.html:10
+#: apps/currencies/models.py:91 apps/export_app/forms.py:73
+#: apps/export_app/forms.py:161 templates/exchange_rates/fragments/list.html:10
#: templates/exchange_rates/pages/index.html:4
#: templates/includes/sidebar.html:204
msgid "Exchange Rates"
@@ -1068,25 +1086,25 @@ msgstr "Службы успешно поставлены в очередь"
msgid "Create transaction"
msgstr "Создать транзакцию"
-#: apps/dca/forms.py:69 apps/transactions/forms.py:582
+#: apps/dca/forms.py:69 apps/transactions/forms.py:668
msgid "From Account"
msgstr "Со счета"
-#: apps/dca/forms.py:75 apps/transactions/forms.py:587
+#: apps/dca/forms.py:75 apps/transactions/forms.py:673
msgid "To Account"
msgstr "В счет"
#: apps/dca/forms.py:117 apps/dca/forms.py:125 apps/export_app/forms.py:49
-#: apps/export_app/forms.py:143 apps/insights/views.py:57
-#: apps/rules/forms.py:185 apps/rules/forms.py:195 apps/rules/models.py:46
-#: apps/rules/models.py:307 apps/transactions/filters.py:84
-#: apps/transactions/forms.py:78 apps/transactions/forms.py:346
-#: apps/transactions/forms.py:526 apps/transactions/forms.py:640
-#: apps/transactions/forms.py:647 apps/transactions/forms.py:862
-#: apps/transactions/forms.py:1114 apps/transactions/models.py:313
-#: apps/transactions/models.py:369 apps/transactions/models.py:770
-#: apps/transactions/models.py:1028 apps/transactions/models.py:1353
-#: templates/entities/fragments/list.html:9
+#: apps/export_app/forms.py:150 apps/insights/views.py:57
+#: apps/rules/forms.py:185 apps/rules/forms.py:196 apps/rules/models.py:47
+#: apps/rules/models.py:308 apps/transactions/filters.py:100
+#: apps/transactions/filters.py:175 apps/transactions/forms.py:161
+#: apps/transactions/forms.py:431 apps/transactions/forms.py:612
+#: apps/transactions/forms.py:726 apps/transactions/forms.py:733
+#: apps/transactions/forms.py:950 apps/transactions/forms.py:1204
+#: apps/transactions/models.py:315 apps/transactions/models.py:371
+#: apps/transactions/models.py:866 apps/transactions/models.py:1127
+#: apps/transactions/models.py:1500 templates/entities/fragments/list.html:9
#: templates/entities/pages/index.html:4 templates/includes/sidebar.html:168
#: templates/insights/fragments/month_by_month.html:40
#: templates/insights/fragments/month_by_month.html:43
@@ -1122,8 +1140,8 @@ msgstr "Суммы транзакций теперь скрыты"
msgid "You must provide an account."
msgstr "Вы должны предоставить учетную запись."
-#: apps/dca/forms.py:322 apps/transactions/forms.py:780
-#: apps/transactions/models.py:978
+#: apps/dca/forms.py:322 apps/transactions/forms.py:866
+#: apps/transactions/models.py:1077
msgid "From and To accounts must be different."
msgstr "Счета «От» и «Получатель» должны быть разными."
@@ -1141,10 +1159,10 @@ msgid "Payment Currency"
msgstr "Валюта платежа"
#: apps/dca/models.py:26 apps/dca/models.py:181 apps/rules/forms.py:180
-#: apps/rules/forms.py:196 apps/rules/models.py:43 apps/rules/models.py:295
-#: apps/transactions/forms.py:504 apps/transactions/forms.py:668
-#: apps/transactions/models.py:354 apps/transactions/models.py:774
-#: apps/transactions/models.py:1031 apps/transactions/models.py:1338
+#: apps/rules/forms.py:197 apps/rules/models.py:44 apps/rules/models.py:296
+#: apps/transactions/forms.py:590 apps/transactions/forms.py:754
+#: apps/transactions/models.py:356 apps/transactions/models.py:870
+#: apps/transactions/models.py:1130 apps/transactions/models.py:1485
msgid "Notes"
msgstr "Заметки"
@@ -1152,7 +1170,7 @@ msgstr "Заметки"
msgid "DCA Strategy"
msgstr "Стратегия DCA"
-#: apps/dca/models.py:35 apps/export_app/forms.py:166
+#: apps/dca/models.py:35 apps/export_app/forms.py:175
msgid "DCA Strategies"
msgstr "Стратегии DCA"
@@ -1172,7 +1190,7 @@ msgstr "Полученная сумма"
msgid "DCA Entry"
msgstr ""
-#: apps/dca/models.py:187 apps/export_app/forms.py:167
+#: apps/dca/models.py:187 apps/export_app/forms.py:176
msgid "DCA Entries"
msgstr "Записи DCA"
@@ -1200,14 +1218,14 @@ msgstr "Запись успешно обновлена"
msgid "Entry deleted successfully"
msgstr "Запись успешно удалена"
-#: apps/export_app/forms.py:13 apps/export_app/forms.py:137
+#: apps/export_app/forms.py:13 apps/export_app/forms.py:144
#: templates/includes/sidebar.html:247 templates/users/fragments/list.html:10
#: templates/users/pages/index.html:4
msgid "Users"
msgstr "Пользователи"
-#: apps/export_app/forms.py:31 apps/export_app/forms.py:144
-#: apps/transactions/models.py:423 templates/includes/sidebar.html:81
+#: apps/export_app/forms.py:31 apps/export_app/forms.py:151
+#: apps/transactions/models.py:425 templates/includes/sidebar.html:81
#: templates/includes/sidebar.html:154
#: templates/recurring_transactions/fragments/list_transactions.html:5
#: templates/recurring_transactions/fragments/table.html:37
@@ -1215,9 +1233,9 @@ msgstr "Пользователи"
msgid "Transactions"
msgstr "Транзакции"
-#: apps/export_app/forms.py:37 apps/export_app/forms.py:141
-#: apps/insights/views.py:43 apps/transactions/filters.py:74
-#: templates/categories/fragments/list.html:9
+#: apps/export_app/forms.py:37 apps/export_app/forms.py:148
+#: apps/insights/views.py:43 apps/transactions/filters.py:90
+#: apps/transactions/filters.py:165 templates/categories/fragments/list.html:9
#: templates/categories/pages/index.html:4 templates/includes/sidebar.html:156
#: templates/insights/fragments/month_by_month.html:18
#: templates/insights/fragments/month_by_month.html:21
@@ -1226,101 +1244,116 @@ msgstr "Транзакции"
msgid "Categories"
msgstr "Категории"
-#: apps/export_app/forms.py:55 apps/export_app/forms.py:147
-#: apps/transactions/models.py:1068 templates/includes/sidebar.html:110
+#: apps/export_app/forms.py:55 apps/export_app/forms.py:155
+#: apps/transactions/models.py:1167 templates/includes/sidebar.html:110
#: templates/recurring_transactions/fragments/list.html:9
#: templates/recurring_transactions/pages/index.html:4
msgid "Recurring Transactions"
msgstr "Повторяющиеся транзакции"
-#: apps/export_app/forms.py:61 apps/export_app/forms.py:145
-#: apps/transactions/models.py:788 templates/includes/sidebar.html:104
+#: apps/export_app/forms.py:61 apps/export_app/forms.py:153
+#: apps/transactions/models.py:884 templates/includes/sidebar.html:104
#: templates/installment_plans/fragments/list.html:9
#: templates/installment_plans/pages/index.html:4
msgid "Installment Plans"
msgstr "Планы рассрочки"
-#: apps/export_app/forms.py:73 apps/export_app/forms.py:150
+#: apps/export_app/forms.py:67 apps/export_app/forms.py:157
+#: apps/transactions/models.py:1518 templates/includes/sidebar.html:98
+#: templates/quick_transactions/pages/index.html:5
+#: templates/quick_transactions/pages/index.html:15
+msgid "Quick Transactions"
+msgstr "Быстрые транзакции"
+
+#: apps/export_app/forms.py:79 apps/export_app/forms.py:159
#: templates/exchange_rates_services/fragments/list.html:10
#: templates/exchange_rates_services/pages/index.html:4
#: templates/includes/sidebar.html:232
msgid "Automatic Exchange Rates"
msgstr "Автоматические обменные курсы"
-#: apps/export_app/forms.py:79 templates/bank_sync/fragments/list.html:8
+#: apps/export_app/forms.py:85 templates/bank_sync/fragments/list.html:8
#: templates/bank_sync/pages/index.html:4 templates/includes/sidebar.html:238
msgid "Bank Sync"
msgstr ""
-#: apps/export_app/forms.py:80
+#: apps/export_app/forms.py:86
msgid "Includes the providers' API keys"
msgstr ""
-#: apps/export_app/forms.py:86 templates/includes/sidebar.html:212
+#: apps/export_app/forms.py:92 templates/includes/sidebar.html:212
#: templates/rules/fragments/list.html:9 templates/rules/pages/index.html:4
msgid "Rules"
msgstr "Правила"
-#: apps/export_app/forms.py:92 templates/cotton/transaction/item.html:66
+#: apps/export_app/forms.py:98 templates/cotton/transaction/item.html:68
msgid "DCA"
msgstr ""
-#: apps/export_app/forms.py:98 apps/export_app/forms.py:168
+#: apps/export_app/forms.py:104 apps/export_app/forms.py:177
#: templates/import_app/fragments/profiles/list.html:21
#: templates/import_app/pages/profiles_index.html:4
msgid "Import Profiles"
msgstr "Импорт профилей"
-#: apps/export_app/forms.py:126 templates/export_app/fragments/export.html:5
+#: apps/export_app/forms.py:133 templates/export_app/fragments/export.html:5
#: templates/export_app/pages/index.html:13
msgid "Export"
msgstr "Экспорт"
-#: apps/export_app/forms.py:134
+#: apps/export_app/forms.py:141
msgid "Import a ZIP file exported from WYGIWYH"
msgstr "Импорт ZIP-файла, экспортированного из WYGIWYH"
-#: apps/export_app/forms.py:135
+#: apps/export_app/forms.py:142
msgid "ZIP File"
msgstr "ZIP File"
-#: apps/export_app/forms.py:157
+#: apps/export_app/forms.py:152 apps/rules/forms.py:193 apps/rules/models.py:42
+#: apps/rules/models.py:320 apps/transactions/models.py:736
+#: templates/transactions/widgets/sub_transactions.html:39
+#, fuzzy
+#| msgid "transactions"
+msgid "Sub-transactions"
+msgstr "транзакции"
+
+#: apps/export_app/forms.py:166
#, fuzzy
msgid "Bank Sync Accounts"
msgstr "Счета"
-#: apps/export_app/forms.py:159 apps/rules/models.py:27
+#: apps/export_app/forms.py:168 apps/rules/models.py:27
msgid "Transaction rules"
msgstr "Правила транзакций"
-#: apps/export_app/forms.py:161 apps/rules/models.py:68
+#: apps/export_app/forms.py:170 apps/rules/models.py:69
msgid "Edit transaction action"
msgstr "Редактировать действие транзакции"
-#: apps/export_app/forms.py:164 apps/rules/models.py:327
+#: apps/export_app/forms.py:173 apps/rules/models.py:332
msgid "Update or create transaction actions"
msgstr "Обновление или создание действий транзакции"
-#: apps/export_app/forms.py:199 templates/cotton/transaction/item.html:310
+#: apps/export_app/forms.py:210 templates/cotton/transaction/item.html:327
#: templates/cotton/ui/deleted_transactions_action_bar.html:53
#: templates/export_app/fragments/restore.html:5
#: templates/export_app/pages/index.html:19
msgid "Restore"
msgstr "Восстановить"
-#: apps/export_app/forms.py:209
+#: apps/export_app/forms.py:220
msgid "Please upload either a ZIP file or at least one CSV file"
msgstr "Пожалуйста, загрузите либо ZIP-файл, либо хотя бы один CSV-файл"
-#: apps/export_app/views.py:190
+#: apps/export_app/views.py:216
msgid "You have to select at least one export"
msgstr "Необходимо выбрать как минимум один экспорт"
-#: apps/export_app/views.py:210
+#: apps/export_app/views.py:236
msgid "Data restored successfully"
msgstr "Данные успешно восстановлены"
-#: apps/export_app/views.py:222
+#: apps/export_app/views.py:248
msgid ""
"There was an error restoring your data. Check the logs for more details."
msgstr ""
@@ -1409,7 +1442,7 @@ msgstr "Запуск успешно удален"
#: apps/insights/forms.py:118 apps/insights/utils/sankey.py:36
#: apps/insights/utils/sankey.py:167 apps/insights/views.py:45
-#: apps/transactions/filters.py:209
+#: apps/transactions/filters.py:294
#: templates/insights/fragments/month_by_month.html:119
#: templates/insights/fragments/year_by_year.html:73
msgid "Uncategorized"
@@ -1466,24 +1499,24 @@ msgstr "Категории отсутствуют"
msgid "Tag"
msgstr ""
-#: apps/insights/views.py:52 apps/transactions/filters.py:215
+#: apps/insights/views.py:52 apps/transactions/filters.py:303
#: templates/insights/fragments/month_by_month.html:121
#: templates/insights/fragments/year_by_year.html:75
msgid "Untagged"
msgstr ""
-#: apps/insights/views.py:53 apps/transactions/models.py:611
+#: apps/insights/views.py:53 apps/transactions/models.py:632
#: templates/tags/fragments/table.html:69
msgid "No tags"
msgstr "Нет тегов"
-#: apps/insights/views.py:58 apps/transactions/models.py:312
+#: apps/insights/views.py:58 apps/transactions/models.py:314
#: templates/insights/fragments/month_by_month.html:88
#: templates/insights/fragments/year_by_year.html:56
msgid "Entity"
msgstr ""
-#: apps/insights/views.py:59 apps/transactions/filters.py:222
+#: apps/insights/views.py:59 apps/transactions/filters.py:311
#: templates/insights/fragments/month_by_month.html:123
#: templates/insights/fragments/year_by_year.html:77
msgid "No entity"
@@ -1501,17 +1534,17 @@ msgstr ""
msgid "Unclassified"
msgstr ""
-#: apps/investments/views.py:289
+#: apps/investments/views.py:290
#, fuzzy
msgid "Asset class added successfully"
msgstr "План рассрочки успешно добавлен"
-#: apps/investments/views.py:297
+#: apps/investments/views.py:298
#, fuzzy
msgid "Asset class updated successfully"
msgstr "Тег успешно обновлен"
-#: apps/investments/views.py:318
+#: apps/investments/views.py:319
#, fuzzy
msgid "Asset class deleted successfully"
msgstr "Тег успешно удален"
@@ -1545,13 +1578,13 @@ msgstr "На следующем экране вы сможете добавит
msgid "Set field"
msgstr ""
-#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:123
+#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:101
msgid "To"
msgstr ""
#: apps/rules/forms.py:78 apps/rules/forms.py:158 apps/rules/models.py:20
-#: apps/rules/models.py:62 apps/rules/models.py:323
+#: apps/rules/models.py:63 apps/rules/models.py:328
#: templates/rules/fragments/list.html:23
msgid "Order"
msgstr "Заказ"
@@ -1569,36 +1602,37 @@ msgid "Operator"
msgstr "Оператор"
#: apps/rules/forms.py:174 apps/rules/forms.py:188 apps/rules/models.py:36
-#: apps/rules/models.py:271 apps/transactions/forms.py:468
-#: apps/transactions/models.py:337 apps/transactions/models.py:730
-#: apps/transactions/models.py:1009 apps/transactions/models.py:1323
+#: apps/rules/models.py:272 apps/transactions/forms.py:554
+#: apps/transactions/models.py:339 apps/transactions/models.py:826
+#: apps/transactions/models.py:1108 apps/transactions/models.py:1470
#: templates/mini_tools/simulator.html:63
msgid "Type"
msgstr ""
#: apps/rules/forms.py:175 apps/rules/forms.py:189 apps/rules/models.py:37
-#: apps/rules/models.py:275 apps/transactions/filters.py:22
-#: apps/transactions/forms.py:472 apps/transactions/forms.py:650
-#: apps/transactions/models.py:339 apps/transactions/models.py:1325
-#: templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/rules/models.py:276 apps/transactions/filters.py:23
+#: apps/transactions/forms.py:558 apps/transactions/forms.py:736
+#: apps/transactions/models.py:341 apps/transactions/models.py:1472
+#: templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/transactions/widgets/paid_toggle_button.html:10
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:13
msgid "Paid"
msgstr "Оплаченный"
#: apps/rules/forms.py:177 apps/rules/forms.py:191 apps/rules/models.py:39
-#: apps/rules/models.py:283 apps/transactions/forms.py:90
-#: apps/transactions/forms.py:488 apps/transactions/forms.py:655
-#: apps/transactions/forms.py:868 apps/transactions/models.py:341
-#: apps/transactions/models.py:748 apps/transactions/models.py:1033
+#: apps/rules/models.py:284 apps/transactions/forms.py:173
+#: apps/transactions/forms.py:574 apps/transactions/forms.py:741
+#: apps/transactions/forms.py:956 apps/transactions/models.py:343
+#: apps/transactions/models.py:844 apps/transactions/models.py:1132
msgid "Reference Date"
msgstr "Дата ссылки"
#: apps/rules/forms.py:178 apps/rules/forms.py:192 apps/rules/models.py:41
-#: apps/rules/models.py:287 apps/transactions/forms.py:495
-#: apps/transactions/models.py:347 apps/transactions/models.py:1014
-#: apps/transactions/models.py:1331
+#: apps/rules/models.py:288 apps/transactions/forms.py:75
+#: apps/transactions/forms.py:581 apps/transactions/models.py:349
+#: apps/transactions/models.py:730 apps/transactions/models.py:1113
+#: apps/transactions/models.py:1478
#: templates/insights/fragments/sankey.html:102
#: templates/installment_plans/fragments/table.html:18
#: templates/mini_tools/simulator.html:70
@@ -1607,51 +1641,52 @@ msgstr "Дата ссылки"
msgid "Amount"
msgstr ""
-#: apps/rules/forms.py:179 apps/rules/forms.py:193 apps/rules/models.py:14
-#: apps/rules/models.py:42 apps/rules/models.py:291
-#: apps/transactions/forms.py:499 apps/transactions/forms.py:659
-#: apps/transactions/models.py:352 apps/transactions/models.py:732
-#: apps/transactions/models.py:1017 apps/transactions/models.py:1336
+#: apps/rules/forms.py:179 apps/rules/forms.py:194 apps/rules/models.py:14
+#: apps/rules/models.py:43 apps/rules/models.py:292
+#: apps/transactions/forms.py:585 apps/transactions/forms.py:745
+#: apps/transactions/models.py:354 apps/transactions/models.py:828
+#: apps/transactions/models.py:1116 apps/transactions/models.py:1483
msgid "Description"
msgstr ""
-#: apps/rules/forms.py:182 apps/rules/forms.py:198 apps/rules/models.py:47
-#: apps/rules/models.py:299 apps/transactions/models.py:399
-#: apps/transactions/models.py:1358
+#: apps/rules/forms.py:182 apps/rules/forms.py:199 apps/rules/models.py:48
+#: apps/rules/models.py:300 apps/transactions/models.py:401
+#: apps/transactions/models.py:1505
msgid "Internal Note"
msgstr ""
-#: apps/rules/forms.py:183 apps/rules/forms.py:199 apps/rules/models.py:48
-#: apps/rules/models.py:303 apps/transactions/models.py:401
-#: apps/transactions/models.py:1360
+#: apps/rules/forms.py:183 apps/rules/forms.py:200 apps/rules/models.py:49
+#: apps/rules/models.py:304 apps/transactions/models.py:403
+#: apps/transactions/models.py:1507
msgid "Internal ID"
msgstr ""
-#: apps/rules/forms.py:186 apps/rules/forms.py:200 apps/rules/models.py:40
-#: apps/rules/models.py:319 apps/transactions/forms.py:672
-#: apps/transactions/models.py:251 apps/transactions/models.py:342
-#: apps/transactions/models.py:1326
+#: apps/rules/forms.py:186 apps/rules/forms.py:201 apps/rules/models.py:40
+#: apps/rules/models.py:324 apps/transactions/forms.py:758
+#: apps/transactions/models.py:253 apps/transactions/models.py:344
+#: apps/transactions/models.py:1473
msgid "Mute"
msgstr ""
-#: apps/rules/forms.py:215
+#: apps/rules/forms.py:216
msgid "Search Criteria"
msgstr ""
-#: apps/rules/forms.py:360
+#: apps/rules/forms.py:361
msgid "Set Values"
msgstr ""
-#: apps/rules/forms.py:407 apps/rules/forms.py:442 apps/rules/forms.py:477
-#: apps/transactions/models.py:422 apps/transactions/models.py:667
+#: apps/rules/forms.py:409 apps/rules/forms.py:444 apps/rules/forms.py:479
+#: apps/transactions/models.py:424 apps/transactions/models.py:703
+#: apps/transactions/models.py:763
msgid "Transaction"
msgstr "Транзакция"
-#: apps/rules/forms.py:411 apps/rules/forms.py:446 apps/rules/forms.py:481
+#: apps/rules/forms.py:413 apps/rules/forms.py:448 apps/rules/forms.py:483
msgid "Type to search for a transaction"
msgstr "Введите текст для поиска транзакции"
-#: apps/rules/forms.py:422 apps/rules/forms.py:457 apps/rules/forms.py:491
+#: apps/rules/forms.py:424 apps/rules/forms.py:459 apps/rules/forms.py:493
#: templates/rules/fragments/transaction_rule/dry_run/created.html:5
#: templates/rules/fragments/transaction_rule/dry_run/deleted.html:5
#: templates/rules/fragments/transaction_rule/dry_run/updated.html:5
@@ -1671,15 +1706,15 @@ msgstr ""
msgid "Transaction rule"
msgstr "Правило транзакции"
-#: apps/rules/models.py:54 apps/rules/models.py:98
+#: apps/rules/models.py:55 apps/rules/models.py:99
msgid "Rule"
msgstr ""
-#: apps/rules/models.py:59
+#: apps/rules/models.py:60
msgid "Field"
msgstr ""
-#: apps/rules/models.py:61 templates/investments/fragments/charts.html:86
+#: apps/rules/models.py:62 templates/investments/fragments/charts.html:86
#: templates/investments/fragments/detail.html:68
#: templates/investments/fragments/detail.html:127
#: templates/investments/fragments/detail.html:245
@@ -1687,57 +1722,57 @@ msgstr ""
msgid "Value"
msgstr ""
-#: apps/rules/models.py:69
+#: apps/rules/models.py:70
msgid "Edit transaction actions"
msgstr ""
-#: apps/rules/models.py:84
+#: apps/rules/models.py:85
msgid "is exactly"
msgstr ""
-#: apps/rules/models.py:85
+#: apps/rules/models.py:86
msgid "contains"
msgstr ""
-#: apps/rules/models.py:86
+#: apps/rules/models.py:87
msgid "starts with"
msgstr ""
-#: apps/rules/models.py:87
+#: apps/rules/models.py:88
msgid "ends with"
msgstr ""
-#: apps/rules/models.py:88
+#: apps/rules/models.py:89
msgid "equals"
msgstr ""
-#: apps/rules/models.py:89
+#: apps/rules/models.py:90
msgid "greater than"
msgstr ""
-#: apps/rules/models.py:90
+#: apps/rules/models.py:91
msgid "less than"
msgstr ""
-#: apps/rules/models.py:91
+#: apps/rules/models.py:92
msgid "greater than or equal"
msgstr "больше или равно"
-#: apps/rules/models.py:92
+#: apps/rules/models.py:93
msgid "less than or equal"
msgstr "меньше или равно"
-#: apps/rules/models.py:102
+#: apps/rules/models.py:103
msgid "Filter"
msgstr "Фильтр"
-#: apps/rules/models.py:105
+#: apps/rules/models.py:106
msgid ""
"Generic expression to enable or disable execution. Should evaluate to True "
"or False"
msgstr ""
-#: apps/rules/models.py:326
+#: apps/rules/models.py:331
msgid "Update or create transaction action"
msgstr "Операция обновления или создания транзакции"
@@ -1781,8 +1816,8 @@ msgstr "Операция обновления или создания транз
msgid "Update or Create Transaction action deleted successfully"
msgstr "Операция обновления или создания транзакции успешно удалена"
-#: apps/transactions/filters.py:23 templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/transactions/filters.py:24 templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/insights/fragments/overview/index.html:68
#: templates/net_worth/net_worth.html:39 templates/net_worth/net_worth.html:43
#: templates/transactions/widgets/paid_toggle_button.html:7
@@ -1790,166 +1825,176 @@ msgstr "Операция обновления или создания транз
msgid "Projected"
msgstr "Прогнозируемый"
-#: apps/transactions/filters.py:28 templates/categories/fragments/table.html:18
+#: apps/transactions/filters.py:29 templates/categories/fragments/table.html:18
msgid "Muted"
msgstr ""
-#: apps/transactions/filters.py:51
+#: apps/transactions/filters.py:67 apps/transactions/filters.py:144
msgid "Content"
msgstr ""
-#: apps/transactions/filters.py:57
+#: apps/transactions/filters.py:73
msgid "Transaction Type"
msgstr "Тип транзакции"
-#: apps/transactions/filters.py:95
+#: apps/transactions/filters.py:111
msgid "Mute Status"
msgstr ""
-#: apps/transactions/filters.py:100
+#: apps/transactions/filters.py:116
msgid "Date from"
msgstr "Дата с"
-#: apps/transactions/filters.py:105 apps/transactions/filters.py:115
+#: apps/transactions/filters.py:121 apps/transactions/filters.py:131
msgid "Until"
msgstr ""
-#: apps/transactions/filters.py:110
+#: apps/transactions/filters.py:126
msgid "Reference date from"
msgstr "Дата отсчета с"
-#: apps/transactions/filters.py:120
+#: apps/transactions/filters.py:136
msgid "Amount min"
msgstr ""
-#: apps/transactions/filters.py:125
+#: apps/transactions/filters.py:141
msgid "Amount max"
msgstr ""
-#: apps/transactions/filters.py:208
+#: apps/transactions/filters.py:240
+msgid "Include"
+msgstr ""
+
+#: apps/transactions/filters.py:245
+msgid "Exclude"
+msgstr ""
+
+#: apps/transactions/filters.py:293
msgid "Categorized"
msgstr ""
-#: apps/transactions/filters.py:215
+#: apps/transactions/filters.py:303
msgid "Tagged"
msgstr ""
-#: apps/transactions/filters.py:221
+#: apps/transactions/filters.py:310
msgid "Any entity"
msgstr ""
-#: apps/transactions/forms.py:192
+#: apps/transactions/forms.py:277
msgid "More"
msgstr ""
-#: apps/transactions/forms.py:229
+#: apps/transactions/forms.py:314
msgid "Save and add similar"
msgstr "Сохранить и добавить похожие"
-#: apps/transactions/forms.py:234
+#: apps/transactions/forms.py:319
msgid "Save and add another"
msgstr "Сохраните и добавьте еще один"
-#: apps/transactions/forms.py:271 templates/cotton/transaction/item.html:184
+#: apps/transactions/forms.py:356 templates/cotton/transaction/item.html:186
#: templates/transactions/fragments/attachments.html:4
#, fuzzy
msgid "Attachments"
msgstr "Рассрочки"
-#: apps/transactions/forms.py:272
+#: apps/transactions/forms.py:357
msgid ""
"Files are private and only visible to users with access to this transaction."
msgstr ""
-#: apps/transactions/forms.py:283
+#: apps/transactions/forms.py:368
#, fuzzy
msgid "Upload"
msgstr "Перезагрузка"
-#: apps/transactions/forms.py:355 apps/transactions/forms.py:1120
-#: apps/transactions/models.py:947
+#: apps/transactions/forms.py:440 apps/transactions/forms.py:1210
+#: apps/transactions/models.py:1046
#, fuzzy
msgid "To account"
msgstr "В счет"
-#: apps/transactions/forms.py:382 apps/transactions/forms.py:675
+#: apps/transactions/forms.py:467 apps/transactions/forms.py:761
msgid "Muted transactions won't be displayed on monthly summaries"
msgstr "Скрытые транзакции не будут отображаться в ежемесячных сводка"
-#: apps/transactions/forms.py:594
+#: apps/transactions/forms.py:680
msgid "From Amount"
msgstr ""
-#: apps/transactions/forms.py:599
+#: apps/transactions/forms.py:685
msgid "To Amount"
msgstr ""
-#: apps/transactions/forms.py:741 apps/transactions/models.py:992
-#: apps/transactions/models.py:1303 templates/cotton/transaction/item.html:52
-#: templates/cotton/transaction/item.html:60
+#: apps/transactions/forms.py:827 apps/transactions/models.py:1091
+#: apps/transactions/models.py:1450 templates/cotton/transaction/item.html:54
+#: templates/cotton/transaction/item.html:62
+#: templates/cotton/transaction/item.html:272
+#: templates/cotton/transaction/item.html:304
#: templates/cotton/ui/quick_transactions_buttons.html:40
#: templates/cotton/ui/transactions_fab.html:44
msgid "Transfer"
msgstr "Передать"
-#: apps/transactions/forms.py:1005
+#: apps/transactions/forms.py:1095
msgid "Tag name"
msgstr "Название тега"
-#: apps/transactions/forms.py:1033
+#: apps/transactions/forms.py:1123
msgid "Entity name"
msgstr "Название организации"
-#: apps/transactions/forms.py:1061
+#: apps/transactions/forms.py:1151
msgid "Category name"
msgstr "Название категории"
-#: apps/transactions/forms.py:1063
+#: apps/transactions/forms.py:1153
msgid "Muted categories won't be displayed on monthly summaries"
msgstr "Категории, не отображаемые в сводках, не будут показываться"
-#: apps/transactions/forms.py:1228
+#: apps/transactions/forms.py:1319
msgid "future transactions"
msgstr "будущие транзакции"
-#: apps/transactions/forms.py:1255
+#: apps/transactions/forms.py:1346
msgid "End date should be after the start date"
msgstr "Дата окончания должна быть после даты начала"
-#: apps/transactions/models.py:256
+#: apps/transactions/models.py:258
msgid ""
"Deactivated categories won't be able to be selected when creating new "
"transactions"
msgstr ""
"Деактивированные категории нельзя будет выбрать при создании новых транзакций"
-#: apps/transactions/models.py:264
+#: apps/transactions/models.py:266
msgid "Transaction Category"
msgstr "Категория транзакции"
-#: apps/transactions/models.py:265
+#: apps/transactions/models.py:267
msgid "Transaction Categories"
msgstr "Категории транзакций"
-#: apps/transactions/models.py:280
+#: apps/transactions/models.py:282
msgid ""
"Deactivated tags won't be able to be selected when creating new transactions"
msgstr ""
"Деактивированные теги нельзя будет выбрать при создании новых транзакций"
-#: apps/transactions/models.py:288 apps/transactions/models.py:289
+#: apps/transactions/models.py:290 apps/transactions/models.py:291
msgid "Transaction Tags"
msgstr "Теги транзакций"
-#: apps/transactions/models.py:304
+#: apps/transactions/models.py:306
msgid ""
"Deactivated entities won't be able to be selected when creating new "
"transactions"
msgstr ""
"Деактивированные объекты нельзя будет выбрать при создании новых транзакций"
-#: apps/transactions/models.py:324 apps/transactions/models.py:991
-#: apps/transactions/models.py:1302
+#: apps/transactions/models.py:326 apps/transactions/models.py:1090
+#: apps/transactions/models.py:1449
#: templates/calendar_view/fragments/list.html:42
#: templates/calendar_view/fragments/list.html:44
#: templates/calendar_view/fragments/list.html:52
@@ -1961,14 +2006,14 @@ msgstr ""
#: templates/investments/fragments/detail.html:71
#: templates/investments/fragments/detail.html:175
#: templates/investments/fragments/detail.html:227
-#: templates/investments/fragments/detail.html:318
+#: templates/investments/fragments/detail.html:326
#: templates/mini_tools/simulator.html:66
#: templates/monthly_overview/fragments/monthly_summary.html:42
msgid "Income"
msgstr "Доход"
-#: apps/transactions/models.py:325 apps/transactions/models.py:993
-#: apps/transactions/models.py:1304
+#: apps/transactions/models.py:327 apps/transactions/models.py:1092
+#: apps/transactions/models.py:1451
#: templates/calendar_view/fragments/list.html:46
#: templates/calendar_view/fragments/list.html:48
#: templates/calendar_view/fragments/list.html:56
@@ -1980,198 +2025,198 @@ msgstr "Доход"
msgid "Expense"
msgstr "Расход"
-#: apps/transactions/models.py:380 apps/transactions/models.py:787
-#: templates/cotton/transaction/item.html:260
-#: templates/cotton/transaction/item.html:277
-#: templates/cotton/transaction/item.html:287
+#: apps/transactions/models.py:382 apps/transactions/models.py:883
+#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:289
+#: templates/cotton/transaction/item.html:299
msgid "Installment Plan"
msgstr "План рассрочки"
-#: apps/transactions/models.py:389 apps/transactions/models.py:1067
-#: templates/cotton/transaction/item.html:250
-#: templates/cotton/transaction/item.html:270
+#: apps/transactions/models.py:391 apps/transactions/models.py:1166
+#: templates/cotton/transaction/item.html:252
+#: templates/cotton/transaction/item.html:282
msgid "Recurring Transaction"
msgstr "Повторяющаяся транзакция"
-#: apps/transactions/models.py:397
+#: apps/transactions/models.py:399
#, fuzzy
msgid "Linked Transaction"
msgstr "Ссылка на транзакцию"
-#: apps/transactions/models.py:405
+#: apps/transactions/models.py:407
msgid "Deleted"
msgstr "Удалено"
-#: apps/transactions/models.py:410
+#: apps/transactions/models.py:412
msgid "Deleted At"
msgstr ""
-#: apps/transactions/models.py:518
+#: apps/transactions/models.py:521
msgid "A transfer needs one expense and one income."
msgstr ""
-#: apps/transactions/models.py:520
+#: apps/transactions/models.py:523
msgid "A transfer needs two different accounts."
msgstr ""
-#: apps/transactions/models.py:524
+#: apps/transactions/models.py:527
msgid "This transaction is already part of another transfer."
msgstr ""
-#: apps/transactions/models.py:613
+#: apps/transactions/models.py:634
msgid "No category"
msgstr "Нет категории"
-#: apps/transactions/models.py:615
+#: apps/transactions/models.py:636
msgid "No description"
msgstr "Нет описания"
-#: apps/transactions/models.py:672
+#: apps/transactions/models.py:735
+#, fuzzy
+#| msgid "transactions"
+msgid "Sub-transaction"
+msgstr "транзакции"
+
+#: apps/transactions/models.py:768
#, fuzzy
msgid "File"
msgstr "ZIP File"
-#: apps/transactions/models.py:674
+#: apps/transactions/models.py:770
msgid "Original Name"
msgstr ""
-#: apps/transactions/models.py:676
+#: apps/transactions/models.py:772
#, fuzzy
msgid "Content Type"
msgstr "Тип интервала"
-#: apps/transactions/models.py:678
+#: apps/transactions/models.py:774
msgid "Size"
msgstr ""
-#: apps/transactions/models.py:683
+#: apps/transactions/models.py:779
msgid "Uploaded By"
msgstr ""
-#: apps/transactions/models.py:688
+#: apps/transactions/models.py:784
#, fuzzy
msgid "Transaction Attachment"
msgstr "Правило транзакции"
-#: apps/transactions/models.py:689
+#: apps/transactions/models.py:785
#, fuzzy
msgid "Transaction Attachments"
msgstr "Теги транзакций"
-#: apps/transactions/models.py:719 templates/includes/sidebar.html:57
+#: apps/transactions/models.py:815 templates/includes/sidebar.html:57
msgid "Yearly"
msgstr "Ежегодно"
-#: apps/transactions/models.py:720 apps/users/models.py:469
+#: apps/transactions/models.py:816 apps/users/models.py:469
#: templates/includes/sidebar.html:51
msgid "Monthly"
msgstr "Ежемесячно"
-#: apps/transactions/models.py:721
+#: apps/transactions/models.py:817
msgid "Weekly"
msgstr "Еженедельно"
-#: apps/transactions/models.py:722
+#: apps/transactions/models.py:818
msgid "Daily"
msgstr "Ежедневно"
-#: apps/transactions/models.py:735
+#: apps/transactions/models.py:831
msgid "Number of Installments"
msgstr "Количество платежей"
-#: apps/transactions/models.py:740
+#: apps/transactions/models.py:836
msgid "Installment Start"
msgstr "Начало выплаты рассрочки"
-#: apps/transactions/models.py:741
+#: apps/transactions/models.py:837
msgid "The installment number to start counting from"
msgstr "Номер платежа, с которого начинается отсчет"
-#: apps/transactions/models.py:746 apps/transactions/models.py:1037
+#: apps/transactions/models.py:842 apps/transactions/models.py:1136
msgid "Start Date"
msgstr "Дата начала"
-#: apps/transactions/models.py:750 apps/transactions/models.py:1038
+#: apps/transactions/models.py:846 apps/transactions/models.py:1137
msgid "End Date"
msgstr "Дата окончания"
-#: apps/transactions/models.py:755
+#: apps/transactions/models.py:851
msgid "Recurrence"
msgstr ""
-#: apps/transactions/models.py:758
+#: apps/transactions/models.py:854
msgid "Installment Amount"
msgstr "Сумма рассрочки"
-#: apps/transactions/models.py:777 apps/transactions/models.py:1057
+#: apps/transactions/models.py:873 apps/transactions/models.py:1156
msgid "Add description to transactions"
msgstr "Добавить описание к транзакциям"
-#: apps/transactions/models.py:780 apps/transactions/models.py:1060
+#: apps/transactions/models.py:876 apps/transactions/models.py:1159
msgid "Add notes to transactions"
msgstr "Добавить примечания к транзакциям"
-#: apps/transactions/models.py:954
+#: apps/transactions/models.py:1053
#, fuzzy
msgid "To amount"
msgstr "Показать суммы"
-#: apps/transactions/models.py:955
+#: apps/transactions/models.py:1054
msgid "Leave empty to use the same amount"
msgstr ""
-#: apps/transactions/models.py:996 templates/mini_tools/simulator.html:129
+#: apps/transactions/models.py:1095 templates/mini_tools/simulator.html:129
msgid "day(s)"
msgstr "день"
-#: apps/transactions/models.py:997 templates/mini_tools/simulator.html:130
+#: apps/transactions/models.py:1096 templates/mini_tools/simulator.html:130
msgid "week(s)"
msgstr "неделя"
-#: apps/transactions/models.py:998 templates/mini_tools/simulator.html:131
+#: apps/transactions/models.py:1097 templates/mini_tools/simulator.html:131
msgid "month(s)"
msgstr "месяц"
-#: apps/transactions/models.py:999 templates/mini_tools/simulator.html:132
+#: apps/transactions/models.py:1098 templates/mini_tools/simulator.html:132
msgid "year(s)"
msgstr "год"
-#: apps/transactions/models.py:1001
+#: apps/transactions/models.py:1100
#: templates/recurring_transactions/fragments/list.html:18
msgid "Paused"
msgstr "Приостановлено"
-#: apps/transactions/models.py:1040
+#: apps/transactions/models.py:1139
msgid "Recurrence Type"
msgstr ""
-#: apps/transactions/models.py:1043
+#: apps/transactions/models.py:1142
msgid "Recurrence Interval"
msgstr ""
-#: apps/transactions/models.py:1046
+#: apps/transactions/models.py:1145
msgid "Keep at most"
msgstr "Хранить максимум"
-#: apps/transactions/models.py:1050
+#: apps/transactions/models.py:1149
msgid "Last Generated Date"
msgstr ""
-#: apps/transactions/models.py:1053
+#: apps/transactions/models.py:1152
msgid "Last Generated Reference Date"
msgstr ""
-#: apps/transactions/models.py:1370 templates/cotton/transaction/item.html:243
+#: apps/transactions/models.py:1517 templates/cotton/transaction/item.html:245
#: templates/cotton/ui/transactions_fab.html:59
msgid "Quick Transaction"
msgstr "Быстрая сделка"
-#: apps/transactions/models.py:1371 templates/includes/sidebar.html:98
-#: templates/quick_transactions/pages/index.html:5
-#: templates/quick_transactions/pages/index.html:15
-msgid "Quick Transactions"
-msgstr "Быстрые транзакции"
-
#: apps/transactions/validators.py:8
#, python-format
msgid "%(value)s has too many decimal places. Maximum is 30."
@@ -2182,35 +2227,43 @@ msgstr ""
msgid "%(value)s is not a non-negative number"
msgstr ""
-#: apps/transactions/views/actions.py:58
+#: apps/transactions/views/actions.py:61
#, python-format
msgid "%(count)s transaction marked as paid"
msgid_plural "%(count)s transactions marked as paid"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:81
+#: apps/transactions/views/actions.py:84
#, python-format
msgid "%(count)s transaction marked as not paid"
msgid_plural "%(count)s transactions marked as not paid"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:105
+#: apps/transactions/views/actions.py:108
#, python-format
msgid "%(count)s transaction deleted successfully"
msgid_plural "%(count)s transactions deleted successfully"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:139
+#: apps/transactions/views/actions.py:142
#, python-format
msgid "%(count)s transaction restored successfully"
msgid_plural "%(count)s transactions restored successfully"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:170
+#: apps/transactions/views/actions.py:174
+#: apps/transactions/views/transactions.py:423
+#, python-format
+msgid "%(count)s transaction updated successfully"
+msgid_plural "%(count)s transactions updated successfully"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apps/transactions/views/actions.py:247
#, python-format
msgid "%(count)s transaction duplicated successfully"
msgid_plural "%(count)s transactions duplicated successfully"
@@ -2229,36 +2282,45 @@ msgstr "Категория успешно обновлена"
msgid "Category deleted successfully"
msgstr "Категория успешно удалена"
-#: apps/transactions/views/conversions.py:72
+#: apps/transactions/views/conversions.py:77
#: apps/transactions/views/quick_transactions.py:46 apps/users/views.py:252
msgid "Item added successfully"
msgstr "Элемент успешно добавлен"
-#: apps/transactions/views/conversions.py:91
+#: apps/transactions/views/conversions.py:97
#, fuzzy
msgid "Convert into quick transaction"
msgstr "Редактировать быструю транзакцию"
-#: apps/transactions/views/conversions.py:108
+#: apps/transactions/views/conversions.py:114
#: apps/transactions/views/recurring_transactions.py:112
msgid "Recurring Transaction added successfully"
msgstr "Повторяющаяся транзакция успешно добавлена"
-#: apps/transactions/views/conversions.py:129
+#: apps/transactions/views/conversions.py:136
#, fuzzy
msgid "Convert into recurring transaction"
msgstr "Редактировать повторяющуюся транзакцию"
-#: apps/transactions/views/conversions.py:148
+#: apps/transactions/views/conversions.py:155
#: apps/transactions/views/installment_plans.py:87
msgid "Installment Plan added successfully"
msgstr "План рассрочки успешно добавлен"
-#: apps/transactions/views/conversions.py:167
+#: apps/transactions/views/conversions.py:175
#, fuzzy
msgid "Convert into installment plan"
msgstr "Изменить план рассрочки"
+#: apps/transactions/views/conversions.py:195
+msgid "Transaction converted into a transfer"
+msgstr ""
+
+#: apps/transactions/views/conversions.py:226
+#, fuzzy
+msgid "Convert into transfer"
+msgstr "Редактировать быструю транзакцию"
+
#: apps/transactions/views/entities.py:72
msgid "Entity added successfully"
msgstr "Объект успешно добавлен"
@@ -2291,7 +2353,7 @@ msgstr "Элемент успешно обновлен"
msgid "Item deleted successfully"
msgstr "Элемент успешно удален"
-#: apps/transactions/views/quick_transactions.py:164
+#: apps/transactions/views/quick_transactions.py:165
#: apps/transactions/views/transactions.py:156
#: apps/transactions/views/transactions.py:343
msgid "Transaction added successfully"
@@ -2343,30 +2405,23 @@ msgstr "Счет успешно удален"
msgid "Transaction updated successfully"
msgstr "Транзакция успешно обновлена"
-#: apps/transactions/views/transactions.py:421
-#, python-format
-msgid "%(count)s transaction updated successfully"
-msgid_plural "%(count)s transactions updated successfully"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apps/transactions/views/transactions.py:448
+#: apps/transactions/views/transactions.py:450
msgid "Transaction duplicated successfully"
msgstr "Транзакция успешно продублирована"
-#: apps/transactions/views/transactions.py:493
+#: apps/transactions/views/transactions.py:495
msgid "Transaction deleted successfully"
msgstr "Транзакция успешно удалена"
-#: apps/transactions/views/transactions.py:523
+#: apps/transactions/views/transactions.py:525
msgid "Transaction restored successfully"
msgstr "Транзакция успешно восстановлена"
-#: apps/transactions/views/transactions.py:549
+#: apps/transactions/views/transactions.py:551
msgid "Transfer added successfully"
msgstr "Перевод успешно добавлен"
-#: apps/transactions/views/transactions.py:579
+#: apps/transactions/views/transactions.py:581
#, fuzzy
msgid "Transfer updated successfully"
msgstr "Перевод успешно добавлен"
@@ -2700,8 +2755,9 @@ msgstr ""
#: templates/accounts/fragments/list.html:37
#: templates/bank_sync/fragments/list.html:33
#: templates/categories/fragments/table.html:29
-#: templates/cotton/transaction/item.html:178
-#: templates/cotton/ui/transactions_action_bar.html:54
+#: templates/cotton/transaction/item.html:180
+#: templates/cotton/ui/transactions_action_bar.html:56
+#: templates/cotton/ui/transactions_action_bar.html:90
#: templates/currencies/fragments/list.html:34
#: templates/dca/fragments/strategy/details.html:63
#: templates/dca/fragments/strategy/list.html:31
@@ -2712,8 +2768,8 @@ msgstr ""
#: templates/import_app/fragments/profiles/list.html:46
#: templates/installment_plans/fragments/table.html:28
#: templates/investment_classes/fragments/list.html:39
-#: templates/investments/fragments/detail.html:302
-#: templates/investments/fragments/detail.html:330
+#: templates/investments/fragments/detail.html:310
+#: templates/investments/fragments/detail.html:338
#: templates/quick_transactions/fragments/list.html:25
#: templates/recurring_transactions/fragments/table.html:30
#: templates/rules/fragments/transaction_rule/view.html:22
@@ -2750,10 +2806,11 @@ msgstr "Поделиться"
#: templates/accounts/fragments/list.html:71
#: templates/bank_sync/fragments/list.html:50
#: templates/categories/fragments/table.html:51
-#: templates/cotton/transaction/item.html:190
-#: templates/cotton/transaction/item.html:316
+#: templates/cotton/transaction/item.html:192
+#: templates/cotton/transaction/item.html:333
#: templates/cotton/ui/deleted_transactions_action_bar.html:57
-#: templates/cotton/ui/transactions_action_bar.html:82
+#: templates/cotton/ui/transactions_action_bar.html:75
+#: templates/cotton/ui/transactions_action_bar.html:107
#: templates/currencies/fragments/list.html:40
#: templates/dca/fragments/strategy/details.html:70
#: templates/dca/fragments/strategy/list.html:38
@@ -2784,10 +2841,11 @@ msgstr "Удалить"
#: templates/accounts/fragments/list.html:75
#: templates/bank_sync/fragments/list.html:54
#: templates/categories/fragments/table.html:56
-#: templates/cotton/transaction/item.html:192
-#: templates/cotton/transaction/item.html:322
+#: templates/cotton/transaction/item.html:194
+#: templates/cotton/transaction/item.html:339
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:44
#: templates/dca/fragments/strategy/details.html:75
#: templates/dca/fragments/strategy/list.html:42
@@ -2815,10 +2873,11 @@ msgstr "Вы уверены?"
#: templates/account_groups/fragments/list.html:59
#: templates/accounts/fragments/list.html:76
#: templates/categories/fragments/table.html:57
-#: templates/cotton/transaction/item.html:193
-#: templates/cotton/transaction/item.html:323
+#: templates/cotton/transaction/item.html:195
+#: templates/cotton/transaction/item.html:340
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:45
#: templates/dca/fragments/strategy/details.html:76
#: templates/dca/fragments/strategy/list.html:43
@@ -2838,8 +2897,8 @@ msgstr "Вы не сможете отменить это!"
#: templates/accounts/fragments/list.html:77
#: templates/bank_sync/fragments/list.html:56
#: templates/categories/fragments/table.html:58
-#: templates/cotton/transaction/item.html:194
-#: templates/cotton/transaction/item.html:324
+#: templates/cotton/transaction/item.html:196
+#: templates/cotton/transaction/item.html:341
#: templates/currencies/fragments/list.html:46
#: templates/dca/fragments/strategy/details.html:77
#: templates/dca/fragments/strategy/list.html:44
@@ -2919,6 +2978,12 @@ msgstr "Скрыть"
msgid "No accounts"
msgstr "Нет счетов"
+#: templates/accounts/fragments/share.html:8
+msgid ""
+"Everyone who can see this account can add, edit and delete its transactions, "
+"installment plans and recurring transactions."
+msgstr ""
+
#: templates/bank_sync/fragments/accounts.html:31
msgid "No accounts found on this service"
msgstr ""
@@ -3014,63 +3079,77 @@ msgstr "Закрыть"
msgid "Search"
msgstr "Поиск"
-#: templates/cotton/transaction/item.html:12
+#: templates/cotton/transaction/item.html:14
msgid "Select"
msgstr "Выбрать"
-#: templates/cotton/transaction/item.html:123
+#: templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:100
msgid "From"
msgstr "От"
-#: templates/cotton/transaction/item.html:207
-#: templates/cotton/transaction/item.html:218
-#: templates/cotton/transaction/item.html:228
+#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:230
msgid "Show on summaries"
msgstr ""
-#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:211
msgid "Controlled by account"
msgstr "Управляется счетом"
-#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:222
msgid "Controlled by category"
msgstr ""
-#: templates/cotton/transaction/item.html:233
+#: templates/cotton/transaction/item.html:235
+#: templates/includes/transactions_bulk_actions.html:15
msgid "Hide from summaries"
msgstr ""
-#: templates/cotton/transaction/item.html:237
+#: templates/cotton/transaction/item.html:239
msgid "Convert"
msgstr ""
-#: templates/cotton/transaction/item.html:252
-#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:254
+#: templates/cotton/transaction/item.html:264
+#: templates/cotton/transaction/item.html:274
msgid "Already part of a plan or recurrence"
msgstr ""
-#: templates/cotton/transaction/item.html:279
+#: templates/cotton/transaction/item.html:291
msgid "Not available for transfers"
msgstr ""
-#: templates/cotton/transaction/item.html:296
+#: templates/cotton/transaction/item.html:313
+#: templates/includes/transactions_bulk_actions.html:22
msgid "Move to previous month"
msgstr "Перейти к предыдущему месяцу"
-#: templates/cotton/transaction/item.html:300
+#: templates/cotton/transaction/item.html:317
+#: templates/includes/transactions_bulk_actions.html:28
msgid "Move to next month"
msgstr "Перенести на следующий месяц"
-#: templates/cotton/transaction/item.html:303
+#: templates/cotton/transaction/item.html:320
+#: templates/includes/transactions_bulk_actions.html:33
msgid "Move to today"
msgstr "Перейдите к сегодняшнему дню"
-#: templates/cotton/transaction/item.html:307
-#: templates/cotton/ui/transactions_action_bar.html:78
+#: templates/cotton/transaction/item.html:324
+#: templates/cotton/ui/transactions_action_bar.html:71
+#: templates/cotton/ui/transactions_action_bar.html:98
msgid "Duplicate"
msgstr "Дубликат"
+#: templates/cotton/transaction/item.html:373
+#, python-format
+msgid "%(counter)s item"
+msgid_plural "%(counter)s items"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
#: templates/cotton/ui/account_card.html:10
#: templates/cotton/ui/currency_card.html:10
msgid "projected income"
@@ -3106,22 +3185,26 @@ msgstr "текущий общий"
msgid "final total"
msgstr "Финальный итог"
-#: templates/cotton/ui/deleted_transactions_action_bar.html:34
-#: templates/cotton/ui/transactions_action_bar.html:34
-msgid "Select All"
-msgstr "Выбрать все"
-
-#: templates/cotton/ui/deleted_transactions_action_bar.html:40
-#: templates/cotton/ui/transactions_action_bar.html:40
+#: templates/cotton/ui/deleted_transactions_action_bar.html:25
+#: templates/cotton/ui/deleted_transactions_action_bar.html:26
+#: templates/cotton/ui/transactions_action_bar.html:25
+#: templates/cotton/ui/transactions_action_bar.html:26
msgid "Unselect All"
msgstr "Снять все"
-#: templates/cotton/ui/deleted_transactions_action_bar.html:46
-msgid "Invert election"
+#: templates/cotton/ui/deleted_transactions_action_bar.html:39
+#: templates/cotton/ui/transactions_action_bar.html:39
+msgid "Select All"
+msgstr "Выбрать все"
+
+#: templates/cotton/ui/deleted_transactions_action_bar.html:45
+#: templates/cotton/ui/transactions_action_bar.html:45
+msgid "Invert selection"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:59
-#: templates/cotton/ui/transactions_action_bar.html:84
+#: templates/cotton/ui/transactions_action_bar.html:77
+#: templates/cotton/ui/transactions_action_bar.html:106
msgid "Yes, delete them!"
msgstr ""
@@ -3132,43 +3215,43 @@ msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:166
#: templates/cotton/ui/deleted_transactions_action_bar.html:182
#: templates/cotton/ui/deleted_transactions_action_bar.html:198
-#: templates/cotton/ui/transactions_action_bar.html:128
-#: templates/cotton/ui/transactions_action_bar.html:143
-#: templates/cotton/ui/transactions_action_bar.html:159
-#: templates/cotton/ui/transactions_action_bar.html:175
-#: templates/cotton/ui/transactions_action_bar.html:191
-#: templates/cotton/ui/transactions_action_bar.html:207
-#: templates/cotton/ui/transactions_action_bar.html:223
+#: templates/cotton/ui/transactions_action_bar.html:153
+#: templates/cotton/ui/transactions_action_bar.html:168
+#: templates/cotton/ui/transactions_action_bar.html:184
+#: templates/cotton/ui/transactions_action_bar.html:200
+#: templates/cotton/ui/transactions_action_bar.html:216
+#: templates/cotton/ui/transactions_action_bar.html:232
+#: templates/cotton/ui/transactions_action_bar.html:248
msgid "copied!"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:123
-#: templates/cotton/ui/transactions_action_bar.html:148
+#: templates/cotton/ui/transactions_action_bar.html:173
msgid "Flat Total"
msgstr "Итого"
#: templates/cotton/ui/deleted_transactions_action_bar.html:139
-#: templates/cotton/ui/transactions_action_bar.html:164
+#: templates/cotton/ui/transactions_action_bar.html:189
msgid "Real Total"
msgstr "Реальная сумма"
#: templates/cotton/ui/deleted_transactions_action_bar.html:155
-#: templates/cotton/ui/transactions_action_bar.html:180
+#: templates/cotton/ui/transactions_action_bar.html:205
msgid "Mean"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:171
-#: templates/cotton/ui/transactions_action_bar.html:196
+#: templates/cotton/ui/transactions_action_bar.html:221
msgid "Max"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:187
-#: templates/cotton/ui/transactions_action_bar.html:212
+#: templates/cotton/ui/transactions_action_bar.html:237
msgid "Min"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:203
-#: templates/cotton/ui/transactions_action_bar.html:228
+#: templates/cotton/ui/transactions_action_bar.html:253
msgid "Count"
msgstr "Считать"
@@ -3192,17 +3275,11 @@ msgstr "Повторяющийся"
msgid "Balance"
msgstr "Баланс"
-#: templates/cotton/ui/transactions_action_bar.html:46
-msgid "Invert selection"
-msgstr ""
-
-#: templates/cotton/ui/transactions_action_bar.html:66
-msgid "Mark as unpaid"
-msgstr "Отметить как неоплаченное"
-
-#: templates/cotton/ui/transactions_action_bar.html:71
-msgid "Mark as paid"
-msgstr "Отметить как оплачено"
+#: templates/cotton/ui/transactions_action_bar.html:83
+#, fuzzy
+#| msgid "Transactions"
+msgid "More actions"
+msgstr "Транзакции"
#: templates/currencies/fragments/add.html:5
msgid "Add currency"
@@ -3635,6 +3712,14 @@ msgstr ""
msgid "Calculator"
msgstr "Калькулятор"
+#: templates/includes/transactions_bulk_actions.html:4
+msgid "Mark as unpaid"
+msgstr "Отметить как неоплаченное"
+
+#: templates/includes/transactions_bulk_actions.html:9
+msgid "Mark as paid"
+msgstr "Отметить как оплачено"
+
#: templates/insights/fragments/category_explorer/charts/account.html:100
#: templates/insights/fragments/category_explorer/charts/currency.html:92
#: templates/monthly_overview/fragments/monthly_account_summary.html:14
@@ -3700,6 +3785,7 @@ msgstr "Нет недавних транзакций"
#: templates/insights/fragments/year_by_year.html:140
#: templates/investment_classes/fragments/list.html:65
#: templates/monthly_overview/fragments/monthly_summary.html:168
+#: templates/transactions/widgets/sub_transactions.html:55
msgid "Total"
msgstr "Итог"
@@ -4112,11 +4198,11 @@ msgstr ""
msgid "Loss, tax or fee"
msgstr ""
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
msgid "No movements yet"
msgstr ""
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
msgid "Use the + button to buy or contribute"
msgstr ""
@@ -4691,6 +4777,12 @@ msgstr ""
msgid "Deleted transactions"
msgstr "Удаленные транзакции"
+#: templates/transactions/widgets/sub_transactions.html:53
+#, fuzzy
+#| msgid "Add quick transaction"
+msgid "Add sub-transaction"
+msgstr "Добавить быструю транзакцию"
+
#: templates/transactions/widgets/unselectable_income_expense_toggle_buttons.html:11
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:7
msgid "Unchanged"
diff --git a/app/locale/sv/LC_MESSAGES/django.po b/app/locale/sv/LC_MESSAGES/django.po
index a0ffb5be..5ca9489c 100644
--- 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: 2026-11-12 03:24+0000\n"
+"POT-Creation-Date: 2026-11-14 14:06+0000\n"
"PO-Revision-Date: 2025-04-14 06:16+0000\n"
"Last-Translator: Emil \n"
"Language-Team: Swedish Public: Shown for all users. Only editable by the owner."
+"Private: Only shown for the owner and shared users. Public: Shown for "
+"all users. Only the owner can edit, share or delete it."
msgstr ""
-#: apps/common/forms.py:76 apps/users/forms.py:191
+#: apps/common/forms.py:78 apps/users/forms.py:191
#: templates/bank_sync/fragments/accounts.html:34
#: templates/transactions/fragments/filter_actions.html:5
msgid "Save"
msgstr ""
-#: apps/common/forms.py:90
+#: apps/common/forms.py:92
msgid "You cannot share this item with its owner."
msgstr ""
@@ -792,6 +803,7 @@ msgid "Now"
msgstr ""
#: apps/common/widgets/tom_select.py:14
+#: templates/transactions/widgets/sub_transaction_row.html:9
msgid "Remove"
msgstr ""
@@ -868,8 +880,8 @@ msgstr ""
msgid "Auto"
msgstr ""
-#: apps/currencies/models.py:91 apps/export_app/forms.py:67
-#: apps/export_app/forms.py:152 templates/exchange_rates/fragments/list.html:10
+#: apps/currencies/models.py:91 apps/export_app/forms.py:73
+#: apps/export_app/forms.py:161 templates/exchange_rates/fragments/list.html:10
#: templates/exchange_rates/pages/index.html:4
#: templates/includes/sidebar.html:204
msgid "Exchange Rates"
@@ -1018,25 +1030,25 @@ msgstr ""
msgid "Create transaction"
msgstr ""
-#: apps/dca/forms.py:69 apps/transactions/forms.py:582
+#: apps/dca/forms.py:69 apps/transactions/forms.py:668
msgid "From Account"
msgstr ""
-#: apps/dca/forms.py:75 apps/transactions/forms.py:587
+#: apps/dca/forms.py:75 apps/transactions/forms.py:673
msgid "To Account"
msgstr ""
#: apps/dca/forms.py:117 apps/dca/forms.py:125 apps/export_app/forms.py:49
-#: apps/export_app/forms.py:143 apps/insights/views.py:57
-#: apps/rules/forms.py:185 apps/rules/forms.py:195 apps/rules/models.py:46
-#: apps/rules/models.py:307 apps/transactions/filters.py:84
-#: apps/transactions/forms.py:78 apps/transactions/forms.py:346
-#: apps/transactions/forms.py:526 apps/transactions/forms.py:640
-#: apps/transactions/forms.py:647 apps/transactions/forms.py:862
-#: apps/transactions/forms.py:1114 apps/transactions/models.py:313
-#: apps/transactions/models.py:369 apps/transactions/models.py:770
-#: apps/transactions/models.py:1028 apps/transactions/models.py:1353
-#: templates/entities/fragments/list.html:9
+#: apps/export_app/forms.py:150 apps/insights/views.py:57
+#: apps/rules/forms.py:185 apps/rules/forms.py:196 apps/rules/models.py:47
+#: apps/rules/models.py:308 apps/transactions/filters.py:100
+#: apps/transactions/filters.py:175 apps/transactions/forms.py:161
+#: apps/transactions/forms.py:431 apps/transactions/forms.py:612
+#: apps/transactions/forms.py:726 apps/transactions/forms.py:733
+#: apps/transactions/forms.py:950 apps/transactions/forms.py:1204
+#: apps/transactions/models.py:315 apps/transactions/models.py:371
+#: apps/transactions/models.py:866 apps/transactions/models.py:1127
+#: apps/transactions/models.py:1500 templates/entities/fragments/list.html:9
#: templates/entities/pages/index.html:4 templates/includes/sidebar.html:168
#: templates/insights/fragments/month_by_month.html:40
#: templates/insights/fragments/month_by_month.html:43
@@ -1071,8 +1083,8 @@ msgstr ""
msgid "You must provide an account."
msgstr ""
-#: apps/dca/forms.py:322 apps/transactions/forms.py:780
-#: apps/transactions/models.py:978
+#: apps/dca/forms.py:322 apps/transactions/forms.py:866
+#: apps/transactions/models.py:1077
msgid "From and To accounts must be different."
msgstr ""
@@ -1090,10 +1102,10 @@ msgid "Payment Currency"
msgstr ""
#: apps/dca/models.py:26 apps/dca/models.py:181 apps/rules/forms.py:180
-#: apps/rules/forms.py:196 apps/rules/models.py:43 apps/rules/models.py:295
-#: apps/transactions/forms.py:504 apps/transactions/forms.py:668
-#: apps/transactions/models.py:354 apps/transactions/models.py:774
-#: apps/transactions/models.py:1031 apps/transactions/models.py:1338
+#: apps/rules/forms.py:197 apps/rules/models.py:44 apps/rules/models.py:296
+#: apps/transactions/forms.py:590 apps/transactions/forms.py:754
+#: apps/transactions/models.py:356 apps/transactions/models.py:870
+#: apps/transactions/models.py:1130 apps/transactions/models.py:1485
msgid "Notes"
msgstr ""
@@ -1101,7 +1113,7 @@ msgstr ""
msgid "DCA Strategy"
msgstr ""
-#: apps/dca/models.py:35 apps/export_app/forms.py:166
+#: apps/dca/models.py:35 apps/export_app/forms.py:175
msgid "DCA Strategies"
msgstr ""
@@ -1121,7 +1133,7 @@ msgstr ""
msgid "DCA Entry"
msgstr ""
-#: apps/dca/models.py:187 apps/export_app/forms.py:167
+#: apps/dca/models.py:187 apps/export_app/forms.py:176
msgid "DCA Entries"
msgstr ""
@@ -1149,14 +1161,14 @@ msgstr ""
msgid "Entry deleted successfully"
msgstr ""
-#: apps/export_app/forms.py:13 apps/export_app/forms.py:137
+#: apps/export_app/forms.py:13 apps/export_app/forms.py:144
#: templates/includes/sidebar.html:247 templates/users/fragments/list.html:10
#: templates/users/pages/index.html:4
msgid "Users"
msgstr ""
-#: apps/export_app/forms.py:31 apps/export_app/forms.py:144
-#: apps/transactions/models.py:423 templates/includes/sidebar.html:81
+#: apps/export_app/forms.py:31 apps/export_app/forms.py:151
+#: apps/transactions/models.py:425 templates/includes/sidebar.html:81
#: templates/includes/sidebar.html:154
#: templates/recurring_transactions/fragments/list_transactions.html:5
#: templates/recurring_transactions/fragments/table.html:37
@@ -1164,9 +1176,9 @@ msgstr ""
msgid "Transactions"
msgstr ""
-#: apps/export_app/forms.py:37 apps/export_app/forms.py:141
-#: apps/insights/views.py:43 apps/transactions/filters.py:74
-#: templates/categories/fragments/list.html:9
+#: apps/export_app/forms.py:37 apps/export_app/forms.py:148
+#: apps/insights/views.py:43 apps/transactions/filters.py:90
+#: apps/transactions/filters.py:165 templates/categories/fragments/list.html:9
#: templates/categories/pages/index.html:4 templates/includes/sidebar.html:156
#: templates/insights/fragments/month_by_month.html:18
#: templates/insights/fragments/month_by_month.html:21
@@ -1175,100 +1187,113 @@ msgstr ""
msgid "Categories"
msgstr ""
-#: apps/export_app/forms.py:55 apps/export_app/forms.py:147
-#: apps/transactions/models.py:1068 templates/includes/sidebar.html:110
+#: apps/export_app/forms.py:55 apps/export_app/forms.py:155
+#: apps/transactions/models.py:1167 templates/includes/sidebar.html:110
#: templates/recurring_transactions/fragments/list.html:9
#: templates/recurring_transactions/pages/index.html:4
msgid "Recurring Transactions"
msgstr ""
-#: apps/export_app/forms.py:61 apps/export_app/forms.py:145
-#: apps/transactions/models.py:788 templates/includes/sidebar.html:104
+#: apps/export_app/forms.py:61 apps/export_app/forms.py:153
+#: apps/transactions/models.py:884 templates/includes/sidebar.html:104
#: templates/installment_plans/fragments/list.html:9
#: templates/installment_plans/pages/index.html:4
msgid "Installment Plans"
msgstr ""
-#: apps/export_app/forms.py:73 apps/export_app/forms.py:150
+#: apps/export_app/forms.py:67 apps/export_app/forms.py:157
+#: apps/transactions/models.py:1518 templates/includes/sidebar.html:98
+#: templates/quick_transactions/pages/index.html:5
+#: templates/quick_transactions/pages/index.html:15
+msgid "Quick Transactions"
+msgstr ""
+
+#: apps/export_app/forms.py:79 apps/export_app/forms.py:159
#: templates/exchange_rates_services/fragments/list.html:10
#: templates/exchange_rates_services/pages/index.html:4
#: templates/includes/sidebar.html:232
msgid "Automatic Exchange Rates"
msgstr ""
-#: apps/export_app/forms.py:79 templates/bank_sync/fragments/list.html:8
+#: apps/export_app/forms.py:85 templates/bank_sync/fragments/list.html:8
#: templates/bank_sync/pages/index.html:4 templates/includes/sidebar.html:238
msgid "Bank Sync"
msgstr ""
-#: apps/export_app/forms.py:80
+#: apps/export_app/forms.py:86
msgid "Includes the providers' API keys"
msgstr ""
-#: apps/export_app/forms.py:86 templates/includes/sidebar.html:212
+#: apps/export_app/forms.py:92 templates/includes/sidebar.html:212
#: templates/rules/fragments/list.html:9 templates/rules/pages/index.html:4
msgid "Rules"
msgstr ""
-#: apps/export_app/forms.py:92 templates/cotton/transaction/item.html:66
+#: apps/export_app/forms.py:98 templates/cotton/transaction/item.html:68
msgid "DCA"
msgstr ""
-#: apps/export_app/forms.py:98 apps/export_app/forms.py:168
+#: apps/export_app/forms.py:104 apps/export_app/forms.py:177
#: templates/import_app/fragments/profiles/list.html:21
#: templates/import_app/pages/profiles_index.html:4
msgid "Import Profiles"
msgstr ""
-#: apps/export_app/forms.py:126 templates/export_app/fragments/export.html:5
+#: apps/export_app/forms.py:133 templates/export_app/fragments/export.html:5
#: templates/export_app/pages/index.html:13
msgid "Export"
msgstr ""
-#: apps/export_app/forms.py:134
+#: apps/export_app/forms.py:141
msgid "Import a ZIP file exported from WYGIWYH"
msgstr ""
-#: apps/export_app/forms.py:135
+#: apps/export_app/forms.py:142
msgid "ZIP File"
msgstr ""
-#: apps/export_app/forms.py:157
+#: apps/export_app/forms.py:152 apps/rules/forms.py:193 apps/rules/models.py:42
+#: apps/rules/models.py:320 apps/transactions/models.py:736
+#: templates/transactions/widgets/sub_transactions.html:39
+msgid "Sub-transactions"
+msgstr ""
+
+#: apps/export_app/forms.py:166
msgid "Bank Sync Accounts"
msgstr ""
-#: apps/export_app/forms.py:159 apps/rules/models.py:27
+#: apps/export_app/forms.py:168 apps/rules/models.py:27
msgid "Transaction rules"
msgstr ""
-#: apps/export_app/forms.py:161 apps/rules/models.py:68
+#: apps/export_app/forms.py:170 apps/rules/models.py:69
msgid "Edit transaction action"
msgstr ""
-#: apps/export_app/forms.py:164 apps/rules/models.py:327
+#: apps/export_app/forms.py:173 apps/rules/models.py:332
msgid "Update or create transaction actions"
msgstr ""
-#: apps/export_app/forms.py:199 templates/cotton/transaction/item.html:310
+#: apps/export_app/forms.py:210 templates/cotton/transaction/item.html:327
#: templates/cotton/ui/deleted_transactions_action_bar.html:53
#: templates/export_app/fragments/restore.html:5
#: templates/export_app/pages/index.html:19
msgid "Restore"
msgstr ""
-#: apps/export_app/forms.py:209
+#: apps/export_app/forms.py:220
msgid "Please upload either a ZIP file or at least one CSV file"
msgstr ""
-#: apps/export_app/views.py:190
+#: apps/export_app/views.py:216
msgid "You have to select at least one export"
msgstr ""
-#: apps/export_app/views.py:210
+#: apps/export_app/views.py:236
msgid "Data restored successfully"
msgstr ""
-#: apps/export_app/views.py:222
+#: apps/export_app/views.py:248
msgid ""
"There was an error restoring your data. Check the logs for more details."
msgstr ""
@@ -1355,7 +1380,7 @@ msgstr ""
#: apps/insights/forms.py:118 apps/insights/utils/sankey.py:36
#: apps/insights/utils/sankey.py:167 apps/insights/views.py:45
-#: apps/transactions/filters.py:209
+#: apps/transactions/filters.py:294
#: templates/insights/fragments/month_by_month.html:119
#: templates/insights/fragments/year_by_year.html:73
msgid "Uncategorized"
@@ -1412,24 +1437,24 @@ msgstr ""
msgid "Tag"
msgstr ""
-#: apps/insights/views.py:52 apps/transactions/filters.py:215
+#: apps/insights/views.py:52 apps/transactions/filters.py:303
#: templates/insights/fragments/month_by_month.html:121
#: templates/insights/fragments/year_by_year.html:75
msgid "Untagged"
msgstr ""
-#: apps/insights/views.py:53 apps/transactions/models.py:611
+#: apps/insights/views.py:53 apps/transactions/models.py:632
#: templates/tags/fragments/table.html:69
msgid "No tags"
msgstr ""
-#: apps/insights/views.py:58 apps/transactions/models.py:312
+#: apps/insights/views.py:58 apps/transactions/models.py:314
#: templates/insights/fragments/month_by_month.html:88
#: templates/insights/fragments/year_by_year.html:56
msgid "Entity"
msgstr ""
-#: apps/insights/views.py:59 apps/transactions/filters.py:222
+#: apps/insights/views.py:59 apps/transactions/filters.py:311
#: templates/insights/fragments/month_by_month.html:123
#: templates/insights/fragments/year_by_year.html:77
msgid "No entity"
@@ -1447,15 +1472,15 @@ msgstr ""
msgid "Unclassified"
msgstr ""
-#: apps/investments/views.py:289
+#: apps/investments/views.py:290
msgid "Asset class added successfully"
msgstr ""
-#: apps/investments/views.py:297
+#: apps/investments/views.py:298
msgid "Asset class updated successfully"
msgstr ""
-#: apps/investments/views.py:318
+#: apps/investments/views.py:319
msgid "Asset class deleted successfully"
msgstr ""
@@ -1488,13 +1513,13 @@ msgstr ""
msgid "Set field"
msgstr ""
-#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:123
+#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:101
msgid "To"
msgstr ""
#: apps/rules/forms.py:78 apps/rules/forms.py:158 apps/rules/models.py:20
-#: apps/rules/models.py:62 apps/rules/models.py:323
+#: apps/rules/models.py:63 apps/rules/models.py:328
#: templates/rules/fragments/list.html:23
msgid "Order"
msgstr ""
@@ -1512,36 +1537,37 @@ msgid "Operator"
msgstr ""
#: apps/rules/forms.py:174 apps/rules/forms.py:188 apps/rules/models.py:36
-#: apps/rules/models.py:271 apps/transactions/forms.py:468
-#: apps/transactions/models.py:337 apps/transactions/models.py:730
-#: apps/transactions/models.py:1009 apps/transactions/models.py:1323
+#: apps/rules/models.py:272 apps/transactions/forms.py:554
+#: apps/transactions/models.py:339 apps/transactions/models.py:826
+#: apps/transactions/models.py:1108 apps/transactions/models.py:1470
#: templates/mini_tools/simulator.html:63
msgid "Type"
msgstr ""
#: apps/rules/forms.py:175 apps/rules/forms.py:189 apps/rules/models.py:37
-#: apps/rules/models.py:275 apps/transactions/filters.py:22
-#: apps/transactions/forms.py:472 apps/transactions/forms.py:650
-#: apps/transactions/models.py:339 apps/transactions/models.py:1325
-#: templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/rules/models.py:276 apps/transactions/filters.py:23
+#: apps/transactions/forms.py:558 apps/transactions/forms.py:736
+#: apps/transactions/models.py:341 apps/transactions/models.py:1472
+#: templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/transactions/widgets/paid_toggle_button.html:10
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:13
msgid "Paid"
msgstr ""
#: apps/rules/forms.py:177 apps/rules/forms.py:191 apps/rules/models.py:39
-#: apps/rules/models.py:283 apps/transactions/forms.py:90
-#: apps/transactions/forms.py:488 apps/transactions/forms.py:655
-#: apps/transactions/forms.py:868 apps/transactions/models.py:341
-#: apps/transactions/models.py:748 apps/transactions/models.py:1033
+#: apps/rules/models.py:284 apps/transactions/forms.py:173
+#: apps/transactions/forms.py:574 apps/transactions/forms.py:741
+#: apps/transactions/forms.py:956 apps/transactions/models.py:343
+#: apps/transactions/models.py:844 apps/transactions/models.py:1132
msgid "Reference Date"
msgstr ""
#: apps/rules/forms.py:178 apps/rules/forms.py:192 apps/rules/models.py:41
-#: apps/rules/models.py:287 apps/transactions/forms.py:495
-#: apps/transactions/models.py:347 apps/transactions/models.py:1014
-#: apps/transactions/models.py:1331
+#: apps/rules/models.py:288 apps/transactions/forms.py:75
+#: apps/transactions/forms.py:581 apps/transactions/models.py:349
+#: apps/transactions/models.py:730 apps/transactions/models.py:1113
+#: apps/transactions/models.py:1478
#: templates/insights/fragments/sankey.html:102
#: templates/installment_plans/fragments/table.html:18
#: templates/mini_tools/simulator.html:70
@@ -1550,51 +1576,52 @@ msgstr ""
msgid "Amount"
msgstr ""
-#: apps/rules/forms.py:179 apps/rules/forms.py:193 apps/rules/models.py:14
-#: apps/rules/models.py:42 apps/rules/models.py:291
-#: apps/transactions/forms.py:499 apps/transactions/forms.py:659
-#: apps/transactions/models.py:352 apps/transactions/models.py:732
-#: apps/transactions/models.py:1017 apps/transactions/models.py:1336
+#: apps/rules/forms.py:179 apps/rules/forms.py:194 apps/rules/models.py:14
+#: apps/rules/models.py:43 apps/rules/models.py:292
+#: apps/transactions/forms.py:585 apps/transactions/forms.py:745
+#: apps/transactions/models.py:354 apps/transactions/models.py:828
+#: apps/transactions/models.py:1116 apps/transactions/models.py:1483
msgid "Description"
msgstr ""
-#: apps/rules/forms.py:182 apps/rules/forms.py:198 apps/rules/models.py:47
-#: apps/rules/models.py:299 apps/transactions/models.py:399
-#: apps/transactions/models.py:1358
+#: apps/rules/forms.py:182 apps/rules/forms.py:199 apps/rules/models.py:48
+#: apps/rules/models.py:300 apps/transactions/models.py:401
+#: apps/transactions/models.py:1505
msgid "Internal Note"
msgstr ""
-#: apps/rules/forms.py:183 apps/rules/forms.py:199 apps/rules/models.py:48
-#: apps/rules/models.py:303 apps/transactions/models.py:401
-#: apps/transactions/models.py:1360
+#: apps/rules/forms.py:183 apps/rules/forms.py:200 apps/rules/models.py:49
+#: apps/rules/models.py:304 apps/transactions/models.py:403
+#: apps/transactions/models.py:1507
msgid "Internal ID"
msgstr ""
-#: apps/rules/forms.py:186 apps/rules/forms.py:200 apps/rules/models.py:40
-#: apps/rules/models.py:319 apps/transactions/forms.py:672
-#: apps/transactions/models.py:251 apps/transactions/models.py:342
-#: apps/transactions/models.py:1326
+#: apps/rules/forms.py:186 apps/rules/forms.py:201 apps/rules/models.py:40
+#: apps/rules/models.py:324 apps/transactions/forms.py:758
+#: apps/transactions/models.py:253 apps/transactions/models.py:344
+#: apps/transactions/models.py:1473
msgid "Mute"
msgstr ""
-#: apps/rules/forms.py:215
+#: apps/rules/forms.py:216
msgid "Search Criteria"
msgstr ""
-#: apps/rules/forms.py:360
+#: apps/rules/forms.py:361
msgid "Set Values"
msgstr ""
-#: apps/rules/forms.py:407 apps/rules/forms.py:442 apps/rules/forms.py:477
-#: apps/transactions/models.py:422 apps/transactions/models.py:667
+#: apps/rules/forms.py:409 apps/rules/forms.py:444 apps/rules/forms.py:479
+#: apps/transactions/models.py:424 apps/transactions/models.py:703
+#: apps/transactions/models.py:763
msgid "Transaction"
msgstr ""
-#: apps/rules/forms.py:411 apps/rules/forms.py:446 apps/rules/forms.py:481
+#: apps/rules/forms.py:413 apps/rules/forms.py:448 apps/rules/forms.py:483
msgid "Type to search for a transaction"
msgstr ""
-#: apps/rules/forms.py:422 apps/rules/forms.py:457 apps/rules/forms.py:491
+#: apps/rules/forms.py:424 apps/rules/forms.py:459 apps/rules/forms.py:493
#: templates/rules/fragments/transaction_rule/dry_run/created.html:5
#: templates/rules/fragments/transaction_rule/dry_run/deleted.html:5
#: templates/rules/fragments/transaction_rule/dry_run/updated.html:5
@@ -1614,15 +1641,15 @@ msgstr ""
msgid "Transaction rule"
msgstr ""
-#: apps/rules/models.py:54 apps/rules/models.py:98
+#: apps/rules/models.py:55 apps/rules/models.py:99
msgid "Rule"
msgstr ""
-#: apps/rules/models.py:59
+#: apps/rules/models.py:60
msgid "Field"
msgstr ""
-#: apps/rules/models.py:61 templates/investments/fragments/charts.html:86
+#: apps/rules/models.py:62 templates/investments/fragments/charts.html:86
#: templates/investments/fragments/detail.html:68
#: templates/investments/fragments/detail.html:127
#: templates/investments/fragments/detail.html:245
@@ -1630,57 +1657,57 @@ msgstr ""
msgid "Value"
msgstr ""
-#: apps/rules/models.py:69
+#: apps/rules/models.py:70
msgid "Edit transaction actions"
msgstr ""
-#: apps/rules/models.py:84
+#: apps/rules/models.py:85
msgid "is exactly"
msgstr ""
-#: apps/rules/models.py:85
+#: apps/rules/models.py:86
msgid "contains"
msgstr ""
-#: apps/rules/models.py:86
+#: apps/rules/models.py:87
msgid "starts with"
msgstr ""
-#: apps/rules/models.py:87
+#: apps/rules/models.py:88
msgid "ends with"
msgstr ""
-#: apps/rules/models.py:88
+#: apps/rules/models.py:89
msgid "equals"
msgstr ""
-#: apps/rules/models.py:89
+#: apps/rules/models.py:90
msgid "greater than"
msgstr ""
-#: apps/rules/models.py:90
+#: apps/rules/models.py:91
msgid "less than"
msgstr ""
-#: apps/rules/models.py:91
+#: apps/rules/models.py:92
msgid "greater than or equal"
msgstr ""
-#: apps/rules/models.py:92
+#: apps/rules/models.py:93
msgid "less than or equal"
msgstr ""
-#: apps/rules/models.py:102
+#: apps/rules/models.py:103
msgid "Filter"
msgstr ""
-#: apps/rules/models.py:105
+#: apps/rules/models.py:106
msgid ""
"Generic expression to enable or disable execution. Should evaluate to True "
"or False"
msgstr ""
-#: apps/rules/models.py:326
+#: apps/rules/models.py:331
msgid "Update or create transaction action"
msgstr ""
@@ -1724,8 +1751,8 @@ msgstr ""
msgid "Update or Create Transaction action deleted successfully"
msgstr ""
-#: apps/transactions/filters.py:23 templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/transactions/filters.py:24 templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/insights/fragments/overview/index.html:68
#: templates/net_worth/net_worth.html:39 templates/net_worth/net_worth.html:43
#: templates/transactions/widgets/paid_toggle_button.html:7
@@ -1733,160 +1760,170 @@ msgstr ""
msgid "Projected"
msgstr ""
-#: apps/transactions/filters.py:28 templates/categories/fragments/table.html:18
+#: apps/transactions/filters.py:29 templates/categories/fragments/table.html:18
msgid "Muted"
msgstr ""
-#: apps/transactions/filters.py:51
+#: apps/transactions/filters.py:67 apps/transactions/filters.py:144
msgid "Content"
msgstr ""
-#: apps/transactions/filters.py:57
+#: apps/transactions/filters.py:73
msgid "Transaction Type"
msgstr ""
-#: apps/transactions/filters.py:95
+#: apps/transactions/filters.py:111
msgid "Mute Status"
msgstr ""
-#: apps/transactions/filters.py:100
+#: apps/transactions/filters.py:116
msgid "Date from"
msgstr ""
-#: apps/transactions/filters.py:105 apps/transactions/filters.py:115
+#: apps/transactions/filters.py:121 apps/transactions/filters.py:131
msgid "Until"
msgstr ""
-#: apps/transactions/filters.py:110
+#: apps/transactions/filters.py:126
msgid "Reference date from"
msgstr ""
-#: apps/transactions/filters.py:120
+#: apps/transactions/filters.py:136
msgid "Amount min"
msgstr ""
-#: apps/transactions/filters.py:125
+#: apps/transactions/filters.py:141
msgid "Amount max"
msgstr ""
-#: apps/transactions/filters.py:208
+#: apps/transactions/filters.py:240
+msgid "Include"
+msgstr ""
+
+#: apps/transactions/filters.py:245
+msgid "Exclude"
+msgstr ""
+
+#: apps/transactions/filters.py:293
msgid "Categorized"
msgstr ""
-#: apps/transactions/filters.py:215
+#: apps/transactions/filters.py:303
msgid "Tagged"
msgstr ""
-#: apps/transactions/filters.py:221
+#: apps/transactions/filters.py:310
msgid "Any entity"
msgstr ""
-#: apps/transactions/forms.py:192
+#: apps/transactions/forms.py:277
msgid "More"
msgstr ""
-#: apps/transactions/forms.py:229
+#: apps/transactions/forms.py:314
msgid "Save and add similar"
msgstr ""
-#: apps/transactions/forms.py:234
+#: apps/transactions/forms.py:319
msgid "Save and add another"
msgstr ""
-#: apps/transactions/forms.py:271 templates/cotton/transaction/item.html:184
+#: apps/transactions/forms.py:356 templates/cotton/transaction/item.html:186
#: templates/transactions/fragments/attachments.html:4
msgid "Attachments"
msgstr ""
-#: apps/transactions/forms.py:272
+#: apps/transactions/forms.py:357
msgid ""
"Files are private and only visible to users with access to this transaction."
msgstr ""
-#: apps/transactions/forms.py:283
+#: apps/transactions/forms.py:368
msgid "Upload"
msgstr ""
-#: apps/transactions/forms.py:355 apps/transactions/forms.py:1120
-#: apps/transactions/models.py:947
+#: apps/transactions/forms.py:440 apps/transactions/forms.py:1210
+#: apps/transactions/models.py:1046
msgid "To account"
msgstr ""
-#: apps/transactions/forms.py:382 apps/transactions/forms.py:675
+#: apps/transactions/forms.py:467 apps/transactions/forms.py:761
msgid "Muted transactions won't be displayed on monthly summaries"
msgstr ""
-#: apps/transactions/forms.py:594
+#: apps/transactions/forms.py:680
msgid "From Amount"
msgstr ""
-#: apps/transactions/forms.py:599
+#: apps/transactions/forms.py:685
msgid "To Amount"
msgstr ""
-#: apps/transactions/forms.py:741 apps/transactions/models.py:992
-#: apps/transactions/models.py:1303 templates/cotton/transaction/item.html:52
-#: templates/cotton/transaction/item.html:60
+#: apps/transactions/forms.py:827 apps/transactions/models.py:1091
+#: apps/transactions/models.py:1450 templates/cotton/transaction/item.html:54
+#: templates/cotton/transaction/item.html:62
+#: templates/cotton/transaction/item.html:272
+#: templates/cotton/transaction/item.html:304
#: templates/cotton/ui/quick_transactions_buttons.html:40
#: templates/cotton/ui/transactions_fab.html:44
msgid "Transfer"
msgstr ""
-#: apps/transactions/forms.py:1005
+#: apps/transactions/forms.py:1095
msgid "Tag name"
msgstr ""
-#: apps/transactions/forms.py:1033
+#: apps/transactions/forms.py:1123
msgid "Entity name"
msgstr ""
-#: apps/transactions/forms.py:1061
+#: apps/transactions/forms.py:1151
msgid "Category name"
msgstr ""
-#: apps/transactions/forms.py:1063
+#: apps/transactions/forms.py:1153
msgid "Muted categories won't be displayed on monthly summaries"
msgstr ""
-#: apps/transactions/forms.py:1228
+#: apps/transactions/forms.py:1319
msgid "future transactions"
msgstr ""
-#: apps/transactions/forms.py:1255
+#: apps/transactions/forms.py:1346
msgid "End date should be after the start date"
msgstr ""
-#: apps/transactions/models.py:256
+#: apps/transactions/models.py:258
msgid ""
"Deactivated categories won't be able to be selected when creating new "
"transactions"
msgstr ""
-#: apps/transactions/models.py:264
+#: apps/transactions/models.py:266
msgid "Transaction Category"
msgstr ""
-#: apps/transactions/models.py:265
+#: apps/transactions/models.py:267
msgid "Transaction Categories"
msgstr ""
-#: apps/transactions/models.py:280
+#: apps/transactions/models.py:282
msgid ""
"Deactivated tags won't be able to be selected when creating new transactions"
msgstr ""
-#: apps/transactions/models.py:288 apps/transactions/models.py:289
+#: apps/transactions/models.py:290 apps/transactions/models.py:291
msgid "Transaction Tags"
msgstr ""
-#: apps/transactions/models.py:304
+#: apps/transactions/models.py:306
msgid ""
"Deactivated entities won't be able to be selected when creating new "
"transactions"
msgstr ""
-#: apps/transactions/models.py:324 apps/transactions/models.py:991
-#: apps/transactions/models.py:1302
+#: apps/transactions/models.py:326 apps/transactions/models.py:1090
+#: apps/transactions/models.py:1449
#: templates/calendar_view/fragments/list.html:42
#: templates/calendar_view/fragments/list.html:44
#: templates/calendar_view/fragments/list.html:52
@@ -1898,14 +1935,14 @@ msgstr ""
#: templates/investments/fragments/detail.html:71
#: templates/investments/fragments/detail.html:175
#: templates/investments/fragments/detail.html:227
-#: templates/investments/fragments/detail.html:318
+#: templates/investments/fragments/detail.html:326
#: templates/mini_tools/simulator.html:66
#: templates/monthly_overview/fragments/monthly_summary.html:42
msgid "Income"
msgstr ""
-#: apps/transactions/models.py:325 apps/transactions/models.py:993
-#: apps/transactions/models.py:1304
+#: apps/transactions/models.py:327 apps/transactions/models.py:1092
+#: apps/transactions/models.py:1451
#: templates/calendar_view/fragments/list.html:46
#: templates/calendar_view/fragments/list.html:48
#: templates/calendar_view/fragments/list.html:56
@@ -1917,192 +1954,190 @@ msgstr ""
msgid "Expense"
msgstr ""
-#: apps/transactions/models.py:380 apps/transactions/models.py:787
-#: templates/cotton/transaction/item.html:260
-#: templates/cotton/transaction/item.html:277
-#: templates/cotton/transaction/item.html:287
+#: apps/transactions/models.py:382 apps/transactions/models.py:883
+#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:289
+#: templates/cotton/transaction/item.html:299
msgid "Installment Plan"
msgstr ""
-#: apps/transactions/models.py:389 apps/transactions/models.py:1067
-#: templates/cotton/transaction/item.html:250
-#: templates/cotton/transaction/item.html:270
+#: apps/transactions/models.py:391 apps/transactions/models.py:1166
+#: templates/cotton/transaction/item.html:252
+#: templates/cotton/transaction/item.html:282
msgid "Recurring Transaction"
msgstr ""
-#: apps/transactions/models.py:397
+#: apps/transactions/models.py:399
msgid "Linked Transaction"
msgstr ""
-#: apps/transactions/models.py:405
+#: apps/transactions/models.py:407
msgid "Deleted"
msgstr ""
-#: apps/transactions/models.py:410
+#: apps/transactions/models.py:412
msgid "Deleted At"
msgstr ""
-#: apps/transactions/models.py:518
+#: apps/transactions/models.py:521
msgid "A transfer needs one expense and one income."
msgstr ""
-#: apps/transactions/models.py:520
+#: apps/transactions/models.py:523
msgid "A transfer needs two different accounts."
msgstr ""
-#: apps/transactions/models.py:524
+#: apps/transactions/models.py:527
msgid "This transaction is already part of another transfer."
msgstr ""
-#: apps/transactions/models.py:613
+#: apps/transactions/models.py:634
msgid "No category"
msgstr ""
-#: apps/transactions/models.py:615
+#: apps/transactions/models.py:636
msgid "No description"
msgstr ""
-#: apps/transactions/models.py:672
+#: apps/transactions/models.py:735
+msgid "Sub-transaction"
+msgstr ""
+
+#: apps/transactions/models.py:768
msgid "File"
msgstr ""
-#: apps/transactions/models.py:674
+#: apps/transactions/models.py:770
msgid "Original Name"
msgstr ""
-#: apps/transactions/models.py:676
+#: apps/transactions/models.py:772
msgid "Content Type"
msgstr ""
-#: apps/transactions/models.py:678
+#: apps/transactions/models.py:774
msgid "Size"
msgstr ""
-#: apps/transactions/models.py:683
+#: apps/transactions/models.py:779
msgid "Uploaded By"
msgstr ""
-#: apps/transactions/models.py:688
+#: apps/transactions/models.py:784
msgid "Transaction Attachment"
msgstr ""
-#: apps/transactions/models.py:689
+#: apps/transactions/models.py:785
msgid "Transaction Attachments"
msgstr ""
-#: apps/transactions/models.py:719 templates/includes/sidebar.html:57
+#: apps/transactions/models.py:815 templates/includes/sidebar.html:57
msgid "Yearly"
msgstr ""
-#: apps/transactions/models.py:720 apps/users/models.py:469
+#: apps/transactions/models.py:816 apps/users/models.py:469
#: templates/includes/sidebar.html:51
msgid "Monthly"
msgstr ""
-#: apps/transactions/models.py:721
+#: apps/transactions/models.py:817
msgid "Weekly"
msgstr ""
-#: apps/transactions/models.py:722
+#: apps/transactions/models.py:818
msgid "Daily"
msgstr ""
-#: apps/transactions/models.py:735
+#: apps/transactions/models.py:831
msgid "Number of Installments"
msgstr ""
-#: apps/transactions/models.py:740
+#: apps/transactions/models.py:836
msgid "Installment Start"
msgstr ""
-#: apps/transactions/models.py:741
+#: apps/transactions/models.py:837
msgid "The installment number to start counting from"
msgstr ""
-#: apps/transactions/models.py:746 apps/transactions/models.py:1037
+#: apps/transactions/models.py:842 apps/transactions/models.py:1136
msgid "Start Date"
msgstr ""
-#: apps/transactions/models.py:750 apps/transactions/models.py:1038
+#: apps/transactions/models.py:846 apps/transactions/models.py:1137
msgid "End Date"
msgstr ""
-#: apps/transactions/models.py:755
+#: apps/transactions/models.py:851
msgid "Recurrence"
msgstr ""
-#: apps/transactions/models.py:758
+#: apps/transactions/models.py:854
msgid "Installment Amount"
msgstr ""
-#: apps/transactions/models.py:777 apps/transactions/models.py:1057
+#: apps/transactions/models.py:873 apps/transactions/models.py:1156
msgid "Add description to transactions"
msgstr ""
-#: apps/transactions/models.py:780 apps/transactions/models.py:1060
+#: apps/transactions/models.py:876 apps/transactions/models.py:1159
msgid "Add notes to transactions"
msgstr ""
-#: apps/transactions/models.py:954
+#: apps/transactions/models.py:1053
msgid "To amount"
msgstr ""
-#: apps/transactions/models.py:955
+#: apps/transactions/models.py:1054
msgid "Leave empty to use the same amount"
msgstr ""
-#: apps/transactions/models.py:996 templates/mini_tools/simulator.html:129
+#: apps/transactions/models.py:1095 templates/mini_tools/simulator.html:129
msgid "day(s)"
msgstr ""
-#: apps/transactions/models.py:997 templates/mini_tools/simulator.html:130
+#: apps/transactions/models.py:1096 templates/mini_tools/simulator.html:130
msgid "week(s)"
msgstr ""
-#: apps/transactions/models.py:998 templates/mini_tools/simulator.html:131
+#: apps/transactions/models.py:1097 templates/mini_tools/simulator.html:131
msgid "month(s)"
msgstr ""
-#: apps/transactions/models.py:999 templates/mini_tools/simulator.html:132
+#: apps/transactions/models.py:1098 templates/mini_tools/simulator.html:132
msgid "year(s)"
msgstr ""
-#: apps/transactions/models.py:1001
+#: apps/transactions/models.py:1100
#: templates/recurring_transactions/fragments/list.html:18
msgid "Paused"
msgstr ""
-#: apps/transactions/models.py:1040
+#: apps/transactions/models.py:1139
msgid "Recurrence Type"
msgstr ""
-#: apps/transactions/models.py:1043
+#: apps/transactions/models.py:1142
msgid "Recurrence Interval"
msgstr ""
-#: apps/transactions/models.py:1046
+#: apps/transactions/models.py:1145
msgid "Keep at most"
msgstr ""
-#: apps/transactions/models.py:1050
+#: apps/transactions/models.py:1149
msgid "Last Generated Date"
msgstr ""
-#: apps/transactions/models.py:1053
+#: apps/transactions/models.py:1152
msgid "Last Generated Reference Date"
msgstr ""
-#: apps/transactions/models.py:1370 templates/cotton/transaction/item.html:243
+#: apps/transactions/models.py:1517 templates/cotton/transaction/item.html:245
#: templates/cotton/ui/transactions_fab.html:59
msgid "Quick Transaction"
msgstr ""
-#: apps/transactions/models.py:1371 templates/includes/sidebar.html:98
-#: templates/quick_transactions/pages/index.html:5
-#: templates/quick_transactions/pages/index.html:15
-msgid "Quick Transactions"
-msgstr ""
-
#: apps/transactions/validators.py:8
#, python-format
msgid "%(value)s has too many decimal places. Maximum is 30."
@@ -2113,35 +2148,43 @@ msgstr ""
msgid "%(value)s is not a non-negative number"
msgstr ""
-#: apps/transactions/views/actions.py:58
+#: apps/transactions/views/actions.py:61
#, python-format
msgid "%(count)s transaction marked as paid"
msgid_plural "%(count)s transactions marked as paid"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:81
+#: apps/transactions/views/actions.py:84
#, python-format
msgid "%(count)s transaction marked as not paid"
msgid_plural "%(count)s transactions marked as not paid"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:105
+#: apps/transactions/views/actions.py:108
#, python-format
msgid "%(count)s transaction deleted successfully"
msgid_plural "%(count)s transactions deleted successfully"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:139
+#: apps/transactions/views/actions.py:142
#, python-format
msgid "%(count)s transaction restored successfully"
msgid_plural "%(count)s transactions restored successfully"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:170
+#: apps/transactions/views/actions.py:174
+#: apps/transactions/views/transactions.py:423
+#, python-format
+msgid "%(count)s transaction updated successfully"
+msgid_plural "%(count)s transactions updated successfully"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apps/transactions/views/actions.py:247
#, python-format
msgid "%(count)s transaction duplicated successfully"
msgid_plural "%(count)s transactions duplicated successfully"
@@ -2160,33 +2203,41 @@ msgstr ""
msgid "Category deleted successfully"
msgstr ""
-#: apps/transactions/views/conversions.py:72
+#: apps/transactions/views/conversions.py:77
#: apps/transactions/views/quick_transactions.py:46 apps/users/views.py:252
msgid "Item added successfully"
msgstr ""
-#: apps/transactions/views/conversions.py:91
+#: apps/transactions/views/conversions.py:97
msgid "Convert into quick transaction"
msgstr ""
-#: apps/transactions/views/conversions.py:108
+#: apps/transactions/views/conversions.py:114
#: apps/transactions/views/recurring_transactions.py:112
msgid "Recurring Transaction added successfully"
msgstr ""
-#: apps/transactions/views/conversions.py:129
+#: apps/transactions/views/conversions.py:136
msgid "Convert into recurring transaction"
msgstr ""
-#: apps/transactions/views/conversions.py:148
+#: apps/transactions/views/conversions.py:155
#: apps/transactions/views/installment_plans.py:87
msgid "Installment Plan added successfully"
msgstr ""
-#: apps/transactions/views/conversions.py:167
+#: apps/transactions/views/conversions.py:175
msgid "Convert into installment plan"
msgstr ""
+#: apps/transactions/views/conversions.py:195
+msgid "Transaction converted into a transfer"
+msgstr ""
+
+#: apps/transactions/views/conversions.py:226
+msgid "Convert into transfer"
+msgstr ""
+
#: apps/transactions/views/entities.py:72
msgid "Entity added successfully"
msgstr ""
@@ -2219,7 +2270,7 @@ msgstr ""
msgid "Item deleted successfully"
msgstr ""
-#: apps/transactions/views/quick_transactions.py:164
+#: apps/transactions/views/quick_transactions.py:165
#: apps/transactions/views/transactions.py:156
#: apps/transactions/views/transactions.py:343
msgid "Transaction added successfully"
@@ -2269,30 +2320,23 @@ msgstr ""
msgid "Transaction updated successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:421
-#, python-format
-msgid "%(count)s transaction updated successfully"
-msgid_plural "%(count)s transactions updated successfully"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apps/transactions/views/transactions.py:448
+#: apps/transactions/views/transactions.py:450
msgid "Transaction duplicated successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:493
+#: apps/transactions/views/transactions.py:495
msgid "Transaction deleted successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:523
+#: apps/transactions/views/transactions.py:525
msgid "Transaction restored successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:549
+#: apps/transactions/views/transactions.py:551
msgid "Transfer added successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:579
+#: apps/transactions/views/transactions.py:581
msgid "Transfer updated successfully"
msgstr ""
@@ -2612,8 +2656,9 @@ msgstr ""
#: templates/accounts/fragments/list.html:37
#: templates/bank_sync/fragments/list.html:33
#: templates/categories/fragments/table.html:29
-#: templates/cotton/transaction/item.html:178
-#: templates/cotton/ui/transactions_action_bar.html:54
+#: templates/cotton/transaction/item.html:180
+#: templates/cotton/ui/transactions_action_bar.html:56
+#: templates/cotton/ui/transactions_action_bar.html:90
#: templates/currencies/fragments/list.html:34
#: templates/dca/fragments/strategy/details.html:63
#: templates/dca/fragments/strategy/list.html:31
@@ -2624,8 +2669,8 @@ msgstr ""
#: templates/import_app/fragments/profiles/list.html:46
#: templates/installment_plans/fragments/table.html:28
#: templates/investment_classes/fragments/list.html:39
-#: templates/investments/fragments/detail.html:302
-#: templates/investments/fragments/detail.html:330
+#: templates/investments/fragments/detail.html:310
+#: templates/investments/fragments/detail.html:338
#: templates/quick_transactions/fragments/list.html:25
#: templates/recurring_transactions/fragments/table.html:30
#: templates/rules/fragments/transaction_rule/view.html:22
@@ -2662,10 +2707,11 @@ msgstr ""
#: templates/accounts/fragments/list.html:71
#: templates/bank_sync/fragments/list.html:50
#: templates/categories/fragments/table.html:51
-#: templates/cotton/transaction/item.html:190
-#: templates/cotton/transaction/item.html:316
+#: templates/cotton/transaction/item.html:192
+#: templates/cotton/transaction/item.html:333
#: templates/cotton/ui/deleted_transactions_action_bar.html:57
-#: templates/cotton/ui/transactions_action_bar.html:82
+#: templates/cotton/ui/transactions_action_bar.html:75
+#: templates/cotton/ui/transactions_action_bar.html:107
#: templates/currencies/fragments/list.html:40
#: templates/dca/fragments/strategy/details.html:70
#: templates/dca/fragments/strategy/list.html:38
@@ -2696,10 +2742,11 @@ msgstr ""
#: templates/accounts/fragments/list.html:75
#: templates/bank_sync/fragments/list.html:54
#: templates/categories/fragments/table.html:56
-#: templates/cotton/transaction/item.html:192
-#: templates/cotton/transaction/item.html:322
+#: templates/cotton/transaction/item.html:194
+#: templates/cotton/transaction/item.html:339
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:44
#: templates/dca/fragments/strategy/details.html:75
#: templates/dca/fragments/strategy/list.html:42
@@ -2727,10 +2774,11 @@ msgstr ""
#: templates/account_groups/fragments/list.html:59
#: templates/accounts/fragments/list.html:76
#: templates/categories/fragments/table.html:57
-#: templates/cotton/transaction/item.html:193
-#: templates/cotton/transaction/item.html:323
+#: templates/cotton/transaction/item.html:195
+#: templates/cotton/transaction/item.html:340
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:45
#: templates/dca/fragments/strategy/details.html:76
#: templates/dca/fragments/strategy/list.html:43
@@ -2750,8 +2798,8 @@ msgstr ""
#: templates/accounts/fragments/list.html:77
#: templates/bank_sync/fragments/list.html:56
#: templates/categories/fragments/table.html:58
-#: templates/cotton/transaction/item.html:194
-#: templates/cotton/transaction/item.html:324
+#: templates/cotton/transaction/item.html:196
+#: templates/cotton/transaction/item.html:341
#: templates/currencies/fragments/list.html:46
#: templates/dca/fragments/strategy/details.html:77
#: templates/dca/fragments/strategy/list.html:44
@@ -2831,6 +2879,12 @@ msgstr ""
msgid "No accounts"
msgstr ""
+#: templates/accounts/fragments/share.html:8
+msgid ""
+"Everyone who can see this account can add, edit and delete its transactions, "
+"installment plans and recurring transactions."
+msgstr ""
+
#: templates/bank_sync/fragments/accounts.html:31
msgid "No accounts found on this service"
msgstr ""
@@ -2925,63 +2979,76 @@ msgstr ""
msgid "Search"
msgstr ""
-#: templates/cotton/transaction/item.html:12
+#: templates/cotton/transaction/item.html:14
msgid "Select"
msgstr ""
-#: templates/cotton/transaction/item.html:123
+#: templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:100
msgid "From"
msgstr ""
-#: templates/cotton/transaction/item.html:207
-#: templates/cotton/transaction/item.html:218
-#: templates/cotton/transaction/item.html:228
+#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:230
msgid "Show on summaries"
msgstr ""
-#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:211
msgid "Controlled by account"
msgstr ""
-#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:222
msgid "Controlled by category"
msgstr ""
-#: templates/cotton/transaction/item.html:233
+#: templates/cotton/transaction/item.html:235
+#: templates/includes/transactions_bulk_actions.html:15
msgid "Hide from summaries"
msgstr ""
-#: templates/cotton/transaction/item.html:237
+#: templates/cotton/transaction/item.html:239
msgid "Convert"
msgstr ""
-#: templates/cotton/transaction/item.html:252
-#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:254
+#: templates/cotton/transaction/item.html:264
+#: templates/cotton/transaction/item.html:274
msgid "Already part of a plan or recurrence"
msgstr ""
-#: templates/cotton/transaction/item.html:279
+#: templates/cotton/transaction/item.html:291
msgid "Not available for transfers"
msgstr ""
-#: templates/cotton/transaction/item.html:296
+#: templates/cotton/transaction/item.html:313
+#: templates/includes/transactions_bulk_actions.html:22
msgid "Move to previous month"
msgstr ""
-#: templates/cotton/transaction/item.html:300
+#: templates/cotton/transaction/item.html:317
+#: templates/includes/transactions_bulk_actions.html:28
msgid "Move to next month"
msgstr ""
-#: templates/cotton/transaction/item.html:303
+#: templates/cotton/transaction/item.html:320
+#: templates/includes/transactions_bulk_actions.html:33
msgid "Move to today"
msgstr ""
-#: templates/cotton/transaction/item.html:307
-#: templates/cotton/ui/transactions_action_bar.html:78
+#: templates/cotton/transaction/item.html:324
+#: templates/cotton/ui/transactions_action_bar.html:71
+#: templates/cotton/ui/transactions_action_bar.html:98
msgid "Duplicate"
msgstr ""
+#: templates/cotton/transaction/item.html:373
+#, python-format
+msgid "%(counter)s item"
+msgid_plural "%(counter)s items"
+msgstr[0] ""
+msgstr[1] ""
+
#: templates/cotton/ui/account_card.html:10
#: templates/cotton/ui/currency_card.html:10
msgid "projected income"
@@ -3017,22 +3084,26 @@ msgstr ""
msgid "final total"
msgstr ""
-#: templates/cotton/ui/deleted_transactions_action_bar.html:34
-#: templates/cotton/ui/transactions_action_bar.html:34
-msgid "Select All"
-msgstr ""
-
-#: templates/cotton/ui/deleted_transactions_action_bar.html:40
-#: templates/cotton/ui/transactions_action_bar.html:40
+#: templates/cotton/ui/deleted_transactions_action_bar.html:25
+#: templates/cotton/ui/deleted_transactions_action_bar.html:26
+#: templates/cotton/ui/transactions_action_bar.html:25
+#: templates/cotton/ui/transactions_action_bar.html:26
msgid "Unselect All"
msgstr ""
-#: templates/cotton/ui/deleted_transactions_action_bar.html:46
-msgid "Invert election"
+#: templates/cotton/ui/deleted_transactions_action_bar.html:39
+#: templates/cotton/ui/transactions_action_bar.html:39
+msgid "Select All"
+msgstr ""
+
+#: templates/cotton/ui/deleted_transactions_action_bar.html:45
+#: templates/cotton/ui/transactions_action_bar.html:45
+msgid "Invert selection"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:59
-#: templates/cotton/ui/transactions_action_bar.html:84
+#: templates/cotton/ui/transactions_action_bar.html:77
+#: templates/cotton/ui/transactions_action_bar.html:106
msgid "Yes, delete them!"
msgstr ""
@@ -3043,43 +3114,43 @@ msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:166
#: templates/cotton/ui/deleted_transactions_action_bar.html:182
#: templates/cotton/ui/deleted_transactions_action_bar.html:198
-#: templates/cotton/ui/transactions_action_bar.html:128
-#: templates/cotton/ui/transactions_action_bar.html:143
-#: templates/cotton/ui/transactions_action_bar.html:159
-#: templates/cotton/ui/transactions_action_bar.html:175
-#: templates/cotton/ui/transactions_action_bar.html:191
-#: templates/cotton/ui/transactions_action_bar.html:207
-#: templates/cotton/ui/transactions_action_bar.html:223
+#: templates/cotton/ui/transactions_action_bar.html:153
+#: templates/cotton/ui/transactions_action_bar.html:168
+#: templates/cotton/ui/transactions_action_bar.html:184
+#: templates/cotton/ui/transactions_action_bar.html:200
+#: templates/cotton/ui/transactions_action_bar.html:216
+#: templates/cotton/ui/transactions_action_bar.html:232
+#: templates/cotton/ui/transactions_action_bar.html:248
msgid "copied!"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:123
-#: templates/cotton/ui/transactions_action_bar.html:148
+#: templates/cotton/ui/transactions_action_bar.html:173
msgid "Flat Total"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:139
-#: templates/cotton/ui/transactions_action_bar.html:164
+#: templates/cotton/ui/transactions_action_bar.html:189
msgid "Real Total"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:155
-#: templates/cotton/ui/transactions_action_bar.html:180
+#: templates/cotton/ui/transactions_action_bar.html:205
msgid "Mean"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:171
-#: templates/cotton/ui/transactions_action_bar.html:196
+#: templates/cotton/ui/transactions_action_bar.html:221
msgid "Max"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:187
-#: templates/cotton/ui/transactions_action_bar.html:212
+#: templates/cotton/ui/transactions_action_bar.html:237
msgid "Min"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:203
-#: templates/cotton/ui/transactions_action_bar.html:228
+#: templates/cotton/ui/transactions_action_bar.html:253
msgid "Count"
msgstr ""
@@ -3103,16 +3174,8 @@ msgstr ""
msgid "Balance"
msgstr ""
-#: templates/cotton/ui/transactions_action_bar.html:46
-msgid "Invert selection"
-msgstr ""
-
-#: templates/cotton/ui/transactions_action_bar.html:66
-msgid "Mark as unpaid"
-msgstr ""
-
-#: templates/cotton/ui/transactions_action_bar.html:71
-msgid "Mark as paid"
+#: templates/cotton/ui/transactions_action_bar.html:83
+msgid "More actions"
msgstr ""
#: templates/currencies/fragments/add.html:5
@@ -3544,6 +3607,14 @@ msgstr ""
msgid "Calculator"
msgstr ""
+#: templates/includes/transactions_bulk_actions.html:4
+msgid "Mark as unpaid"
+msgstr ""
+
+#: templates/includes/transactions_bulk_actions.html:9
+msgid "Mark as paid"
+msgstr ""
+
#: templates/insights/fragments/category_explorer/charts/account.html:100
#: templates/insights/fragments/category_explorer/charts/currency.html:92
#: templates/monthly_overview/fragments/monthly_account_summary.html:14
@@ -3609,6 +3680,7 @@ msgstr ""
#: templates/insights/fragments/year_by_year.html:140
#: templates/investment_classes/fragments/list.html:65
#: templates/monthly_overview/fragments/monthly_summary.html:168
+#: templates/transactions/widgets/sub_transactions.html:55
msgid "Total"
msgstr ""
@@ -4013,11 +4085,11 @@ msgstr ""
msgid "Loss, tax or fee"
msgstr ""
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
msgid "No movements yet"
msgstr ""
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
msgid "Use the + button to buy or contribute"
msgstr ""
@@ -4572,6 +4644,10 @@ msgstr ""
msgid "Deleted transactions"
msgstr ""
+#: templates/transactions/widgets/sub_transactions.html:53
+msgid "Add sub-transaction"
+msgstr ""
+
#: templates/transactions/widgets/unselectable_income_expense_toggle_buttons.html:11
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:7
msgid "Unchanged"
diff --git a/app/locale/sw/LC_MESSAGES/django.po b/app/locale/sw/LC_MESSAGES/django.po
index cbea566d..b31b3473 100644
--- a/app/locale/sw/LC_MESSAGES/django.po
+++ b/app/locale/sw/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-11-12 03:24+0000\n"
+"POT-Creation-Date: 2026-11-14 14:06+0000\n"
"PO-Revision-Date: 2026-01-18 19:24+0000\n"
"Last-Translator: Ebrahim Tayabali \n"
"Language-Team: Swahili Public: Shown for all users. Only editable by the owner."
+"Private: Only shown for the owner and shared users. Public: Shown for "
+"all users. Only the owner can edit, share or delete it."
msgstr ""
-#: apps/common/forms.py:76 apps/users/forms.py:191
+#: apps/common/forms.py:78 apps/users/forms.py:191
#: templates/bank_sync/fragments/accounts.html:34
#: templates/transactions/fragments/filter_actions.html:5
msgid "Save"
msgstr ""
-#: apps/common/forms.py:90
+#: apps/common/forms.py:92
msgid "You cannot share this item with its owner."
msgstr ""
@@ -794,6 +805,7 @@ msgid "Now"
msgstr ""
#: apps/common/widgets/tom_select.py:14
+#: templates/transactions/widgets/sub_transaction_row.html:9
msgid "Remove"
msgstr ""
@@ -870,8 +882,8 @@ msgstr ""
msgid "Auto"
msgstr ""
-#: apps/currencies/models.py:91 apps/export_app/forms.py:67
-#: apps/export_app/forms.py:152 templates/exchange_rates/fragments/list.html:10
+#: apps/currencies/models.py:91 apps/export_app/forms.py:73
+#: apps/export_app/forms.py:161 templates/exchange_rates/fragments/list.html:10
#: templates/exchange_rates/pages/index.html:4
#: templates/includes/sidebar.html:204
msgid "Exchange Rates"
@@ -1020,25 +1032,25 @@ msgstr ""
msgid "Create transaction"
msgstr ""
-#: apps/dca/forms.py:69 apps/transactions/forms.py:582
+#: apps/dca/forms.py:69 apps/transactions/forms.py:668
msgid "From Account"
msgstr ""
-#: apps/dca/forms.py:75 apps/transactions/forms.py:587
+#: apps/dca/forms.py:75 apps/transactions/forms.py:673
msgid "To Account"
msgstr ""
#: apps/dca/forms.py:117 apps/dca/forms.py:125 apps/export_app/forms.py:49
-#: apps/export_app/forms.py:143 apps/insights/views.py:57
-#: apps/rules/forms.py:185 apps/rules/forms.py:195 apps/rules/models.py:46
-#: apps/rules/models.py:307 apps/transactions/filters.py:84
-#: apps/transactions/forms.py:78 apps/transactions/forms.py:346
-#: apps/transactions/forms.py:526 apps/transactions/forms.py:640
-#: apps/transactions/forms.py:647 apps/transactions/forms.py:862
-#: apps/transactions/forms.py:1114 apps/transactions/models.py:313
-#: apps/transactions/models.py:369 apps/transactions/models.py:770
-#: apps/transactions/models.py:1028 apps/transactions/models.py:1353
-#: templates/entities/fragments/list.html:9
+#: apps/export_app/forms.py:150 apps/insights/views.py:57
+#: apps/rules/forms.py:185 apps/rules/forms.py:196 apps/rules/models.py:47
+#: apps/rules/models.py:308 apps/transactions/filters.py:100
+#: apps/transactions/filters.py:175 apps/transactions/forms.py:161
+#: apps/transactions/forms.py:431 apps/transactions/forms.py:612
+#: apps/transactions/forms.py:726 apps/transactions/forms.py:733
+#: apps/transactions/forms.py:950 apps/transactions/forms.py:1204
+#: apps/transactions/models.py:315 apps/transactions/models.py:371
+#: apps/transactions/models.py:866 apps/transactions/models.py:1127
+#: apps/transactions/models.py:1500 templates/entities/fragments/list.html:9
#: templates/entities/pages/index.html:4 templates/includes/sidebar.html:168
#: templates/insights/fragments/month_by_month.html:40
#: templates/insights/fragments/month_by_month.html:43
@@ -1073,8 +1085,8 @@ msgstr ""
msgid "You must provide an account."
msgstr ""
-#: apps/dca/forms.py:322 apps/transactions/forms.py:780
-#: apps/transactions/models.py:978
+#: apps/dca/forms.py:322 apps/transactions/forms.py:866
+#: apps/transactions/models.py:1077
msgid "From and To accounts must be different."
msgstr ""
@@ -1092,10 +1104,10 @@ msgid "Payment Currency"
msgstr ""
#: apps/dca/models.py:26 apps/dca/models.py:181 apps/rules/forms.py:180
-#: apps/rules/forms.py:196 apps/rules/models.py:43 apps/rules/models.py:295
-#: apps/transactions/forms.py:504 apps/transactions/forms.py:668
-#: apps/transactions/models.py:354 apps/transactions/models.py:774
-#: apps/transactions/models.py:1031 apps/transactions/models.py:1338
+#: apps/rules/forms.py:197 apps/rules/models.py:44 apps/rules/models.py:296
+#: apps/transactions/forms.py:590 apps/transactions/forms.py:754
+#: apps/transactions/models.py:356 apps/transactions/models.py:870
+#: apps/transactions/models.py:1130 apps/transactions/models.py:1485
msgid "Notes"
msgstr ""
@@ -1103,7 +1115,7 @@ msgstr ""
msgid "DCA Strategy"
msgstr ""
-#: apps/dca/models.py:35 apps/export_app/forms.py:166
+#: apps/dca/models.py:35 apps/export_app/forms.py:175
msgid "DCA Strategies"
msgstr ""
@@ -1123,7 +1135,7 @@ msgstr ""
msgid "DCA Entry"
msgstr ""
-#: apps/dca/models.py:187 apps/export_app/forms.py:167
+#: apps/dca/models.py:187 apps/export_app/forms.py:176
msgid "DCA Entries"
msgstr ""
@@ -1151,14 +1163,14 @@ msgstr ""
msgid "Entry deleted successfully"
msgstr ""
-#: apps/export_app/forms.py:13 apps/export_app/forms.py:137
+#: apps/export_app/forms.py:13 apps/export_app/forms.py:144
#: templates/includes/sidebar.html:247 templates/users/fragments/list.html:10
#: templates/users/pages/index.html:4
msgid "Users"
msgstr ""
-#: apps/export_app/forms.py:31 apps/export_app/forms.py:144
-#: apps/transactions/models.py:423 templates/includes/sidebar.html:81
+#: apps/export_app/forms.py:31 apps/export_app/forms.py:151
+#: apps/transactions/models.py:425 templates/includes/sidebar.html:81
#: templates/includes/sidebar.html:154
#: templates/recurring_transactions/fragments/list_transactions.html:5
#: templates/recurring_transactions/fragments/table.html:37
@@ -1166,9 +1178,9 @@ msgstr ""
msgid "Transactions"
msgstr ""
-#: apps/export_app/forms.py:37 apps/export_app/forms.py:141
-#: apps/insights/views.py:43 apps/transactions/filters.py:74
-#: templates/categories/fragments/list.html:9
+#: apps/export_app/forms.py:37 apps/export_app/forms.py:148
+#: apps/insights/views.py:43 apps/transactions/filters.py:90
+#: apps/transactions/filters.py:165 templates/categories/fragments/list.html:9
#: templates/categories/pages/index.html:4 templates/includes/sidebar.html:156
#: templates/insights/fragments/month_by_month.html:18
#: templates/insights/fragments/month_by_month.html:21
@@ -1177,100 +1189,113 @@ msgstr ""
msgid "Categories"
msgstr ""
-#: apps/export_app/forms.py:55 apps/export_app/forms.py:147
-#: apps/transactions/models.py:1068 templates/includes/sidebar.html:110
+#: apps/export_app/forms.py:55 apps/export_app/forms.py:155
+#: apps/transactions/models.py:1167 templates/includes/sidebar.html:110
#: templates/recurring_transactions/fragments/list.html:9
#: templates/recurring_transactions/pages/index.html:4
msgid "Recurring Transactions"
msgstr ""
-#: apps/export_app/forms.py:61 apps/export_app/forms.py:145
-#: apps/transactions/models.py:788 templates/includes/sidebar.html:104
+#: apps/export_app/forms.py:61 apps/export_app/forms.py:153
+#: apps/transactions/models.py:884 templates/includes/sidebar.html:104
#: templates/installment_plans/fragments/list.html:9
#: templates/installment_plans/pages/index.html:4
msgid "Installment Plans"
msgstr ""
-#: apps/export_app/forms.py:73 apps/export_app/forms.py:150
+#: apps/export_app/forms.py:67 apps/export_app/forms.py:157
+#: apps/transactions/models.py:1518 templates/includes/sidebar.html:98
+#: templates/quick_transactions/pages/index.html:5
+#: templates/quick_transactions/pages/index.html:15
+msgid "Quick Transactions"
+msgstr ""
+
+#: apps/export_app/forms.py:79 apps/export_app/forms.py:159
#: templates/exchange_rates_services/fragments/list.html:10
#: templates/exchange_rates_services/pages/index.html:4
#: templates/includes/sidebar.html:232
msgid "Automatic Exchange Rates"
msgstr ""
-#: apps/export_app/forms.py:79 templates/bank_sync/fragments/list.html:8
+#: apps/export_app/forms.py:85 templates/bank_sync/fragments/list.html:8
#: templates/bank_sync/pages/index.html:4 templates/includes/sidebar.html:238
msgid "Bank Sync"
msgstr ""
-#: apps/export_app/forms.py:80
+#: apps/export_app/forms.py:86
msgid "Includes the providers' API keys"
msgstr ""
-#: apps/export_app/forms.py:86 templates/includes/sidebar.html:212
+#: apps/export_app/forms.py:92 templates/includes/sidebar.html:212
#: templates/rules/fragments/list.html:9 templates/rules/pages/index.html:4
msgid "Rules"
msgstr ""
-#: apps/export_app/forms.py:92 templates/cotton/transaction/item.html:66
+#: apps/export_app/forms.py:98 templates/cotton/transaction/item.html:68
msgid "DCA"
msgstr ""
-#: apps/export_app/forms.py:98 apps/export_app/forms.py:168
+#: apps/export_app/forms.py:104 apps/export_app/forms.py:177
#: templates/import_app/fragments/profiles/list.html:21
#: templates/import_app/pages/profiles_index.html:4
msgid "Import Profiles"
msgstr ""
-#: apps/export_app/forms.py:126 templates/export_app/fragments/export.html:5
+#: apps/export_app/forms.py:133 templates/export_app/fragments/export.html:5
#: templates/export_app/pages/index.html:13
msgid "Export"
msgstr ""
-#: apps/export_app/forms.py:134
+#: apps/export_app/forms.py:141
msgid "Import a ZIP file exported from WYGIWYH"
msgstr ""
-#: apps/export_app/forms.py:135
+#: apps/export_app/forms.py:142
msgid "ZIP File"
msgstr ""
-#: apps/export_app/forms.py:157
+#: apps/export_app/forms.py:152 apps/rules/forms.py:193 apps/rules/models.py:42
+#: apps/rules/models.py:320 apps/transactions/models.py:736
+#: templates/transactions/widgets/sub_transactions.html:39
+msgid "Sub-transactions"
+msgstr ""
+
+#: apps/export_app/forms.py:166
msgid "Bank Sync Accounts"
msgstr ""
-#: apps/export_app/forms.py:159 apps/rules/models.py:27
+#: apps/export_app/forms.py:168 apps/rules/models.py:27
msgid "Transaction rules"
msgstr ""
-#: apps/export_app/forms.py:161 apps/rules/models.py:68
+#: apps/export_app/forms.py:170 apps/rules/models.py:69
msgid "Edit transaction action"
msgstr ""
-#: apps/export_app/forms.py:164 apps/rules/models.py:327
+#: apps/export_app/forms.py:173 apps/rules/models.py:332
msgid "Update or create transaction actions"
msgstr ""
-#: apps/export_app/forms.py:199 templates/cotton/transaction/item.html:310
+#: apps/export_app/forms.py:210 templates/cotton/transaction/item.html:327
#: templates/cotton/ui/deleted_transactions_action_bar.html:53
#: templates/export_app/fragments/restore.html:5
#: templates/export_app/pages/index.html:19
msgid "Restore"
msgstr ""
-#: apps/export_app/forms.py:209
+#: apps/export_app/forms.py:220
msgid "Please upload either a ZIP file or at least one CSV file"
msgstr ""
-#: apps/export_app/views.py:190
+#: apps/export_app/views.py:216
msgid "You have to select at least one export"
msgstr ""
-#: apps/export_app/views.py:210
+#: apps/export_app/views.py:236
msgid "Data restored successfully"
msgstr ""
-#: apps/export_app/views.py:222
+#: apps/export_app/views.py:248
msgid ""
"There was an error restoring your data. Check the logs for more details."
msgstr ""
@@ -1357,7 +1382,7 @@ msgstr ""
#: apps/insights/forms.py:118 apps/insights/utils/sankey.py:36
#: apps/insights/utils/sankey.py:167 apps/insights/views.py:45
-#: apps/transactions/filters.py:209
+#: apps/transactions/filters.py:294
#: templates/insights/fragments/month_by_month.html:119
#: templates/insights/fragments/year_by_year.html:73
msgid "Uncategorized"
@@ -1414,24 +1439,24 @@ msgstr ""
msgid "Tag"
msgstr ""
-#: apps/insights/views.py:52 apps/transactions/filters.py:215
+#: apps/insights/views.py:52 apps/transactions/filters.py:303
#: templates/insights/fragments/month_by_month.html:121
#: templates/insights/fragments/year_by_year.html:75
msgid "Untagged"
msgstr ""
-#: apps/insights/views.py:53 apps/transactions/models.py:611
+#: apps/insights/views.py:53 apps/transactions/models.py:632
#: templates/tags/fragments/table.html:69
msgid "No tags"
msgstr ""
-#: apps/insights/views.py:58 apps/transactions/models.py:312
+#: apps/insights/views.py:58 apps/transactions/models.py:314
#: templates/insights/fragments/month_by_month.html:88
#: templates/insights/fragments/year_by_year.html:56
msgid "Entity"
msgstr ""
-#: apps/insights/views.py:59 apps/transactions/filters.py:222
+#: apps/insights/views.py:59 apps/transactions/filters.py:311
#: templates/insights/fragments/month_by_month.html:123
#: templates/insights/fragments/year_by_year.html:77
msgid "No entity"
@@ -1449,15 +1474,15 @@ msgstr ""
msgid "Unclassified"
msgstr ""
-#: apps/investments/views.py:289
+#: apps/investments/views.py:290
msgid "Asset class added successfully"
msgstr ""
-#: apps/investments/views.py:297
+#: apps/investments/views.py:298
msgid "Asset class updated successfully"
msgstr ""
-#: apps/investments/views.py:318
+#: apps/investments/views.py:319
msgid "Asset class deleted successfully"
msgstr ""
@@ -1490,13 +1515,13 @@ msgstr ""
msgid "Set field"
msgstr ""
-#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:123
+#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:101
msgid "To"
msgstr ""
#: apps/rules/forms.py:78 apps/rules/forms.py:158 apps/rules/models.py:20
-#: apps/rules/models.py:62 apps/rules/models.py:323
+#: apps/rules/models.py:63 apps/rules/models.py:328
#: templates/rules/fragments/list.html:23
msgid "Order"
msgstr ""
@@ -1514,36 +1539,37 @@ msgid "Operator"
msgstr ""
#: apps/rules/forms.py:174 apps/rules/forms.py:188 apps/rules/models.py:36
-#: apps/rules/models.py:271 apps/transactions/forms.py:468
-#: apps/transactions/models.py:337 apps/transactions/models.py:730
-#: apps/transactions/models.py:1009 apps/transactions/models.py:1323
+#: apps/rules/models.py:272 apps/transactions/forms.py:554
+#: apps/transactions/models.py:339 apps/transactions/models.py:826
+#: apps/transactions/models.py:1108 apps/transactions/models.py:1470
#: templates/mini_tools/simulator.html:63
msgid "Type"
msgstr ""
#: apps/rules/forms.py:175 apps/rules/forms.py:189 apps/rules/models.py:37
-#: apps/rules/models.py:275 apps/transactions/filters.py:22
-#: apps/transactions/forms.py:472 apps/transactions/forms.py:650
-#: apps/transactions/models.py:339 apps/transactions/models.py:1325
-#: templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/rules/models.py:276 apps/transactions/filters.py:23
+#: apps/transactions/forms.py:558 apps/transactions/forms.py:736
+#: apps/transactions/models.py:341 apps/transactions/models.py:1472
+#: templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/transactions/widgets/paid_toggle_button.html:10
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:13
msgid "Paid"
msgstr ""
#: apps/rules/forms.py:177 apps/rules/forms.py:191 apps/rules/models.py:39
-#: apps/rules/models.py:283 apps/transactions/forms.py:90
-#: apps/transactions/forms.py:488 apps/transactions/forms.py:655
-#: apps/transactions/forms.py:868 apps/transactions/models.py:341
-#: apps/transactions/models.py:748 apps/transactions/models.py:1033
+#: apps/rules/models.py:284 apps/transactions/forms.py:173
+#: apps/transactions/forms.py:574 apps/transactions/forms.py:741
+#: apps/transactions/forms.py:956 apps/transactions/models.py:343
+#: apps/transactions/models.py:844 apps/transactions/models.py:1132
msgid "Reference Date"
msgstr ""
#: apps/rules/forms.py:178 apps/rules/forms.py:192 apps/rules/models.py:41
-#: apps/rules/models.py:287 apps/transactions/forms.py:495
-#: apps/transactions/models.py:347 apps/transactions/models.py:1014
-#: apps/transactions/models.py:1331
+#: apps/rules/models.py:288 apps/transactions/forms.py:75
+#: apps/transactions/forms.py:581 apps/transactions/models.py:349
+#: apps/transactions/models.py:730 apps/transactions/models.py:1113
+#: apps/transactions/models.py:1478
#: templates/insights/fragments/sankey.html:102
#: templates/installment_plans/fragments/table.html:18
#: templates/mini_tools/simulator.html:70
@@ -1552,51 +1578,52 @@ msgstr ""
msgid "Amount"
msgstr ""
-#: apps/rules/forms.py:179 apps/rules/forms.py:193 apps/rules/models.py:14
-#: apps/rules/models.py:42 apps/rules/models.py:291
-#: apps/transactions/forms.py:499 apps/transactions/forms.py:659
-#: apps/transactions/models.py:352 apps/transactions/models.py:732
-#: apps/transactions/models.py:1017 apps/transactions/models.py:1336
+#: apps/rules/forms.py:179 apps/rules/forms.py:194 apps/rules/models.py:14
+#: apps/rules/models.py:43 apps/rules/models.py:292
+#: apps/transactions/forms.py:585 apps/transactions/forms.py:745
+#: apps/transactions/models.py:354 apps/transactions/models.py:828
+#: apps/transactions/models.py:1116 apps/transactions/models.py:1483
msgid "Description"
msgstr ""
-#: apps/rules/forms.py:182 apps/rules/forms.py:198 apps/rules/models.py:47
-#: apps/rules/models.py:299 apps/transactions/models.py:399
-#: apps/transactions/models.py:1358
+#: apps/rules/forms.py:182 apps/rules/forms.py:199 apps/rules/models.py:48
+#: apps/rules/models.py:300 apps/transactions/models.py:401
+#: apps/transactions/models.py:1505
msgid "Internal Note"
msgstr ""
-#: apps/rules/forms.py:183 apps/rules/forms.py:199 apps/rules/models.py:48
-#: apps/rules/models.py:303 apps/transactions/models.py:401
-#: apps/transactions/models.py:1360
+#: apps/rules/forms.py:183 apps/rules/forms.py:200 apps/rules/models.py:49
+#: apps/rules/models.py:304 apps/transactions/models.py:403
+#: apps/transactions/models.py:1507
msgid "Internal ID"
msgstr ""
-#: apps/rules/forms.py:186 apps/rules/forms.py:200 apps/rules/models.py:40
-#: apps/rules/models.py:319 apps/transactions/forms.py:672
-#: apps/transactions/models.py:251 apps/transactions/models.py:342
-#: apps/transactions/models.py:1326
+#: apps/rules/forms.py:186 apps/rules/forms.py:201 apps/rules/models.py:40
+#: apps/rules/models.py:324 apps/transactions/forms.py:758
+#: apps/transactions/models.py:253 apps/transactions/models.py:344
+#: apps/transactions/models.py:1473
msgid "Mute"
msgstr ""
-#: apps/rules/forms.py:215
+#: apps/rules/forms.py:216
msgid "Search Criteria"
msgstr ""
-#: apps/rules/forms.py:360
+#: apps/rules/forms.py:361
msgid "Set Values"
msgstr ""
-#: apps/rules/forms.py:407 apps/rules/forms.py:442 apps/rules/forms.py:477
-#: apps/transactions/models.py:422 apps/transactions/models.py:667
+#: apps/rules/forms.py:409 apps/rules/forms.py:444 apps/rules/forms.py:479
+#: apps/transactions/models.py:424 apps/transactions/models.py:703
+#: apps/transactions/models.py:763
msgid "Transaction"
msgstr ""
-#: apps/rules/forms.py:411 apps/rules/forms.py:446 apps/rules/forms.py:481
+#: apps/rules/forms.py:413 apps/rules/forms.py:448 apps/rules/forms.py:483
msgid "Type to search for a transaction"
msgstr ""
-#: apps/rules/forms.py:422 apps/rules/forms.py:457 apps/rules/forms.py:491
+#: apps/rules/forms.py:424 apps/rules/forms.py:459 apps/rules/forms.py:493
#: templates/rules/fragments/transaction_rule/dry_run/created.html:5
#: templates/rules/fragments/transaction_rule/dry_run/deleted.html:5
#: templates/rules/fragments/transaction_rule/dry_run/updated.html:5
@@ -1616,15 +1643,15 @@ msgstr ""
msgid "Transaction rule"
msgstr ""
-#: apps/rules/models.py:54 apps/rules/models.py:98
+#: apps/rules/models.py:55 apps/rules/models.py:99
msgid "Rule"
msgstr ""
-#: apps/rules/models.py:59
+#: apps/rules/models.py:60
msgid "Field"
msgstr ""
-#: apps/rules/models.py:61 templates/investments/fragments/charts.html:86
+#: apps/rules/models.py:62 templates/investments/fragments/charts.html:86
#: templates/investments/fragments/detail.html:68
#: templates/investments/fragments/detail.html:127
#: templates/investments/fragments/detail.html:245
@@ -1632,57 +1659,57 @@ msgstr ""
msgid "Value"
msgstr ""
-#: apps/rules/models.py:69
+#: apps/rules/models.py:70
msgid "Edit transaction actions"
msgstr ""
-#: apps/rules/models.py:84
+#: apps/rules/models.py:85
msgid "is exactly"
msgstr ""
-#: apps/rules/models.py:85
+#: apps/rules/models.py:86
msgid "contains"
msgstr ""
-#: apps/rules/models.py:86
+#: apps/rules/models.py:87
msgid "starts with"
msgstr ""
-#: apps/rules/models.py:87
+#: apps/rules/models.py:88
msgid "ends with"
msgstr ""
-#: apps/rules/models.py:88
+#: apps/rules/models.py:89
msgid "equals"
msgstr ""
-#: apps/rules/models.py:89
+#: apps/rules/models.py:90
msgid "greater than"
msgstr ""
-#: apps/rules/models.py:90
+#: apps/rules/models.py:91
msgid "less than"
msgstr ""
-#: apps/rules/models.py:91
+#: apps/rules/models.py:92
msgid "greater than or equal"
msgstr ""
-#: apps/rules/models.py:92
+#: apps/rules/models.py:93
msgid "less than or equal"
msgstr ""
-#: apps/rules/models.py:102
+#: apps/rules/models.py:103
msgid "Filter"
msgstr ""
-#: apps/rules/models.py:105
+#: apps/rules/models.py:106
msgid ""
"Generic expression to enable or disable execution. Should evaluate to True "
"or False"
msgstr ""
-#: apps/rules/models.py:326
+#: apps/rules/models.py:331
msgid "Update or create transaction action"
msgstr ""
@@ -1726,8 +1753,8 @@ msgstr ""
msgid "Update or Create Transaction action deleted successfully"
msgstr ""
-#: apps/transactions/filters.py:23 templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/transactions/filters.py:24 templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/insights/fragments/overview/index.html:68
#: templates/net_worth/net_worth.html:39 templates/net_worth/net_worth.html:43
#: templates/transactions/widgets/paid_toggle_button.html:7
@@ -1735,162 +1762,172 @@ msgstr ""
msgid "Projected"
msgstr ""
-#: apps/transactions/filters.py:28 templates/categories/fragments/table.html:18
+#: apps/transactions/filters.py:29 templates/categories/fragments/table.html:18
msgid "Muted"
msgstr ""
-#: apps/transactions/filters.py:51
+#: apps/transactions/filters.py:67 apps/transactions/filters.py:144
msgid "Content"
msgstr ""
-#: apps/transactions/filters.py:57
+#: apps/transactions/filters.py:73
msgid "Transaction Type"
msgstr ""
-#: apps/transactions/filters.py:95
+#: apps/transactions/filters.py:111
msgid "Mute Status"
msgstr ""
-#: apps/transactions/filters.py:100
+#: apps/transactions/filters.py:116
msgid "Date from"
msgstr ""
-#: apps/transactions/filters.py:105 apps/transactions/filters.py:115
+#: apps/transactions/filters.py:121 apps/transactions/filters.py:131
msgid "Until"
msgstr ""
-#: apps/transactions/filters.py:110
+#: apps/transactions/filters.py:126
msgid "Reference date from"
msgstr ""
-#: apps/transactions/filters.py:120
+#: apps/transactions/filters.py:136
msgid "Amount min"
msgstr ""
-#: apps/transactions/filters.py:125
+#: apps/transactions/filters.py:141
msgid "Amount max"
msgstr ""
-#: apps/transactions/filters.py:208
+#: apps/transactions/filters.py:240
+msgid "Include"
+msgstr ""
+
+#: apps/transactions/filters.py:245
+msgid "Exclude"
+msgstr ""
+
+#: apps/transactions/filters.py:293
msgid "Categorized"
msgstr ""
-#: apps/transactions/filters.py:215
+#: apps/transactions/filters.py:303
msgid "Tagged"
msgstr ""
-#: apps/transactions/filters.py:221
+#: apps/transactions/filters.py:310
msgid "Any entity"
msgstr ""
-#: apps/transactions/forms.py:192
+#: apps/transactions/forms.py:277
msgid "More"
msgstr ""
-#: apps/transactions/forms.py:229
+#: apps/transactions/forms.py:314
msgid "Save and add similar"
msgstr ""
-#: apps/transactions/forms.py:234
+#: apps/transactions/forms.py:319
msgid "Save and add another"
msgstr ""
-#: apps/transactions/forms.py:271 templates/cotton/transaction/item.html:184
+#: apps/transactions/forms.py:356 templates/cotton/transaction/item.html:186
#: templates/transactions/fragments/attachments.html:4
msgid "Attachments"
msgstr ""
-#: apps/transactions/forms.py:272
+#: apps/transactions/forms.py:357
msgid ""
"Files are private and only visible to users with access to this transaction."
msgstr ""
-#: apps/transactions/forms.py:283
+#: apps/transactions/forms.py:368
msgid "Upload"
msgstr ""
-#: apps/transactions/forms.py:355 apps/transactions/forms.py:1120
-#: apps/transactions/models.py:947
+#: apps/transactions/forms.py:440 apps/transactions/forms.py:1210
+#: apps/transactions/models.py:1046
#, fuzzy
#| msgid "Asset account"
msgid "To account"
msgstr "Akaunti ya Mali"
-#: apps/transactions/forms.py:382 apps/transactions/forms.py:675
+#: apps/transactions/forms.py:467 apps/transactions/forms.py:761
msgid "Muted transactions won't be displayed on monthly summaries"
msgstr ""
-#: apps/transactions/forms.py:594
+#: apps/transactions/forms.py:680
msgid "From Amount"
msgstr ""
-#: apps/transactions/forms.py:599
+#: apps/transactions/forms.py:685
msgid "To Amount"
msgstr ""
-#: apps/transactions/forms.py:741 apps/transactions/models.py:992
-#: apps/transactions/models.py:1303 templates/cotton/transaction/item.html:52
-#: templates/cotton/transaction/item.html:60
+#: apps/transactions/forms.py:827 apps/transactions/models.py:1091
+#: apps/transactions/models.py:1450 templates/cotton/transaction/item.html:54
+#: templates/cotton/transaction/item.html:62
+#: templates/cotton/transaction/item.html:272
+#: templates/cotton/transaction/item.html:304
#: templates/cotton/ui/quick_transactions_buttons.html:40
#: templates/cotton/ui/transactions_fab.html:44
msgid "Transfer"
msgstr ""
-#: apps/transactions/forms.py:1005
+#: apps/transactions/forms.py:1095
msgid "Tag name"
msgstr ""
-#: apps/transactions/forms.py:1033
+#: apps/transactions/forms.py:1123
msgid "Entity name"
msgstr ""
-#: apps/transactions/forms.py:1061
+#: apps/transactions/forms.py:1151
msgid "Category name"
msgstr ""
-#: apps/transactions/forms.py:1063
+#: apps/transactions/forms.py:1153
msgid "Muted categories won't be displayed on monthly summaries"
msgstr ""
-#: apps/transactions/forms.py:1228
+#: apps/transactions/forms.py:1319
msgid "future transactions"
msgstr ""
-#: apps/transactions/forms.py:1255
+#: apps/transactions/forms.py:1346
msgid "End date should be after the start date"
msgstr ""
-#: apps/transactions/models.py:256
+#: apps/transactions/models.py:258
msgid ""
"Deactivated categories won't be able to be selected when creating new "
"transactions"
msgstr ""
-#: apps/transactions/models.py:264
+#: apps/transactions/models.py:266
msgid "Transaction Category"
msgstr ""
-#: apps/transactions/models.py:265
+#: apps/transactions/models.py:267
msgid "Transaction Categories"
msgstr ""
-#: apps/transactions/models.py:280
+#: apps/transactions/models.py:282
msgid ""
"Deactivated tags won't be able to be selected when creating new transactions"
msgstr ""
-#: apps/transactions/models.py:288 apps/transactions/models.py:289
+#: apps/transactions/models.py:290 apps/transactions/models.py:291
msgid "Transaction Tags"
msgstr ""
-#: apps/transactions/models.py:304
+#: apps/transactions/models.py:306
msgid ""
"Deactivated entities won't be able to be selected when creating new "
"transactions"
msgstr ""
-#: apps/transactions/models.py:324 apps/transactions/models.py:991
-#: apps/transactions/models.py:1302
+#: apps/transactions/models.py:326 apps/transactions/models.py:1090
+#: apps/transactions/models.py:1449
#: templates/calendar_view/fragments/list.html:42
#: templates/calendar_view/fragments/list.html:44
#: templates/calendar_view/fragments/list.html:52
@@ -1902,14 +1939,14 @@ msgstr ""
#: templates/investments/fragments/detail.html:71
#: templates/investments/fragments/detail.html:175
#: templates/investments/fragments/detail.html:227
-#: templates/investments/fragments/detail.html:318
+#: templates/investments/fragments/detail.html:326
#: templates/mini_tools/simulator.html:66
#: templates/monthly_overview/fragments/monthly_summary.html:42
msgid "Income"
msgstr ""
-#: apps/transactions/models.py:325 apps/transactions/models.py:993
-#: apps/transactions/models.py:1304
+#: apps/transactions/models.py:327 apps/transactions/models.py:1092
+#: apps/transactions/models.py:1451
#: templates/calendar_view/fragments/list.html:46
#: templates/calendar_view/fragments/list.html:48
#: templates/calendar_view/fragments/list.html:56
@@ -1921,192 +1958,190 @@ msgstr ""
msgid "Expense"
msgstr ""
-#: apps/transactions/models.py:380 apps/transactions/models.py:787
-#: templates/cotton/transaction/item.html:260
-#: templates/cotton/transaction/item.html:277
-#: templates/cotton/transaction/item.html:287
+#: apps/transactions/models.py:382 apps/transactions/models.py:883
+#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:289
+#: templates/cotton/transaction/item.html:299
msgid "Installment Plan"
msgstr ""
-#: apps/transactions/models.py:389 apps/transactions/models.py:1067
-#: templates/cotton/transaction/item.html:250
-#: templates/cotton/transaction/item.html:270
+#: apps/transactions/models.py:391 apps/transactions/models.py:1166
+#: templates/cotton/transaction/item.html:252
+#: templates/cotton/transaction/item.html:282
msgid "Recurring Transaction"
msgstr ""
-#: apps/transactions/models.py:397
+#: apps/transactions/models.py:399
msgid "Linked Transaction"
msgstr ""
-#: apps/transactions/models.py:405
+#: apps/transactions/models.py:407
msgid "Deleted"
msgstr ""
-#: apps/transactions/models.py:410
+#: apps/transactions/models.py:412
msgid "Deleted At"
msgstr ""
-#: apps/transactions/models.py:518
+#: apps/transactions/models.py:521
msgid "A transfer needs one expense and one income."
msgstr ""
-#: apps/transactions/models.py:520
+#: apps/transactions/models.py:523
msgid "A transfer needs two different accounts."
msgstr ""
-#: apps/transactions/models.py:524
+#: apps/transactions/models.py:527
msgid "This transaction is already part of another transfer."
msgstr ""
-#: apps/transactions/models.py:613
+#: apps/transactions/models.py:634
msgid "No category"
msgstr ""
-#: apps/transactions/models.py:615
+#: apps/transactions/models.py:636
msgid "No description"
msgstr ""
-#: apps/transactions/models.py:672
+#: apps/transactions/models.py:735
+msgid "Sub-transaction"
+msgstr ""
+
+#: apps/transactions/models.py:768
msgid "File"
msgstr ""
-#: apps/transactions/models.py:674
+#: apps/transactions/models.py:770
msgid "Original Name"
msgstr ""
-#: apps/transactions/models.py:676
+#: apps/transactions/models.py:772
msgid "Content Type"
msgstr ""
-#: apps/transactions/models.py:678
+#: apps/transactions/models.py:774
msgid "Size"
msgstr ""
-#: apps/transactions/models.py:683
+#: apps/transactions/models.py:779
msgid "Uploaded By"
msgstr ""
-#: apps/transactions/models.py:688
+#: apps/transactions/models.py:784
msgid "Transaction Attachment"
msgstr ""
-#: apps/transactions/models.py:689
+#: apps/transactions/models.py:785
msgid "Transaction Attachments"
msgstr ""
-#: apps/transactions/models.py:719 templates/includes/sidebar.html:57
+#: apps/transactions/models.py:815 templates/includes/sidebar.html:57
msgid "Yearly"
msgstr ""
-#: apps/transactions/models.py:720 apps/users/models.py:469
+#: apps/transactions/models.py:816 apps/users/models.py:469
#: templates/includes/sidebar.html:51
msgid "Monthly"
msgstr ""
-#: apps/transactions/models.py:721
+#: apps/transactions/models.py:817
msgid "Weekly"
msgstr ""
-#: apps/transactions/models.py:722
+#: apps/transactions/models.py:818
msgid "Daily"
msgstr ""
-#: apps/transactions/models.py:735
+#: apps/transactions/models.py:831
msgid "Number of Installments"
msgstr ""
-#: apps/transactions/models.py:740
+#: apps/transactions/models.py:836
msgid "Installment Start"
msgstr ""
-#: apps/transactions/models.py:741
+#: apps/transactions/models.py:837
msgid "The installment number to start counting from"
msgstr ""
-#: apps/transactions/models.py:746 apps/transactions/models.py:1037
+#: apps/transactions/models.py:842 apps/transactions/models.py:1136
msgid "Start Date"
msgstr ""
-#: apps/transactions/models.py:750 apps/transactions/models.py:1038
+#: apps/transactions/models.py:846 apps/transactions/models.py:1137
msgid "End Date"
msgstr ""
-#: apps/transactions/models.py:755
+#: apps/transactions/models.py:851
msgid "Recurrence"
msgstr ""
-#: apps/transactions/models.py:758
+#: apps/transactions/models.py:854
msgid "Installment Amount"
msgstr ""
-#: apps/transactions/models.py:777 apps/transactions/models.py:1057
+#: apps/transactions/models.py:873 apps/transactions/models.py:1156
msgid "Add description to transactions"
msgstr ""
-#: apps/transactions/models.py:780 apps/transactions/models.py:1060
+#: apps/transactions/models.py:876 apps/transactions/models.py:1159
msgid "Add notes to transactions"
msgstr ""
-#: apps/transactions/models.py:954
+#: apps/transactions/models.py:1053
msgid "To amount"
msgstr ""
-#: apps/transactions/models.py:955
+#: apps/transactions/models.py:1054
msgid "Leave empty to use the same amount"
msgstr ""
-#: apps/transactions/models.py:996 templates/mini_tools/simulator.html:129
+#: apps/transactions/models.py:1095 templates/mini_tools/simulator.html:129
msgid "day(s)"
msgstr ""
-#: apps/transactions/models.py:997 templates/mini_tools/simulator.html:130
+#: apps/transactions/models.py:1096 templates/mini_tools/simulator.html:130
msgid "week(s)"
msgstr ""
-#: apps/transactions/models.py:998 templates/mini_tools/simulator.html:131
+#: apps/transactions/models.py:1097 templates/mini_tools/simulator.html:131
msgid "month(s)"
msgstr ""
-#: apps/transactions/models.py:999 templates/mini_tools/simulator.html:132
+#: apps/transactions/models.py:1098 templates/mini_tools/simulator.html:132
msgid "year(s)"
msgstr ""
-#: apps/transactions/models.py:1001
+#: apps/transactions/models.py:1100
#: templates/recurring_transactions/fragments/list.html:18
msgid "Paused"
msgstr ""
-#: apps/transactions/models.py:1040
+#: apps/transactions/models.py:1139
msgid "Recurrence Type"
msgstr ""
-#: apps/transactions/models.py:1043
+#: apps/transactions/models.py:1142
msgid "Recurrence Interval"
msgstr ""
-#: apps/transactions/models.py:1046
+#: apps/transactions/models.py:1145
msgid "Keep at most"
msgstr ""
-#: apps/transactions/models.py:1050
+#: apps/transactions/models.py:1149
msgid "Last Generated Date"
msgstr ""
-#: apps/transactions/models.py:1053
+#: apps/transactions/models.py:1152
msgid "Last Generated Reference Date"
msgstr ""
-#: apps/transactions/models.py:1370 templates/cotton/transaction/item.html:243
+#: apps/transactions/models.py:1517 templates/cotton/transaction/item.html:245
#: templates/cotton/ui/transactions_fab.html:59
msgid "Quick Transaction"
msgstr ""
-#: apps/transactions/models.py:1371 templates/includes/sidebar.html:98
-#: templates/quick_transactions/pages/index.html:5
-#: templates/quick_transactions/pages/index.html:15
-msgid "Quick Transactions"
-msgstr ""
-
#: apps/transactions/validators.py:8
#, python-format
msgid "%(value)s has too many decimal places. Maximum is 30."
@@ -2117,35 +2152,43 @@ msgstr ""
msgid "%(value)s is not a non-negative number"
msgstr ""
-#: apps/transactions/views/actions.py:58
+#: apps/transactions/views/actions.py:61
#, python-format
msgid "%(count)s transaction marked as paid"
msgid_plural "%(count)s transactions marked as paid"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:81
+#: apps/transactions/views/actions.py:84
#, python-format
msgid "%(count)s transaction marked as not paid"
msgid_plural "%(count)s transactions marked as not paid"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:105
+#: apps/transactions/views/actions.py:108
#, python-format
msgid "%(count)s transaction deleted successfully"
msgid_plural "%(count)s transactions deleted successfully"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:139
+#: apps/transactions/views/actions.py:142
#, python-format
msgid "%(count)s transaction restored successfully"
msgid_plural "%(count)s transactions restored successfully"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:170
+#: apps/transactions/views/actions.py:174
+#: apps/transactions/views/transactions.py:423
+#, python-format
+msgid "%(count)s transaction updated successfully"
+msgid_plural "%(count)s transactions updated successfully"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apps/transactions/views/actions.py:247
#, python-format
msgid "%(count)s transaction duplicated successfully"
msgid_plural "%(count)s transactions duplicated successfully"
@@ -2164,33 +2207,41 @@ msgstr ""
msgid "Category deleted successfully"
msgstr ""
-#: apps/transactions/views/conversions.py:72
+#: apps/transactions/views/conversions.py:77
#: apps/transactions/views/quick_transactions.py:46 apps/users/views.py:252
msgid "Item added successfully"
msgstr ""
-#: apps/transactions/views/conversions.py:91
+#: apps/transactions/views/conversions.py:97
msgid "Convert into quick transaction"
msgstr ""
-#: apps/transactions/views/conversions.py:108
+#: apps/transactions/views/conversions.py:114
#: apps/transactions/views/recurring_transactions.py:112
msgid "Recurring Transaction added successfully"
msgstr ""
-#: apps/transactions/views/conversions.py:129
+#: apps/transactions/views/conversions.py:136
msgid "Convert into recurring transaction"
msgstr ""
-#: apps/transactions/views/conversions.py:148
+#: apps/transactions/views/conversions.py:155
#: apps/transactions/views/installment_plans.py:87
msgid "Installment Plan added successfully"
msgstr ""
-#: apps/transactions/views/conversions.py:167
+#: apps/transactions/views/conversions.py:175
msgid "Convert into installment plan"
msgstr ""
+#: apps/transactions/views/conversions.py:195
+msgid "Transaction converted into a transfer"
+msgstr ""
+
+#: apps/transactions/views/conversions.py:226
+msgid "Convert into transfer"
+msgstr ""
+
#: apps/transactions/views/entities.py:72
msgid "Entity added successfully"
msgstr ""
@@ -2223,7 +2274,7 @@ msgstr ""
msgid "Item deleted successfully"
msgstr ""
-#: apps/transactions/views/quick_transactions.py:164
+#: apps/transactions/views/quick_transactions.py:165
#: apps/transactions/views/transactions.py:156
#: apps/transactions/views/transactions.py:343
msgid "Transaction added successfully"
@@ -2273,30 +2324,23 @@ msgstr ""
msgid "Transaction updated successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:421
-#, python-format
-msgid "%(count)s transaction updated successfully"
-msgid_plural "%(count)s transactions updated successfully"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apps/transactions/views/transactions.py:448
+#: apps/transactions/views/transactions.py:450
msgid "Transaction duplicated successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:493
+#: apps/transactions/views/transactions.py:495
msgid "Transaction deleted successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:523
+#: apps/transactions/views/transactions.py:525
msgid "Transaction restored successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:549
+#: apps/transactions/views/transactions.py:551
msgid "Transfer added successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:579
+#: apps/transactions/views/transactions.py:581
msgid "Transfer updated successfully"
msgstr ""
@@ -2620,8 +2664,9 @@ msgstr ""
#: templates/accounts/fragments/list.html:37
#: templates/bank_sync/fragments/list.html:33
#: templates/categories/fragments/table.html:29
-#: templates/cotton/transaction/item.html:178
-#: templates/cotton/ui/transactions_action_bar.html:54
+#: templates/cotton/transaction/item.html:180
+#: templates/cotton/ui/transactions_action_bar.html:56
+#: templates/cotton/ui/transactions_action_bar.html:90
#: templates/currencies/fragments/list.html:34
#: templates/dca/fragments/strategy/details.html:63
#: templates/dca/fragments/strategy/list.html:31
@@ -2632,8 +2677,8 @@ msgstr ""
#: templates/import_app/fragments/profiles/list.html:46
#: templates/installment_plans/fragments/table.html:28
#: templates/investment_classes/fragments/list.html:39
-#: templates/investments/fragments/detail.html:302
-#: templates/investments/fragments/detail.html:330
+#: templates/investments/fragments/detail.html:310
+#: templates/investments/fragments/detail.html:338
#: templates/quick_transactions/fragments/list.html:25
#: templates/recurring_transactions/fragments/table.html:30
#: templates/rules/fragments/transaction_rule/view.html:22
@@ -2670,10 +2715,11 @@ msgstr ""
#: templates/accounts/fragments/list.html:71
#: templates/bank_sync/fragments/list.html:50
#: templates/categories/fragments/table.html:51
-#: templates/cotton/transaction/item.html:190
-#: templates/cotton/transaction/item.html:316
+#: templates/cotton/transaction/item.html:192
+#: templates/cotton/transaction/item.html:333
#: templates/cotton/ui/deleted_transactions_action_bar.html:57
-#: templates/cotton/ui/transactions_action_bar.html:82
+#: templates/cotton/ui/transactions_action_bar.html:75
+#: templates/cotton/ui/transactions_action_bar.html:107
#: templates/currencies/fragments/list.html:40
#: templates/dca/fragments/strategy/details.html:70
#: templates/dca/fragments/strategy/list.html:38
@@ -2704,10 +2750,11 @@ msgstr ""
#: templates/accounts/fragments/list.html:75
#: templates/bank_sync/fragments/list.html:54
#: templates/categories/fragments/table.html:56
-#: templates/cotton/transaction/item.html:192
-#: templates/cotton/transaction/item.html:322
+#: templates/cotton/transaction/item.html:194
+#: templates/cotton/transaction/item.html:339
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:44
#: templates/dca/fragments/strategy/details.html:75
#: templates/dca/fragments/strategy/list.html:42
@@ -2735,10 +2782,11 @@ msgstr ""
#: templates/account_groups/fragments/list.html:59
#: templates/accounts/fragments/list.html:76
#: templates/categories/fragments/table.html:57
-#: templates/cotton/transaction/item.html:193
-#: templates/cotton/transaction/item.html:323
+#: templates/cotton/transaction/item.html:195
+#: templates/cotton/transaction/item.html:340
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:45
#: templates/dca/fragments/strategy/details.html:76
#: templates/dca/fragments/strategy/list.html:43
@@ -2758,8 +2806,8 @@ msgstr ""
#: templates/accounts/fragments/list.html:77
#: templates/bank_sync/fragments/list.html:56
#: templates/categories/fragments/table.html:58
-#: templates/cotton/transaction/item.html:194
-#: templates/cotton/transaction/item.html:324
+#: templates/cotton/transaction/item.html:196
+#: templates/cotton/transaction/item.html:341
#: templates/currencies/fragments/list.html:46
#: templates/dca/fragments/strategy/details.html:77
#: templates/dca/fragments/strategy/list.html:44
@@ -2839,6 +2887,12 @@ msgstr ""
msgid "No accounts"
msgstr ""
+#: templates/accounts/fragments/share.html:8
+msgid ""
+"Everyone who can see this account can add, edit and delete its transactions, "
+"installment plans and recurring transactions."
+msgstr ""
+
#: templates/bank_sync/fragments/accounts.html:31
msgid "No accounts found on this service"
msgstr ""
@@ -2933,63 +2987,76 @@ msgstr ""
msgid "Search"
msgstr ""
-#: templates/cotton/transaction/item.html:12
+#: templates/cotton/transaction/item.html:14
msgid "Select"
msgstr ""
-#: templates/cotton/transaction/item.html:123
+#: templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:100
msgid "From"
msgstr ""
-#: templates/cotton/transaction/item.html:207
-#: templates/cotton/transaction/item.html:218
-#: templates/cotton/transaction/item.html:228
+#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:230
msgid "Show on summaries"
msgstr ""
-#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:211
msgid "Controlled by account"
msgstr ""
-#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:222
msgid "Controlled by category"
msgstr ""
-#: templates/cotton/transaction/item.html:233
+#: templates/cotton/transaction/item.html:235
+#: templates/includes/transactions_bulk_actions.html:15
msgid "Hide from summaries"
msgstr ""
-#: templates/cotton/transaction/item.html:237
+#: templates/cotton/transaction/item.html:239
msgid "Convert"
msgstr ""
-#: templates/cotton/transaction/item.html:252
-#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:254
+#: templates/cotton/transaction/item.html:264
+#: templates/cotton/transaction/item.html:274
msgid "Already part of a plan or recurrence"
msgstr ""
-#: templates/cotton/transaction/item.html:279
+#: templates/cotton/transaction/item.html:291
msgid "Not available for transfers"
msgstr ""
-#: templates/cotton/transaction/item.html:296
+#: templates/cotton/transaction/item.html:313
+#: templates/includes/transactions_bulk_actions.html:22
msgid "Move to previous month"
msgstr ""
-#: templates/cotton/transaction/item.html:300
+#: templates/cotton/transaction/item.html:317
+#: templates/includes/transactions_bulk_actions.html:28
msgid "Move to next month"
msgstr ""
-#: templates/cotton/transaction/item.html:303
+#: templates/cotton/transaction/item.html:320
+#: templates/includes/transactions_bulk_actions.html:33
msgid "Move to today"
msgstr ""
-#: templates/cotton/transaction/item.html:307
-#: templates/cotton/ui/transactions_action_bar.html:78
+#: templates/cotton/transaction/item.html:324
+#: templates/cotton/ui/transactions_action_bar.html:71
+#: templates/cotton/ui/transactions_action_bar.html:98
msgid "Duplicate"
msgstr ""
+#: templates/cotton/transaction/item.html:373
+#, python-format
+msgid "%(counter)s item"
+msgid_plural "%(counter)s items"
+msgstr[0] ""
+msgstr[1] ""
+
#: templates/cotton/ui/account_card.html:10
#: templates/cotton/ui/currency_card.html:10
msgid "projected income"
@@ -3025,22 +3092,26 @@ msgstr ""
msgid "final total"
msgstr ""
-#: templates/cotton/ui/deleted_transactions_action_bar.html:34
-#: templates/cotton/ui/transactions_action_bar.html:34
-msgid "Select All"
-msgstr ""
-
-#: templates/cotton/ui/deleted_transactions_action_bar.html:40
-#: templates/cotton/ui/transactions_action_bar.html:40
+#: templates/cotton/ui/deleted_transactions_action_bar.html:25
+#: templates/cotton/ui/deleted_transactions_action_bar.html:26
+#: templates/cotton/ui/transactions_action_bar.html:25
+#: templates/cotton/ui/transactions_action_bar.html:26
msgid "Unselect All"
msgstr ""
-#: templates/cotton/ui/deleted_transactions_action_bar.html:46
-msgid "Invert election"
+#: templates/cotton/ui/deleted_transactions_action_bar.html:39
+#: templates/cotton/ui/transactions_action_bar.html:39
+msgid "Select All"
+msgstr ""
+
+#: templates/cotton/ui/deleted_transactions_action_bar.html:45
+#: templates/cotton/ui/transactions_action_bar.html:45
+msgid "Invert selection"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:59
-#: templates/cotton/ui/transactions_action_bar.html:84
+#: templates/cotton/ui/transactions_action_bar.html:77
+#: templates/cotton/ui/transactions_action_bar.html:106
msgid "Yes, delete them!"
msgstr ""
@@ -3051,43 +3122,43 @@ msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:166
#: templates/cotton/ui/deleted_transactions_action_bar.html:182
#: templates/cotton/ui/deleted_transactions_action_bar.html:198
-#: templates/cotton/ui/transactions_action_bar.html:128
-#: templates/cotton/ui/transactions_action_bar.html:143
-#: templates/cotton/ui/transactions_action_bar.html:159
-#: templates/cotton/ui/transactions_action_bar.html:175
-#: templates/cotton/ui/transactions_action_bar.html:191
-#: templates/cotton/ui/transactions_action_bar.html:207
-#: templates/cotton/ui/transactions_action_bar.html:223
+#: templates/cotton/ui/transactions_action_bar.html:153
+#: templates/cotton/ui/transactions_action_bar.html:168
+#: templates/cotton/ui/transactions_action_bar.html:184
+#: templates/cotton/ui/transactions_action_bar.html:200
+#: templates/cotton/ui/transactions_action_bar.html:216
+#: templates/cotton/ui/transactions_action_bar.html:232
+#: templates/cotton/ui/transactions_action_bar.html:248
msgid "copied!"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:123
-#: templates/cotton/ui/transactions_action_bar.html:148
+#: templates/cotton/ui/transactions_action_bar.html:173
msgid "Flat Total"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:139
-#: templates/cotton/ui/transactions_action_bar.html:164
+#: templates/cotton/ui/transactions_action_bar.html:189
msgid "Real Total"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:155
-#: templates/cotton/ui/transactions_action_bar.html:180
+#: templates/cotton/ui/transactions_action_bar.html:205
msgid "Mean"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:171
-#: templates/cotton/ui/transactions_action_bar.html:196
+#: templates/cotton/ui/transactions_action_bar.html:221
msgid "Max"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:187
-#: templates/cotton/ui/transactions_action_bar.html:212
+#: templates/cotton/ui/transactions_action_bar.html:237
msgid "Min"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:203
-#: templates/cotton/ui/transactions_action_bar.html:228
+#: templates/cotton/ui/transactions_action_bar.html:253
msgid "Count"
msgstr ""
@@ -3111,16 +3182,8 @@ msgstr ""
msgid "Balance"
msgstr ""
-#: templates/cotton/ui/transactions_action_bar.html:46
-msgid "Invert selection"
-msgstr ""
-
-#: templates/cotton/ui/transactions_action_bar.html:66
-msgid "Mark as unpaid"
-msgstr ""
-
-#: templates/cotton/ui/transactions_action_bar.html:71
-msgid "Mark as paid"
+#: templates/cotton/ui/transactions_action_bar.html:83
+msgid "More actions"
msgstr ""
#: templates/currencies/fragments/add.html:5
@@ -3552,6 +3615,14 @@ msgstr ""
msgid "Calculator"
msgstr ""
+#: templates/includes/transactions_bulk_actions.html:4
+msgid "Mark as unpaid"
+msgstr ""
+
+#: templates/includes/transactions_bulk_actions.html:9
+msgid "Mark as paid"
+msgstr ""
+
#: templates/insights/fragments/category_explorer/charts/account.html:100
#: templates/insights/fragments/category_explorer/charts/currency.html:92
#: templates/monthly_overview/fragments/monthly_account_summary.html:14
@@ -3617,6 +3688,7 @@ msgstr ""
#: templates/insights/fragments/year_by_year.html:140
#: templates/investment_classes/fragments/list.html:65
#: templates/monthly_overview/fragments/monthly_summary.html:168
+#: templates/transactions/widgets/sub_transactions.html:55
msgid "Total"
msgstr ""
@@ -4019,11 +4091,11 @@ msgstr ""
msgid "Loss, tax or fee"
msgstr ""
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
msgid "No movements yet"
msgstr ""
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
msgid "Use the + button to buy or contribute"
msgstr ""
@@ -4582,6 +4654,10 @@ msgstr ""
msgid "Deleted transactions"
msgstr ""
+#: templates/transactions/widgets/sub_transactions.html:53
+msgid "Add sub-transaction"
+msgstr ""
+
#: templates/transactions/widgets/unselectable_income_expense_toggle_buttons.html:11
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:7
msgid "Unchanged"
diff --git a/app/locale/uk/LC_MESSAGES/django.po b/app/locale/uk/LC_MESSAGES/django.po
index 19f22ed6..675ea992 100644
--- 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: 2026-11-12 03:24+0000\n"
+"POT-Creation-Date: 2026-11-14 14:06+0000\n"
"PO-Revision-Date: 2025-11-01 01:17+0000\n"
"Last-Translator: mlystopad \n"
"Language-Team: Ukrainian Public: Shown for all users. Only editable by the owner."
msgid ""
-"Private: Only shown for the owner and shared users. Only editable by the "
-"owner. Public: Shown for all users. Only editable by the owner."
+"Private: Only shown for the owner and shared users. Public: Shown for "
+"all users. Only the owner can edit, share or delete it."
msgstr ""
"Private: Відображається лише для власника та користувачів із загальним "
"доступом. Редагувати може лише власник. Public: Відображається для всіх "
"користувачів. Редагувати може лише власник."
-#: apps/common/forms.py:76 apps/users/forms.py:191
+#: apps/common/forms.py:78 apps/users/forms.py:191
#: templates/bank_sync/fragments/accounts.html:34
#: templates/transactions/fragments/filter_actions.html:5
msgid "Save"
msgstr "Зберегти"
-#: apps/common/forms.py:90
+#: apps/common/forms.py:92
msgid "You cannot share this item with its owner."
msgstr "Ви не можете поділитися цією річчю з її власником."
@@ -838,6 +855,7 @@ msgid "Now"
msgstr "Зараз"
#: apps/common/widgets/tom_select.py:14
+#: templates/transactions/widgets/sub_transaction_row.html:9
msgid "Remove"
msgstr "Видалити"
@@ -914,8 +932,8 @@ msgstr "Дата і час"
msgid "Auto"
msgstr "Авто"
-#: apps/currencies/models.py:91 apps/export_app/forms.py:67
-#: apps/export_app/forms.py:152 templates/exchange_rates/fragments/list.html:10
+#: apps/currencies/models.py:91 apps/export_app/forms.py:73
+#: apps/export_app/forms.py:161 templates/exchange_rates/fragments/list.html:10
#: templates/exchange_rates/pages/index.html:4
#: templates/includes/sidebar.html:204
msgid "Exchange Rates"
@@ -1076,25 +1094,25 @@ msgstr "Сервіси успішно поставлено в чергу"
msgid "Create transaction"
msgstr "Створити транзакцію"
-#: apps/dca/forms.py:69 apps/transactions/forms.py:582
+#: apps/dca/forms.py:69 apps/transactions/forms.py:668
msgid "From Account"
msgstr "З Рахунку"
-#: apps/dca/forms.py:75 apps/transactions/forms.py:587
+#: apps/dca/forms.py:75 apps/transactions/forms.py:673
msgid "To Account"
msgstr "На рахунок"
#: apps/dca/forms.py:117 apps/dca/forms.py:125 apps/export_app/forms.py:49
-#: apps/export_app/forms.py:143 apps/insights/views.py:57
-#: apps/rules/forms.py:185 apps/rules/forms.py:195 apps/rules/models.py:46
-#: apps/rules/models.py:307 apps/transactions/filters.py:84
-#: apps/transactions/forms.py:78 apps/transactions/forms.py:346
-#: apps/transactions/forms.py:526 apps/transactions/forms.py:640
-#: apps/transactions/forms.py:647 apps/transactions/forms.py:862
-#: apps/transactions/forms.py:1114 apps/transactions/models.py:313
-#: apps/transactions/models.py:369 apps/transactions/models.py:770
-#: apps/transactions/models.py:1028 apps/transactions/models.py:1353
-#: templates/entities/fragments/list.html:9
+#: apps/export_app/forms.py:150 apps/insights/views.py:57
+#: apps/rules/forms.py:185 apps/rules/forms.py:196 apps/rules/models.py:47
+#: apps/rules/models.py:308 apps/transactions/filters.py:100
+#: apps/transactions/filters.py:175 apps/transactions/forms.py:161
+#: apps/transactions/forms.py:431 apps/transactions/forms.py:612
+#: apps/transactions/forms.py:726 apps/transactions/forms.py:733
+#: apps/transactions/forms.py:950 apps/transactions/forms.py:1204
+#: apps/transactions/models.py:315 apps/transactions/models.py:371
+#: apps/transactions/models.py:866 apps/transactions/models.py:1127
+#: apps/transactions/models.py:1500 templates/entities/fragments/list.html:9
#: templates/entities/pages/index.html:4 templates/includes/sidebar.html:168
#: templates/insights/fragments/month_by_month.html:40
#: templates/insights/fragments/month_by_month.html:43
@@ -1129,8 +1147,8 @@ msgstr ""
msgid "You must provide an account."
msgstr "Необхідно вказати рахунок."
-#: apps/dca/forms.py:322 apps/transactions/forms.py:780
-#: apps/transactions/models.py:978
+#: apps/dca/forms.py:322 apps/transactions/forms.py:866
+#: apps/transactions/models.py:1077
msgid "From and To accounts must be different."
msgstr "Рахунки «З» та «На» повинні бути різними."
@@ -1148,10 +1166,10 @@ msgid "Payment Currency"
msgstr "Валюта платежу"
#: apps/dca/models.py:26 apps/dca/models.py:181 apps/rules/forms.py:180
-#: apps/rules/forms.py:196 apps/rules/models.py:43 apps/rules/models.py:295
-#: apps/transactions/forms.py:504 apps/transactions/forms.py:668
-#: apps/transactions/models.py:354 apps/transactions/models.py:774
-#: apps/transactions/models.py:1031 apps/transactions/models.py:1338
+#: apps/rules/forms.py:197 apps/rules/models.py:44 apps/rules/models.py:296
+#: apps/transactions/forms.py:590 apps/transactions/forms.py:754
+#: apps/transactions/models.py:356 apps/transactions/models.py:870
+#: apps/transactions/models.py:1130 apps/transactions/models.py:1485
msgid "Notes"
msgstr "Примітки"
@@ -1159,7 +1177,7 @@ msgstr "Примітки"
msgid "DCA Strategy"
msgstr ""
-#: apps/dca/models.py:35 apps/export_app/forms.py:166
+#: apps/dca/models.py:35 apps/export_app/forms.py:175
msgid "DCA Strategies"
msgstr ""
@@ -1179,7 +1197,7 @@ msgstr "Отримана Сума"
msgid "DCA Entry"
msgstr ""
-#: apps/dca/models.py:187 apps/export_app/forms.py:167
+#: apps/dca/models.py:187 apps/export_app/forms.py:176
msgid "DCA Entries"
msgstr ""
@@ -1207,14 +1225,14 @@ msgstr "Запис успішно оновлено"
msgid "Entry deleted successfully"
msgstr "Запис успішно видалено"
-#: apps/export_app/forms.py:13 apps/export_app/forms.py:137
+#: apps/export_app/forms.py:13 apps/export_app/forms.py:144
#: templates/includes/sidebar.html:247 templates/users/fragments/list.html:10
#: templates/users/pages/index.html:4
msgid "Users"
msgstr "Користувачі"
-#: apps/export_app/forms.py:31 apps/export_app/forms.py:144
-#: apps/transactions/models.py:423 templates/includes/sidebar.html:81
+#: apps/export_app/forms.py:31 apps/export_app/forms.py:151
+#: apps/transactions/models.py:425 templates/includes/sidebar.html:81
#: templates/includes/sidebar.html:154
#: templates/recurring_transactions/fragments/list_transactions.html:5
#: templates/recurring_transactions/fragments/table.html:37
@@ -1222,9 +1240,9 @@ msgstr "Користувачі"
msgid "Transactions"
msgstr "Транзакції"
-#: apps/export_app/forms.py:37 apps/export_app/forms.py:141
-#: apps/insights/views.py:43 apps/transactions/filters.py:74
-#: templates/categories/fragments/list.html:9
+#: apps/export_app/forms.py:37 apps/export_app/forms.py:148
+#: apps/insights/views.py:43 apps/transactions/filters.py:90
+#: apps/transactions/filters.py:165 templates/categories/fragments/list.html:9
#: templates/categories/pages/index.html:4 templates/includes/sidebar.html:156
#: templates/insights/fragments/month_by_month.html:18
#: templates/insights/fragments/month_by_month.html:21
@@ -1233,102 +1251,117 @@ msgstr "Транзакції"
msgid "Categories"
msgstr "Категорії"
-#: apps/export_app/forms.py:55 apps/export_app/forms.py:147
-#: apps/transactions/models.py:1068 templates/includes/sidebar.html:110
+#: apps/export_app/forms.py:55 apps/export_app/forms.py:155
+#: apps/transactions/models.py:1167 templates/includes/sidebar.html:110
#: templates/recurring_transactions/fragments/list.html:9
#: templates/recurring_transactions/pages/index.html:4
msgid "Recurring Transactions"
msgstr "Регулярні транзакції"
-#: apps/export_app/forms.py:61 apps/export_app/forms.py:145
-#: apps/transactions/models.py:788 templates/includes/sidebar.html:104
+#: apps/export_app/forms.py:61 apps/export_app/forms.py:153
+#: apps/transactions/models.py:884 templates/includes/sidebar.html:104
#: templates/installment_plans/fragments/list.html:9
#: templates/installment_plans/pages/index.html:4
msgid "Installment Plans"
msgstr "Плани Розстрочки"
-#: apps/export_app/forms.py:73 apps/export_app/forms.py:150
+#: apps/export_app/forms.py:67 apps/export_app/forms.py:157
+#: apps/transactions/models.py:1518 templates/includes/sidebar.html:98
+#: templates/quick_transactions/pages/index.html:5
+#: templates/quick_transactions/pages/index.html:15
+msgid "Quick Transactions"
+msgstr ""
+
+#: apps/export_app/forms.py:79 apps/export_app/forms.py:159
#: templates/exchange_rates_services/fragments/list.html:10
#: templates/exchange_rates_services/pages/index.html:4
#: templates/includes/sidebar.html:232
msgid "Automatic Exchange Rates"
msgstr "Автоматичні Курси Обміну"
-#: apps/export_app/forms.py:79 templates/bank_sync/fragments/list.html:8
+#: apps/export_app/forms.py:85 templates/bank_sync/fragments/list.html:8
#: templates/bank_sync/pages/index.html:4 templates/includes/sidebar.html:238
msgid "Bank Sync"
msgstr ""
-#: apps/export_app/forms.py:80
+#: apps/export_app/forms.py:86
msgid "Includes the providers' API keys"
msgstr ""
-#: apps/export_app/forms.py:86 templates/includes/sidebar.html:212
+#: apps/export_app/forms.py:92 templates/includes/sidebar.html:212
#: templates/rules/fragments/list.html:9 templates/rules/pages/index.html:4
msgid "Rules"
msgstr "Правила"
-#: apps/export_app/forms.py:92 templates/cotton/transaction/item.html:66
+#: apps/export_app/forms.py:98 templates/cotton/transaction/item.html:68
msgid "DCA"
msgstr ""
-#: apps/export_app/forms.py:98 apps/export_app/forms.py:168
+#: apps/export_app/forms.py:104 apps/export_app/forms.py:177
#: templates/import_app/fragments/profiles/list.html:21
#: templates/import_app/pages/profiles_index.html:4
msgid "Import Profiles"
msgstr "Імпортувати Профілі"
-#: apps/export_app/forms.py:126 templates/export_app/fragments/export.html:5
+#: apps/export_app/forms.py:133 templates/export_app/fragments/export.html:5
#: templates/export_app/pages/index.html:13
msgid "Export"
msgstr "Експортувати"
-#: apps/export_app/forms.py:134
+#: apps/export_app/forms.py:141
msgid "Import a ZIP file exported from WYGIWYH"
msgstr "Імпортувати ZIP-файл, експортований із WYGIWYH"
-#: apps/export_app/forms.py:135
+#: apps/export_app/forms.py:142
msgid "ZIP File"
msgstr "ZIP-Файл"
-#: apps/export_app/forms.py:157
+#: apps/export_app/forms.py:152 apps/rules/forms.py:193 apps/rules/models.py:42
+#: apps/rules/models.py:320 apps/transactions/models.py:736
+#: templates/transactions/widgets/sub_transactions.html:39
+#, fuzzy
+#| msgid "Transactions"
+msgid "Sub-transactions"
+msgstr "Транзакції"
+
+#: apps/export_app/forms.py:166
#, fuzzy
#| msgid "Accounts"
msgid "Bank Sync Accounts"
msgstr "Рахунки"
-#: apps/export_app/forms.py:159 apps/rules/models.py:27
+#: apps/export_app/forms.py:168 apps/rules/models.py:27
msgid "Transaction rules"
msgstr "Правила транзакцій"
-#: apps/export_app/forms.py:161 apps/rules/models.py:68
+#: apps/export_app/forms.py:170 apps/rules/models.py:69
msgid "Edit transaction action"
msgstr ""
-#: apps/export_app/forms.py:164 apps/rules/models.py:327
+#: apps/export_app/forms.py:173 apps/rules/models.py:332
msgid "Update or create transaction actions"
msgstr ""
-#: apps/export_app/forms.py:199 templates/cotton/transaction/item.html:310
+#: apps/export_app/forms.py:210 templates/cotton/transaction/item.html:327
#: templates/cotton/ui/deleted_transactions_action_bar.html:53
#: templates/export_app/fragments/restore.html:5
#: templates/export_app/pages/index.html:19
msgid "Restore"
msgstr "Відновити"
-#: apps/export_app/forms.py:209
+#: apps/export_app/forms.py:220
msgid "Please upload either a ZIP file or at least one CSV file"
msgstr "Будь ласка, завантажте або ZIP-файл, або принаймні один CSV-файл"
-#: apps/export_app/views.py:190
+#: apps/export_app/views.py:216
msgid "You have to select at least one export"
msgstr "Ви повинні обрати принаймні один експорт"
-#: apps/export_app/views.py:210
+#: apps/export_app/views.py:236
msgid "Data restored successfully"
msgstr "Дані успішно відновлено"
-#: apps/export_app/views.py:222
+#: apps/export_app/views.py:248
msgid ""
"There was an error restoring your data. Check the logs for more details."
msgstr ""
@@ -1417,7 +1450,7 @@ msgstr ""
#: apps/insights/forms.py:118 apps/insights/utils/sankey.py:36
#: apps/insights/utils/sankey.py:167 apps/insights/views.py:45
-#: apps/transactions/filters.py:209
+#: apps/transactions/filters.py:294
#: templates/insights/fragments/month_by_month.html:119
#: templates/insights/fragments/year_by_year.html:73
msgid "Uncategorized"
@@ -1476,24 +1509,24 @@ msgstr ""
msgid "Tag"
msgstr "Мітки"
-#: apps/insights/views.py:52 apps/transactions/filters.py:215
+#: apps/insights/views.py:52 apps/transactions/filters.py:303
#: templates/insights/fragments/month_by_month.html:121
#: templates/insights/fragments/year_by_year.html:75
msgid "Untagged"
msgstr ""
-#: apps/insights/views.py:53 apps/transactions/models.py:611
+#: apps/insights/views.py:53 apps/transactions/models.py:632
#: templates/tags/fragments/table.html:69
msgid "No tags"
msgstr ""
-#: apps/insights/views.py:58 apps/transactions/models.py:312
+#: apps/insights/views.py:58 apps/transactions/models.py:314
#: templates/insights/fragments/month_by_month.html:88
#: templates/insights/fragments/year_by_year.html:56
msgid "Entity"
msgstr ""
-#: apps/insights/views.py:59 apps/transactions/filters.py:222
+#: apps/insights/views.py:59 apps/transactions/filters.py:311
#: templates/insights/fragments/month_by_month.html:123
#: templates/insights/fragments/year_by_year.html:77
msgid "No entity"
@@ -1511,19 +1544,19 @@ msgstr ""
msgid "Unclassified"
msgstr ""
-#: apps/investments/views.py:289
+#: apps/investments/views.py:290
#, fuzzy
#| msgid "Account added successfully"
msgid "Asset class added successfully"
msgstr "Рахунок додано успішно"
-#: apps/investments/views.py:297
+#: apps/investments/views.py:298
#, fuzzy
#| msgid "Account updated successfully"
msgid "Asset class updated successfully"
msgstr "Рахунок успішно оновлено"
-#: apps/investments/views.py:318
+#: apps/investments/views.py:319
#, fuzzy
#| msgid "Account deleted successfully"
msgid "Asset class deleted successfully"
@@ -1558,13 +1591,13 @@ msgstr ""
msgid "Set field"
msgstr ""
-#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:123
+#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:101
msgid "To"
msgstr ""
#: apps/rules/forms.py:78 apps/rules/forms.py:158 apps/rules/models.py:20
-#: apps/rules/models.py:62 apps/rules/models.py:323
+#: apps/rules/models.py:63 apps/rules/models.py:328
#: templates/rules/fragments/list.html:23
msgid "Order"
msgstr ""
@@ -1582,36 +1615,37 @@ msgid "Operator"
msgstr ""
#: apps/rules/forms.py:174 apps/rules/forms.py:188 apps/rules/models.py:36
-#: apps/rules/models.py:271 apps/transactions/forms.py:468
-#: apps/transactions/models.py:337 apps/transactions/models.py:730
-#: apps/transactions/models.py:1009 apps/transactions/models.py:1323
+#: apps/rules/models.py:272 apps/transactions/forms.py:554
+#: apps/transactions/models.py:339 apps/transactions/models.py:826
+#: apps/transactions/models.py:1108 apps/transactions/models.py:1470
#: templates/mini_tools/simulator.html:63
msgid "Type"
msgstr ""
#: apps/rules/forms.py:175 apps/rules/forms.py:189 apps/rules/models.py:37
-#: apps/rules/models.py:275 apps/transactions/filters.py:22
-#: apps/transactions/forms.py:472 apps/transactions/forms.py:650
-#: apps/transactions/models.py:339 apps/transactions/models.py:1325
-#: templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/rules/models.py:276 apps/transactions/filters.py:23
+#: apps/transactions/forms.py:558 apps/transactions/forms.py:736
+#: apps/transactions/models.py:341 apps/transactions/models.py:1472
+#: templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/transactions/widgets/paid_toggle_button.html:10
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:13
msgid "Paid"
msgstr ""
#: apps/rules/forms.py:177 apps/rules/forms.py:191 apps/rules/models.py:39
-#: apps/rules/models.py:283 apps/transactions/forms.py:90
-#: apps/transactions/forms.py:488 apps/transactions/forms.py:655
-#: apps/transactions/forms.py:868 apps/transactions/models.py:341
-#: apps/transactions/models.py:748 apps/transactions/models.py:1033
+#: apps/rules/models.py:284 apps/transactions/forms.py:173
+#: apps/transactions/forms.py:574 apps/transactions/forms.py:741
+#: apps/transactions/forms.py:956 apps/transactions/models.py:343
+#: apps/transactions/models.py:844 apps/transactions/models.py:1132
msgid "Reference Date"
msgstr ""
#: apps/rules/forms.py:178 apps/rules/forms.py:192 apps/rules/models.py:41
-#: apps/rules/models.py:287 apps/transactions/forms.py:495
-#: apps/transactions/models.py:347 apps/transactions/models.py:1014
-#: apps/transactions/models.py:1331
+#: apps/rules/models.py:288 apps/transactions/forms.py:75
+#: apps/transactions/forms.py:581 apps/transactions/models.py:349
+#: apps/transactions/models.py:730 apps/transactions/models.py:1113
+#: apps/transactions/models.py:1478
#: templates/insights/fragments/sankey.html:102
#: templates/installment_plans/fragments/table.html:18
#: templates/mini_tools/simulator.html:70
@@ -1620,51 +1654,52 @@ msgstr ""
msgid "Amount"
msgstr ""
-#: apps/rules/forms.py:179 apps/rules/forms.py:193 apps/rules/models.py:14
-#: apps/rules/models.py:42 apps/rules/models.py:291
-#: apps/transactions/forms.py:499 apps/transactions/forms.py:659
-#: apps/transactions/models.py:352 apps/transactions/models.py:732
-#: apps/transactions/models.py:1017 apps/transactions/models.py:1336
+#: apps/rules/forms.py:179 apps/rules/forms.py:194 apps/rules/models.py:14
+#: apps/rules/models.py:43 apps/rules/models.py:292
+#: apps/transactions/forms.py:585 apps/transactions/forms.py:745
+#: apps/transactions/models.py:354 apps/transactions/models.py:828
+#: apps/transactions/models.py:1116 apps/transactions/models.py:1483
msgid "Description"
msgstr ""
-#: apps/rules/forms.py:182 apps/rules/forms.py:198 apps/rules/models.py:47
-#: apps/rules/models.py:299 apps/transactions/models.py:399
-#: apps/transactions/models.py:1358
+#: apps/rules/forms.py:182 apps/rules/forms.py:199 apps/rules/models.py:48
+#: apps/rules/models.py:300 apps/transactions/models.py:401
+#: apps/transactions/models.py:1505
msgid "Internal Note"
msgstr ""
-#: apps/rules/forms.py:183 apps/rules/forms.py:199 apps/rules/models.py:48
-#: apps/rules/models.py:303 apps/transactions/models.py:401
-#: apps/transactions/models.py:1360
+#: apps/rules/forms.py:183 apps/rules/forms.py:200 apps/rules/models.py:49
+#: apps/rules/models.py:304 apps/transactions/models.py:403
+#: apps/transactions/models.py:1507
msgid "Internal ID"
msgstr ""
-#: apps/rules/forms.py:186 apps/rules/forms.py:200 apps/rules/models.py:40
-#: apps/rules/models.py:319 apps/transactions/forms.py:672
-#: apps/transactions/models.py:251 apps/transactions/models.py:342
-#: apps/transactions/models.py:1326
+#: apps/rules/forms.py:186 apps/rules/forms.py:201 apps/rules/models.py:40
+#: apps/rules/models.py:324 apps/transactions/forms.py:758
+#: apps/transactions/models.py:253 apps/transactions/models.py:344
+#: apps/transactions/models.py:1473
msgid "Mute"
msgstr ""
-#: apps/rules/forms.py:215
+#: apps/rules/forms.py:216
msgid "Search Criteria"
msgstr ""
-#: apps/rules/forms.py:360
+#: apps/rules/forms.py:361
msgid "Set Values"
msgstr ""
-#: apps/rules/forms.py:407 apps/rules/forms.py:442 apps/rules/forms.py:477
-#: apps/transactions/models.py:422 apps/transactions/models.py:667
+#: apps/rules/forms.py:409 apps/rules/forms.py:444 apps/rules/forms.py:479
+#: apps/transactions/models.py:424 apps/transactions/models.py:703
+#: apps/transactions/models.py:763
msgid "Transaction"
msgstr ""
-#: apps/rules/forms.py:411 apps/rules/forms.py:446 apps/rules/forms.py:481
+#: apps/rules/forms.py:413 apps/rules/forms.py:448 apps/rules/forms.py:483
msgid "Type to search for a transaction"
msgstr ""
-#: apps/rules/forms.py:422 apps/rules/forms.py:457 apps/rules/forms.py:491
+#: apps/rules/forms.py:424 apps/rules/forms.py:459 apps/rules/forms.py:493
#: templates/rules/fragments/transaction_rule/dry_run/created.html:5
#: templates/rules/fragments/transaction_rule/dry_run/deleted.html:5
#: templates/rules/fragments/transaction_rule/dry_run/updated.html:5
@@ -1684,15 +1719,15 @@ msgstr ""
msgid "Transaction rule"
msgstr ""
-#: apps/rules/models.py:54 apps/rules/models.py:98
+#: apps/rules/models.py:55 apps/rules/models.py:99
msgid "Rule"
msgstr ""
-#: apps/rules/models.py:59
+#: apps/rules/models.py:60
msgid "Field"
msgstr ""
-#: apps/rules/models.py:61 templates/investments/fragments/charts.html:86
+#: apps/rules/models.py:62 templates/investments/fragments/charts.html:86
#: templates/investments/fragments/detail.html:68
#: templates/investments/fragments/detail.html:127
#: templates/investments/fragments/detail.html:245
@@ -1700,57 +1735,57 @@ msgstr ""
msgid "Value"
msgstr ""
-#: apps/rules/models.py:69
+#: apps/rules/models.py:70
msgid "Edit transaction actions"
msgstr ""
-#: apps/rules/models.py:84
+#: apps/rules/models.py:85
msgid "is exactly"
msgstr ""
-#: apps/rules/models.py:85
+#: apps/rules/models.py:86
msgid "contains"
msgstr ""
-#: apps/rules/models.py:86
+#: apps/rules/models.py:87
msgid "starts with"
msgstr ""
-#: apps/rules/models.py:87
+#: apps/rules/models.py:88
msgid "ends with"
msgstr ""
-#: apps/rules/models.py:88
+#: apps/rules/models.py:89
msgid "equals"
msgstr ""
-#: apps/rules/models.py:89
+#: apps/rules/models.py:90
msgid "greater than"
msgstr ""
-#: apps/rules/models.py:90
+#: apps/rules/models.py:91
msgid "less than"
msgstr ""
-#: apps/rules/models.py:91
+#: apps/rules/models.py:92
msgid "greater than or equal"
msgstr ""
-#: apps/rules/models.py:92
+#: apps/rules/models.py:93
msgid "less than or equal"
msgstr ""
-#: apps/rules/models.py:102
+#: apps/rules/models.py:103
msgid "Filter"
msgstr ""
-#: apps/rules/models.py:105
+#: apps/rules/models.py:106
msgid ""
"Generic expression to enable or disable execution. Should evaluate to True "
"or False"
msgstr ""
-#: apps/rules/models.py:326
+#: apps/rules/models.py:331
msgid "Update or create transaction action"
msgstr ""
@@ -1794,8 +1829,8 @@ msgstr ""
msgid "Update or Create Transaction action deleted successfully"
msgstr ""
-#: apps/transactions/filters.py:23 templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/transactions/filters.py:24 templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/insights/fragments/overview/index.html:68
#: templates/net_worth/net_worth.html:39 templates/net_worth/net_worth.html:43
#: templates/transactions/widgets/paid_toggle_button.html:7
@@ -1803,164 +1838,174 @@ msgstr ""
msgid "Projected"
msgstr ""
-#: apps/transactions/filters.py:28 templates/categories/fragments/table.html:18
+#: apps/transactions/filters.py:29 templates/categories/fragments/table.html:18
msgid "Muted"
msgstr ""
-#: apps/transactions/filters.py:51
+#: apps/transactions/filters.py:67 apps/transactions/filters.py:144
msgid "Content"
msgstr ""
-#: apps/transactions/filters.py:57
+#: apps/transactions/filters.py:73
msgid "Transaction Type"
msgstr ""
-#: apps/transactions/filters.py:95
+#: apps/transactions/filters.py:111
msgid "Mute Status"
msgstr ""
-#: apps/transactions/filters.py:100
+#: apps/transactions/filters.py:116
msgid "Date from"
msgstr ""
-#: apps/transactions/filters.py:105 apps/transactions/filters.py:115
+#: apps/transactions/filters.py:121 apps/transactions/filters.py:131
msgid "Until"
msgstr ""
-#: apps/transactions/filters.py:110
+#: apps/transactions/filters.py:126
msgid "Reference date from"
msgstr ""
-#: apps/transactions/filters.py:120
+#: apps/transactions/filters.py:136
msgid "Amount min"
msgstr ""
-#: apps/transactions/filters.py:125
+#: apps/transactions/filters.py:141
msgid "Amount max"
msgstr ""
-#: apps/transactions/filters.py:208
+#: apps/transactions/filters.py:240
+msgid "Include"
+msgstr ""
+
+#: apps/transactions/filters.py:245
+msgid "Exclude"
+msgstr ""
+
+#: apps/transactions/filters.py:293
#, fuzzy
#| msgid "Category"
msgid "Categorized"
msgstr "Категорія"
-#: apps/transactions/filters.py:215
+#: apps/transactions/filters.py:303
msgid "Tagged"
msgstr ""
-#: apps/transactions/filters.py:221
+#: apps/transactions/filters.py:310
msgid "Any entity"
msgstr ""
-#: apps/transactions/forms.py:192
+#: apps/transactions/forms.py:277
msgid "More"
msgstr ""
-#: apps/transactions/forms.py:229
+#: apps/transactions/forms.py:314
msgid "Save and add similar"
msgstr ""
-#: apps/transactions/forms.py:234
+#: apps/transactions/forms.py:319
msgid "Save and add another"
msgstr ""
-#: apps/transactions/forms.py:271 templates/cotton/transaction/item.html:184
+#: apps/transactions/forms.py:356 templates/cotton/transaction/item.html:186
#: templates/transactions/fragments/attachments.html:4
msgid "Attachments"
msgstr ""
-#: apps/transactions/forms.py:272
+#: apps/transactions/forms.py:357
msgid ""
"Files are private and only visible to users with access to this transaction."
msgstr ""
-#: apps/transactions/forms.py:283
+#: apps/transactions/forms.py:368
msgid "Upload"
msgstr ""
-#: apps/transactions/forms.py:355 apps/transactions/forms.py:1120
-#: apps/transactions/models.py:947
+#: apps/transactions/forms.py:440 apps/transactions/forms.py:1210
+#: apps/transactions/models.py:1046
#, fuzzy
#| msgid "To Account"
msgid "To account"
msgstr "На рахунок"
-#: apps/transactions/forms.py:382 apps/transactions/forms.py:675
+#: apps/transactions/forms.py:467 apps/transactions/forms.py:761
msgid "Muted transactions won't be displayed on monthly summaries"
msgstr ""
-#: apps/transactions/forms.py:594
+#: apps/transactions/forms.py:680
msgid "From Amount"
msgstr ""
-#: apps/transactions/forms.py:599
+#: apps/transactions/forms.py:685
msgid "To Amount"
msgstr ""
-#: apps/transactions/forms.py:741 apps/transactions/models.py:992
-#: apps/transactions/models.py:1303 templates/cotton/transaction/item.html:52
-#: templates/cotton/transaction/item.html:60
+#: apps/transactions/forms.py:827 apps/transactions/models.py:1091
+#: apps/transactions/models.py:1450 templates/cotton/transaction/item.html:54
+#: templates/cotton/transaction/item.html:62
+#: templates/cotton/transaction/item.html:272
+#: templates/cotton/transaction/item.html:304
#: templates/cotton/ui/quick_transactions_buttons.html:40
#: templates/cotton/ui/transactions_fab.html:44
msgid "Transfer"
msgstr ""
-#: apps/transactions/forms.py:1005
+#: apps/transactions/forms.py:1095
msgid "Tag name"
msgstr ""
-#: apps/transactions/forms.py:1033
+#: apps/transactions/forms.py:1123
msgid "Entity name"
msgstr ""
-#: apps/transactions/forms.py:1061
+#: apps/transactions/forms.py:1151
msgid "Category name"
msgstr ""
-#: apps/transactions/forms.py:1063
+#: apps/transactions/forms.py:1153
msgid "Muted categories won't be displayed on monthly summaries"
msgstr ""
-#: apps/transactions/forms.py:1228
+#: apps/transactions/forms.py:1319
msgid "future transactions"
msgstr ""
-#: apps/transactions/forms.py:1255
+#: apps/transactions/forms.py:1346
msgid "End date should be after the start date"
msgstr ""
-#: apps/transactions/models.py:256
+#: apps/transactions/models.py:258
msgid ""
"Deactivated categories won't be able to be selected when creating new "
"transactions"
msgstr ""
-#: apps/transactions/models.py:264
+#: apps/transactions/models.py:266
msgid "Transaction Category"
msgstr ""
-#: apps/transactions/models.py:265
+#: apps/transactions/models.py:267
msgid "Transaction Categories"
msgstr ""
-#: apps/transactions/models.py:280
+#: apps/transactions/models.py:282
msgid ""
"Deactivated tags won't be able to be selected when creating new transactions"
msgstr ""
-#: apps/transactions/models.py:288 apps/transactions/models.py:289
+#: apps/transactions/models.py:290 apps/transactions/models.py:291
msgid "Transaction Tags"
msgstr ""
-#: apps/transactions/models.py:304
+#: apps/transactions/models.py:306
msgid ""
"Deactivated entities won't be able to be selected when creating new "
"transactions"
msgstr ""
-#: apps/transactions/models.py:324 apps/transactions/models.py:991
-#: apps/transactions/models.py:1302
+#: apps/transactions/models.py:326 apps/transactions/models.py:1090
+#: apps/transactions/models.py:1449
#: templates/calendar_view/fragments/list.html:42
#: templates/calendar_view/fragments/list.html:44
#: templates/calendar_view/fragments/list.html:52
@@ -1972,14 +2017,14 @@ msgstr ""
#: templates/investments/fragments/detail.html:71
#: templates/investments/fragments/detail.html:175
#: templates/investments/fragments/detail.html:227
-#: templates/investments/fragments/detail.html:318
+#: templates/investments/fragments/detail.html:326
#: templates/mini_tools/simulator.html:66
#: templates/monthly_overview/fragments/monthly_summary.html:42
msgid "Income"
msgstr ""
-#: apps/transactions/models.py:325 apps/transactions/models.py:993
-#: apps/transactions/models.py:1304
+#: apps/transactions/models.py:327 apps/transactions/models.py:1092
+#: apps/transactions/models.py:1451
#: templates/calendar_view/fragments/list.html:46
#: templates/calendar_view/fragments/list.html:48
#: templates/calendar_view/fragments/list.html:56
@@ -1991,204 +2036,204 @@ msgstr ""
msgid "Expense"
msgstr ""
-#: apps/transactions/models.py:380 apps/transactions/models.py:787
-#: templates/cotton/transaction/item.html:260
-#: templates/cotton/transaction/item.html:277
-#: templates/cotton/transaction/item.html:287
+#: apps/transactions/models.py:382 apps/transactions/models.py:883
+#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:289
+#: templates/cotton/transaction/item.html:299
msgid "Installment Plan"
msgstr ""
-#: apps/transactions/models.py:389 apps/transactions/models.py:1067
-#: templates/cotton/transaction/item.html:250
-#: templates/cotton/transaction/item.html:270
+#: apps/transactions/models.py:391 apps/transactions/models.py:1166
+#: templates/cotton/transaction/item.html:252
+#: templates/cotton/transaction/item.html:282
msgid "Recurring Transaction"
msgstr ""
-#: apps/transactions/models.py:397
+#: apps/transactions/models.py:399
#, fuzzy
#| msgid "Link transaction"
msgid "Linked Transaction"
msgstr "Пов’язати транзакцію"
-#: apps/transactions/models.py:405
+#: apps/transactions/models.py:407
msgid "Deleted"
msgstr ""
-#: apps/transactions/models.py:410
+#: apps/transactions/models.py:412
msgid "Deleted At"
msgstr ""
-#: apps/transactions/models.py:518
+#: apps/transactions/models.py:521
msgid "A transfer needs one expense and one income."
msgstr ""
-#: apps/transactions/models.py:520
+#: apps/transactions/models.py:523
msgid "A transfer needs two different accounts."
msgstr ""
-#: apps/transactions/models.py:524
+#: apps/transactions/models.py:527
msgid "This transaction is already part of another transfer."
msgstr ""
-#: apps/transactions/models.py:613
+#: apps/transactions/models.py:634
msgid "No category"
msgstr ""
-#: apps/transactions/models.py:615
+#: apps/transactions/models.py:636
msgid "No description"
msgstr ""
-#: apps/transactions/models.py:672
+#: apps/transactions/models.py:735
+#, fuzzy
+#| msgid "Transactions"
+msgid "Sub-transaction"
+msgstr "Транзакції"
+
+#: apps/transactions/models.py:768
#, fuzzy
#| msgid "ZIP File"
msgid "File"
msgstr "ZIP-Файл"
-#: apps/transactions/models.py:674
+#: apps/transactions/models.py:770
msgid "Original Name"
msgstr ""
-#: apps/transactions/models.py:676
+#: apps/transactions/models.py:772
#, fuzzy
#| msgid "Interval Type"
msgid "Content Type"
msgstr "Тип інтервалу"
-#: apps/transactions/models.py:678
+#: apps/transactions/models.py:774
msgid "Size"
msgstr ""
-#: apps/transactions/models.py:683
+#: apps/transactions/models.py:779
msgid "Uploaded By"
msgstr ""
-#: apps/transactions/models.py:688
+#: apps/transactions/models.py:784
#, fuzzy
#| msgid "Transaction rules"
msgid "Transaction Attachment"
msgstr "Правила транзакцій"
-#: apps/transactions/models.py:689
+#: apps/transactions/models.py:785
#, fuzzy
#| msgid "Transaction rules"
msgid "Transaction Attachments"
msgstr "Правила транзакцій"
-#: apps/transactions/models.py:719 templates/includes/sidebar.html:57
+#: apps/transactions/models.py:815 templates/includes/sidebar.html:57
msgid "Yearly"
msgstr ""
-#: apps/transactions/models.py:720 apps/users/models.py:469
+#: apps/transactions/models.py:816 apps/users/models.py:469
#: templates/includes/sidebar.html:51
msgid "Monthly"
msgstr ""
-#: apps/transactions/models.py:721
+#: apps/transactions/models.py:817
msgid "Weekly"
msgstr ""
-#: apps/transactions/models.py:722
+#: apps/transactions/models.py:818
msgid "Daily"
msgstr ""
-#: apps/transactions/models.py:735
+#: apps/transactions/models.py:831
msgid "Number of Installments"
msgstr ""
-#: apps/transactions/models.py:740
+#: apps/transactions/models.py:836
msgid "Installment Start"
msgstr ""
-#: apps/transactions/models.py:741
+#: apps/transactions/models.py:837
msgid "The installment number to start counting from"
msgstr ""
-#: apps/transactions/models.py:746 apps/transactions/models.py:1037
+#: apps/transactions/models.py:842 apps/transactions/models.py:1136
msgid "Start Date"
msgstr ""
-#: apps/transactions/models.py:750 apps/transactions/models.py:1038
+#: apps/transactions/models.py:846 apps/transactions/models.py:1137
msgid "End Date"
msgstr ""
-#: apps/transactions/models.py:755
+#: apps/transactions/models.py:851
msgid "Recurrence"
msgstr ""
-#: apps/transactions/models.py:758
+#: apps/transactions/models.py:854
msgid "Installment Amount"
msgstr ""
-#: apps/transactions/models.py:777 apps/transactions/models.py:1057
+#: apps/transactions/models.py:873 apps/transactions/models.py:1156
msgid "Add description to transactions"
msgstr ""
-#: apps/transactions/models.py:780 apps/transactions/models.py:1060
+#: apps/transactions/models.py:876 apps/transactions/models.py:1159
msgid "Add notes to transactions"
msgstr ""
-#: apps/transactions/models.py:954
+#: apps/transactions/models.py:1053
#, fuzzy
#| msgid "To Account"
msgid "To amount"
msgstr "На рахунок"
-#: apps/transactions/models.py:955
+#: apps/transactions/models.py:1054
msgid "Leave empty to use the same amount"
msgstr ""
-#: apps/transactions/models.py:996 templates/mini_tools/simulator.html:129
+#: apps/transactions/models.py:1095 templates/mini_tools/simulator.html:129
msgid "day(s)"
msgstr ""
-#: apps/transactions/models.py:997 templates/mini_tools/simulator.html:130
+#: apps/transactions/models.py:1096 templates/mini_tools/simulator.html:130
msgid "week(s)"
msgstr ""
-#: apps/transactions/models.py:998 templates/mini_tools/simulator.html:131
+#: apps/transactions/models.py:1097 templates/mini_tools/simulator.html:131
msgid "month(s)"
msgstr ""
-#: apps/transactions/models.py:999 templates/mini_tools/simulator.html:132
+#: apps/transactions/models.py:1098 templates/mini_tools/simulator.html:132
msgid "year(s)"
msgstr ""
-#: apps/transactions/models.py:1001
+#: apps/transactions/models.py:1100
#: templates/recurring_transactions/fragments/list.html:18
msgid "Paused"
msgstr ""
-#: apps/transactions/models.py:1040
+#: apps/transactions/models.py:1139
msgid "Recurrence Type"
msgstr ""
-#: apps/transactions/models.py:1043
+#: apps/transactions/models.py:1142
msgid "Recurrence Interval"
msgstr ""
-#: apps/transactions/models.py:1046
+#: apps/transactions/models.py:1145
msgid "Keep at most"
msgstr ""
-#: apps/transactions/models.py:1050
+#: apps/transactions/models.py:1149
msgid "Last Generated Date"
msgstr ""
-#: apps/transactions/models.py:1053
+#: apps/transactions/models.py:1152
msgid "Last Generated Reference Date"
msgstr ""
-#: apps/transactions/models.py:1370 templates/cotton/transaction/item.html:243
+#: apps/transactions/models.py:1517 templates/cotton/transaction/item.html:245
#: templates/cotton/ui/transactions_fab.html:59
msgid "Quick Transaction"
msgstr ""
-#: apps/transactions/models.py:1371 templates/includes/sidebar.html:98
-#: templates/quick_transactions/pages/index.html:5
-#: templates/quick_transactions/pages/index.html:15
-msgid "Quick Transactions"
-msgstr ""
-
#: apps/transactions/validators.py:8
#, python-format
msgid "%(value)s has too many decimal places. Maximum is 30."
@@ -2199,35 +2244,43 @@ msgstr ""
msgid "%(value)s is not a non-negative number"
msgstr ""
-#: apps/transactions/views/actions.py:58
+#: apps/transactions/views/actions.py:61
#, python-format
msgid "%(count)s transaction marked as paid"
msgid_plural "%(count)s transactions marked as paid"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:81
+#: apps/transactions/views/actions.py:84
#, python-format
msgid "%(count)s transaction marked as not paid"
msgid_plural "%(count)s transactions marked as not paid"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:105
+#: apps/transactions/views/actions.py:108
#, python-format
msgid "%(count)s transaction deleted successfully"
msgid_plural "%(count)s transactions deleted successfully"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:139
+#: apps/transactions/views/actions.py:142
#, python-format
msgid "%(count)s transaction restored successfully"
msgid_plural "%(count)s transactions restored successfully"
msgstr[0] ""
msgstr[1] ""
-#: apps/transactions/views/actions.py:170
+#: apps/transactions/views/actions.py:174
+#: apps/transactions/views/transactions.py:423
+#, python-format
+msgid "%(count)s transaction updated successfully"
+msgid_plural "%(count)s transactions updated successfully"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apps/transactions/views/actions.py:247
#, python-format
msgid "%(count)s transaction duplicated successfully"
msgid_plural "%(count)s transactions duplicated successfully"
@@ -2246,39 +2299,49 @@ msgstr ""
msgid "Category deleted successfully"
msgstr ""
-#: apps/transactions/views/conversions.py:72
+#: apps/transactions/views/conversions.py:77
#: apps/transactions/views/quick_transactions.py:46 apps/users/views.py:252
msgid "Item added successfully"
msgstr ""
-#: apps/transactions/views/conversions.py:91
+#: apps/transactions/views/conversions.py:97
#, fuzzy
#| msgid "Link transaction"
msgid "Convert into quick transaction"
msgstr "Пов’язати транзакцію"
-#: apps/transactions/views/conversions.py:108
+#: apps/transactions/views/conversions.py:114
#: apps/transactions/views/recurring_transactions.py:112
msgid "Recurring Transaction added successfully"
msgstr ""
-#: apps/transactions/views/conversions.py:129
+#: apps/transactions/views/conversions.py:136
#, fuzzy
#| msgid "Recurring Transactions"
msgid "Convert into recurring transaction"
msgstr "Регулярні транзакції"
-#: apps/transactions/views/conversions.py:148
+#: apps/transactions/views/conversions.py:155
#: apps/transactions/views/installment_plans.py:87
msgid "Installment Plan added successfully"
msgstr ""
-#: apps/transactions/views/conversions.py:167
+#: apps/transactions/views/conversions.py:175
#, fuzzy
#| msgid "Installment Plans"
msgid "Convert into installment plan"
msgstr "Плани Розстрочки"
+#: apps/transactions/views/conversions.py:195
+msgid "Transaction converted into a transfer"
+msgstr ""
+
+#: apps/transactions/views/conversions.py:226
+#, fuzzy
+#| msgid "Link transaction"
+msgid "Convert into transfer"
+msgstr "Пов’язати транзакцію"
+
#: apps/transactions/views/entities.py:72
msgid "Entity added successfully"
msgstr ""
@@ -2313,7 +2376,7 @@ msgstr ""
msgid "Item deleted successfully"
msgstr "Рахунок успішно видалено"
-#: apps/transactions/views/quick_transactions.py:164
+#: apps/transactions/views/quick_transactions.py:165
#: apps/transactions/views/transactions.py:156
#: apps/transactions/views/transactions.py:343
msgid "Transaction added successfully"
@@ -2367,30 +2430,23 @@ msgstr "Рахунок успішно видалено"
msgid "Transaction updated successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:421
-#, python-format
-msgid "%(count)s transaction updated successfully"
-msgid_plural "%(count)s transactions updated successfully"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apps/transactions/views/transactions.py:448
+#: apps/transactions/views/transactions.py:450
msgid "Transaction duplicated successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:493
+#: apps/transactions/views/transactions.py:495
msgid "Transaction deleted successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:523
+#: apps/transactions/views/transactions.py:525
msgid "Transaction restored successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:549
+#: apps/transactions/views/transactions.py:551
msgid "Transfer added successfully"
msgstr ""
-#: apps/transactions/views/transactions.py:579
+#: apps/transactions/views/transactions.py:581
#, fuzzy
#| msgid "Entry updated successfully"
msgid "Transfer updated successfully"
@@ -2731,8 +2787,9 @@ msgstr ""
#: templates/accounts/fragments/list.html:37
#: templates/bank_sync/fragments/list.html:33
#: templates/categories/fragments/table.html:29
-#: templates/cotton/transaction/item.html:178
-#: templates/cotton/ui/transactions_action_bar.html:54
+#: templates/cotton/transaction/item.html:180
+#: templates/cotton/ui/transactions_action_bar.html:56
+#: templates/cotton/ui/transactions_action_bar.html:90
#: templates/currencies/fragments/list.html:34
#: templates/dca/fragments/strategy/details.html:63
#: templates/dca/fragments/strategy/list.html:31
@@ -2743,8 +2800,8 @@ msgstr ""
#: templates/import_app/fragments/profiles/list.html:46
#: templates/installment_plans/fragments/table.html:28
#: templates/investment_classes/fragments/list.html:39
-#: templates/investments/fragments/detail.html:302
-#: templates/investments/fragments/detail.html:330
+#: templates/investments/fragments/detail.html:310
+#: templates/investments/fragments/detail.html:338
#: templates/quick_transactions/fragments/list.html:25
#: templates/recurring_transactions/fragments/table.html:30
#: templates/rules/fragments/transaction_rule/view.html:22
@@ -2781,10 +2838,11 @@ msgstr ""
#: templates/accounts/fragments/list.html:71
#: templates/bank_sync/fragments/list.html:50
#: templates/categories/fragments/table.html:51
-#: templates/cotton/transaction/item.html:190
-#: templates/cotton/transaction/item.html:316
+#: templates/cotton/transaction/item.html:192
+#: templates/cotton/transaction/item.html:333
#: templates/cotton/ui/deleted_transactions_action_bar.html:57
-#: templates/cotton/ui/transactions_action_bar.html:82
+#: templates/cotton/ui/transactions_action_bar.html:75
+#: templates/cotton/ui/transactions_action_bar.html:107
#: templates/currencies/fragments/list.html:40
#: templates/dca/fragments/strategy/details.html:70
#: templates/dca/fragments/strategy/list.html:38
@@ -2815,10 +2873,11 @@ msgstr ""
#: templates/accounts/fragments/list.html:75
#: templates/bank_sync/fragments/list.html:54
#: templates/categories/fragments/table.html:56
-#: templates/cotton/transaction/item.html:192
-#: templates/cotton/transaction/item.html:322
+#: templates/cotton/transaction/item.html:194
+#: templates/cotton/transaction/item.html:339
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:44
#: templates/dca/fragments/strategy/details.html:75
#: templates/dca/fragments/strategy/list.html:42
@@ -2846,10 +2905,11 @@ msgstr ""
#: templates/account_groups/fragments/list.html:59
#: templates/accounts/fragments/list.html:76
#: templates/categories/fragments/table.html:57
-#: templates/cotton/transaction/item.html:193
-#: templates/cotton/transaction/item.html:323
+#: templates/cotton/transaction/item.html:195
+#: templates/cotton/transaction/item.html:340
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:45
#: templates/dca/fragments/strategy/details.html:76
#: templates/dca/fragments/strategy/list.html:43
@@ -2869,8 +2929,8 @@ msgstr ""
#: templates/accounts/fragments/list.html:77
#: templates/bank_sync/fragments/list.html:56
#: templates/categories/fragments/table.html:58
-#: templates/cotton/transaction/item.html:194
-#: templates/cotton/transaction/item.html:324
+#: templates/cotton/transaction/item.html:196
+#: templates/cotton/transaction/item.html:341
#: templates/currencies/fragments/list.html:46
#: templates/dca/fragments/strategy/details.html:77
#: templates/dca/fragments/strategy/list.html:44
@@ -2950,6 +3010,12 @@ msgstr ""
msgid "No accounts"
msgstr ""
+#: templates/accounts/fragments/share.html:8
+msgid ""
+"Everyone who can see this account can add, edit and delete its transactions, "
+"installment plans and recurring transactions."
+msgstr ""
+
#: templates/bank_sync/fragments/accounts.html:31
#, fuzzy
#| msgid "Transactions"
@@ -3046,63 +3112,77 @@ msgstr ""
msgid "Search"
msgstr ""
-#: templates/cotton/transaction/item.html:12
+#: templates/cotton/transaction/item.html:14
msgid "Select"
msgstr ""
-#: templates/cotton/transaction/item.html:123
+#: templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:100
msgid "From"
msgstr ""
-#: templates/cotton/transaction/item.html:207
-#: templates/cotton/transaction/item.html:218
-#: templates/cotton/transaction/item.html:228
+#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:230
msgid "Show on summaries"
msgstr ""
-#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:211
msgid "Controlled by account"
msgstr ""
-#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:222
msgid "Controlled by category"
msgstr ""
-#: templates/cotton/transaction/item.html:233
+#: templates/cotton/transaction/item.html:235
+#: templates/includes/transactions_bulk_actions.html:15
msgid "Hide from summaries"
msgstr ""
-#: templates/cotton/transaction/item.html:237
+#: templates/cotton/transaction/item.html:239
msgid "Convert"
msgstr ""
-#: templates/cotton/transaction/item.html:252
-#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:254
+#: templates/cotton/transaction/item.html:264
+#: templates/cotton/transaction/item.html:274
msgid "Already part of a plan or recurrence"
msgstr ""
-#: templates/cotton/transaction/item.html:279
+#: templates/cotton/transaction/item.html:291
msgid "Not available for transfers"
msgstr ""
-#: templates/cotton/transaction/item.html:296
+#: templates/cotton/transaction/item.html:313
+#: templates/includes/transactions_bulk_actions.html:22
msgid "Move to previous month"
msgstr ""
-#: templates/cotton/transaction/item.html:300
+#: templates/cotton/transaction/item.html:317
+#: templates/includes/transactions_bulk_actions.html:28
msgid "Move to next month"
msgstr ""
-#: templates/cotton/transaction/item.html:303
+#: templates/cotton/transaction/item.html:320
+#: templates/includes/transactions_bulk_actions.html:33
msgid "Move to today"
msgstr ""
-#: templates/cotton/transaction/item.html:307
-#: templates/cotton/ui/transactions_action_bar.html:78
+#: templates/cotton/transaction/item.html:324
+#: templates/cotton/ui/transactions_action_bar.html:71
+#: templates/cotton/ui/transactions_action_bar.html:98
msgid "Duplicate"
msgstr ""
+#: templates/cotton/transaction/item.html:373
+#, python-format
+msgid "%(counter)s item"
+msgid_plural "%(counter)s items"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
#: templates/cotton/ui/account_card.html:10
#: templates/cotton/ui/currency_card.html:10
msgid "projected income"
@@ -3138,22 +3218,26 @@ msgstr ""
msgid "final total"
msgstr ""
-#: templates/cotton/ui/deleted_transactions_action_bar.html:34
-#: templates/cotton/ui/transactions_action_bar.html:34
-msgid "Select All"
-msgstr ""
-
-#: templates/cotton/ui/deleted_transactions_action_bar.html:40
-#: templates/cotton/ui/transactions_action_bar.html:40
+#: templates/cotton/ui/deleted_transactions_action_bar.html:25
+#: templates/cotton/ui/deleted_transactions_action_bar.html:26
+#: templates/cotton/ui/transactions_action_bar.html:25
+#: templates/cotton/ui/transactions_action_bar.html:26
msgid "Unselect All"
msgstr ""
-#: templates/cotton/ui/deleted_transactions_action_bar.html:46
-msgid "Invert election"
+#: templates/cotton/ui/deleted_transactions_action_bar.html:39
+#: templates/cotton/ui/transactions_action_bar.html:39
+msgid "Select All"
+msgstr ""
+
+#: templates/cotton/ui/deleted_transactions_action_bar.html:45
+#: templates/cotton/ui/transactions_action_bar.html:45
+msgid "Invert selection"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:59
-#: templates/cotton/ui/transactions_action_bar.html:84
+#: templates/cotton/ui/transactions_action_bar.html:77
+#: templates/cotton/ui/transactions_action_bar.html:106
msgid "Yes, delete them!"
msgstr ""
@@ -3164,43 +3248,43 @@ msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:166
#: templates/cotton/ui/deleted_transactions_action_bar.html:182
#: templates/cotton/ui/deleted_transactions_action_bar.html:198
-#: templates/cotton/ui/transactions_action_bar.html:128
-#: templates/cotton/ui/transactions_action_bar.html:143
-#: templates/cotton/ui/transactions_action_bar.html:159
-#: templates/cotton/ui/transactions_action_bar.html:175
-#: templates/cotton/ui/transactions_action_bar.html:191
-#: templates/cotton/ui/transactions_action_bar.html:207
-#: templates/cotton/ui/transactions_action_bar.html:223
+#: templates/cotton/ui/transactions_action_bar.html:153
+#: templates/cotton/ui/transactions_action_bar.html:168
+#: templates/cotton/ui/transactions_action_bar.html:184
+#: templates/cotton/ui/transactions_action_bar.html:200
+#: templates/cotton/ui/transactions_action_bar.html:216
+#: templates/cotton/ui/transactions_action_bar.html:232
+#: templates/cotton/ui/transactions_action_bar.html:248
msgid "copied!"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:123
-#: templates/cotton/ui/transactions_action_bar.html:148
+#: templates/cotton/ui/transactions_action_bar.html:173
msgid "Flat Total"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:139
-#: templates/cotton/ui/transactions_action_bar.html:164
+#: templates/cotton/ui/transactions_action_bar.html:189
msgid "Real Total"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:155
-#: templates/cotton/ui/transactions_action_bar.html:180
+#: templates/cotton/ui/transactions_action_bar.html:205
msgid "Mean"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:171
-#: templates/cotton/ui/transactions_action_bar.html:196
+#: templates/cotton/ui/transactions_action_bar.html:221
msgid "Max"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:187
-#: templates/cotton/ui/transactions_action_bar.html:212
+#: templates/cotton/ui/transactions_action_bar.html:237
msgid "Min"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:203
-#: templates/cotton/ui/transactions_action_bar.html:228
+#: templates/cotton/ui/transactions_action_bar.html:253
msgid "Count"
msgstr ""
@@ -3224,17 +3308,11 @@ msgstr ""
msgid "Balance"
msgstr ""
-#: templates/cotton/ui/transactions_action_bar.html:46
-msgid "Invert selection"
-msgstr ""
-
-#: templates/cotton/ui/transactions_action_bar.html:66
-msgid "Mark as unpaid"
-msgstr ""
-
-#: templates/cotton/ui/transactions_action_bar.html:71
-msgid "Mark as paid"
-msgstr ""
+#: templates/cotton/ui/transactions_action_bar.html:83
+#, fuzzy
+#| msgid "Transactions"
+msgid "More actions"
+msgstr "Транзакції"
#: templates/currencies/fragments/add.html:5
msgid "Add currency"
@@ -3668,6 +3746,14 @@ msgstr ""
msgid "Calculator"
msgstr ""
+#: templates/includes/transactions_bulk_actions.html:4
+msgid "Mark as unpaid"
+msgstr ""
+
+#: templates/includes/transactions_bulk_actions.html:9
+msgid "Mark as paid"
+msgstr ""
+
#: templates/insights/fragments/category_explorer/charts/account.html:100
#: templates/insights/fragments/category_explorer/charts/currency.html:92
#: templates/monthly_overview/fragments/monthly_account_summary.html:14
@@ -3733,6 +3819,7 @@ msgstr ""
#: templates/insights/fragments/year_by_year.html:140
#: templates/investment_classes/fragments/list.html:65
#: templates/monthly_overview/fragments/monthly_summary.html:168
+#: templates/transactions/widgets/sub_transactions.html:55
msgid "Total"
msgstr ""
@@ -4151,11 +4238,11 @@ msgstr ""
msgid "Loss, tax or fee"
msgstr ""
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
msgid "No movements yet"
msgstr ""
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
msgid "Use the + button to buy or contribute"
msgstr ""
@@ -4732,6 +4819,12 @@ msgstr ""
msgid "Deleted transactions"
msgstr ""
+#: templates/transactions/widgets/sub_transactions.html:53
+#, fuzzy
+#| msgid "Transactions"
+msgid "Add sub-transaction"
+msgstr "Транзакції"
+
#: templates/transactions/widgets/unselectable_income_expense_toggle_buttons.html:11
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:7
msgid "Unchanged"
diff --git a/app/locale/zh_Hant/LC_MESSAGES/django.po b/app/locale/zh_Hant/LC_MESSAGES/django.po
index 7fdff6c4..59da8ad8 100644
--- a/app/locale/zh_Hant/LC_MESSAGES/django.po
+++ b/app/locale/zh_Hant/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-11-12 03:24+0000\n"
+"POT-Creation-Date: 2026-11-14 14:06+0000\n"
"PO-Revision-Date: 2025-10-08 16:17+0000\n"
"Last-Translator: doody \n"
"Language-Team: Chinese (Traditional Han script) Public: Shown for all users. Only editable by the owner."
msgid ""
-"Private: Only shown for the owner and shared users. Only editable by the "
-"owner. Public: Shown for all users. Only editable by the owner."
+"Private: Only shown for the owner and shared users. Public: Shown for "
+"all users. Only the owner can edit, share or delete it."
msgstr ""
"私人:只會顯示給擁有者或著已分享的使用者。只有擁有者可以編輯這個選項。 公"
"開:所有使用者都可以看到。只有擁有者可以編輯這個選項。"
-#: apps/common/forms.py:76 apps/users/forms.py:191
+#: apps/common/forms.py:78 apps/users/forms.py:191
#: templates/bank_sync/fragments/accounts.html:34
#: templates/transactions/fragments/filter_actions.html:5
msgid "Save"
msgstr "儲存"
-#: apps/common/forms.py:90
+#: apps/common/forms.py:92
msgid "You cannot share this item with its owner."
msgstr "你不能將這個項目分享給他的擁有者。"
@@ -832,6 +849,7 @@ msgid "Now"
msgstr "現在"
#: apps/common/widgets/tom_select.py:14
+#: templates/transactions/widgets/sub_transaction_row.html:9
msgid "Remove"
msgstr "移除"
@@ -908,8 +926,8 @@ msgstr "日期和時間"
msgid "Auto"
msgstr "自動"
-#: apps/currencies/models.py:91 apps/export_app/forms.py:67
-#: apps/export_app/forms.py:152 templates/exchange_rates/fragments/list.html:10
+#: apps/currencies/models.py:91 apps/export_app/forms.py:73
+#: apps/export_app/forms.py:161 templates/exchange_rates/fragments/list.html:10
#: templates/exchange_rates/pages/index.html:4
#: templates/includes/sidebar.html:204
msgid "Exchange Rates"
@@ -1066,25 +1084,25 @@ msgstr "成功排程服務"
msgid "Create transaction"
msgstr "建立交易"
-#: apps/dca/forms.py:69 apps/transactions/forms.py:582
+#: apps/dca/forms.py:69 apps/transactions/forms.py:668
msgid "From Account"
msgstr "來源帳戶"
-#: apps/dca/forms.py:75 apps/transactions/forms.py:587
+#: apps/dca/forms.py:75 apps/transactions/forms.py:673
msgid "To Account"
msgstr "目標帳戶"
#: apps/dca/forms.py:117 apps/dca/forms.py:125 apps/export_app/forms.py:49
-#: apps/export_app/forms.py:143 apps/insights/views.py:57
-#: apps/rules/forms.py:185 apps/rules/forms.py:195 apps/rules/models.py:46
-#: apps/rules/models.py:307 apps/transactions/filters.py:84
-#: apps/transactions/forms.py:78 apps/transactions/forms.py:346
-#: apps/transactions/forms.py:526 apps/transactions/forms.py:640
-#: apps/transactions/forms.py:647 apps/transactions/forms.py:862
-#: apps/transactions/forms.py:1114 apps/transactions/models.py:313
-#: apps/transactions/models.py:369 apps/transactions/models.py:770
-#: apps/transactions/models.py:1028 apps/transactions/models.py:1353
-#: templates/entities/fragments/list.html:9
+#: apps/export_app/forms.py:150 apps/insights/views.py:57
+#: apps/rules/forms.py:185 apps/rules/forms.py:196 apps/rules/models.py:47
+#: apps/rules/models.py:308 apps/transactions/filters.py:100
+#: apps/transactions/filters.py:175 apps/transactions/forms.py:161
+#: apps/transactions/forms.py:431 apps/transactions/forms.py:612
+#: apps/transactions/forms.py:726 apps/transactions/forms.py:733
+#: apps/transactions/forms.py:950 apps/transactions/forms.py:1204
+#: apps/transactions/models.py:315 apps/transactions/models.py:371
+#: apps/transactions/models.py:866 apps/transactions/models.py:1127
+#: apps/transactions/models.py:1500 templates/entities/fragments/list.html:9
#: templates/entities/pages/index.html:4 templates/includes/sidebar.html:168
#: templates/insights/fragments/month_by_month.html:40
#: templates/insights/fragments/month_by_month.html:43
@@ -1120,8 +1138,8 @@ msgstr "已隱藏交易金額"
msgid "You must provide an account."
msgstr "務必選擇一個帳戶。"
-#: apps/dca/forms.py:322 apps/transactions/forms.py:780
-#: apps/transactions/models.py:978
+#: apps/dca/forms.py:322 apps/transactions/forms.py:866
+#: apps/transactions/models.py:1077
msgid "From and To accounts must be different."
msgstr "來源跟目標帳戶不得相同。"
@@ -1139,10 +1157,10 @@ msgid "Payment Currency"
msgstr "交易貨幣"
#: apps/dca/models.py:26 apps/dca/models.py:181 apps/rules/forms.py:180
-#: apps/rules/forms.py:196 apps/rules/models.py:43 apps/rules/models.py:295
-#: apps/transactions/forms.py:504 apps/transactions/forms.py:668
-#: apps/transactions/models.py:354 apps/transactions/models.py:774
-#: apps/transactions/models.py:1031 apps/transactions/models.py:1338
+#: apps/rules/forms.py:197 apps/rules/models.py:44 apps/rules/models.py:296
+#: apps/transactions/forms.py:590 apps/transactions/forms.py:754
+#: apps/transactions/models.py:356 apps/transactions/models.py:870
+#: apps/transactions/models.py:1130 apps/transactions/models.py:1485
msgid "Notes"
msgstr "備註"
@@ -1150,7 +1168,7 @@ msgstr "備註"
msgid "DCA Strategy"
msgstr "定期定額策略"
-#: apps/dca/models.py:35 apps/export_app/forms.py:166
+#: apps/dca/models.py:35 apps/export_app/forms.py:175
msgid "DCA Strategies"
msgstr "定期定額策略"
@@ -1170,7 +1188,7 @@ msgstr "收款總額"
msgid "DCA Entry"
msgstr "定期定額投入"
-#: apps/dca/models.py:187 apps/export_app/forms.py:167
+#: apps/dca/models.py:187 apps/export_app/forms.py:176
msgid "DCA Entries"
msgstr "定期定額投入"
@@ -1198,14 +1216,14 @@ msgstr "成功更新投入"
msgid "Entry deleted successfully"
msgstr "成功刪除投入"
-#: apps/export_app/forms.py:13 apps/export_app/forms.py:137
+#: apps/export_app/forms.py:13 apps/export_app/forms.py:144
#: templates/includes/sidebar.html:247 templates/users/fragments/list.html:10
#: templates/users/pages/index.html:4
msgid "Users"
msgstr "使用者"
-#: apps/export_app/forms.py:31 apps/export_app/forms.py:144
-#: apps/transactions/models.py:423 templates/includes/sidebar.html:81
+#: apps/export_app/forms.py:31 apps/export_app/forms.py:151
+#: apps/transactions/models.py:425 templates/includes/sidebar.html:81
#: templates/includes/sidebar.html:154
#: templates/recurring_transactions/fragments/list_transactions.html:5
#: templates/recurring_transactions/fragments/table.html:37
@@ -1213,9 +1231,9 @@ msgstr "使用者"
msgid "Transactions"
msgstr "交易"
-#: apps/export_app/forms.py:37 apps/export_app/forms.py:141
-#: apps/insights/views.py:43 apps/transactions/filters.py:74
-#: templates/categories/fragments/list.html:9
+#: apps/export_app/forms.py:37 apps/export_app/forms.py:148
+#: apps/insights/views.py:43 apps/transactions/filters.py:90
+#: apps/transactions/filters.py:165 templates/categories/fragments/list.html:9
#: templates/categories/pages/index.html:4 templates/includes/sidebar.html:156
#: templates/insights/fragments/month_by_month.html:18
#: templates/insights/fragments/month_by_month.html:21
@@ -1224,102 +1242,117 @@ msgstr "交易"
msgid "Categories"
msgstr "類別"
-#: apps/export_app/forms.py:55 apps/export_app/forms.py:147
-#: apps/transactions/models.py:1068 templates/includes/sidebar.html:110
+#: apps/export_app/forms.py:55 apps/export_app/forms.py:155
+#: apps/transactions/models.py:1167 templates/includes/sidebar.html:110
#: templates/recurring_transactions/fragments/list.html:9
#: templates/recurring_transactions/pages/index.html:4
msgid "Recurring Transactions"
msgstr "定期扣款交易"
-#: apps/export_app/forms.py:61 apps/export_app/forms.py:145
-#: apps/transactions/models.py:788 templates/includes/sidebar.html:104
+#: apps/export_app/forms.py:61 apps/export_app/forms.py:153
+#: apps/transactions/models.py:884 templates/includes/sidebar.html:104
#: templates/installment_plans/fragments/list.html:9
#: templates/installment_plans/pages/index.html:4
msgid "Installment Plans"
msgstr "分期付款計劃"
-#: apps/export_app/forms.py:73 apps/export_app/forms.py:150
+#: apps/export_app/forms.py:67 apps/export_app/forms.py:157
+#: apps/transactions/models.py:1518 templates/includes/sidebar.html:98
+#: templates/quick_transactions/pages/index.html:5
+#: templates/quick_transactions/pages/index.html:15
+msgid "Quick Transactions"
+msgstr "快速交易"
+
+#: apps/export_app/forms.py:79 apps/export_app/forms.py:159
#: templates/exchange_rates_services/fragments/list.html:10
#: templates/exchange_rates_services/pages/index.html:4
#: templates/includes/sidebar.html:232
msgid "Automatic Exchange Rates"
msgstr "自動匯率換算"
-#: apps/export_app/forms.py:79 templates/bank_sync/fragments/list.html:8
+#: apps/export_app/forms.py:85 templates/bank_sync/fragments/list.html:8
#: templates/bank_sync/pages/index.html:4 templates/includes/sidebar.html:238
msgid "Bank Sync"
msgstr ""
-#: apps/export_app/forms.py:80
+#: apps/export_app/forms.py:86
msgid "Includes the providers' API keys"
msgstr ""
-#: apps/export_app/forms.py:86 templates/includes/sidebar.html:212
+#: apps/export_app/forms.py:92 templates/includes/sidebar.html:212
#: templates/rules/fragments/list.html:9 templates/rules/pages/index.html:4
msgid "Rules"
msgstr "規則"
-#: apps/export_app/forms.py:92 templates/cotton/transaction/item.html:66
+#: apps/export_app/forms.py:98 templates/cotton/transaction/item.html:68
msgid "DCA"
msgstr "定期定額"
-#: apps/export_app/forms.py:98 apps/export_app/forms.py:168
+#: apps/export_app/forms.py:104 apps/export_app/forms.py:177
#: templates/import_app/fragments/profiles/list.html:21
#: templates/import_app/pages/profiles_index.html:4
msgid "Import Profiles"
msgstr "匯入設定"
-#: apps/export_app/forms.py:126 templates/export_app/fragments/export.html:5
+#: apps/export_app/forms.py:133 templates/export_app/fragments/export.html:5
#: templates/export_app/pages/index.html:13
msgid "Export"
msgstr "匯出"
-#: apps/export_app/forms.py:134
+#: apps/export_app/forms.py:141
msgid "Import a ZIP file exported from WYGIWYH"
msgstr "匯入一個由WYGIWYH會出的ZIP檔"
-#: apps/export_app/forms.py:135
+#: apps/export_app/forms.py:142
msgid "ZIP File"
msgstr "ZIP檔"
-#: apps/export_app/forms.py:157
+#: apps/export_app/forms.py:152 apps/rules/forms.py:193 apps/rules/models.py:42
+#: apps/rules/models.py:320 apps/transactions/models.py:736
+#: templates/transactions/widgets/sub_transactions.html:39
+#, fuzzy
+#| msgid "transactions"
+msgid "Sub-transactions"
+msgstr "交易"
+
+#: apps/export_app/forms.py:166
#, fuzzy
#| msgid "By account"
msgid "Bank Sync Accounts"
msgstr "按照帳戶"
-#: apps/export_app/forms.py:159 apps/rules/models.py:27
+#: apps/export_app/forms.py:168 apps/rules/models.py:27
msgid "Transaction rules"
msgstr "交易規則"
-#: apps/export_app/forms.py:161 apps/rules/models.py:68
+#: apps/export_app/forms.py:170 apps/rules/models.py:69
msgid "Edit transaction action"
msgstr "編輯交易規則"
-#: apps/export_app/forms.py:164 apps/rules/models.py:327
+#: apps/export_app/forms.py:173 apps/rules/models.py:332
msgid "Update or create transaction actions"
msgstr "更新或建立交易規則"
-#: apps/export_app/forms.py:199 templates/cotton/transaction/item.html:310
+#: apps/export_app/forms.py:210 templates/cotton/transaction/item.html:327
#: templates/cotton/ui/deleted_transactions_action_bar.html:53
#: templates/export_app/fragments/restore.html:5
#: templates/export_app/pages/index.html:19
msgid "Restore"
msgstr "還原"
-#: apps/export_app/forms.py:209
+#: apps/export_app/forms.py:220
msgid "Please upload either a ZIP file or at least one CSV file"
msgstr "請上傳一個ZIP檔或著至少一個CSV檔"
-#: apps/export_app/views.py:190
+#: apps/export_app/views.py:216
msgid "You have to select at least one export"
msgstr "你需要選擇至少一個項目來匯出"
-#: apps/export_app/views.py:210
+#: apps/export_app/views.py:236
msgid "Data restored successfully"
msgstr "成功還原資料"
-#: apps/export_app/views.py:222
+#: apps/export_app/views.py:248
msgid ""
"There was an error restoring your data. Check the logs for more details."
msgstr "資料還原發生錯誤,請確認日誌檔。"
@@ -1406,7 +1439,7 @@ msgstr "成功刪除匯入任務"
#: apps/insights/forms.py:118 apps/insights/utils/sankey.py:36
#: apps/insights/utils/sankey.py:167 apps/insights/views.py:45
-#: apps/transactions/filters.py:209
+#: apps/transactions/filters.py:294
#: templates/insights/fragments/month_by_month.html:119
#: templates/insights/fragments/year_by_year.html:73
msgid "Uncategorized"
@@ -1465,24 +1498,24 @@ msgstr "沒有分類"
msgid "Tag"
msgstr "標籤"
-#: apps/insights/views.py:52 apps/transactions/filters.py:215
+#: apps/insights/views.py:52 apps/transactions/filters.py:303
#: templates/insights/fragments/month_by_month.html:121
#: templates/insights/fragments/year_by_year.html:75
msgid "Untagged"
msgstr "未標籤"
-#: apps/insights/views.py:53 apps/transactions/models.py:611
+#: apps/insights/views.py:53 apps/transactions/models.py:632
#: templates/tags/fragments/table.html:69
msgid "No tags"
msgstr "沒有標籤"
-#: apps/insights/views.py:58 apps/transactions/models.py:312
+#: apps/insights/views.py:58 apps/transactions/models.py:314
#: templates/insights/fragments/month_by_month.html:88
#: templates/insights/fragments/year_by_year.html:56
msgid "Entity"
msgstr "實體"
-#: apps/insights/views.py:59 apps/transactions/filters.py:222
+#: apps/insights/views.py:59 apps/transactions/filters.py:311
#: templates/insights/fragments/month_by_month.html:123
#: templates/insights/fragments/year_by_year.html:77
msgid "No entity"
@@ -1500,19 +1533,19 @@ msgstr ""
msgid "Unclassified"
msgstr ""
-#: apps/investments/views.py:289
+#: apps/investments/views.py:290
#, fuzzy
#| msgid "Installment Plan added successfully"
msgid "Asset class added successfully"
msgstr "成功新增分期付款計劃"
-#: apps/investments/views.py:297
+#: apps/investments/views.py:298
#, fuzzy
#| msgid "Tag updated successfully"
msgid "Asset class updated successfully"
msgstr "成功更新標籤"
-#: apps/investments/views.py:318
+#: apps/investments/views.py:319
#, fuzzy
#| msgid "Tag deleted successfully"
msgid "Asset class deleted successfully"
@@ -1547,13 +1580,13 @@ msgstr ""
msgid "Set field"
msgstr "設定欄位"
-#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:123
+#: apps/rules/forms.py:77 templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:101
msgid "To"
msgstr "到"
#: apps/rules/forms.py:78 apps/rules/forms.py:158 apps/rules/models.py:20
-#: apps/rules/models.py:62 apps/rules/models.py:323
+#: apps/rules/models.py:63 apps/rules/models.py:328
#: templates/rules/fragments/list.html:23
msgid "Order"
msgstr "順序"
@@ -1571,36 +1604,37 @@ msgid "Operator"
msgstr "運算子"
#: apps/rules/forms.py:174 apps/rules/forms.py:188 apps/rules/models.py:36
-#: apps/rules/models.py:271 apps/transactions/forms.py:468
-#: apps/transactions/models.py:337 apps/transactions/models.py:730
-#: apps/transactions/models.py:1009 apps/transactions/models.py:1323
+#: apps/rules/models.py:272 apps/transactions/forms.py:554
+#: apps/transactions/models.py:339 apps/transactions/models.py:826
+#: apps/transactions/models.py:1108 apps/transactions/models.py:1470
#: templates/mini_tools/simulator.html:63
msgid "Type"
msgstr "種類"
#: apps/rules/forms.py:175 apps/rules/forms.py:189 apps/rules/models.py:37
-#: apps/rules/models.py:275 apps/transactions/filters.py:22
-#: apps/transactions/forms.py:472 apps/transactions/forms.py:650
-#: apps/transactions/models.py:339 apps/transactions/models.py:1325
-#: templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/rules/models.py:276 apps/transactions/filters.py:23
+#: apps/transactions/forms.py:558 apps/transactions/forms.py:736
+#: apps/transactions/models.py:341 apps/transactions/models.py:1472
+#: templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/transactions/widgets/paid_toggle_button.html:10
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:13
msgid "Paid"
msgstr "已支付"
#: apps/rules/forms.py:177 apps/rules/forms.py:191 apps/rules/models.py:39
-#: apps/rules/models.py:283 apps/transactions/forms.py:90
-#: apps/transactions/forms.py:488 apps/transactions/forms.py:655
-#: apps/transactions/forms.py:868 apps/transactions/models.py:341
-#: apps/transactions/models.py:748 apps/transactions/models.py:1033
+#: apps/rules/models.py:284 apps/transactions/forms.py:173
+#: apps/transactions/forms.py:574 apps/transactions/forms.py:741
+#: apps/transactions/forms.py:956 apps/transactions/models.py:343
+#: apps/transactions/models.py:844 apps/transactions/models.py:1132
msgid "Reference Date"
msgstr "起算日"
#: apps/rules/forms.py:178 apps/rules/forms.py:192 apps/rules/models.py:41
-#: apps/rules/models.py:287 apps/transactions/forms.py:495
-#: apps/transactions/models.py:347 apps/transactions/models.py:1014
-#: apps/transactions/models.py:1331
+#: apps/rules/models.py:288 apps/transactions/forms.py:75
+#: apps/transactions/forms.py:581 apps/transactions/models.py:349
+#: apps/transactions/models.py:730 apps/transactions/models.py:1113
+#: apps/transactions/models.py:1478
#: templates/insights/fragments/sankey.html:102
#: templates/installment_plans/fragments/table.html:18
#: templates/mini_tools/simulator.html:70
@@ -1609,51 +1643,52 @@ msgstr "起算日"
msgid "Amount"
msgstr "金額"
-#: apps/rules/forms.py:179 apps/rules/forms.py:193 apps/rules/models.py:14
-#: apps/rules/models.py:42 apps/rules/models.py:291
-#: apps/transactions/forms.py:499 apps/transactions/forms.py:659
-#: apps/transactions/models.py:352 apps/transactions/models.py:732
-#: apps/transactions/models.py:1017 apps/transactions/models.py:1336
+#: apps/rules/forms.py:179 apps/rules/forms.py:194 apps/rules/models.py:14
+#: apps/rules/models.py:43 apps/rules/models.py:292
+#: apps/transactions/forms.py:585 apps/transactions/forms.py:745
+#: apps/transactions/models.py:354 apps/transactions/models.py:828
+#: apps/transactions/models.py:1116 apps/transactions/models.py:1483
msgid "Description"
msgstr "描述"
-#: apps/rules/forms.py:182 apps/rules/forms.py:198 apps/rules/models.py:47
-#: apps/rules/models.py:299 apps/transactions/models.py:399
-#: apps/transactions/models.py:1358
+#: apps/rules/forms.py:182 apps/rules/forms.py:199 apps/rules/models.py:48
+#: apps/rules/models.py:300 apps/transactions/models.py:401
+#: apps/transactions/models.py:1505
msgid "Internal Note"
msgstr "內部註記"
-#: apps/rules/forms.py:183 apps/rules/forms.py:199 apps/rules/models.py:48
-#: apps/rules/models.py:303 apps/transactions/models.py:401
-#: apps/transactions/models.py:1360
+#: apps/rules/forms.py:183 apps/rules/forms.py:200 apps/rules/models.py:49
+#: apps/rules/models.py:304 apps/transactions/models.py:403
+#: apps/transactions/models.py:1507
msgid "Internal ID"
msgstr "內部ID"
-#: apps/rules/forms.py:186 apps/rules/forms.py:200 apps/rules/models.py:40
-#: apps/rules/models.py:319 apps/transactions/forms.py:672
-#: apps/transactions/models.py:251 apps/transactions/models.py:342
-#: apps/transactions/models.py:1326
+#: apps/rules/forms.py:186 apps/rules/forms.py:201 apps/rules/models.py:40
+#: apps/rules/models.py:324 apps/transactions/forms.py:758
+#: apps/transactions/models.py:253 apps/transactions/models.py:344
+#: apps/transactions/models.py:1473
msgid "Mute"
msgstr "靜音"
-#: apps/rules/forms.py:215
+#: apps/rules/forms.py:216
msgid "Search Criteria"
msgstr "搜尋條件"
-#: apps/rules/forms.py:360
+#: apps/rules/forms.py:361
msgid "Set Values"
msgstr "設定值"
-#: apps/rules/forms.py:407 apps/rules/forms.py:442 apps/rules/forms.py:477
-#: apps/transactions/models.py:422 apps/transactions/models.py:667
+#: apps/rules/forms.py:409 apps/rules/forms.py:444 apps/rules/forms.py:479
+#: apps/transactions/models.py:424 apps/transactions/models.py:703
+#: apps/transactions/models.py:763
msgid "Transaction"
msgstr "交易"
-#: apps/rules/forms.py:411 apps/rules/forms.py:446 apps/rules/forms.py:481
+#: apps/rules/forms.py:413 apps/rules/forms.py:448 apps/rules/forms.py:483
msgid "Type to search for a transaction"
msgstr "搜尋交易的種類"
-#: apps/rules/forms.py:422 apps/rules/forms.py:457 apps/rules/forms.py:491
+#: apps/rules/forms.py:424 apps/rules/forms.py:459 apps/rules/forms.py:493
#: templates/rules/fragments/transaction_rule/dry_run/created.html:5
#: templates/rules/fragments/transaction_rule/dry_run/deleted.html:5
#: templates/rules/fragments/transaction_rule/dry_run/updated.html:5
@@ -1673,15 +1708,15 @@ msgstr "順序"
msgid "Transaction rule"
msgstr "交易規則"
-#: apps/rules/models.py:54 apps/rules/models.py:98
+#: apps/rules/models.py:55 apps/rules/models.py:99
msgid "Rule"
msgstr "規則"
-#: apps/rules/models.py:59
+#: apps/rules/models.py:60
msgid "Field"
msgstr "欄位"
-#: apps/rules/models.py:61 templates/investments/fragments/charts.html:86
+#: apps/rules/models.py:62 templates/investments/fragments/charts.html:86
#: templates/investments/fragments/detail.html:68
#: templates/investments/fragments/detail.html:127
#: templates/investments/fragments/detail.html:245
@@ -1689,57 +1724,57 @@ msgstr "欄位"
msgid "Value"
msgstr "值"
-#: apps/rules/models.py:69
+#: apps/rules/models.py:70
msgid "Edit transaction actions"
msgstr "編輯交易行為"
-#: apps/rules/models.py:84
+#: apps/rules/models.py:85
msgid "is exactly"
msgstr "完全符合"
-#: apps/rules/models.py:85
+#: apps/rules/models.py:86
msgid "contains"
msgstr "包含"
-#: apps/rules/models.py:86
+#: apps/rules/models.py:87
msgid "starts with"
msgstr "開頭為"
-#: apps/rules/models.py:87
+#: apps/rules/models.py:88
msgid "ends with"
msgstr "結尾是"
-#: apps/rules/models.py:88
+#: apps/rules/models.py:89
msgid "equals"
msgstr "等於"
-#: apps/rules/models.py:89
+#: apps/rules/models.py:90
msgid "greater than"
msgstr "大於"
-#: apps/rules/models.py:90
+#: apps/rules/models.py:91
msgid "less than"
msgstr "小於"
-#: apps/rules/models.py:91
+#: apps/rules/models.py:92
msgid "greater than or equal"
msgstr "大於或等於"
-#: apps/rules/models.py:92
+#: apps/rules/models.py:93
msgid "less than or equal"
msgstr "小於或等於"
-#: apps/rules/models.py:102
+#: apps/rules/models.py:103
msgid "Filter"
msgstr "過濾"
-#: apps/rules/models.py:105
+#: apps/rules/models.py:106
msgid ""
"Generic expression to enable or disable execution. Should evaluate to True "
"or False"
msgstr "決定是否啟用或停用規則執行的通用表達式,結果應該是 True 或著 False"
-#: apps/rules/models.py:326
+#: apps/rules/models.py:331
msgid "Update or create transaction action"
msgstr "更新或建立交易行為"
@@ -1783,8 +1818,8 @@ msgstr "成功更新「更新或建立交易行為」"
msgid "Update or Create Transaction action deleted successfully"
msgstr "成功刪除「更新或建立交易行為」"
-#: apps/transactions/filters.py:23 templates/cotton/transaction/item.html:23
-#: templates/cotton/transaction/item.html:34
+#: apps/transactions/filters.py:24 templates/cotton/transaction/item.html:25
+#: templates/cotton/transaction/item.html:36
#: templates/insights/fragments/overview/index.html:68
#: templates/net_worth/net_worth.html:39 templates/net_worth/net_worth.html:43
#: templates/transactions/widgets/paid_toggle_button.html:7
@@ -1792,166 +1827,176 @@ msgstr "成功刪除「更新或建立交易行為」"
msgid "Projected"
msgstr "預期"
-#: apps/transactions/filters.py:28 templates/categories/fragments/table.html:18
+#: apps/transactions/filters.py:29 templates/categories/fragments/table.html:18
msgid "Muted"
msgstr "已靜音"
-#: apps/transactions/filters.py:51
+#: apps/transactions/filters.py:67 apps/transactions/filters.py:144
msgid "Content"
msgstr "內容"
-#: apps/transactions/filters.py:57
+#: apps/transactions/filters.py:73
msgid "Transaction Type"
msgstr "交易種類"
-#: apps/transactions/filters.py:95
+#: apps/transactions/filters.py:111
#, fuzzy
#| msgid "Status"
msgid "Mute Status"
msgstr "狀態"
-#: apps/transactions/filters.py:100
+#: apps/transactions/filters.py:116
msgid "Date from"
msgstr "起始日期"
-#: apps/transactions/filters.py:105 apps/transactions/filters.py:115
+#: apps/transactions/filters.py:121 apps/transactions/filters.py:131
msgid "Until"
msgstr "直到"
-#: apps/transactions/filters.py:110
+#: apps/transactions/filters.py:126
msgid "Reference date from"
msgstr "起算日日期"
-#: apps/transactions/filters.py:120
+#: apps/transactions/filters.py:136
msgid "Amount min"
msgstr "最小金額"
-#: apps/transactions/filters.py:125
+#: apps/transactions/filters.py:141
msgid "Amount max"
msgstr "最大金額"
-#: apps/transactions/filters.py:208
+#: apps/transactions/filters.py:240
+msgid "Include"
+msgstr ""
+
+#: apps/transactions/filters.py:245
+msgid "Exclude"
+msgstr ""
+
+#: apps/transactions/filters.py:293
msgid "Categorized"
msgstr "已分類"
-#: apps/transactions/filters.py:215
+#: apps/transactions/filters.py:303
msgid "Tagged"
msgstr "已標籤"
-#: apps/transactions/filters.py:221
+#: apps/transactions/filters.py:310
msgid "Any entity"
msgstr "任何實體"
-#: apps/transactions/forms.py:192
+#: apps/transactions/forms.py:277
msgid "More"
msgstr "更多"
-#: apps/transactions/forms.py:229
+#: apps/transactions/forms.py:314
msgid "Save and add similar"
msgstr "儲存並新增類似"
-#: apps/transactions/forms.py:234
+#: apps/transactions/forms.py:319
msgid "Save and add another"
msgstr "儲存並新增另一個"
-#: apps/transactions/forms.py:271 templates/cotton/transaction/item.html:184
+#: apps/transactions/forms.py:356 templates/cotton/transaction/item.html:186
#: templates/transactions/fragments/attachments.html:4
#, fuzzy
#| msgid "Installments"
msgid "Attachments"
msgstr "分期付款"
-#: apps/transactions/forms.py:272
+#: apps/transactions/forms.py:357
msgid ""
"Files are private and only visible to users with access to this transaction."
msgstr ""
-#: apps/transactions/forms.py:283
+#: apps/transactions/forms.py:368
msgid "Upload"
msgstr ""
-#: apps/transactions/forms.py:355 apps/transactions/forms.py:1120
-#: apps/transactions/models.py:947
+#: apps/transactions/forms.py:440 apps/transactions/forms.py:1210
+#: apps/transactions/models.py:1046
#, fuzzy
#| msgid "To Account"
msgid "To account"
msgstr "目標帳戶"
-#: apps/transactions/forms.py:382 apps/transactions/forms.py:675
+#: apps/transactions/forms.py:467 apps/transactions/forms.py:761
msgid "Muted transactions won't be displayed on monthly summaries"
msgstr "每月總結不會顯示已經靜音的交易"
-#: apps/transactions/forms.py:594
+#: apps/transactions/forms.py:680
msgid "From Amount"
msgstr "原始金額"
-#: apps/transactions/forms.py:599
+#: apps/transactions/forms.py:685
msgid "To Amount"
msgstr "目標金額"
-#: apps/transactions/forms.py:741 apps/transactions/models.py:992
-#: apps/transactions/models.py:1303 templates/cotton/transaction/item.html:52
-#: templates/cotton/transaction/item.html:60
+#: apps/transactions/forms.py:827 apps/transactions/models.py:1091
+#: apps/transactions/models.py:1450 templates/cotton/transaction/item.html:54
+#: templates/cotton/transaction/item.html:62
+#: templates/cotton/transaction/item.html:272
+#: templates/cotton/transaction/item.html:304
#: templates/cotton/ui/quick_transactions_buttons.html:40
#: templates/cotton/ui/transactions_fab.html:44
msgid "Transfer"
msgstr "轉帳"
-#: apps/transactions/forms.py:1005
+#: apps/transactions/forms.py:1095
msgid "Tag name"
msgstr "標籤名稱"
-#: apps/transactions/forms.py:1033
+#: apps/transactions/forms.py:1123
msgid "Entity name"
msgstr "實體名稱"
-#: apps/transactions/forms.py:1061
+#: apps/transactions/forms.py:1151
msgid "Category name"
msgstr "分類名稱"
-#: apps/transactions/forms.py:1063
+#: apps/transactions/forms.py:1153
msgid "Muted categories won't be displayed on monthly summaries"
msgstr "靜音的分類不會顯示在每個月的總結中"
-#: apps/transactions/forms.py:1228
+#: apps/transactions/forms.py:1319
msgid "future transactions"
msgstr "未來的交易"
-#: apps/transactions/forms.py:1255
+#: apps/transactions/forms.py:1346
msgid "End date should be after the start date"
msgstr "結束日期應該大於起始日期"
-#: apps/transactions/models.py:256
+#: apps/transactions/models.py:258
msgid ""
"Deactivated categories won't be able to be selected when creating new "
"transactions"
msgstr "新增交易的時候無法選擇停用的分類"
-#: apps/transactions/models.py:264
+#: apps/transactions/models.py:266
msgid "Transaction Category"
msgstr "交易分類"
-#: apps/transactions/models.py:265
+#: apps/transactions/models.py:267
msgid "Transaction Categories"
msgstr "交易分類"
-#: apps/transactions/models.py:280
+#: apps/transactions/models.py:282
msgid ""
"Deactivated tags won't be able to be selected when creating new transactions"
msgstr "新增交易的時候無法選擇停用的標籤"
-#: apps/transactions/models.py:288 apps/transactions/models.py:289
+#: apps/transactions/models.py:290 apps/transactions/models.py:291
msgid "Transaction Tags"
msgstr "交易標籤"
-#: apps/transactions/models.py:304
+#: apps/transactions/models.py:306
msgid ""
"Deactivated entities won't be able to be selected when creating new "
"transactions"
msgstr "新增交易的時候無法選擇停用的實體"
-#: apps/transactions/models.py:324 apps/transactions/models.py:991
-#: apps/transactions/models.py:1302
+#: apps/transactions/models.py:326 apps/transactions/models.py:1090
+#: apps/transactions/models.py:1449
#: templates/calendar_view/fragments/list.html:42
#: templates/calendar_view/fragments/list.html:44
#: templates/calendar_view/fragments/list.html:52
@@ -1963,14 +2008,14 @@ msgstr "新增交易的時候無法選擇停用的實體"
#: templates/investments/fragments/detail.html:71
#: templates/investments/fragments/detail.html:175
#: templates/investments/fragments/detail.html:227
-#: templates/investments/fragments/detail.html:318
+#: templates/investments/fragments/detail.html:326
#: templates/mini_tools/simulator.html:66
#: templates/monthly_overview/fragments/monthly_summary.html:42
msgid "Income"
msgstr "收入"
-#: apps/transactions/models.py:325 apps/transactions/models.py:993
-#: apps/transactions/models.py:1304
+#: apps/transactions/models.py:327 apps/transactions/models.py:1092
+#: apps/transactions/models.py:1451
#: templates/calendar_view/fragments/list.html:46
#: templates/calendar_view/fragments/list.html:48
#: templates/calendar_view/fragments/list.html:56
@@ -1982,204 +2027,204 @@ msgstr "收入"
msgid "Expense"
msgstr "支出"
-#: apps/transactions/models.py:380 apps/transactions/models.py:787
-#: templates/cotton/transaction/item.html:260
-#: templates/cotton/transaction/item.html:277
-#: templates/cotton/transaction/item.html:287
+#: apps/transactions/models.py:382 apps/transactions/models.py:883
+#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:289
+#: templates/cotton/transaction/item.html:299
msgid "Installment Plan"
msgstr "分期付款計劃"
-#: apps/transactions/models.py:389 apps/transactions/models.py:1067
-#: templates/cotton/transaction/item.html:250
-#: templates/cotton/transaction/item.html:270
+#: apps/transactions/models.py:391 apps/transactions/models.py:1166
+#: templates/cotton/transaction/item.html:252
+#: templates/cotton/transaction/item.html:282
msgid "Recurring Transaction"
msgstr "定期扣款交易"
-#: apps/transactions/models.py:397
+#: apps/transactions/models.py:399
#, fuzzy
#| msgid "Link transaction"
msgid "Linked Transaction"
msgstr "連結交易"
-#: apps/transactions/models.py:405
+#: apps/transactions/models.py:407
msgid "Deleted"
msgstr "已刪除"
-#: apps/transactions/models.py:410
+#: apps/transactions/models.py:412
msgid "Deleted At"
msgstr "刪除時間"
-#: apps/transactions/models.py:518
+#: apps/transactions/models.py:521
msgid "A transfer needs one expense and one income."
msgstr ""
-#: apps/transactions/models.py:520
+#: apps/transactions/models.py:523
msgid "A transfer needs two different accounts."
msgstr ""
-#: apps/transactions/models.py:524
+#: apps/transactions/models.py:527
msgid "This transaction is already part of another transfer."
msgstr ""
-#: apps/transactions/models.py:613
+#: apps/transactions/models.py:634
msgid "No category"
msgstr "沒有分類"
-#: apps/transactions/models.py:615
+#: apps/transactions/models.py:636
msgid "No description"
msgstr "沒有描述"
-#: apps/transactions/models.py:672
+#: apps/transactions/models.py:735
+#, fuzzy
+#| msgid "transactions"
+msgid "Sub-transaction"
+msgstr "交易"
+
+#: apps/transactions/models.py:768
#, fuzzy
#| msgid "ZIP File"
msgid "File"
msgstr "ZIP檔"
-#: apps/transactions/models.py:674
+#: apps/transactions/models.py:770
msgid "Original Name"
msgstr ""
-#: apps/transactions/models.py:676
+#: apps/transactions/models.py:772
#, fuzzy
#| msgid "Content"
msgid "Content Type"
msgstr "內容"
-#: apps/transactions/models.py:678
+#: apps/transactions/models.py:774
msgid "Size"
msgstr ""
-#: apps/transactions/models.py:683
+#: apps/transactions/models.py:779
msgid "Uploaded By"
msgstr ""
-#: apps/transactions/models.py:688
+#: apps/transactions/models.py:784
#, fuzzy
#| msgid "Transactions on"
msgid "Transaction Attachment"
msgstr "交易時間"
-#: apps/transactions/models.py:689
+#: apps/transactions/models.py:785
#, fuzzy
#| msgid "Transaction Tags"
msgid "Transaction Attachments"
msgstr "交易標籤"
-#: apps/transactions/models.py:719 templates/includes/sidebar.html:57
+#: apps/transactions/models.py:815 templates/includes/sidebar.html:57
msgid "Yearly"
msgstr "年"
-#: apps/transactions/models.py:720 apps/users/models.py:469
+#: apps/transactions/models.py:816 apps/users/models.py:469
#: templates/includes/sidebar.html:51
msgid "Monthly"
msgstr "月"
-#: apps/transactions/models.py:721
+#: apps/transactions/models.py:817
msgid "Weekly"
msgstr "週"
-#: apps/transactions/models.py:722
+#: apps/transactions/models.py:818
msgid "Daily"
msgstr "日"
-#: apps/transactions/models.py:735
+#: apps/transactions/models.py:831
msgid "Number of Installments"
msgstr "期數"
-#: apps/transactions/models.py:740
+#: apps/transactions/models.py:836
msgid "Installment Start"
msgstr "分期付款起始日"
-#: apps/transactions/models.py:741
+#: apps/transactions/models.py:837
msgid "The installment number to start counting from"
msgstr "開始計算的期數"
-#: apps/transactions/models.py:746 apps/transactions/models.py:1037
+#: apps/transactions/models.py:842 apps/transactions/models.py:1136
msgid "Start Date"
msgstr "起始日期"
-#: apps/transactions/models.py:750 apps/transactions/models.py:1038
+#: apps/transactions/models.py:846 apps/transactions/models.py:1137
msgid "End Date"
msgstr "結束日期"
-#: apps/transactions/models.py:755
+#: apps/transactions/models.py:851
msgid "Recurrence"
msgstr "頻率"
-#: apps/transactions/models.py:758
+#: apps/transactions/models.py:854
msgid "Installment Amount"
msgstr "分期付款金額"
-#: apps/transactions/models.py:777 apps/transactions/models.py:1057
+#: apps/transactions/models.py:873 apps/transactions/models.py:1156
msgid "Add description to transactions"
msgstr "為交易增加描述"
-#: apps/transactions/models.py:780 apps/transactions/models.py:1060
+#: apps/transactions/models.py:876 apps/transactions/models.py:1159
msgid "Add notes to transactions"
msgstr "為交易新增註記"
-#: apps/transactions/models.py:954
+#: apps/transactions/models.py:1053
#, fuzzy
#| msgid "To Amount"
msgid "To amount"
msgstr "目標金額"
-#: apps/transactions/models.py:955
+#: apps/transactions/models.py:1054
msgid "Leave empty to use the same amount"
msgstr ""
-#: apps/transactions/models.py:996 templates/mini_tools/simulator.html:129
+#: apps/transactions/models.py:1095 templates/mini_tools/simulator.html:129
msgid "day(s)"
msgstr "天"
-#: apps/transactions/models.py:997 templates/mini_tools/simulator.html:130
+#: apps/transactions/models.py:1096 templates/mini_tools/simulator.html:130
msgid "week(s)"
msgstr "週"
-#: apps/transactions/models.py:998 templates/mini_tools/simulator.html:131
+#: apps/transactions/models.py:1097 templates/mini_tools/simulator.html:131
msgid "month(s)"
msgstr "月"
-#: apps/transactions/models.py:999 templates/mini_tools/simulator.html:132
+#: apps/transactions/models.py:1098 templates/mini_tools/simulator.html:132
msgid "year(s)"
msgstr "年"
-#: apps/transactions/models.py:1001
+#: apps/transactions/models.py:1100
#: templates/recurring_transactions/fragments/list.html:18
msgid "Paused"
msgstr "已暫停"
-#: apps/transactions/models.py:1040
+#: apps/transactions/models.py:1139
msgid "Recurrence Type"
msgstr "頻率"
-#: apps/transactions/models.py:1043
+#: apps/transactions/models.py:1142
msgid "Recurrence Interval"
msgstr "頻率間隔"
-#: apps/transactions/models.py:1046
+#: apps/transactions/models.py:1145
msgid "Keep at most"
msgstr "持續最多"
-#: apps/transactions/models.py:1050
+#: apps/transactions/models.py:1149
msgid "Last Generated Date"
msgstr "最後產生的日期"
-#: apps/transactions/models.py:1053
+#: apps/transactions/models.py:1152
msgid "Last Generated Reference Date"
msgstr "最後產生的起算日"
-#: apps/transactions/models.py:1370 templates/cotton/transaction/item.html:243
+#: apps/transactions/models.py:1517 templates/cotton/transaction/item.html:245
#: templates/cotton/ui/transactions_fab.html:59
msgid "Quick Transaction"
msgstr "快速交易"
-#: apps/transactions/models.py:1371 templates/includes/sidebar.html:98
-#: templates/quick_transactions/pages/index.html:5
-#: templates/quick_transactions/pages/index.html:15
-msgid "Quick Transactions"
-msgstr "快速交易"
-
#: apps/transactions/validators.py:8
#, python-format
msgid "%(value)s has too many decimal places. Maximum is 30."
@@ -2190,31 +2235,38 @@ msgstr "小數點後%(value)s位數字太大,最多30位數。"
msgid "%(value)s is not a non-negative number"
msgstr "%(value)s不是一個正值"
-#: apps/transactions/views/actions.py:58
+#: apps/transactions/views/actions.py:61
#, python-format
msgid "%(count)s transaction marked as paid"
msgid_plural "%(count)s transactions marked as paid"
msgstr[0] "%(count)s筆交易標記為已支付"
-#: apps/transactions/views/actions.py:81
+#: apps/transactions/views/actions.py:84
#, python-format
msgid "%(count)s transaction marked as not paid"
msgid_plural "%(count)s transactions marked as not paid"
msgstr[0] "%(count)s筆交易標記為未支付"
-#: apps/transactions/views/actions.py:105
+#: apps/transactions/views/actions.py:108
#, python-format
msgid "%(count)s transaction deleted successfully"
msgid_plural "%(count)s transactions deleted successfully"
msgstr[0] "成功刪除%(count)s筆交易"
-#: apps/transactions/views/actions.py:139
+#: apps/transactions/views/actions.py:142
#, python-format
msgid "%(count)s transaction restored successfully"
msgid_plural "%(count)s transactions restored successfully"
msgstr[0] "成功復原%(count)s筆交易"
-#: apps/transactions/views/actions.py:170
+#: apps/transactions/views/actions.py:174
+#: apps/transactions/views/transactions.py:423
+#, python-format
+msgid "%(count)s transaction updated successfully"
+msgid_plural "%(count)s transactions updated successfully"
+msgstr[0] "成功更新%(count)s筆交易"
+
+#: apps/transactions/views/actions.py:247
#, python-format
msgid "%(count)s transaction duplicated successfully"
msgid_plural "%(count)s transactions duplicated successfully"
@@ -2232,39 +2284,49 @@ msgstr "成功更新分類"
msgid "Category deleted successfully"
msgstr "成功刪除分類"
-#: apps/transactions/views/conversions.py:72
+#: apps/transactions/views/conversions.py:77
#: apps/transactions/views/quick_transactions.py:46 apps/users/views.py:252
msgid "Item added successfully"
msgstr "成功新增項目"
-#: apps/transactions/views/conversions.py:91
+#: apps/transactions/views/conversions.py:97
#, fuzzy
#| msgid "Edit quick transaction"
msgid "Convert into quick transaction"
msgstr "編輯快速交易"
-#: apps/transactions/views/conversions.py:108
+#: apps/transactions/views/conversions.py:114
#: apps/transactions/views/recurring_transactions.py:112
msgid "Recurring Transaction added successfully"
msgstr "成功新增定期扣款"
-#: apps/transactions/views/conversions.py:129
+#: apps/transactions/views/conversions.py:136
#, fuzzy
#| msgid "Edit recurring transaction"
msgid "Convert into recurring transaction"
msgstr "編輯重複交易"
-#: apps/transactions/views/conversions.py:148
+#: apps/transactions/views/conversions.py:155
#: apps/transactions/views/installment_plans.py:87
msgid "Installment Plan added successfully"
msgstr "成功新增分期付款計劃"
-#: apps/transactions/views/conversions.py:167
+#: apps/transactions/views/conversions.py:175
#, fuzzy
#| msgid "Edit installment plan"
msgid "Convert into installment plan"
msgstr "編輯分期付款計劃"
+#: apps/transactions/views/conversions.py:195
+msgid "Transaction converted into a transfer"
+msgstr ""
+
+#: apps/transactions/views/conversions.py:226
+#, fuzzy
+#| msgid "Edit quick transaction"
+msgid "Convert into transfer"
+msgstr "編輯快速交易"
+
#: apps/transactions/views/entities.py:72
msgid "Entity added successfully"
msgstr "成功新增實體"
@@ -2297,7 +2359,7 @@ msgstr "成功更新項目"
msgid "Item deleted successfully"
msgstr "成功刪除項目"
-#: apps/transactions/views/quick_transactions.py:164
+#: apps/transactions/views/quick_transactions.py:165
#: apps/transactions/views/transactions.py:156
#: apps/transactions/views/transactions.py:343
msgid "Transaction added successfully"
@@ -2351,29 +2413,23 @@ msgstr "成功刪除帳戶"
msgid "Transaction updated successfully"
msgstr "成功更新交易"
-#: apps/transactions/views/transactions.py:421
-#, python-format
-msgid "%(count)s transaction updated successfully"
-msgid_plural "%(count)s transactions updated successfully"
-msgstr[0] "成功更新%(count)s筆交易"
-
-#: apps/transactions/views/transactions.py:448
+#: apps/transactions/views/transactions.py:450
msgid "Transaction duplicated successfully"
msgstr "成功複製交易"
-#: apps/transactions/views/transactions.py:493
+#: apps/transactions/views/transactions.py:495
msgid "Transaction deleted successfully"
msgstr "成功刪除交易"
-#: apps/transactions/views/transactions.py:523
+#: apps/transactions/views/transactions.py:525
msgid "Transaction restored successfully"
msgstr "成功復原交易"
-#: apps/transactions/views/transactions.py:549
+#: apps/transactions/views/transactions.py:551
msgid "Transfer added successfully"
msgstr "成功新增轉帳"
-#: apps/transactions/views/transactions.py:579
+#: apps/transactions/views/transactions.py:581
#, fuzzy
#| msgid "Transfer added successfully"
msgid "Transfer updated successfully"
@@ -2725,8 +2781,9 @@ msgstr "操作"
#: templates/accounts/fragments/list.html:37
#: templates/bank_sync/fragments/list.html:33
#: templates/categories/fragments/table.html:29
-#: templates/cotton/transaction/item.html:178
-#: templates/cotton/ui/transactions_action_bar.html:54
+#: templates/cotton/transaction/item.html:180
+#: templates/cotton/ui/transactions_action_bar.html:56
+#: templates/cotton/ui/transactions_action_bar.html:90
#: templates/currencies/fragments/list.html:34
#: templates/dca/fragments/strategy/details.html:63
#: templates/dca/fragments/strategy/list.html:31
@@ -2737,8 +2794,8 @@ msgstr "操作"
#: templates/import_app/fragments/profiles/list.html:46
#: templates/installment_plans/fragments/table.html:28
#: templates/investment_classes/fragments/list.html:39
-#: templates/investments/fragments/detail.html:302
-#: templates/investments/fragments/detail.html:330
+#: templates/investments/fragments/detail.html:310
+#: templates/investments/fragments/detail.html:338
#: templates/quick_transactions/fragments/list.html:25
#: templates/recurring_transactions/fragments/table.html:30
#: templates/rules/fragments/transaction_rule/view.html:22
@@ -2775,10 +2832,11 @@ msgstr "分享"
#: templates/accounts/fragments/list.html:71
#: templates/bank_sync/fragments/list.html:50
#: templates/categories/fragments/table.html:51
-#: templates/cotton/transaction/item.html:190
-#: templates/cotton/transaction/item.html:316
+#: templates/cotton/transaction/item.html:192
+#: templates/cotton/transaction/item.html:333
#: templates/cotton/ui/deleted_transactions_action_bar.html:57
-#: templates/cotton/ui/transactions_action_bar.html:82
+#: templates/cotton/ui/transactions_action_bar.html:75
+#: templates/cotton/ui/transactions_action_bar.html:107
#: templates/currencies/fragments/list.html:40
#: templates/dca/fragments/strategy/details.html:70
#: templates/dca/fragments/strategy/list.html:38
@@ -2809,10 +2867,11 @@ msgstr "刪除"
#: templates/accounts/fragments/list.html:75
#: templates/bank_sync/fragments/list.html:54
#: templates/categories/fragments/table.html:56
-#: templates/cotton/transaction/item.html:192
-#: templates/cotton/transaction/item.html:322
+#: templates/cotton/transaction/item.html:194
+#: templates/cotton/transaction/item.html:339
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:44
#: templates/dca/fragments/strategy/details.html:75
#: templates/dca/fragments/strategy/list.html:42
@@ -2840,10 +2899,11 @@ msgstr "確定嗎?"
#: templates/account_groups/fragments/list.html:59
#: templates/accounts/fragments/list.html:76
#: templates/categories/fragments/table.html:57
-#: templates/cotton/transaction/item.html:193
-#: templates/cotton/transaction/item.html:323
+#: templates/cotton/transaction/item.html:195
+#: templates/cotton/transaction/item.html:340
#: templates/cotton/ui/deleted_transactions_action_bar.html:58
-#: templates/cotton/ui/transactions_action_bar.html:83
+#: templates/cotton/ui/transactions_action_bar.html:76
+#: templates/cotton/ui/transactions_action_bar.html:105
#: templates/currencies/fragments/list.html:45
#: templates/dca/fragments/strategy/details.html:76
#: templates/dca/fragments/strategy/list.html:43
@@ -2863,8 +2923,8 @@ msgstr "您將無法復原這個行為!"
#: templates/accounts/fragments/list.html:77
#: templates/bank_sync/fragments/list.html:56
#: templates/categories/fragments/table.html:58
-#: templates/cotton/transaction/item.html:194
-#: templates/cotton/transaction/item.html:324
+#: templates/cotton/transaction/item.html:196
+#: templates/cotton/transaction/item.html:341
#: templates/currencies/fragments/list.html:46
#: templates/dca/fragments/strategy/details.html:77
#: templates/dca/fragments/strategy/list.html:44
@@ -2944,6 +3004,12 @@ msgstr "不追蹤"
msgid "No accounts"
msgstr "沒有帳戶"
+#: templates/accounts/fragments/share.html:8
+msgid ""
+"Everyone who can see this account can add, edit and delete its transactions, "
+"installment plans and recurring transactions."
+msgstr ""
+
#: templates/bank_sync/fragments/accounts.html:31
#, fuzzy
#| msgid "No transactions on this date"
@@ -3044,65 +3110,77 @@ msgstr "關閉"
msgid "Search"
msgstr "搜尋"
-#: templates/cotton/transaction/item.html:12
+#: templates/cotton/transaction/item.html:14
msgid "Select"
msgstr "選擇"
-#: templates/cotton/transaction/item.html:123
+#: templates/cotton/transaction/item.html:125
#: templates/insights/fragments/sankey.html:100
msgid "From"
msgstr "從"
-#: templates/cotton/transaction/item.html:207
-#: templates/cotton/transaction/item.html:218
-#: templates/cotton/transaction/item.html:228
+#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:230
msgid "Show on summaries"
msgstr "在總覽中顯示"
-#: templates/cotton/transaction/item.html:209
+#: templates/cotton/transaction/item.html:211
msgid "Controlled by account"
msgstr "受帳戶控制"
-#: templates/cotton/transaction/item.html:220
+#: templates/cotton/transaction/item.html:222
msgid "Controlled by category"
msgstr "受分類控制"
-#: templates/cotton/transaction/item.html:233
+#: templates/cotton/transaction/item.html:235
+#: templates/includes/transactions_bulk_actions.html:15
msgid "Hide from summaries"
msgstr "從總覽中隱藏"
-#: templates/cotton/transaction/item.html:237
+#: templates/cotton/transaction/item.html:239
#, fuzzy
#| msgid "Invert"
msgid "Convert"
msgstr "交換"
-#: templates/cotton/transaction/item.html:252
-#: templates/cotton/transaction/item.html:262
+#: templates/cotton/transaction/item.html:254
+#: templates/cotton/transaction/item.html:264
+#: templates/cotton/transaction/item.html:274
msgid "Already part of a plan or recurrence"
msgstr ""
-#: templates/cotton/transaction/item.html:279
+#: templates/cotton/transaction/item.html:291
msgid "Not available for transfers"
msgstr ""
-#: templates/cotton/transaction/item.html:296
+#: templates/cotton/transaction/item.html:313
+#: templates/includes/transactions_bulk_actions.html:22
msgid "Move to previous month"
msgstr "移動到上個月"
-#: templates/cotton/transaction/item.html:300
+#: templates/cotton/transaction/item.html:317
+#: templates/includes/transactions_bulk_actions.html:28
msgid "Move to next month"
msgstr "移動到下個月"
-#: templates/cotton/transaction/item.html:303
+#: templates/cotton/transaction/item.html:320
+#: templates/includes/transactions_bulk_actions.html:33
msgid "Move to today"
msgstr "移動到今天"
-#: templates/cotton/transaction/item.html:307
-#: templates/cotton/ui/transactions_action_bar.html:78
+#: templates/cotton/transaction/item.html:324
+#: templates/cotton/ui/transactions_action_bar.html:71
+#: templates/cotton/ui/transactions_action_bar.html:98
msgid "Duplicate"
msgstr "複製"
+#: templates/cotton/transaction/item.html:373
+#, python-format
+msgid "%(counter)s item"
+msgid_plural "%(counter)s items"
+msgstr[0] ""
+
#: templates/cotton/ui/account_card.html:10
#: templates/cotton/ui/currency_card.html:10
msgid "projected income"
@@ -3138,22 +3216,26 @@ msgstr "當前的總額"
msgid "final total"
msgstr "最後的總額"
-#: templates/cotton/ui/deleted_transactions_action_bar.html:34
-#: templates/cotton/ui/transactions_action_bar.html:34
-msgid "Select All"
-msgstr "選擇全部"
-
-#: templates/cotton/ui/deleted_transactions_action_bar.html:40
-#: templates/cotton/ui/transactions_action_bar.html:40
+#: templates/cotton/ui/deleted_transactions_action_bar.html:25
+#: templates/cotton/ui/deleted_transactions_action_bar.html:26
+#: templates/cotton/ui/transactions_action_bar.html:25
+#: templates/cotton/ui/transactions_action_bar.html:26
msgid "Unselect All"
msgstr "取消選擇全部"
-#: templates/cotton/ui/deleted_transactions_action_bar.html:46
-msgid "Invert election"
+#: templates/cotton/ui/deleted_transactions_action_bar.html:39
+#: templates/cotton/ui/transactions_action_bar.html:39
+msgid "Select All"
+msgstr "選擇全部"
+
+#: templates/cotton/ui/deleted_transactions_action_bar.html:45
+#: templates/cotton/ui/transactions_action_bar.html:45
+msgid "Invert selection"
msgstr ""
#: templates/cotton/ui/deleted_transactions_action_bar.html:59
-#: templates/cotton/ui/transactions_action_bar.html:84
+#: templates/cotton/ui/transactions_action_bar.html:77
+#: templates/cotton/ui/transactions_action_bar.html:106
#, fuzzy
#| msgid "Yes, delete them!"
msgid "Yes, delete them!"
@@ -3166,45 +3248,45 @@ msgstr "確認,刪除它!"
#: templates/cotton/ui/deleted_transactions_action_bar.html:166
#: templates/cotton/ui/deleted_transactions_action_bar.html:182
#: templates/cotton/ui/deleted_transactions_action_bar.html:198
-#: templates/cotton/ui/transactions_action_bar.html:128
-#: templates/cotton/ui/transactions_action_bar.html:143
-#: templates/cotton/ui/transactions_action_bar.html:159
-#: templates/cotton/ui/transactions_action_bar.html:175
-#: templates/cotton/ui/transactions_action_bar.html:191
-#: templates/cotton/ui/transactions_action_bar.html:207
-#: templates/cotton/ui/transactions_action_bar.html:223
+#: templates/cotton/ui/transactions_action_bar.html:153
+#: templates/cotton/ui/transactions_action_bar.html:168
+#: templates/cotton/ui/transactions_action_bar.html:184
+#: templates/cotton/ui/transactions_action_bar.html:200
+#: templates/cotton/ui/transactions_action_bar.html:216
+#: templates/cotton/ui/transactions_action_bar.html:232
+#: templates/cotton/ui/transactions_action_bar.html:248
#, fuzzy
#| msgid "copied!"
msgid "copied!"
msgstr "已經複製!"
#: templates/cotton/ui/deleted_transactions_action_bar.html:123
-#: templates/cotton/ui/transactions_action_bar.html:148
+#: templates/cotton/ui/transactions_action_bar.html:173
msgid "Flat Total"
msgstr "總價"
#: templates/cotton/ui/deleted_transactions_action_bar.html:139
-#: templates/cotton/ui/transactions_action_bar.html:164
+#: templates/cotton/ui/transactions_action_bar.html:189
msgid "Real Total"
msgstr "真實總額"
#: templates/cotton/ui/deleted_transactions_action_bar.html:155
-#: templates/cotton/ui/transactions_action_bar.html:180
+#: templates/cotton/ui/transactions_action_bar.html:205
msgid "Mean"
msgstr "平均值"
#: templates/cotton/ui/deleted_transactions_action_bar.html:171
-#: templates/cotton/ui/transactions_action_bar.html:196
+#: templates/cotton/ui/transactions_action_bar.html:221
msgid "Max"
msgstr "最大值"
#: templates/cotton/ui/deleted_transactions_action_bar.html:187
-#: templates/cotton/ui/transactions_action_bar.html:212
+#: templates/cotton/ui/transactions_action_bar.html:237
msgid "Min"
msgstr "最小值"
#: templates/cotton/ui/deleted_transactions_action_bar.html:203
-#: templates/cotton/ui/transactions_action_bar.html:228
+#: templates/cotton/ui/transactions_action_bar.html:253
msgid "Count"
msgstr "計數"
@@ -3230,17 +3312,11 @@ msgstr "重複"
msgid "Balance"
msgstr "餘額"
-#: templates/cotton/ui/transactions_action_bar.html:46
-msgid "Invert selection"
-msgstr ""
-
-#: templates/cotton/ui/transactions_action_bar.html:66
-msgid "Mark as unpaid"
-msgstr "標記為未支付"
-
-#: templates/cotton/ui/transactions_action_bar.html:71
-msgid "Mark as paid"
-msgstr "標記為已支付"
+#: templates/cotton/ui/transactions_action_bar.html:83
+#, fuzzy
+#| msgid "Transactions"
+msgid "More actions"
+msgstr "交易"
#: templates/currencies/fragments/add.html:5
msgid "Add currency"
@@ -3676,6 +3752,14 @@ msgstr "可用"
msgid "Calculator"
msgstr "計算機"
+#: templates/includes/transactions_bulk_actions.html:4
+msgid "Mark as unpaid"
+msgstr "標記為未支付"
+
+#: templates/includes/transactions_bulk_actions.html:9
+msgid "Mark as paid"
+msgstr "標記為已支付"
+
#: templates/insights/fragments/category_explorer/charts/account.html:100
#: templates/insights/fragments/category_explorer/charts/currency.html:92
#: templates/monthly_overview/fragments/monthly_account_summary.html:14
@@ -3741,6 +3825,7 @@ msgstr "沒有近期交易"
#: templates/insights/fragments/year_by_year.html:140
#: templates/investment_classes/fragments/list.html:65
#: templates/monthly_overview/fragments/monthly_summary.html:168
+#: templates/transactions/widgets/sub_transactions.html:55
msgid "Total"
msgstr "總額"
@@ -4189,13 +4274,13 @@ msgstr ""
msgid "Loss, tax or fee"
msgstr ""
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
#, fuzzy
#| msgid "No presets yet"
msgid "No movements yet"
msgstr "尚未設定任何設定組"
-#: templates/investments/fragments/detail.html:312
+#: templates/investments/fragments/detail.html:320
msgid "Use the + button to buy or contribute"
msgstr ""
@@ -4792,6 +4877,12 @@ msgstr "沒有刪除的交易可以顯示"
msgid "Deleted transactions"
msgstr "刪除的交易"
+#: templates/transactions/widgets/sub_transactions.html:53
+#, fuzzy
+#| msgid "Add quick transaction"
+msgid "Add sub-transaction"
+msgstr "新增快速交易"
+
#: templates/transactions/widgets/unselectable_income_expense_toggle_buttons.html:11
#: templates/transactions/widgets/unselectable_paid_toggle_button.html:7
msgid "Unchanged"
diff --git a/app/templates/accounts/fragments/share.html b/app/templates/accounts/fragments/share.html
index 6e18189b..bdfb5bfe 100644
--- a/app/templates/accounts/fragments/share.html
+++ b/app/templates/accounts/fragments/share.html
@@ -5,6 +5,7 @@
{% block title %}{% translate 'Share settings' %}{% endblock %}
{% block body %}
+{% translate "Everyone who can see this account can add, edit and delete its transactions, installment plans and recurring transactions." %}
diff --git a/app/templates/cotton/transaction/item.html b/app/templates/cotton/transaction/item.html
index 9da2e221..8c5d6490 100644
--- a/app/templates/cotton/transaction/item.html
+++ b/app/templates/cotton/transaction/item.html
@@ -2,10 +2,12 @@
{% load i18n %}
{# With "Combine transfers" on, a transfer is shown once: its "from" side with the "to" side alongside #}
{% with transaction=transaction.display_transaction transfer_to=transaction.transfer_to is_transfer=transaction.shown_as_transfer %}
+{% with subs=transaction.saved_sub_transactions %}
-
+ class="transaction {% if is_transfer %}transfer{% elif transaction.type == "EX" %}expense{% else %}income{% endif %} group/transaction"
+ {% if subs %}x-data="{ subsOpen: false }"{% endif %}>
+
+ {% if subs %}
+ {# Breakdown, opened from the tab hanging under the card; amounts line up with the total #}
+
+
+ {% for sub in subs %}
+
+ {{ sub.name }}
+
+
+ {% endfor %}
+
+
+
+
+ {% blocktranslate count counter=subs|length %}{{ counter }} item{% plural %}{{ counter }} items{% endblocktranslate %}
+
+
+ {% endif %}
{% endwith %}
+{% endwith %}
diff --git a/app/templates/cotton/ui/deleted_transactions_action_bar.html b/app/templates/cotton/ui/deleted_transactions_action_bar.html
index 6b6d5864..918ab801 100644
--- a/app/templates/cotton/ui/deleted_transactions_action_bar.html
+++ b/app/templates/cotton/ui/deleted_transactions_action_bar.html
@@ -17,38 +17,38 @@
end
end">
-
+
{% spaceless %}
0
-
-
-
-
-
+
+
-
+
@@ -59,7 +59,7 @@
data-confirm-text="{% translate "Yes, delete them!" %}" _="install prompt_swal">
-
+
-
-
0
+
+
0
-
+
{% spaceless %}
0
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
+ {# Below md every action folds into a single menu so the bar doesn't overflow #}
+
+
+
+
+
+
+
+
-
-
0
+
+
0
+ {# Breakdown, e.g. fees and taxes inside a contribution #}
+ {% with subs=tx.sub_transactions.all %}{% if subs %}
+
+ {% for sub in subs %}
+ {{ sub.name }}
+ {% endfor %}
+
+ {% endif %}{% endwith %}
-
+
{# What the other side paid beats a rate conversion, so it's shown first #}
{% if p and p.account.currency != a %}
diff --git a/app/templates/transactions/widgets/sub_transaction_row.html b/app/templates/transactions/widgets/sub_transaction_row.html
new file mode 100644
index 00000000..014fc4ba
--- /dev/null
+++ b/app/templates/transactions/widgets/sub_transaction_row.html
@@ -0,0 +1,14 @@
+{% load i18n %}
+
+ {{ sub.id }}
+
+
+ {{ sub.name }}
+ {{ sub.amount }}
+
+
+ {% for error in sub.non_field_errors %}
{{ error }}
{% endfor %}
+ {% for error in sub.name.errors %}
{{ error }}
{% endfor %}
+ {% for error in sub.amount.errors %}
{{ error }}
{% endfor %}
+
diff --git a/app/templates/transactions/widgets/sub_transactions.html b/app/templates/transactions/widgets/sub_transactions.html
new file mode 100644
index 00000000..92f22928
--- /dev/null
+++ b/app/templates/transactions/widgets/sub_transactions.html
@@ -0,0 +1,58 @@
+{% load i18n formats %}
+{% with formset=form.sub_transactions %}
+{# The amount is the sum of these rows, so it's hidden while there are any. #}
+{# Transfers don't take them; `type` comes from the form's _type_aware scope when it has one. #}
+
+ {{ formset.management_form }}
+ {% for error in formset.non_form_errors %}
{{ error }}
{% endfor %}
+
+
{% translate 'Sub-transactions' %}
+
+
+ {% for sub in formset %}
+ {% include "transactions/widgets/sub_transaction_row.html" with sub=sub %}
+ {% endfor %}
+
+
+
+ {% include "transactions/widgets/sub_transaction_row.html" with sub=formset.empty_form %}
+
+
+
+
+ {% translate 'Add sub-transaction' %}
+
+ {% translate 'Total' %}:
+
+
+{% endwith %}
diff --git a/frontend/src/js/datepicker.js b/frontend/src/js/datepicker.js
index 6f5f4fbc..ff530a06 100644
--- a/frontend/src/js/datepicker.js
+++ b/frontend/src/js/datepicker.js
@@ -113,18 +113,32 @@ function isMobile() {
// swaps the body: AirDatepicker then rebuilds the container, but keeps the old
// overlay, which is left detached and can't receive the clicks that close a picker.
let mobileOverlay = null;
+// The container AirDatepicker opens every picker into (its own reference, not a lookup by
+// id: a history restore brings back lifeless copies of it from htmx's snapshot).
+let globalContainer = null;
function createAirDatepicker(element, opts) {
const datepicker = new AirDatepicker(element, opts);
- mobileOverlay ??= document.querySelector('.air-datepicker-overlay');
- const container = document.getElementById(AirDatepicker.defaultGlobalContainerId);
- if (mobileOverlay && !mobileOverlay.isConnected && container) {
+ globalContainer = datepicker.$container;
+ mobileOverlay ??= globalContainer.querySelector('.air-datepicker-overlay');
+ if (mobileOverlay && !mobileOverlay.isConnected) {
mobileOverlay.classList.remove('-active-'); // its picker was swapped out while open
- container.appendChild(mobileOverlay);
+ globalContainer.appendChild(mobileOverlay);
}
return datepicker;
}
+// Pickers kept by hx-preserve aren't recreated, so nothing makes AirDatepicker rebuild
+// the container the swap removed: put it back, and drop any snapshot copies of it.
+// Runs after htmx:load, so pickers created by this swap have already set globalContainer.
+document.addEventListener('htmx:afterSwap', () => {
+ if (!globalContainer) return;
+ document.querySelectorAll(`#${AirDatepicker.defaultGlobalContainerId}`).forEach(c => {
+ if (c !== globalContainer) c.remove();
+ });
+ if (!globalContainer.isConnected) document.body.appendChild(globalContainer);
+});
+
window.DatePicker = async function createDynamicDatePicker(element) {
let todayButton = {
content: element.dataset.nowButtonTxt,
diff --git a/uv.lock b/uv.lock
index 872ac4e0..acc87821 100644
--- a/uv.lock
+++ b/uv.lock
@@ -1069,11 +1069,11 @@ wheels = [
[[package]]
name = "soupsieve"
-version = "2.9"
+version = "4.0"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/80/f1/93422647dd7e461f23d254e6b2bfa687a85b53aeb4903fcdbb74474d4584/soupsieve-2.9.tar.gz", hash = "sha256:acee8417325c5653e1377dc31eccad59eb82cbc65942afe6174c53b3aaad63fc", size = 122122, upload-time = "2026-07-19T01:35:18.425Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/7d/5e/19b7c5d20bc2f226c44f33a9d9aab9740efed7555b96e656231fd564e514/soupsieve-4.0.tar.gz", hash = "sha256:ccd6470b256394ac44b08b86fd94b30a17d335a5335c8a3d15565f7b03d3c8cf", size = 151929, upload-time = "2026-11-03T14:28:55.388Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/7b/d6/3185ab5ad1280319b31986898f3206dd7227cd75e293d4dba2a5e6bf27a0/soupsieve-2.9-py3-none-any.whl", hash = "sha256:a2b2c76d67df2382d245409fd71e321a571717e58463efa32ace87dcadac2c12", size = 37387, upload-time = "2026-07-19T01:35:17.106Z" },
+ { url = "https://files.pythonhosted.org/packages/4f/18/d24df2f733ee0655c58717d51add4118a70e64692d0e47d403b9aac4cf98/soupsieve-4.0-py3-none-any.whl", hash = "sha256:5e7494bfce90e06676cfb4c5c2cf22243e98e5cf24646bb1ecdda46d318550a0", size = 50158, upload-time = "2026-11-03T14:28:53.988Z" },
]
[[package]]