fix: visual bug when backspacing on the "amount" field

style: remove color from scrollbar

.env.example

@@ -31,3 +31,10 @@ ENABLE_SOFT_DELETE=false
 KEEP_DELETED_TRANSACTIONS_FOR=365
 
 TASK_WORKERS=1 # This only work if you're using the single container option. Increase to have more open queues via procrastinate, you probably don't need to increase this.
+
+# OIDC Configuration. Uncomment the lines below if you want to add OIDC login to your instance
+#OIDC_CLIENT_NAME=""
+#OIDC_CLIENT_ID=""
+#OIDC_CLIENT_SECRET=""
+#OIDC_SERVER_URL=""
+#OIDC_ALLOW_SIGNUP=true

README.md

@@ -144,6 +144,31 @@ To create the first user, open the container's console using Unraid's UI, by cli
 | ADMIN_EMAIL                   | string         | None                              | Automatically creates an admin account with this email. Must have `ADMIN_PASSWORD` also set.                                                                                                                                             |
 | ADMIN_PASSWORD                | string         | None                              | Automatically creates an admin account with this password. Must have `ADMIN_EMAIL` also set.                                                                                                                                             |
 
+## OIDC Configuration
+
+WYGIWYH supports login via OpenID Connect (OIDC) through `django-allauth`. This allows users to authenticate using an external OIDC provider.
+
+> [!NOTE]
+> Currently only OpenID Connect is supported as a provider, open an issue if you need something else.
+
+To configure OIDC, you need to set the following environment variables:
+
+| Variable             | Description                                                                                                                                                                                                                                            |
+|----------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `OIDC_CLIENT_NAME`   | The name of the provider. will be displayed in the login page. Defaults to `OpenID Connect`                                                                                                                                                            |
+| `OIDC_CLIENT_ID`     | The Client ID provided by your OIDC provider.                                                                                                                                                                                                          |
+| `OIDC_CLIENT_SECRET` | The Client Secret provided by your OIDC provider.                                                                                                                                                                                                      |
+| `OIDC_SERVER_URL`    | The base URL of your OIDC provider's discovery document or authorization server (e.g., `https://your-provider.com/auth/realms/your-realm`). `django-allauth` will use this to discover the necessary endpoints (authorization, token, userinfo, etc.). |
+| `OIDC_ALLOW_SIGNUP`  | Allow the automatic creation of inexistent accounts on a successfull authentication. Defaults to `true`.                                                                                                                                               |
+
+**Callback URL (Redirect URI):**
+
+When configuring your OIDC provider, you will need to provide a callback URL (also known as a Redirect URI). For WYGIWYH, the default callback URL is:
+
+`https://your.wygiwyh.domain/auth/oidc/<OIDC_CLIENT_NAME>/login/callback/`
+
+Replace `https://your.wygiwyh.domain` with the actual URL where your WYGIWYH instance is accessible. And `<OIDC_CLIENT_NAME>` with the slugfied value set in OIDC_CLIENT_NAME or the default `openid-connect` if you haven't set this variable.
+
 # How it works
 
 Check out our [Wiki](https://github.com/eitchtee/WYGIWYH/wiki) for more information.

app/WYGIWYH/settings.py

@@ -14,6 +14,7 @@ import os
 import sys
 from pathlib import Path
 
+from django.utils.text import slugify
 
 SITE_TITLE = "WYGIWYH"
 TITLE_SEPARATOR = "::"
@@ -42,6 +43,7 @@ INSTALLED_APPS = [
     "django.contrib.contenttypes",
     "django.contrib.sessions",
     "django.contrib.messages",
+    "django.contrib.sites",
     "whitenoise.runserver_nostatic",
     "django.contrib.staticfiles",
     "webpack_boilerplate",
@@ -61,7 +63,6 @@ INSTALLED_APPS = [
     "apps.transactions.apps.TransactionsConfig",
     "apps.currencies.apps.CurrenciesConfig",
     "apps.accounts.apps.AccountsConfig",
-    "apps.common.apps.CommonConfig",
     "apps.net_worth.apps.NetWorthConfig",
     "apps.import_app.apps.ImportConfig",
     "apps.export_app.apps.ExportConfig",
@@ -74,8 +75,15 @@ INSTALLED_APPS = [
     "apps.calendar_view.apps.CalendarViewConfig",
     "apps.dca.apps.DcaConfig",
     "pwa",
+    "allauth",
+    "allauth.account",
+    "allauth.socialaccount",
+    "allauth.socialaccount.providers.openid_connect",
+    "apps.common.apps.CommonConfig",
 ]
 
+SITE_ID = 1
+
 MIDDLEWARE = [
     "django_browser_reload.middleware.BrowserReloadMiddleware",
     "apps.common.middleware.thread_local.ThreadLocalMiddleware",
@@ -91,6 +99,7 @@ MIDDLEWARE = [
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
     "hijack.middleware.HijackUserMiddleware",
+    "allauth.account.middleware.AccountMiddleware",
 ]
 
 ROOT_URLCONF = "WYGIWYH.urls"
@@ -307,6 +316,42 @@ DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 
 LOGIN_REDIRECT_URL = "/"
 LOGIN_URL = "/login/"
+LOGOUT_REDIRECT_URL = "/login/"
+
+# Allauth settings
+AUTHENTICATION_BACKENDS = [
+    "django.contrib.auth.backends.ModelBackend",  # Keep default
+    "allauth.account.auth_backends.AuthenticationBackend",
+]
+
+SOCIALACCOUNT_PROVIDERS = {"openid_connect": {"APPS": []}}
+
+if (
+    os.getenv("OIDC_CLIENT_ID")
+    and os.getenv("OIDC_CLIENT_SECRET")
+    and os.getenv("OIDC_SERVER_URL")
+):
+    SOCIALACCOUNT_PROVIDERS["openid_connect"]["APPS"].append(
+        {
+            "provider_id": slugify(os.getenv("OIDC_CLIENT_NAME", "OpenID Connect")),
+            "name": os.getenv("OIDC_CLIENT_NAME", "OpenID Connect"),
+            "client_id": os.getenv("OIDC_CLIENT_ID"),
+            "secret": os.getenv("OIDC_CLIENT_SECRET"),
+            "settings": {
+                "server_url": os.getenv("OIDC_SERVER_URL"),
+            },
+        }
+    )
+
+ACCOUNT_LOGIN_METHODS = {"email"}
+ACCOUNT_SIGNUP_FIELDS = ["email*", "password1*", "password2*"]
+ACCOUNT_USER_MODEL_USERNAME_FIELD = None
+ACCOUNT_EMAIL_VERIFICATION = "none"
+SOCIALACCOUNT_LOGIN_ON_GET = True
+SOCIALACCOUNT_ONLY = True
+SOCIALACCOUNT_AUTO_SIGNUP = os.getenv("OIDC_ALLOW_SIGNUP", "true").lower() == "true"
+ACCOUNT_ADAPTER = "allauth.account.adapter.DefaultAccountAdapter"
+SOCIALACCOUNT_ADAPTER = "allauth.socialaccount.adapter.DefaultSocialAccountAdapter"
 
 # CRISPY FORMS
 CRISPY_ALLOWED_TEMPLATE_PACKS = ["bootstrap5", "crispy_forms/pure_text"]

app/WYGIWYH/urls.py

@@ -21,6 +21,8 @@ from drf_spectacular.views import (
     SpectacularAPIView,
     SpectacularSwaggerView,
 )
+from allauth.socialaccount.providers.openid_connect.views import login, callback
+
 
 urlpatterns = [
     path("admin/", admin.site.urls),
@@ -36,6 +38,13 @@ urlpatterns = [
         SpectacularSwaggerView.as_view(url_name="schema"),
         name="swagger-ui",
     ),
+    path("auth/", include("allauth.urls")),  # allauth urls
+    # path("auth/oidc/<str:provider_id>/login/", login, name="openid_connect_login"),
+    # path(
+    #     "auth/oidc/<str:provider_id>/login/callback/",
+    #     callback,
+    #     name="openid_connect_callback",
+    # ),
     path("", include("apps.transactions.urls")),
     path("", include("apps.common.urls")),
     path("", include("apps.users.urls")),

app/apps/accounts/tests.py

@@ -1,33 +1,19 @@
-from django.test import TestCase, Client
-from django.core.exceptions import ValidationError
-from django.contrib.auth.models import User
-from django.db import IntegrityError, models
-from django.utils import timezone
-from django.urls import reverse
-from decimal import Decimal
+from django.test import TestCase
 
 from apps.accounts.models import Account, AccountGroup
 from apps.currencies.models import Currency
-from apps.accounts.forms import AccountForm
-from apps.transactions.models import Transaction, TransactionCategory
 
 
 class AccountTests(TestCase):
     def setUp(self):
         """Set up test data"""
-        self.owner1 = User.objects.create_user(username='testowner', password='password123')
-        self.client = Client()
-        self.client.login(username='testowner', password='password123')
-
         self.currency = Currency.objects.create(
             code="USD", name="US Dollar", decimal_places=2, prefix="$ "
         )
-        self.eur = Currency.objects.create(
+        self.exchange_currency = Currency.objects.create(
             code="EUR", name="Euro", decimal_places=2, prefix="€ "
         )
-        self.account_group = AccountGroup.objects.create(name="Test Group", owner=self.owner1)
-        self.reconciliation_category = TransactionCategory.objects.create(name='Reconciliation', owner=self.owner1, type='INFO')
-
+        self.account_group = AccountGroup.objects.create(name="Test Group")
 
     def test_account_creation(self):
         """Test basic account creation"""
@@ -49,262 +35,7 @@ class AccountTests(TestCase):
         """Test account creation with exchange currency"""
         account = Account.objects.create(
             name="Exchange Account",
-            owner=self.owner1, # Added owner
-            group=self.account_group, # Added group
             currency=self.currency,
-            exchange_currency=self.eur, # Changed to self.eur
+            exchange_currency=self.exchange_currency,
         )
-        self.assertEqual(account.exchange_currency, self.eur) # Changed to self.eur
-
-    def test_account_archiving(self):
-        """Test archiving and unarchiving an account"""
-        account = Account.objects.create(
-            name="Archivable Account",
-            owner=self.owner1, # Added owner
-            group=self.account_group,
-            currency=self.currency,
-            is_asset=True, # Assuming default, can be anything for this test
-            is_archived=False,
-        )
-        self.assertFalse(account.is_archived, "Account should initially be unarchived")
-
-        # Archive the account
-        account.is_archived = True
-        account.save()
-
-        archived_account = Account.objects.get(pk=account.pk)
-        self.assertTrue(archived_account.is_archived, "Account should be archived")
-
-        # Unarchive the account
-        archived_account.is_archived = False
-        archived_account.save()
-
-        unarchived_account = Account.objects.get(pk=account.pk)
-        self.assertFalse(unarchived_account.is_archived, "Account should be unarchived")
-
-    def test_account_exchange_currency_cannot_be_same_as_currency(self):
-        """Test that exchange_currency cannot be the same as currency."""
-        with self.assertRaises(ValidationError) as cm:
-            account = Account(
-                name="Same Currency Account",
-                owner=self.owner1, # Added owner
-                group=self.account_group,
-                currency=self.currency,
-                exchange_currency=self.currency,  # Same as currency
-            )
-            account.full_clean()
-        self.assertIn('exchange_currency', cm.exception.error_dict)
-        # To check for a specific message (optional, might make test brittle):
-        # self.assertTrue(any("cannot be the same as the main currency" in e.message
-        #                     for e in cm.exception.error_dict['exchange_currency']))
-
-    def test_account_name_unique_per_owner(self):
-        """Test that account name is unique per owner."""
-        owner1 = User.objects.create_user(username='owner1', password='password123')
-        owner2 = User.objects.create_user(username='owner2', password='password123')
-
-        # Initial account for self.owner1 (owner1 from setUp)
-        Account.objects.create(
-            name="Unique Name Test",
-            owner=self.owner1, # Changed to self.owner1
-            group=self.account_group,
-            currency=self.currency,
-        )
-
-        # Attempt to create another account with the same name and self.owner1 - should fail
-        with self.assertRaises(IntegrityError):
-            Account.objects.create(
-                name="Unique Name Test",
-                owner=self.owner1, # Changed to self.owner1
-                group=self.account_group,
-                currency=self.currency,
-            )
-
-        # Create account with the same name but for owner2 - should succeed
-        try:
-            Account.objects.create(
-                name="Unique Name Test",
-                owner=owner2, # owner2 is locally defined here, that's fine for this test
-                group=self.account_group,
-                currency=self.currency,
-            )
-        except IntegrityError:
-            self.fail("Creating account with same name but different owner failed unexpectedly.")
-
-        # Create account with a different name for self.owner1 - should succeed
-        try:
-            Account.objects.create(
-                name="Another Name Test",
-                owner=self.owner1, # Changed to self.owner1
-                group=self.account_group,
-                currency=self.currency,
-            )
-        except IntegrityError:
-            self.fail("Creating account with different name for the same owner failed unexpectedly.")
-
-    def test_account_form_valid_data(self):
-        """Test AccountForm with valid data."""
-        form_data = {
-            'name': 'Form Test Account',
-            'group': self.account_group.pk,
-            'currency': self.currency.pk,
-            'exchange_currency': self.eur.pk,
-            'is_asset': True,
-            'is_archived': False,
-            'description': 'A valid test account from form.'
-        }
-        form = AccountForm(data=form_data)
-        self.assertTrue(form.is_valid(), form.errors.as_text())
-
-        account = form.save(commit=False)
-        account.owner = self.owner1
-        account.save()
-
-        self.assertEqual(account.name, 'Form Test Account')
-        self.assertEqual(account.owner, self.owner1)
-        self.assertEqual(account.group, self.account_group)
-        self.assertEqual(account.currency, self.currency)
-        self.assertEqual(account.exchange_currency, self.eur)
-        self.assertTrue(account.is_asset)
-        self.assertFalse(account.is_archived)
-
-    def test_account_form_missing_name(self):
-        """Test AccountForm with missing name."""
-        form_data = {
-            'group': self.account_group.pk,
-            'currency': self.currency.pk,
-        }
-        form = AccountForm(data=form_data)
-        self.assertFalse(form.is_valid())
-        self.assertIn('name', form.errors)
-
-    def test_account_form_exchange_currency_same_as_currency(self):
-        """Test AccountForm where exchange_currency is the same as currency."""
-        form_data = {
-            'name': 'Same Currency Form Account',
-            'group': self.account_group.pk,
-            'currency': self.currency.pk,
-            'exchange_currency': self.currency.pk,  # Same as currency
-        }
-        form = AccountForm(data=form_data)
-        self.assertFalse(form.is_valid())
-        self.assertIn('exchange_currency', form.errors)
-
-
-class AccountGroupTests(TestCase):
-    def setUp(self):
-        """Set up test data for AccountGroup tests."""
-        self.owner1 = User.objects.create_user(username='groupowner1', password='password123')
-        self.owner2 = User.objects.create_user(username='groupowner2', password='password123')
-
-    def test_account_group_creation(self):
-        """Test basic AccountGroup creation."""
-        group = AccountGroup.objects.create(name="Test Group", owner=self.owner1)
-        self.assertEqual(group.name, "Test Group")
-        self.assertEqual(group.owner, self.owner1)
-        self.assertEqual(str(group), "Test Group") # Assuming __str__ returns the name
-
-    def test_account_group_name_unique_per_owner(self):
-        """Test that AccountGroup name is unique per owner."""
-        # Initial group for owner1
-        AccountGroup.objects.create(name="Unique Group Name", owner=self.owner1)
-
-        # Attempt to create another group with the same name and owner1 - should fail
-        with self.assertRaises(IntegrityError):
-            AccountGroup.objects.create(name="Unique Group Name", owner=self.owner1)
-
-        # Create group with the same name but for owner2 - should succeed
-        try:
-            AccountGroup.objects.create(name="Unique Group Name", owner=self.owner2)
-        except IntegrityError:
-            self.fail("Creating group with same name but different owner failed unexpectedly.")
-
-        # Create group with a different name for owner1 - should succeed
-        try:
-            AccountGroup.objects.create(name="Another Group Name", owner=self.owner1)
-        except IntegrityError:
-            self.fail("Creating group with different name for the same owner failed unexpectedly.")
-
-    def test_account_reconciliation_creates_transaction(self):
-        """Test that account_reconciliation view creates a transaction for the difference."""
-
-        # Helper function to get balance
-        def get_balance(account):
-            balance = account.transactions.filter(is_paid=True).aggregate(
-                total_income=models.Sum('amount', filter=models.Q(type=Transaction.Type.INCOME)),
-                total_expense=models.Sum('amount', filter=models.Q(type=Transaction.Type.EXPENSE)),
-                total_transfer_in=models.Sum('amount', filter=models.Q(type=Transaction.Type.TRANSFER, transfer_to_account=account)),
-                total_transfer_out=models.Sum('amount', filter=models.Q(type=Transaction.Type.TRANSFER, account=account))
-            )['total_income'] or Decimal('0.00')
-            balance -= account.transactions.filter(is_paid=True).aggregate(
-                total_expense=models.Sum('amount', filter=models.Q(type=Transaction.Type.EXPENSE))
-            )['total_expense'] or Decimal('0.00')
-            # For transfers, a more complete logic might be needed if transfers are involved in reconciliation scope
-            return balance
-
-        account_usd = Account.objects.create(
-            name="USD Account for Recon",
-            owner=self.owner1,
-            currency=self.currency,
-            group=self.account_group
-        )
-        account_eur = Account.objects.create(
-            name="EUR Account for Recon",
-            owner=self.owner1,
-            currency=self.eur,
-            group=self.account_group
-        )
-
-        # Initial transactions
-        Transaction.objects.create(account=account_usd, type=Transaction.Type.INCOME, amount=Decimal('100.00'), date=timezone.localdate(timezone.now()), description='Initial USD', category=self.reconciliation_category, owner=self.owner1, is_paid=True)
-        Transaction.objects.create(account=account_eur, type=Transaction.Type.INCOME, amount=Decimal('200.00'), date=timezone.localdate(timezone.now()), description='Initial EUR', category=self.reconciliation_category, owner=self.owner1, is_paid=True)
-        Transaction.objects.create(account=account_eur, type=Transaction.Type.EXPENSE, amount=Decimal('50.00'), date=timezone.localdate(timezone.now()), description='EUR Expense', category=self.reconciliation_category, owner=self.owner1, is_paid=True)
-
-        initial_usd_balance = get_balance(account_usd) # Should be 100.00
-        initial_eur_balance = get_balance(account_eur) # Should be 150.00
-        self.assertEqual(initial_usd_balance, Decimal('100.00'))
-        self.assertEqual(initial_eur_balance, Decimal('150.00'))
-
-        initial_transaction_count = Transaction.objects.filter(owner=self.owner1).count() # Should be 3
-
-        formset_data = {
-            'form-TOTAL_FORMS': '2',
-            'form-INITIAL_FORMS': '2', # Based on view logic, it builds initial data for all accounts
-            'form-MAX_NUM_FORMS': '', # Can be empty or a number >= TOTAL_FORMS
-            'form-0-account_id': account_usd.id,
-            'form-0-new_balance': '120.00', # New balance for USD account (implies +20 adjustment)
-            'form-0-category': self.reconciliation_category.id,
-            'form-1-account_id': account_eur.id,
-            'form-1-new_balance': '150.00', # Same as current balance for EUR account (no adjustment)
-            'form-1-category': self.reconciliation_category.id,
-        }
-
-        response = self.client.post(
-            reverse('accounts:account_reconciliation'),
-            data=formset_data,
-            HTTP_HX_REQUEST='true' # Required if view uses @only_htmx
-        )
-
-        self.assertEqual(response.status_code, 204, response.content.decode()) # 204 No Content for successful HTMX POST
-
-        # Check that only one new transaction was created
-        self.assertEqual(Transaction.objects.filter(owner=self.owner1).count(), initial_transaction_count + 1)
-
-        # Get the newly created transaction
-        new_transaction = Transaction.objects.filter(
-            account=account_usd,
-            description="Balance reconciliation"
-        ).first()
-
-        self.assertIsNotNone(new_transaction)
-        self.assertEqual(new_transaction.type, Transaction.Type.INCOME)
-        self.assertEqual(new_transaction.amount, Decimal('20.00'))
-        self.assertEqual(new_transaction.category, self.reconciliation_category)
-        self.assertEqual(new_transaction.owner, self.owner1)
-        self.assertTrue(new_transaction.is_paid)
-        self.assertEqual(new_transaction.date, timezone.localdate(timezone.now()))
-
-
-        # Verify final balances
-        self.assertEqual(get_balance(account_usd), Decimal('120.00'))
-        self.assertEqual(get_balance(account_eur), Decimal('150.00'))
+        self.assertEqual(account.exchange_currency, self.exchange_currency)

app/apps/api/tests.py

@@ -1,124 +0,0 @@
-from django.test import TestCase
-from django.contrib.auth.models import User
-from rest_framework.test import APIClient
-from django.urls import reverse
-from datetime import date
-from decimal import Decimal
-from unittest.mock import patch
-
-from apps.accounts.models import Account, AccountGroup # Added AccountGroup
-from apps.currencies.models import Currency
-from apps.transactions.models import TransactionCategory, Transaction
-from apps.rules.signals import transaction_created # Assuming this is the correct path
-
-# Default page size for pagination, adjust if your project's default is different
-DEFAULT_PAGE_SIZE = 10
-
-class APITestCase(TestCase):
-    def setUp(self):
-        self.user = User.objects.create_user(username='testuser', email='test@example.com', password='testpassword')
-        self.client = APIClient()
-        self.client.force_authenticate(user=self.user)
-
-        self.currency = Currency.objects.create(code="USD", name="US Dollar Test API", decimal_places=2)
-        # Account model requires an AccountGroup
-        self.account_group = AccountGroup.objects.create(name="API Test Group", owner=self.user)
-        self.account = Account.objects.create(
-            name="Test API Account",
-            currency=self.currency,
-            owner=self.user,
-            group=self.account_group
-        )
-        self.category = TransactionCategory.objects.create(
-            name="Test API Category",
-            owner=self.user,
-            type=TransactionCategory.TransactionType.EXPENSE # Default type, can be adjusted
-        )
-        # Remove the example test if it's no longer needed or update it
-        # self.assertEqual(1 + 1, 2) # from test_example
-
-    def test_transactions_endpoint_authenticated_user(self):
-        # User and client are now set up in self.setUp
-        url = reverse('api:transaction-list') # Using 'api:' namespace
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-
-    @patch('apps.rules.signals.transaction_created.send')
-    def test_create_transaction_api_success(self, mock_signal_send):
-        url = reverse('api:transaction-list')
-        data = {
-            'account': self.account.pk, # Changed from account_id to account to match typical DRF serializer field names
-            'type': Transaction.Type.EXPENSE.value, # Use enum value
-            'date': date(2023, 1, 15).isoformat(),
-            'amount': '123.45',
-            'description': 'API Test Expense',
-            'category': self.category.pk,
-            'tags': [],
-            'entities': []
-        }
-
-        initial_transaction_count = Transaction.objects.count()
-        response = self.client.post(url, data, format='json')
-
-        self.assertEqual(response.status_code, 201, response.data) # Print response.data on failure
-        self.assertEqual(Transaction.objects.count(), initial_transaction_count + 1)
-
-        created_transaction = Transaction.objects.latest('id') # Get the latest transaction
-
-        self.assertEqual(created_transaction.description, 'API Test Expense')
-        self.assertEqual(created_transaction.amount, Decimal('123.45'))
-        self.assertEqual(created_transaction.owner, self.user)
-        self.assertEqual(created_transaction.account, self.account)
-        self.assertEqual(created_transaction.category, self.category)
-
-        mock_signal_send.assert_called_once()
-        # Check sender argument of the signal call
-        self.assertEqual(mock_signal_send.call_args.kwargs['sender'], Transaction)
-        self.assertEqual(mock_signal_send.call_args.kwargs['instance'], created_transaction)
-
-
-    def test_create_transaction_api_invalid_data(self):
-        url = reverse('api:transaction-list')
-        data = {
-            'account': self.account.pk,
-            'type': 'INVALID_TYPE', # Invalid type
-            'date': date(2023, 1, 15).isoformat(),
-            'amount': 'not_a_number', # Invalid amount
-            'description': 'API Test Invalid Data',
-            'category': self.category.pk
-        }
-        response = self.client.post(url, data, format='json')
-
-        self.assertEqual(response.status_code, 400)
-        self.assertIn('type', response.data)
-        self.assertIn('amount', response.data)
-
-    def test_transaction_list_pagination(self):
-        # Create more transactions than page size (e.g., DEFAULT_PAGE_SIZE + 5)
-        num_to_create = DEFAULT_PAGE_SIZE + 5
-        for i in range(num_to_create):
-            Transaction.objects.create(
-                account=self.account,
-                type=Transaction.Type.EXPENSE,
-                date=date(2023, 1, 1) + timedelta(days=i),
-                amount=Decimal(f"{10 + i}.00"),
-                description=f"Pag Test Transaction {i+1}",
-                owner=self.user,
-                category=self.category
-            )
-
-        url = reverse('api:transaction-list')
-        response = self.client.get(url)
-
-        self.assertEqual(response.status_code, 200)
-        self.assertIn('count', response.data)
-        self.assertEqual(response.data['count'], num_to_create)
-
-        self.assertIn('next', response.data)
-        self.assertIsNotNone(response.data['next']) # Assuming count > page size
-
-        self.assertIn('previous', response.data) # Will be None for the first page
-        # self.assertIsNone(response.data['previous']) # For the first page
-
-        self.assertIn('results', response.data)
-        self.assertEqual(len(response.data['results']), DEFAULT_PAGE_SIZE)

app/apps/calendar_view/tests.py

@@ -1,100 +0,0 @@
-from django.test import TestCase, Client
-from django.contrib.auth.models import User
-from django.urls import reverse
-from django.utils import timezone # Though specific dates are used, good for general test setup
-from decimal import Decimal
-from datetime import date
-
-from apps.accounts.models import Account, AccountGroup
-from apps.currencies.models import Currency
-from apps.transactions.models import TransactionCategory, Transaction
-# from apps.calendar_view.utils.calendar import get_transactions_by_day # Not directly testing this util here
-
-class CalendarViewTests(TestCase): # Renamed from CalendarViewTestCase to CalendarViewTests
-    def setUp(self):
-        self.user = User.objects.create_user(username='testcalendaruser', password='password')
-        self.client = Client()
-        self.client.login(username='testcalendaruser', password='password')
-
-        self.currency_usd = Currency.objects.create(name="CV USD", code="CVUSD", decimal_places=2, prefix="$CV ")
-        self.account_group = AccountGroup.objects.create(name="CV Group", owner=self.user)
-        self.account_usd1 = Account.objects.create(
-            name="CV Account USD 1",
-            currency=self.currency_usd,
-            owner=self.user,
-            group=self.account_group
-        )
-        self.category_cv = TransactionCategory.objects.create(
-            name="CV Cat",
-            owner=self.user,
-            type=TransactionCategory.TransactionType.INFO # Using INFO as a generic type
-        )
-
-        # Transactions for specific dates
-        self.t1 = Transaction.objects.create(
-            owner=self.user, account=self.account_usd1, category=self.category_cv,
-            date=date(2023, 3, 5), amount=Decimal("10.00"),
-            type=Transaction.Type.EXPENSE, is_paid=True, description="March 5th Tx"
-        )
-        self.t2 = Transaction.objects.create(
-            owner=self.user, account=self.account_usd1, category=self.category_cv,
-            date=date(2023, 3, 10), amount=Decimal("20.00"),
-            type=Transaction.Type.EXPENSE, is_paid=True, description="March 10th Tx"
-        )
-        self.t3 = Transaction.objects.create(
-            owner=self.user, account=self.account_usd1, category=self.category_cv,
-            date=date(2023, 4, 5), amount=Decimal("30.00"),
-            type=Transaction.Type.EXPENSE, is_paid=True, description="April 5th Tx"
-        )
-
-    def test_calendar_list_view_context_data(self):
-        # Assumes 'calendar_view:calendar_list' is the correct URL name for the main calendar view
-        # The previous test used 'calendar_view:calendar'. I'll assume 'calendar_list' is the new/correct one.
-        # If the view that shows the grid is named 'calendar', this should be adjusted.
-        # Based on subtask, this is for calendar_list view.
-        url = reverse('calendar_view:calendar_list', kwargs={'month': 3, 'year': 2023})
-        response = self.client.get(url)
-
-        self.assertEqual(response.status_code, 200)
-        self.assertIn('dates', response.context)
-
-        dates_context = response.context['dates']
-
-        entry_mar5 = next((d for d in dates_context if d['date'] == date(2023, 3, 5)), None)
-        self.assertIsNotNone(entry_mar5, "Date March 5th not found in context.")
-        self.assertIn(self.t1, entry_mar5['transactions'], "Transaction t1 not in March 5th transactions.")
-
-        entry_mar10 = next((d for d in dates_context if d['date'] == date(2023, 3, 10)), None)
-        self.assertIsNotNone(entry_mar10, "Date March 10th not found in context.")
-        self.assertIn(self.t2, entry_mar10['transactions'], "Transaction t2 not in March 10th transactions.")
-
-        for day_data in dates_context:
-            self.assertNotIn(self.t3, day_data['transactions'], f"Transaction t3 (April 5th) found in March {day_data['date']} transactions.")
-
-    def test_calendar_transactions_list_view_specific_day(self):
-        url = reverse('calendar_view:calendar_transactions_list', kwargs={'day': 5, 'month': 3, 'year': 2023})
-        response = self.client.get(url)
-
-        self.assertEqual(response.status_code, 200)
-        self.assertIn('transactions', response.context)
-
-        transactions_context = response.context['transactions']
-
-        self.assertIn(self.t1, transactions_context, "Transaction t1 (March 5th) not found in context for specific day view.")
-        self.assertNotIn(self.t2, transactions_context, "Transaction t2 (March 10th) found in context for March 5th.")
-        self.assertNotIn(self.t3, transactions_context, "Transaction t3 (April 5th) found in context for March 5th.")
-        self.assertEqual(len(transactions_context), 1)
-
-    def test_calendar_view_authenticated_user_generic_month(self):
-        # This is similar to the old test_calendar_view_authenticated_user.
-        # It tests general access to the main calendar view (which might be 'calendar_list' or 'calendar')
-        # Let's use the 'calendar' name as it was in the old test, assuming it's the main monthly view.
-        # If 'calendar_list' is the actual main monthly view, this might be slightly redundant
-        # with the setup of test_calendar_list_view_context_data but still good for general access check.
-        url = reverse('calendar_view:calendar', args=[2023, 1]) # e.g. Jan 2023
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        # Further context checks could be added here if this view has a different structure than 'calendar_list'
-        self.assertIn('dates', response.context) # Assuming it also provides 'dates'
-        self.assertIn('current_month_date', response.context)
-        self.assertEqual(response.context['current_month_date'], date(2023,1,1))

app/apps/common/apps.py

@@ -4,3 +4,17 @@ from django.apps import AppConfig
 class CommonConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
     name = "apps.common"
+
+    def ready(self):
+        from django.contrib import admin
+        from django.contrib.sites.models import Site
+        from allauth.socialaccount.models import (
+            SocialAccount,
+            SocialApp,
+            SocialToken,
+        )
+
+        admin.site.unregister(Site)
+        admin.site.unregister(SocialAccount)
+        admin.site.unregister(SocialApp)
+        admin.site.unregister(SocialToken)

app/apps/common/functions/format.py

@@ -5,7 +5,7 @@ from django.utils.formats import get_format as original_get_format
 def get_format(format_type=None, lang=None, use_l10n=None):
     user = get_current_user()
 
-    if user and user.is_authenticated and hasattr(user, "settings"):
+    if user and user.is_authenticated and hasattr(user, "settings") and use_l10n:
         user_settings = user.settings
         if format_type == "THOUSAND_SEPARATOR":
             number_format = getattr(user_settings, "number_format", None)

app/apps/common/models.py

@@ -65,6 +65,18 @@ class SharedObject(models.Model):
         super().save(*args, **kwargs)
 
 
+class OwnedObjectManager(models.Manager):
+    def get_queryset(self):
+        """Return only objects the user can access"""
+        user = get_current_user()
+        base_qs = super().get_queryset()
+
+        if user and user.is_authenticated:
+            return base_qs.filter(Q(owner=user) | Q(owner=None)).distinct()
+
+        return base_qs
+
+
 class OwnedObject(models.Model):
     owner = models.ForeignKey(
         settings.AUTH_USER_MODEL,

app/apps/common/tests.py

@@ -1,183 +0,0 @@
-from django.test import TestCase, RequestFactory
-from django.template import Template, Context
-from django.urls import reverse, resolve, NoReverseMatch
-from django.contrib.auth.models import User
-from decimal import Decimal # Keep existing imports if they are from other tests
-from app.apps.common.functions.decimals import truncate_decimal # Keep existing imports
-
-# Helper to create a dummy request with resolver_match
-def setup_request_for_view(factory, view_name_or_url, user=None, namespace=None, view_name_for_resolver=None):
-    try:
-        url = reverse(view_name_or_url)
-    except NoReverseMatch:
-        url = view_name_or_url # Assume it's already a URL path
-
-    request = factory.get(url)
-    if user:
-        request.user = user
-
-    try:
-        # For resolver_match, we need to simulate how Django does it.
-        # It needs specific view_name and namespace if applicable.
-        # If view_name_for_resolver is provided, use that for resolving,
-        # otherwise, assume view_name_or_url is the view name for resolver_match.
-        resolver_match_source = view_name_for_resolver if view_name_for_resolver else view_name_or_url
-
-        # If it's a namespaced view name like 'app:view', resolve might handle it directly.
-        # If namespace is separately provided, it means the view_name itself is not namespaced.
-        resolved_match = resolve(url) # Resolve the URL to get func, args, kwargs, etc.
-
-        # Ensure resolver_match has the correct attributes, especially 'view_name' and 'namespace'
-        if hasattr(resolved_match, 'view_name'):
-            if ':' in resolved_match.view_name and not namespace: # e.g. 'app_name:view_name'
-                request.resolver_match = resolved_match
-            elif namespace and resolved_match.namespace == namespace and resolved_match.url_name == resolver_match_source.split(':')[-1]:
-                request.resolver_match = resolved_match
-            elif not namespace and resolved_match.url_name == resolver_match_source:
-                 request.resolver_match = resolved_match
-            else: # Fallback or if specific view_name/namespace parts are needed for resolver_match
-                # This part is tricky without knowing the exact structure of resolver_match expected by the tag
-                # Forcing the view_name and namespace if they are explicitly passed.
-                if namespace:
-                    resolved_match.namespace = namespace
-                if view_name_for_resolver: # This should be the non-namespaced view name part
-                     resolved_match.view_name = f"{namespace}:{view_name_for_resolver.split(':')[-1]}" if namespace else view_name_for_resolver.split(':')[-1]
-                     resolved_match.url_name = view_name_for_resolver.split(':')[-1]
-
-                request.resolver_match = resolved_match
-
-        else: # Fallback if resolve() doesn't directly give a full resolver_match object as expected
-            request.resolver_match = None
-
-
-    except Exception as e:
-        print(f"Warning: Could not resolve URL or set resolver_match for '{view_name_or_url}' (or '{view_name_for_resolver}') for test setup: {e}")
-        request.resolver_match = None
-    return request
-
-class CommonTestCase(TestCase): # Keep existing test class if other tests depend on it
-    def test_example(self): # Example of an old test
-        self.assertEqual(1 + 1, 2)
-
-    def test_truncate_decimal_function(self): # Example of an old test from problem description
-        test_cases = [
-            (Decimal('123.456'), 0, Decimal('123')),
-            (Decimal('123.456'), 1, Decimal('123.4')),
-            (Decimal('123.456'), 2, Decimal('123.45')),
-        ]
-        for value, places, expected in test_cases:
-            with self.subTest(value=value, places=places, expected=expected):
-                self.assertEqual(truncate_decimal(value, places), expected)
-
-
-class CommonTemplateTagsTests(TestCase):
-    def setUp(self):
-        self.factory = RequestFactory()
-        self.user = User.objects.create_user('testuser', 'password123')
-
-        # Using view names that should exist in a typical Django project with auth
-        # Ensure these URLs are part of your project's urlpatterns for tests to pass.
-        self.view_name_login = 'login' # Typically 'login' or 'account_login'
-        self.namespace_login = None # Often no namespace for basic auth views, or 'account'
-
-        self.view_name_admin = 'admin:index' # Admin index
-        self.namespace_admin = 'admin'
-
-        # Check if these can be reversed, skip tests if not.
-        try:
-            reverse(self.view_name_login)
-        except NoReverseMatch:
-            self.view_name_login = None # Mark as unusable
-            print(f"Warning: Could not reverse '{self.view_name_login}'. Some active_link tests might be skipped.")
-        try:
-            reverse(self.view_name_admin)
-        except NoReverseMatch:
-            self.view_name_admin = None # Mark as unusable
-            print(f"Warning: Could not reverse '{self.view_name_admin}'. Some active_link tests might be skipped.")
-
-    def test_active_link_view_match(self):
-        if not self.view_name_login: self.skipTest("Login URL not reversible.")
-        request = setup_request_for_view(self.factory, self.view_name_login, self.user,
-                                         namespace=self.namespace_login, view_name_for_resolver=self.view_name_login)
-        if not request.resolver_match: self.skipTest(f"Could not set resolver_match for {self.view_name_login}.")
-
-        template_str = "{% load active_link %} {% active_link views='" + self.view_name_login + "' %}"
-        template = Template(template_str)
-        rendered = template.render(Context({'request': request}))
-        self.assertEqual(rendered.strip(), "active")
-
-    def test_active_link_view_no_match(self):
-        if not self.view_name_login: self.skipTest("Login URL not reversible.")
-        request = setup_request_for_view(self.factory, self.view_name_login, self.user,
-                                         namespace=self.namespace_login, view_name_for_resolver=self.view_name_login)
-        if not request.resolver_match: self.skipTest(f"Could not set resolver_match for {self.view_name_login}.")
-
-        template_str = "{% load active_link %} {% active_link views='non_existent_view_name' %}"
-        template = Template(template_str)
-        rendered = template.render(Context({'request': request}))
-        self.assertEqual(rendered.strip(), "")
-
-    def test_active_link_view_match_custom_class(self):
-        if not self.view_name_login: self.skipTest("Login URL not reversible.")
-        request = setup_request_for_view(self.factory, self.view_name_login, self.user,
-                                         namespace=self.namespace_login, view_name_for_resolver=self.view_name_login)
-        if not request.resolver_match: self.skipTest(f"Could not set resolver_match for {self.view_name_login}.")
-
-        template_str = "{% load active_link %} {% active_link views='" + self.view_name_login + "' css_class='custom-active' %}"
-        template = Template(template_str)
-        rendered = template.render(Context({'request': request}))
-        self.assertEqual(rendered.strip(), "custom-active")
-
-    def test_active_link_view_no_match_inactive_class(self):
-        if not self.view_name_login: self.skipTest("Login URL not reversible.")
-        request = setup_request_for_view(self.factory, self.view_name_login, self.user,
-                                         namespace=self.namespace_login, view_name_for_resolver=self.view_name_login)
-        if not request.resolver_match: self.skipTest(f"Could not set resolver_match for {self.view_name_login}.")
-
-        template_str = "{% load active_link %} {% active_link views='non_existent_view_name' inactive_class='custom-inactive' %}"
-        template = Template(template_str)
-        rendered = template.render(Context({'request': request}))
-        self.assertEqual(rendered.strip(), "custom-inactive")
-
-    def test_active_link_namespace_match(self):
-        if not self.view_name_admin: self.skipTest("Admin URL not reversible.")
-        # The view_name_admin is already namespaced 'admin:index'
-        request = setup_request_for_view(self.factory, self.view_name_admin, self.user,
-                                         namespace=self.namespace_admin, view_name_for_resolver=self.view_name_admin)
-        if not request.resolver_match: self.skipTest(f"Could not set resolver_match for {self.view_name_admin}.")
-        # Ensure the resolver_match has the namespace set correctly by setup_request_for_view
-        self.assertEqual(request.resolver_match.namespace, self.namespace_admin, "Namespace not correctly set in resolver_match for test.")
-
-        template_str = "{% load active_link %} {% active_link namespaces='" + self.namespace_admin + "' %}"
-        template = Template(template_str)
-        rendered = template.render(Context({'request': request}))
-        self.assertEqual(rendered.strip(), "active")
-
-    def test_active_link_multiple_views_one_match(self):
-        if not self.view_name_login: self.skipTest("Login URL not reversible.")
-        request = setup_request_for_view(self.factory, self.view_name_login, self.user,
-                                         namespace=self.namespace_login, view_name_for_resolver=self.view_name_login)
-        if not request.resolver_match: self.skipTest(f"Could not set resolver_match for {self.view_name_login}.")
-
-        template_str = "{% load active_link %} {% active_link views='other_app:other_view||" + self.view_name_login + "' %}"
-        template = Template(template_str)
-        rendered = template.render(Context({'request': request}))
-        self.assertEqual(rendered.strip(), "active")
-
-    def test_active_link_no_request_in_context(self):
-        if not self.view_name_login: self.skipTest("Login URL not reversible for placeholder view name.")
-        template_str = "{% load active_link %} {% active_link views='" + self.view_name_login + "' %}"
-        template = Template(template_str)
-        rendered = template.render(Context({})) # Empty context, no 'request'
-        self.assertEqual(rendered.strip(), "")
-
-    def test_active_link_request_without_resolver_match(self):
-        request = self.factory.get('/some_unresolved_url/') # This URL won't resolve
-        request.user = self.user
-        request.resolver_match = None # Explicitly set to None, as resolve() would fail
-
-        if not self.view_name_login: self.skipTest("Login URL not reversible for placeholder view name.")
-        template_str = "{% load active_link %} {% active_link views='" + self.view_name_login + "' %}"
-        template = Template(template_str)
-        rendered = template.render(Context({'request': request}))
-        self.assertEqual(rendered.strip(), "")

app/apps/common/widgets/datepicker.py

@@ -37,7 +37,9 @@ class AirDatePickerInput(widgets.DateInput):
     def _get_current_language():
         """Get current language code in format compatible with AirDatepicker"""
         lang_code = translation.get_language()
-        # AirDatepicker uses simple language codes
+        # AirDatepicker uses simple language codes, except for pt-br
+        if lang_code.lower() == "pt-br":
+            return "pt-BR"
         return lang_code.split("-")[0]
 
     def _get_format(self):

app/apps/common/widgets/decimal.py

@@ -37,6 +37,7 @@ class ArbitraryDecimalDisplayNumberInput(forms.TextInput):
                 "x-data": "",
                 "x-mask:dynamic": f"$money($input, '{get_format('DECIMAL_SEPARATOR')}', "
                 f"'{get_format('THOUSAND_SEPARATOR')}', '30')",
+                "x-on:keyup": "$el.dispatchEvent(new Event('input'))",
             }
         )
 

app/apps/currencies/tests.py

@@ -4,12 +4,8 @@ from django.core.exceptions import ValidationError
 from django.db import IntegrityError
 from django.test import TestCase
 from django.utils import timezone
-from django.contrib.auth.models import User # Added for ERS owner
-from datetime import date # Added for CurrencyConversionUtilsTests
-from apps.currencies.utils.convert import get_exchange_rate, convert # Added convert
-from unittest.mock import patch # Added patch
 
-from apps.currencies.models import Currency, ExchangeRate, ExchangeRateService
+from apps.currencies.models import Currency, ExchangeRate
 
 
 class CurrencyTests(TestCase):
@@ -56,163 +52,6 @@ class CurrencyTests(TestCase):
         with self.assertRaises(IntegrityError):
             Currency.objects.create(code="USD2", name="US Dollar", decimal_places=2)
 
-    def test_currency_exchange_currency_cannot_be_self(self):
-        """Test that a currency's exchange_currency cannot be itself."""
-        currency = Currency.objects.create(
-            code="XYZ", name="Test XYZ", decimal_places=2
-        )
-        currency.exchange_currency = currency  # Set exchange_currency to self
-
-        with self.assertRaises(ValidationError) as cm:
-            currency.full_clean()
-
-        self.assertIn('exchange_currency', cm.exception.error_dict)
-        # Optionally, check for a specific error message if known:
-        # self.assertTrue(any("cannot be the same as the currency itself" in e.message
-        #                     for e in cm.exception.error_dict['exchange_currency']))
-
-
-class ExchangeRateServiceTests(TestCase):
-    def setUp(self):
-        self.owner = User.objects.create_user(username='ers_owner', password='password123')
-        self.base_currency = Currency.objects.create(code="BSC", name="Base Service Coin", decimal_places=2)
-        self.default_ers_params = {
-            'name': "Test ERS",
-            'owner': self.owner,
-            'base_currency': self.base_currency,
-            'provider_class': "dummy.provider.ClassName", # Placeholder
-        }
-
-    def _create_ers_instance(self, interval_type, fetch_interval, **kwargs):
-        params = {**self.default_ers_params, 'interval_type': interval_type, 'fetch_interval': fetch_interval, **kwargs}
-        return ExchangeRateService(**params)
-
-    # Tests for IntervalType.EVERY
-    def test_ers_interval_every_valid_integer(self):
-        ers = self._create_ers_instance(ExchangeRateService.IntervalType.EVERY, "12")
-        try:
-            ers.full_clean()
-        except ValidationError:
-            self.fail("ValidationError raised unexpectedly for valid 'EVERY' interval '12'.")
-
-    def test_ers_interval_every_invalid_not_integer(self):
-        ers = self._create_ers_instance(ExchangeRateService.IntervalType.EVERY, "abc")
-        with self.assertRaises(ValidationError) as cm:
-            ers.full_clean()
-        self.assertIn('fetch_interval', cm.exception.error_dict)
-
-    def test_ers_interval_every_invalid_too_low(self):
-        ers = self._create_ers_instance(ExchangeRateService.IntervalType.EVERY, "0")
-        with self.assertRaises(ValidationError) as cm:
-            ers.full_clean()
-        self.assertIn('fetch_interval', cm.exception.error_dict)
-
-    def test_ers_interval_every_invalid_too_high(self):
-        ers = self._create_ers_instance(ExchangeRateService.IntervalType.EVERY, "25") # Max is 24 for 'EVERY'
-        with self.assertRaises(ValidationError) as cm:
-            ers.full_clean()
-        self.assertIn('fetch_interval', cm.exception.error_dict)
-
-    # Tests for IntervalType.ON (and by extension NOT_ON, as validation logic is shared)
-    def test_ers_interval_on_not_on_valid_single_hour(self):
-        ers = self._create_ers_instance(ExchangeRateService.IntervalType.ON, "5")
-        try:
-            ers.full_clean() # Should normalize to "5" if not already
-        except ValidationError:
-            self.fail("ValidationError raised unexpectedly for valid 'ON' interval '5'.")
-        self.assertEqual(ers.fetch_interval, "5")
-
-
-    def test_ers_interval_on_not_on_valid_multiple_hours(self):
-        ers = self._create_ers_instance(ExchangeRateService.IntervalType.ON, "1,8,22")
-        try:
-            ers.full_clean()
-        except ValidationError:
-            self.fail("ValidationError raised unexpectedly for valid 'ON' interval '1,8,22'.")
-        self.assertEqual(ers.fetch_interval, "1,8,22")
-
-
-    def test_ers_interval_on_not_on_valid_range(self):
-        ers = self._create_ers_instance(ExchangeRateService.IntervalType.ON, "0-4")
-        ers.full_clean() # Should not raise ValidationError
-        self.assertEqual(ers.fetch_interval, "0,1,2,3,4")
-
-    def test_ers_interval_on_not_on_valid_mixed(self):
-        ers = self._create_ers_instance(ExchangeRateService.IntervalType.ON, "1-3,8,10-12")
-        ers.full_clean() # Should not raise ValidationError
-        self.assertEqual(ers.fetch_interval, "1,2,3,8,10,11,12")
-
-    def test_ers_interval_on_not_on_invalid_char(self):
-        ers = self._create_ers_instance(ExchangeRateService.IntervalType.ON, "1-3,a")
-        with self.assertRaises(ValidationError) as cm:
-            ers.full_clean()
-        self.assertIn('fetch_interval', cm.exception.error_dict)
-
-    def test_ers_interval_on_not_on_invalid_hour_too_high(self):
-        ers = self._create_ers_instance(ExchangeRateService.IntervalType.ON, "24") # Max is 23 for 'ON' type hours
-        with self.assertRaises(ValidationError) as cm:
-            ers.full_clean()
-        self.assertIn('fetch_interval', cm.exception.error_dict)
-
-    def test_ers_interval_on_not_on_invalid_range_format(self):
-        ers = self._create_ers_instance(ExchangeRateService.IntervalType.ON, "5-1")
-        with self.assertRaises(ValidationError) as cm:
-            ers.full_clean()
-        self.assertIn('fetch_interval', cm.exception.error_dict)
-
-    def test_ers_interval_on_not_on_invalid_range_value_too_high(self):
-        ers = self._create_ers_instance(ExchangeRateService.IntervalType.ON, "20-24") # 24 is invalid hour
-        with self.assertRaises(ValidationError) as cm:
-            ers.full_clean()
-        self.assertIn('fetch_interval', cm.exception.error_dict)
-
-    def test_ers_interval_on_not_on_empty_interval(self):
-        ers = self._create_ers_instance(ExchangeRateService.IntervalType.ON, "")
-        with self.assertRaises(ValidationError) as cm:
-            ers.full_clean()
-        self.assertIn('fetch_interval', cm.exception.error_dict)
-
-    @patch('apps.currencies.exchange_rates.fetcher.PROVIDER_MAPPING')
-    def test_get_provider_valid_service_type(self, mock_provider_mapping):
-        """Test get_provider returns a configured provider instance for a valid service_type."""
-
-        class MockSynthFinanceProvider:
-            def __init__(self, key):
-                self.key = key
-
-        # Configure the mock PROVIDER_MAPPING
-        mock_provider_mapping.get.return_value = MockSynthFinanceProvider
-
-        service_instance = self._create_ers_instance(
-            interval_type=ExchangeRateService.IntervalType.EVERY, # Needs some valid interval type
-            fetch_interval="1", # Needs some valid fetch interval
-            service_type=ExchangeRateService.ServiceType.SYNTH_FINANCE,
-            api_key="test_key"
-        )
-        # Ensure the service_type is correctly passed to the mock
-        # The actual get_provider method uses PROVIDER_MAPPING[self.service_type]
-        # So, we should make the mock_provider_mapping behave like a dict for the specific key
-        mock_provider_mapping = {ExchangeRateService.ServiceType.SYNTH_FINANCE: MockSynthFinanceProvider}
-
-        with patch('apps.currencies.exchange_rates.fetcher.PROVIDER_MAPPING', mock_provider_mapping):
-            provider = service_instance.get_provider()
-
-        self.assertIsInstance(provider, MockSynthFinanceProvider)
-        self.assertEqual(provider.key, "test_key")
-
-    @patch('apps.currencies.exchange_rates.fetcher.PROVIDER_MAPPING', {}) # Empty mapping
-    def test_get_provider_invalid_service_type(self, mock_provider_mapping_empty):
-        """Test get_provider raises KeyError for an invalid or unmapped service_type."""
-        service_instance = self._create_ers_instance(
-            interval_type=ExchangeRateService.IntervalType.EVERY,
-            fetch_interval="1",
-            service_type="UNMAPPED_SERVICE_TYPE", # A type not in the (mocked) mapping
-            api_key="any_key"
-        )
-
-        with self.assertRaises(KeyError):
-            service_instance.get_provider()
-
 
 class ExchangeRateTests(TestCase):
     def setUp(self):
@@ -244,169 +83,10 @@ class ExchangeRateTests(TestCase):
             rate=Decimal("0.85"),
             date=date,
         )
-        with self.assertRaises(IntegrityError):
+        with self.assertRaises(Exception):  # Could be IntegrityError
             ExchangeRate.objects.create(
                 from_currency=self.usd,
                 to_currency=self.eur,
                 rate=Decimal("0.86"),
                 date=date,
             )
-
-    def test_from_and_to_currency_cannot_be_same(self):
-        """Test that from_currency and to_currency cannot be the same."""
-        with self.assertRaises(ValidationError) as cm:
-            rate = ExchangeRate(
-                from_currency=self.usd,
-                to_currency=self.usd,  # Same as from_currency
-                rate=Decimal("1.00"),
-                date=timezone.now().date(),
-            )
-            rate.full_clean()
-
-        # Check if the error message is as expected or if the error is associated with a specific field.
-        # The exact key ('to_currency' or '__all__') depends on how the model's clean() method is implemented.
-        # Assuming the validation error is raised with a message like "From and to currency cannot be the same."
-        # and is a non-field error or specifically tied to 'to_currency'.
-        self.assertTrue(
-            '__all__' in cm.exception.error_dict or 'to_currency' in cm.exception.error_dict,
-            "ValidationError should be for '__all__' or 'to_currency'"
-        )
-        # Optionally, check for a specific message if it's consistent:
-        # found_message = False
-        # if '__all__' in cm.exception.error_dict:
-        #     found_message = any("cannot be the same" in e.message for e in cm.exception.error_dict['__all__'])
-        # if not found_message and 'to_currency' in cm.exception.error_dict:
-        #     found_message = any("cannot be the same" in e.message for e in cm.exception.error_dict['to_currency'])
-        # self.assertTrue(found_message, "Error message about currencies being the same not found.")
-
-
-class CurrencyConversionUtilsTests(TestCase):
-    def setUp(self):
-        self.usd = Currency.objects.create(code="USD", name="US Dollar", decimal_places=2, prefix="$", suffix="")
-        self.eur = Currency.objects.create(code="EUR", name="Euro", decimal_places=2, prefix="€", suffix="")
-        self.gbp = Currency.objects.create(code="GBP", name="British Pound", decimal_places=2, prefix="£", suffix="")
-
-        # Rates for USD <-> EUR
-        self.usd_eur_rate_10th = ExchangeRate.objects.create(from_currency=self.usd, to_currency=self.eur, rate=Decimal("0.90"), date=date(2023, 1, 10))
-        self.usd_eur_rate_15th = ExchangeRate.objects.create(from_currency=self.usd, to_currency=self.eur, rate=Decimal("0.92"), date=date(2023, 1, 15))
-        ExchangeRate.objects.create(from_currency=self.usd, to_currency=self.eur, rate=Decimal("0.88"), date=date(2023, 1, 5))
-
-        # Rate for GBP <-> USD (for inverse lookup)
-        self.gbp_usd_rate_10th = ExchangeRate.objects.create(from_currency=self.gbp, to_currency=self.usd, rate=Decimal("1.25"), date=date(2023, 1, 10))
-
-    def test_get_direct_rate_closest_date(self):
-        """Test fetching a direct rate, ensuring the closest date is chosen."""
-        result = get_exchange_rate(self.usd, self.eur, date(2023, 1, 16))
-        self.assertIsNotNone(result)
-        self.assertEqual(result.effective_rate, Decimal("0.92"))
-        self.assertEqual(result.original_from_currency, self.usd)
-        self.assertEqual(result.original_to_currency, self.eur)
-
-    def test_get_inverse_rate_closest_date(self):
-        """Test fetching an inverse rate, ensuring the closest date and correct calculation."""
-        # We are looking for USD to GBP. We have GBP to USD on 2023-01-10.
-        # Target date is 2023-01-12.
-        result = get_exchange_rate(self.usd, self.gbp, date(2023, 1, 12))
-        self.assertIsNotNone(result)
-        self.assertEqual(result.effective_rate, Decimal("1") / self.gbp_usd_rate_10th.rate)
-        self.assertEqual(result.original_from_currency, self.gbp) # original_from_currency should be GBP
-        self.assertEqual(result.original_to_currency, self.usd)   # original_to_currency should be USD
-
-    def test_get_rate_exact_date_preference(self):
-        """Test that an exact date match is preferred over a closer one."""
-        # Existing rate is on 2023-01-15 (0.92)
-        # Add an exact match for the query date
-        exact_date_rate = ExchangeRate.objects.create(from_currency=self.usd, to_currency=self.eur, rate=Decimal("0.91"), date=date(2023, 1, 16))
-
-        result = get_exchange_rate(self.usd, self.eur, date(2023, 1, 16))
-        self.assertIsNotNone(result)
-        self.assertEqual(result.effective_rate, Decimal("0.91"))
-        self.assertEqual(result.original_from_currency, self.usd)
-        self.assertEqual(result.original_to_currency, self.eur)
-
-    def test_get_rate_no_matching_pair(self):
-        """Test that None is returned if no direct or inverse rate exists between the pair."""
-        # No rates exist for EUR <-> GBP in the setUp
-        result = get_exchange_rate(self.eur, self.gbp, date(2023, 1, 10))
-        self.assertIsNone(result)
-
-    def test_get_rate_prefer_direct_over_inverse_same_diff(self):
-        """Test that a direct rate is preferred over an inverse if date differences are equal."""
-        # We have GBP-USD on 2023-01-10 (self.gbp_usd_rate_10th)
-        # This means an inverse USD-GBP rate is available for 2023-01-10.
-        # Add a direct USD-GBP rate for the same date.
-        direct_usd_gbp_rate = ExchangeRate.objects.create(from_currency=self.usd, to_currency=self.gbp, rate=Decimal("0.80"), date=date(2023, 1, 10))
-
-        result = get_exchange_rate(self.usd, self.gbp, date(2023, 1, 10))
-        self.assertIsNotNone(result)
-        self.assertEqual(result.effective_rate, Decimal("0.80"))
-        self.assertEqual(result.original_from_currency, self.usd)
-        self.assertEqual(result.original_to_currency, self.gbp)
-
-        # Now test the EUR to USD case from the problem description
-        # Add EUR to USD, rate 1.1, date 2023-01-10
-        eur_usd_direct_rate = ExchangeRate.objects.create(from_currency=self.eur, to_currency=self.usd, rate=Decimal("1.1"), date=date(2023, 1, 10))
-        # We also have USD to EUR on 2023-01-10 (rate 0.90), which would be an inverse match for EUR to USD.
-
-        result_eur_usd = get_exchange_rate(self.eur, self.usd, date(2023, 1, 10))
-        self.assertIsNotNone(result_eur_usd)
-        self.assertEqual(result_eur_usd.effective_rate, Decimal("1.1"))
-        self.assertEqual(result_eur_usd.original_from_currency, self.eur)
-        self.assertEqual(result_eur_usd.original_to_currency, self.usd)
-
-    def test_convert_successful_direct(self):
-        """Test successful conversion using a direct rate."""
-        # Uses self.usd_eur_rate_15th (0.92) as it's closest to 2023-01-16
-        converted_amount, prefix, suffix, dp = convert(Decimal('100'), self.usd, self.eur, date(2023, 1, 16))
-        self.assertEqual(converted_amount, Decimal('92.00'))
-        self.assertEqual(prefix, self.eur.prefix)
-        self.assertEqual(suffix, self.eur.suffix)
-        self.assertEqual(dp, self.eur.decimal_places)
-
-    def test_convert_successful_inverse(self):
-        """Test successful conversion using an inverse rate."""
-        # Uses self.gbp_usd_rate_10th (GBP to USD @ 1.25), so USD to GBP is 1/1.25 = 0.8
-        # Target date 2023-01-12, closest is 2023-01-10
-        converted_amount, prefix, suffix, dp = convert(Decimal('100'), self.usd, self.gbp, date(2023, 1, 12))
-        expected_amount = Decimal('100') * (Decimal('1') / self.gbp_usd_rate_10th.rate)
-        self.assertEqual(converted_amount, expected_amount.quantize(Decimal('0.01')))
-        self.assertEqual(prefix, self.gbp.prefix)
-        self.assertEqual(suffix, self.gbp.suffix)
-        self.assertEqual(dp, self.gbp.decimal_places)
-
-    def test_convert_no_rate_found(self):
-        """Test conversion when no exchange rate is found."""
-        result_tuple = convert(Decimal('100'), self.eur, self.gbp, date(2023, 1, 10))
-        self.assertEqual(result_tuple, (None, None, None, None))
-
-    def test_convert_same_currency(self):
-        """Test conversion when from_currency and to_currency are the same."""
-        result_tuple = convert(Decimal('100'), self.usd, self.usd, date(2023, 1, 10))
-        self.assertEqual(result_tuple, (None, None, None, None))
-
-    def test_convert_zero_amount(self):
-        """Test conversion when the amount is zero."""
-        result_tuple = convert(Decimal('0'), self.usd, self.eur, date(2023, 1, 10))
-        self.assertEqual(result_tuple, (None, None, None, None))
-
-    @patch('apps.currencies.utils.convert.timezone')
-    def test_convert_no_date_uses_today(self, mock_timezone):
-        """Test conversion uses today's date when no date is provided."""
-        # Mock timezone.now().date() to return a specific date
-        mock_today = date(2023, 1, 16)
-        mock_timezone.now.return_value.date.return_value = mock_today
-
-        # This should use self.usd_eur_rate_15th (0.92) as it's closest to mocked "today" (2023-01-16)
-        converted_amount, prefix, suffix, dp = convert(Decimal('100'), self.usd, self.eur)
-
-        self.assertEqual(converted_amount, Decimal('92.00'))
-        self.assertEqual(prefix, self.eur.prefix)
-        self.assertEqual(suffix, self.eur.suffix)
-        self.assertEqual(dp, self.eur.decimal_places)
-
-        # Verify that timezone.now().date() was called (indirectly, by get_exchange_rate)
-        # This specific assertion for get_exchange_rate being called with a specific date
-        # would require patching get_exchange_rate itself, which is more complex.
-        # For now, we rely on the correct outcome given the mocked date.
-        # A more direct way to test date passing is if convert took get_exchange_rate as a dependency.
-        mock_timezone.now.return_value.date.assert_called_once()

app/apps/dca/tests.py

@@ -1,344 +1,3 @@
-from django.test import TestCase, Client
-from django.contrib.auth.models import User
-from django.urls import reverse
-from django.forms import NON_FIELD_ERRORS
-from apps.currencies.models import Currency
-from apps.dca.models import DCAStrategy, DCAEntry
-from apps.dca.forms import DCAStrategyForm, DCAEntryForm # Added DCAEntryForm
-from apps.accounts.models import Account, AccountGroup # Added Account models
-from apps.transactions.models import TransactionCategory, Transaction # Added Transaction models
-from decimal import Decimal
-from datetime import date
-from unittest.mock import patch
+from django.test import TestCase
 
-class DCATests(TestCase):
-    def setUp(self):
-        self.owner = User.objects.create_user(username='testowner', password='password123')
-        self.client = Client()
-        self.client.login(username='testowner', password='password123')
-
-        self.payment_curr = Currency.objects.create(code="USD", name="US Dollar", decimal_places=2)
-        self.target_curr = Currency.objects.create(code="BTC", name="Bitcoin", decimal_places=8)
-
-        # AccountGroup for accounts
-        self.account_group = AccountGroup.objects.create(name="DCA Test Group", owner=self.owner)
-
-        # Accounts for transactions
-        self.account1 = Account.objects.create(
-            name="Payment Account USD",
-            owner=self.owner,
-            currency=self.payment_curr,
-            group=self.account_group
-        )
-        self.account2 = Account.objects.create(
-            name="Target Account BTC",
-            owner=self.owner,
-            currency=self.target_curr,
-            group=self.account_group
-        )
-
-        # TransactionCategory for transactions
-        # Using INFO type as it's generic. TRANSFER might imply specific paired transaction logic not relevant here.
-        self.category1 = TransactionCategory.objects.create(
-            name="DCA Category",
-            owner=self.owner,
-            type=TransactionCategory.TransactionType.INFO
-        )
-
-
-        self.strategy1 = DCAStrategy.objects.create(
-            name="Test Strategy 1",
-            owner=self.owner,
-            payment_currency=self.payment_curr,
-            target_currency=self.target_curr
-        )
-
-        self.entries1 = [
-            DCAEntry.objects.create(
-                strategy=self.strategy1,
-                date=date(2023, 1, 1),
-                amount_paid=Decimal('100.00'),
-                amount_received=Decimal('0.010')
-            ),
-            DCAEntry.objects.create(
-                strategy=self.strategy1,
-                date=date(2023, 2, 1),
-                amount_paid=Decimal('150.00'),
-                amount_received=Decimal('0.012')
-            ),
-            DCAEntry.objects.create(
-                strategy=self.strategy1,
-                date=date(2023, 3, 1),
-                amount_paid=Decimal('120.00'),
-                amount_received=Decimal('0.008')
-            )
-        ]
-
-    def test_strategy_index_view_authenticated_user(self):
-        # Uses self.client and self.owner from setUp
-        response = self.client.get(reverse('dca:dca_strategy_index'))
-        self.assertEqual(response.status_code, 200)
-
-    def test_strategy_totals_and_average_price(self):
-        self.assertEqual(self.strategy1.total_entries(), 3)
-        self.assertEqual(self.strategy1.total_invested(), Decimal('370.00')) # 100 + 150 + 120
-        self.assertEqual(self.strategy1.total_received(), Decimal('0.030'))  # 0.01 + 0.012 + 0.008
-
-        expected_avg_price = Decimal('370.00') / Decimal('0.030')
-        # Match precision of the model method if it's specific, e.g. quantize
-        # For now, direct comparison. The model might return a Decimal that needs specific quantizing.
-        self.assertEqual(self.strategy1.average_entry_price(), expected_avg_price)
-
-    def test_strategy_average_price_no_received(self):
-        strategy2 = DCAStrategy.objects.create(
-            name="Test Strategy 2",
-            owner=self.owner,
-            payment_currency=self.payment_curr,
-            target_currency=self.target_curr
-        )
-        DCAEntry.objects.create(
-            strategy=strategy2,
-            date=date(2023, 4, 1),
-            amount_paid=Decimal('100.00'),
-            amount_received=Decimal('0') # Total received is zero
-        )
-        self.assertEqual(strategy2.total_received(), Decimal('0'))
-        self.assertEqual(strategy2.average_entry_price(), Decimal('0'))
-
-    @patch('apps.dca.models.convert')
-    def test_dca_entry_value_and_pl(self, mock_convert):
-        entry = self.entries1[0] # amount_paid=100, amount_received=0.010
-
-        # Simulate current price: 1 target_curr = 20,000 payment_curr
-        # So, 0.010 target_curr should be 0.010 * 20000 = 200 payment_curr
-        simulated_converted_value = entry.amount_received * Decimal('20000')
-        mock_convert.return_value = (
-            simulated_converted_value,
-            self.payment_curr.prefix,
-            self.payment_curr.suffix,
-            self.payment_curr.decimal_places
-        )
-
-        current_val = entry.current_value()
-        self.assertEqual(current_val, Decimal('200.00'))
-
-        # Profit/Loss = current_value - amount_paid = 200 - 100 = 100
-        self.assertEqual(entry.profit_loss(), Decimal('100.00'))
-
-        # P/L % = (profit_loss / amount_paid) * 100 = (100 / 100) * 100 = 100
-        self.assertEqual(entry.profit_loss_percentage(), Decimal('100.00'))
-
-        # Check that convert was called correctly by current_value()
-        # current_value calls convert(self.amount_received, self.strategy.target_currency, self.strategy.payment_currency)
-        # The date argument defaults to None if not passed, which is the case here.
-        mock_convert.assert_called_once_with(
-            entry.amount_received,
-            self.strategy1.target_currency,
-            self.strategy1.payment_currency,
-            None # Date argument is optional and defaults to None
-        )
-
-    @patch('apps.dca.models.convert')
-    def test_dca_strategy_value_and_pl(self, mock_convert):
-
-        def side_effect_func(amount_to_convert, from_currency, to_currency, date=None):
-            if from_currency == self.target_curr and to_currency == self.payment_curr:
-                # Simulate current price: 1 target_curr = 20,000 payment_curr
-                converted_value = amount_to_convert * Decimal('20000')
-                return (converted_value, self.payment_curr.prefix, self.payment_curr.suffix, self.payment_curr.decimal_places)
-            # Fallback for any other unexpected calls, though not expected in this test
-            return (Decimal('0'), '', '', 2)
-
-        mock_convert.side_effect = side_effect_func
-
-        # strategy1 entries:
-        # 1: paid 100, received 0.010. Current value = 0.010 * 20000 = 200
-        # 2: paid 150, received 0.012. Current value = 0.012 * 20000 = 240
-        # 3: paid 120, received 0.008. Current value = 0.008 * 20000 = 160
-        # Total current value = 200 + 240 + 160 = 600
-        self.assertEqual(self.strategy1.current_total_value(), Decimal('600.00'))
-
-        # Total invested = 100 + 150 + 120 = 370
-        # Total profit/loss = current_total_value - total_invested = 600 - 370 = 230
-        self.assertEqual(self.strategy1.total_profit_loss(), Decimal('230.00'))
-
-        # Total P/L % = (total_profit_loss / total_invested) * 100
-        # (230 / 370) * 100 = 62.162162...
-        expected_pl_percentage = (Decimal('230.00') / Decimal('370.00')) * Decimal('100')
-        self.assertAlmostEqual(self.strategy1.total_profit_loss_percentage(), expected_pl_percentage, places=2)
-
-    def test_dca_strategy_form_valid_data(self):
-        form_data = {
-            'name': 'Form Test Strategy',
-            'target_currency': self.target_curr.pk,
-            'payment_currency': self.payment_curr.pk
-        }
-        form = DCAStrategyForm(data=form_data)
-        self.assertTrue(form.is_valid(), form.errors.as_text())
-
-        strategy = form.save(commit=False)
-        strategy.owner = self.owner
-        strategy.save()
-
-        self.assertEqual(strategy.name, 'Form Test Strategy')
-        self.assertEqual(strategy.owner, self.owner)
-        self.assertEqual(strategy.target_currency, self.target_curr)
-        self.assertEqual(strategy.payment_currency, self.payment_curr)
-
-    def test_dca_strategy_form_missing_name(self):
-        form_data = {
-            'target_currency': self.target_curr.pk,
-            'payment_currency': self.payment_curr.pk
-        }
-        form = DCAStrategyForm(data=form_data)
-        self.assertFalse(form.is_valid())
-        self.assertIn('name', form.errors)
-
-    def test_dca_strategy_form_missing_target_currency(self):
-        form_data = {
-            'name': 'Form Test Missing Target',
-            'payment_currency': self.payment_curr.pk
-        }
-        form = DCAStrategyForm(data=form_data)
-        self.assertFalse(form.is_valid())
-        self.assertIn('target_currency', form.errors)
-
-    # Tests for DCAEntryForm clean method
-    def test_dca_entry_form_clean_create_transaction_missing_accounts(self):
-        data = {
-            'date': date(2023, 1, 1),
-            'amount_paid': Decimal('100.00'),
-            'amount_received': Decimal('0.01'),
-            'create_transaction': True,
-            # from_account and to_account are missing
-        }
-        form = DCAEntryForm(data=data, strategy=self.strategy1, owner=self.owner)
-        self.assertFalse(form.is_valid())
-        self.assertIn('from_account', form.errors)
-        self.assertIn('to_account', form.errors)
-
-    def test_dca_entry_form_clean_create_transaction_same_accounts(self):
-        data = {
-            'date': date(2023, 1, 1),
-            'amount_paid': Decimal('100.00'),
-            'amount_received': Decimal('0.01'),
-            'create_transaction': True,
-            'from_account': self.account1.pk,
-            'to_account': self.account1.pk, # Same as from_account
-            'from_category': self.category1.pk,
-            'to_category': self.category1.pk,
-        }
-        form = DCAEntryForm(data=data, strategy=self.strategy1, owner=self.owner)
-        self.assertFalse(form.is_valid())
-        # Check for non-field error or specific field error based on form implementation
-        self.assertTrue(NON_FIELD_ERRORS in form.errors or 'to_account' in form.errors)
-        if NON_FIELD_ERRORS in form.errors:
-             self.assertTrue(any("From and To accounts must be different" in error for error in form.errors[NON_FIELD_ERRORS]))
-
-
-    # Tests for DCAEntryForm save method
-    def test_dca_entry_form_save_create_transactions(self):
-        data = {
-            'date': date(2023, 5, 1),
-            'amount_paid': Decimal('200.00'),
-            'amount_received': Decimal('0.025'),
-            'create_transaction': True,
-            'from_account': self.account1.pk,
-            'to_account': self.account2.pk,
-            'from_category': self.category1.pk,
-            'to_category': self.category1.pk,
-            'description': 'Test DCA entry transaction creation'
-        }
-        form = DCAEntryForm(data=data, strategy=self.strategy1, owner=self.owner)
-
-        if not form.is_valid():
-            print(form.errors.as_json()) # Print errors if form is invalid
-        self.assertTrue(form.is_valid())
-
-        entry = form.save()
-
-        self.assertIsNotNone(entry.pk)
-        self.assertEqual(entry.strategy, self.strategy1)
-        self.assertIsNotNone(entry.expense_transaction)
-        self.assertIsNotNone(entry.income_transaction)
-
-        # Check expense transaction
-        expense_tx = entry.expense_transaction
-        self.assertEqual(expense_tx.account, self.account1)
-        self.assertEqual(expense_tx.type, Transaction.Type.EXPENSE)
-        self.assertEqual(expense_tx.amount, data['amount_paid'])
-        self.assertEqual(expense_tx.category, self.category1)
-        self.assertEqual(expense_tx.owner, self.owner)
-        self.assertEqual(expense_tx.date, data['date'])
-        self.assertIn(str(entry.id)[:8], expense_tx.description) # Check if part of entry ID is in description
-
-        # Check income transaction
-        income_tx = entry.income_transaction
-        self.assertEqual(income_tx.account, self.account2)
-        self.assertEqual(income_tx.type, Transaction.Type.INCOME)
-        self.assertEqual(income_tx.amount, data['amount_received'])
-        self.assertEqual(income_tx.category, self.category1)
-        self.assertEqual(income_tx.owner, self.owner)
-        self.assertEqual(income_tx.date, data['date'])
-        self.assertIn(str(entry.id)[:8], income_tx.description)
-
-
-    def test_dca_entry_form_save_update_linked_transactions(self):
-        # 1. Create an initial DCAEntry with linked transactions
-        initial_data = {
-            'date': date(2023, 6, 1),
-            'amount_paid': Decimal('50.00'),
-            'amount_received': Decimal('0.005'),
-            'create_transaction': True,
-            'from_account': self.account1.pk,
-            'to_account': self.account2.pk,
-            'from_category': self.category1.pk,
-            'to_category': self.category1.pk,
-        }
-        initial_form = DCAEntryForm(data=initial_data, strategy=self.strategy1, owner=self.owner)
-        self.assertTrue(initial_form.is_valid(), initial_form.errors.as_json())
-        initial_entry = initial_form.save()
-
-        self.assertIsNotNone(initial_entry.expense_transaction)
-        self.assertIsNotNone(initial_entry.income_transaction)
-
-        # 2. Data for updating the form
-        update_data = {
-            'date': initial_entry.date, # Keep date same or change, as needed
-            'amount_paid': Decimal('55.00'), # New value
-            'amount_received': Decimal('0.006'), # New value
-            # 'create_transaction': False, # Or not present, form should not create new if instance has linked tx
-            'from_account': initial_entry.expense_transaction.account.pk, # Keep same accounts
-            'to_account': initial_entry.income_transaction.account.pk,
-            'from_category': initial_entry.expense_transaction.category.pk,
-            'to_category': initial_entry.income_transaction.category.pk,
-        }
-
-        # When create_transaction is not checked (or False), it means we are not creating *new* transactions,
-        # but if the instance already has linked transactions, they *should* be updated.
-        # The form's save method should handle this.
-
-        update_form = DCAEntryForm(data=update_data, instance=initial_entry, strategy=initial_entry.strategy, owner=self.owner)
-
-        if not update_form.is_valid():
-            print(update_form.errors.as_json()) # Print errors if form is invalid
-        self.assertTrue(update_form.is_valid())
-
-        updated_entry = update_form.save()
-
-        # Refresh from DB to ensure changes are saved and reflected
-        updated_entry.refresh_from_db()
-        if updated_entry.expense_transaction: # Check if it exists before trying to refresh
-            updated_entry.expense_transaction.refresh_from_db()
-        if updated_entry.income_transaction: # Check if it exists before trying to refresh
-            updated_entry.income_transaction.refresh_from_db()
-
-
-        self.assertEqual(updated_entry.amount_paid, Decimal('55.00'))
-        self.assertEqual(updated_entry.amount_received, Decimal('0.006'))
-
-        self.assertIsNotNone(updated_entry.expense_transaction, "Expense transaction should still be linked.")
-        self.assertEqual(updated_entry.expense_transaction.amount, Decimal('55.00'))
-
-        self.assertIsNotNone(updated_entry.income_transaction, "Income transaction should still be linked.")
-        self.assertEqual(updated_entry.income_transaction.amount, Decimal('0.006'))
+# Create your tests here.

app/apps/export_app/tests.py

@@ -1,164 +1,3 @@
-from django.test import TestCase, Client
-from django.contrib.auth.models import User
-from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
-from unittest.mock import patch, MagicMock
-from io import BytesIO
-import zipfile # Added for zip file creation
-from django.core.files.uploadedfile import InMemoryUploadedFile # Added for file upload testing
+from django.test import TestCase
 
-# Dataset from tablib is not directly imported, its behavior will be mocked.
-# Resource classes are also mocked by path string.
-
-from apps.export_app.forms import ExportForm, RestoreForm # Added RestoreForm
-
-
-class ExportAppTests(TestCase):
-    def setUp(self):
-        self.superuser = User.objects.create_superuser(
-            username='super',
-            email='super@example.com',
-            password='password'
-        )
-        self.client = Client()
-        self.client.login(username='super', password='password')
-
-    @patch('apps.export_app.views.UserResource')
-    def test_export_form_single_selection_csv_response(self, mock_UserResource):
-        # Configure the mock UserResource
-        mock_user_resource_instance = mock_UserResource.return_value
-
-        # Mock the export() method's return value (which is a Dataset object)
-        # Then, mock the 'csv' attribute of this Dataset object
-        mock_dataset = MagicMock() # Using MagicMock for the dataset
-        mock_dataset.csv = "user_id,username\n1,testuser"
-        mock_user_resource_instance.export.return_value = mock_dataset
-
-        post_data = {'users': True} # Other fields default to False or their initial values
-
-        response = self.client.post(reverse('export_app:export_form'), data=post_data)
-
-        mock_user_resource_instance.export.assert_called_once()
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response['Content-Type'], 'text/csv')
-        self.assertIn("attachment; filename=", response['Content-Disposition'])
-        self.assertIn(".csv", response['Content-Disposition'])
-        # Check if the filename contains 'users'
-        self.assertIn("users_export_", response['Content-Disposition'].lower())
-        self.assertEqual(response.content.decode(), "user_id,username\n1,testuser")
-
-    @patch('apps.export_app.views.AccountResource') # Mock AccountResource first
-    @patch('apps.export_app.views.UserResource')   # Then UserResource
-    def test_export_form_multiple_selections_zip_response(self, mock_UserResource, mock_AccountResource):
-        # Configure UserResource mock
-        mock_user_instance = mock_UserResource.return_value
-        mock_user_dataset = MagicMock()
-        mock_user_dataset.csv = "user_data_here"
-        mock_user_instance.export.return_value = mock_user_dataset
-
-        # Configure AccountResource mock
-        mock_account_instance = mock_AccountResource.return_value
-        mock_account_dataset = MagicMock()
-        mock_account_dataset.csv = "account_data_here"
-        mock_account_instance.export.return_value = mock_account_dataset
-
-        post_data = {
-            'users': True,
-            'accounts': True
-            # other fields default to False or their initial values
-        }
-
-        response = self.client.post(reverse('export_app:export_form'), data=post_data)
-
-        mock_user_instance.export.assert_called_once()
-        mock_account_instance.export.assert_called_once()
-
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response['Content-Type'], 'application/zip')
-        self.assertIn("attachment; filename=", response['Content-Disposition'])
-        self.assertIn(".zip", response['Content-Disposition'])
-        # Add zip file content check if possible and required later
-
-    def test_export_form_no_selection(self):
-        # Get all field names from ExportForm and set them to False
-        # This ensures that if new export options are added, this test still tries to unselect them.
-        form_fields = ExportForm.base_fields.keys()
-        post_data = {field: False for field in form_fields}
-
-        response = self.client.post(reverse('export_app:export_form'), data=post_data)
-
-        self.assertEqual(response.status_code, 200)
-        # The expected message is "You have to select at least one export"
-        # This message is translatable, so using _() for comparison if the view returns translated string.
-        # The view returns HttpResponse(_("You have to select at least one export"))
-        self.assertEqual(response.content.decode('utf-8'), _("You have to select at least one export"))
-
-    # Placeholder for zip content check, if to be implemented
-    # import zipfile
-    # def test_zip_contents(self):
-    #     # ... (setup response with zip data) ...
-    #     with zipfile.ZipFile(BytesIO(response.content), 'r') as zipf:
-    #         self.assertIn('users.csv', zipf.namelist())
-    #         self.assertIn('accounts.csv', zipf.namelist())
-    #         user_csv_content = zipf.read('users.csv').decode()
-    #         self.assertEqual(user_csv_content, "user_data_here")
-    #         account_csv_content = zipf.read('accounts.csv').decode()
-    #         self.assertEqual(account_csv_content, "account_data_here")
-
-    @patch('apps.export_app.views.process_imports')
-    def test_import_form_valid_zip_calls_process_imports(self, mock_process_imports):
-        # Create a mock ZIP file content
-        zip_content_buffer = BytesIO()
-        with zipfile.ZipFile(zip_content_buffer, 'w') as zf:
-            zf.writestr('dummy.csv', 'some,data')
-        zip_content_buffer.seek(0)
-
-        # Create an InMemoryUploadedFile instance
-        mock_zip_file = InMemoryUploadedFile(
-            zip_content_buffer,
-            'zip_file',  # field_name
-            'test_export.zip',  # file_name
-            'application/zip',  # content_type
-            zip_content_buffer.getbuffer().nbytes,  # size
-            None  # charset
-        )
-
-        post_data = {'zip_file': mock_zip_file}
-        url = reverse('export_app:restore_form')
-
-        response = self.client.post(url, data=post_data, format='multipart')
-
-        mock_process_imports.assert_called_once()
-        # Check the second argument passed to process_imports (the form's cleaned_data['zip_file'])
-        # The first argument (args[0]) is the request object.
-        # The second argument (args[1]) is the form instance.
-        # We need to check the 'zip_file' attribute of the cleaned_data of the form instance.
-        # However, it's simpler to check the UploadedFile object directly if that's what process_imports receives.
-        # Based on the task: "The second argument to process_imports is form.cleaned_data['zip_file']"
-        # This means that process_imports is called as process_imports(request, form.cleaned_data['zip_file'], ...)
-        # Let's assume process_imports signature is process_imports(request, file_obj, ...)
-        # So, call_args[0][1] would be the file_obj.
-
-        # Actually, the view calls process_imports(request, form)
-        # So, we check form.cleaned_data['zip_file'] on the passed form instance
-        called_form_instance = mock_process_imports.call_args[0][1] # The form instance
-        self.assertEqual(called_form_instance.cleaned_data['zip_file'], mock_zip_file)
-
-        self.assertEqual(response.status_code, 204)
-        # The HX-Trigger header might have multiple values, ensure both are present
-        self.assertIn("hide_offcanvas", response.headers['HX-Trigger'])
-        self.assertIn("updated", response.headers['HX-Trigger'])
-
-
-    def test_import_form_no_file_selected(self):
-        post_data = {} # No file selected
-        url = reverse('export_app:restore_form')
-
-        response = self.client.post(url, data=post_data)
-
-        self.assertEqual(response.status_code, 200) # Form re-rendered with errors
-        # Check that the specific error message from RestoreForm.clean() is present
-        expected_error_message = _("Please upload either a ZIP file or at least one CSV file")
-        self.assertContains(response, expected_error_message)
-        # Also check for the HX-Trigger which is always set
-        self.assertIn("updated", response.headers['HX-Trigger'])
+# Create your tests here.

app/apps/import_app/tests.py

@@ -1,424 +1,3 @@
 from django.test import TestCase
-from django.core.exceptions import ValidationError
-from django.db import IntegrityError
-import yaml
-from decimal import Decimal
-from datetime import date
 
-from django.test import TestCase
-from django.core.exceptions import ValidationError
-from django.db import IntegrityError
-
-from apps.import_app.models import ImportProfile, ImportRun
-from apps.import_app.forms import ImportProfileForm
-from apps.import_app.services.v1 import ImportService
-from apps.import_app.schemas import version_1
-from apps.transactions.models import Transaction # For Transaction.Type
-from unittest.mock import patch
-import tempfile
-import os
-
-
-class ImportProfileTests(TestCase):
-
-    def test_import_profile_valid_yaml_v1(self):
-        valid_yaml_config = """
-settings:
-  file_type: csv
-  delimiter: ','
-  encoding: utf-8
-  skip_lines: 0
-  trigger_transaction_rules: true
-  importing: transactions
-mapping:
-  date:
-    target: date
-    source: Transaction Date
-    format: '%Y-%m-%d'
-  amount:
-    target: amount
-    source: Amount
-  description:
-    target: description
-    source: Narrative
-  account:
-    target: account
-    source: Account Name
-    type: name
-  type:
-    target: type
-    source: Credit Debit
-    detection_method: sign # Assumes positive is income, negative is expense
-  is_paid:
-    target: is_paid
-    detection_method: always_paid
-deduplication: []
-        """
-        profile = ImportProfile(
-            name="Test Valid Profile V1",
-            yaml_config=valid_yaml_config,
-            version=ImportProfile.Versions.VERSION_1
-        )
-        try:
-            profile.full_clean()
-        except ValidationError as e:
-            self.fail(f"Valid YAML config raised ValidationError: {e.error_dict}")
-
-        # Optional: Save and retrieve
-        profile.save()
-        retrieved_profile = ImportProfile.objects.get(pk=profile.pk)
-        self.assertIsNotNone(retrieved_profile)
-        self.assertEqual(retrieved_profile.name, "Test Valid Profile V1")
-
-    def test_import_profile_invalid_yaml_syntax_v1(self):
-        invalid_yaml = "settings: { file_type: csv, delimiter: ','" # Malformed YAML
-        profile = ImportProfile(
-            name="Test Invalid Syntax V1",
-            yaml_config=invalid_yaml,
-            version=ImportProfile.Versions.VERSION_1
-        )
-        with self.assertRaises(ValidationError) as cm:
-            profile.full_clean()
-
-        self.assertIn('yaml_config', cm.exception.error_dict)
-        self.assertTrue(any("YAML" in error.message.lower() or "syntax" in error.message.lower() for error in cm.exception.error_dict['yaml_config']))
-
-    def test_import_profile_schema_validation_error_v1(self):
-        schema_error_yaml = """
-settings:
-  file_type: csv
-  importing: transactions
-mapping:
-  date: # Missing 'format' which is required for TransactionDateMapping
-    target: date
-    source: Transaction Date
-        """
-        profile = ImportProfile(
-            name="Test Schema Error V1",
-            yaml_config=schema_error_yaml,
-            version=ImportProfile.Versions.VERSION_1
-        )
-        with self.assertRaises(ValidationError) as cm:
-            profile.full_clean()
-
-        self.assertIn('yaml_config', cm.exception.error_dict)
-        # Pydantic errors usually mention the field and "field required" or similar
-        self.assertTrue(any("format" in error.message.lower() and "field required" in error.message.lower()
-                            for error in cm.exception.error_dict['yaml_config']),
-                        f"Error messages: {[e.message for e in cm.exception.error_dict['yaml_config']]}")
-
-
-    def test_import_profile_custom_validate_mappings_error_v1(self):
-        custom_validate_yaml = """
-settings:
-  file_type: csv
-  importing: transactions # Importing transactions
-mapping:
-  account_name: # This is an AccountNameMapping, not suitable for 'transactions' importing setting
-    target: account_name
-    source: AccName
-        """
-        profile = ImportProfile(
-            name="Test Custom Validate Error V1",
-            yaml_config=custom_validate_yaml,
-            version=ImportProfile.Versions.VERSION_1
-        )
-        with self.assertRaises(ValidationError) as cm:
-            profile.full_clean()
-
-        self.assertIn('yaml_config', cm.exception.error_dict)
-        # Check for the specific message raised by custom_validate_mappings
-        # The message is "Mapping type AccountNameMapping not allowed for importing 'transactions'."
-        self.assertTrue(any("mapping type accountnamemapping not allowed for importing 'transactions'" in error.message.lower()
-                            for error in cm.exception.error_dict['yaml_config']),
-                        f"Error messages: {[e.message for e in cm.exception.error_dict['yaml_config']]}")
-
-
-    def test_import_profile_name_unique(self):
-        valid_yaml_config = """
-settings:
-  file_type: csv
-  importing: transactions
-mapping:
-  date:
-    target: date
-    source: Date
-    format: '%Y-%m-%d'
-        """ # Minimal valid YAML for this test
-
-        ImportProfile.objects.create(
-            name="Unique Name Test",
-            yaml_config=valid_yaml_config,
-            version=ImportProfile.Versions.VERSION_1
-        )
-
-        profile2 = ImportProfile(
-            name="Unique Name Test", # Same name
-            yaml_config=valid_yaml_config,
-            version=ImportProfile.Versions.VERSION_1
-        )
-
-        # full_clean should catch this because of the unique constraint on the model field.
-        # Django's Model.full_clean() calls Model.validate_unique().
-        with self.assertRaises(ValidationError) as cm:
-            profile2.full_clean()
-
-        self.assertIn('name', cm.exception.error_dict)
-        self.assertTrue(any("already exists" in error.message.lower() for error in cm.exception.error_dict['name']))
-
-        # As a fallback, or for more direct DB constraint testing, also test IntegrityError on save if full_clean didn't catch it.
-        # This will only be reached if the full_clean() above somehow passes.
-        # try:
-        #     profile2.save()
-        # except IntegrityError:
-        #     pass # Expected if full_clean didn't catch it
-        # else:
-        #     if 'name' not in cm.exception.error_dict: # If full_clean passed and save also passed
-        #         self.fail("IntegrityError not raised for duplicate name on save(), and full_clean() didn't catch it.")
-
-    def test_import_profile_form_valid_data(self):
-        valid_yaml_config = """
-settings:
-  file_type: csv
-  delimiter: ','
-  encoding: utf-8
-  skip_lines: 0
-  trigger_transaction_rules: true
-  importing: transactions
-mapping:
-  date:
-    target: date
-    source: Transaction Date
-    format: '%Y-%m-%d'
-  amount:
-    target: amount
-    source: Amount
-  description:
-    target: description
-    source: Narrative
-  account:
-    target: account
-    source: Account Name
-    type: name
-  type:
-    target: type
-    source: Credit Debit
-    detection_method: sign
-  is_paid:
-    target: is_paid
-    detection_method: always_paid
-deduplication: []
-        """
-        form_data = {
-            'name': 'Form Test Valid',
-            'yaml_config': valid_yaml_config,
-            'version': ImportProfile.Versions.VERSION_1
-        }
-        form = ImportProfileForm(data=form_data)
-        self.assertTrue(form.is_valid(), f"Form errors: {form.errors.as_json()}")
-
-        profile = form.save()
-        self.assertIsNotNone(profile.pk)
-        self.assertEqual(profile.name, 'Form Test Valid')
-        # YAMLField might re-serialize the YAML, so direct string comparison might be brittle
-        # if spacing/ordering changes. However, for now, let's assume it's stored as provided or close enough.
-        # A more robust check would be to load both YAMLs and compare the resulting dicts.
-        self.assertEqual(profile.yaml_config.strip(), valid_yaml_config.strip())
-        self.assertEqual(profile.version, ImportProfile.Versions.VERSION_1)
-
-    def test_import_profile_form_invalid_yaml(self):
-        # Using a YAML that causes a schema validation error (missing 'format' for date mapping)
-        invalid_yaml_for_form = """
-settings:
-  file_type: csv
-  importing: transactions
-mapping:
-  date:
-    target: date
-    source: Transaction Date
-        """
-        form_data = {
-            'name': 'Form Test Invalid',
-            'yaml_config': invalid_yaml_for_form,
-            'version': ImportProfile.Versions.VERSION_1
-        }
-        form = ImportProfileForm(data=form_data)
-        self.assertFalse(form.is_valid())
-        self.assertIn('yaml_config', form.errors)
-        # Check for a message indicating schema validation failure
-        self.assertTrue(any("field required" in error.lower() for error in form.errors['yaml_config']))
-
-
-class ImportServiceTests(TestCase):
-    # ... (existing setUp and other test methods from previous task) ...
-    def setUp(self):
-        minimal_yaml_config = """
-settings:
-  file_type: csv
-  importing: transactions
-mapping:
-  description:
-    target: description
-    source: Desc
-        """
-        self.profile = ImportProfile.objects.create(
-            name="Test Service Profile",
-            yaml_config=minimal_yaml_config,
-            version=ImportProfile.Versions.VERSION_1
-        )
-        self.import_run = ImportRun.objects.create(
-            profile=self.profile,
-            status=ImportRun.Status.PENDING
-        )
-        # self.service is initialized in each test to allow specific mapping_config
-        # or to re-initialize if service state changes (though it shouldn't for these private methods)
-
-    # Tests for _transform_value
-    def test_transform_value_replace(self):
-        service = ImportService(self.import_run)
-        mapping_config = version_1.ColumnMapping(target="description", source="Desc") # Basic mapping
-        mapping_config.transformations = [
-            version_1.ReplaceTransformationRule(type="replace", pattern="old", replacement="new")
-        ]
-        transformed_value = service._transform_value("this is old text", mapping_config)
-        self.assertEqual(transformed_value, "this is new text")
-
-    def test_transform_value_date_format(self):
-        service = ImportService(self.import_run)
-        # DateFormatTransformationRule is typically part of a DateMapping, but testing transform directly
-        mapping_config = version_1.TransactionDateMapping(target="date", source="Date", format="%d/%m/%Y") # format is for final coercion
-        mapping_config.transformations = [
-            version_1.DateFormatTransformationRule(type="date_format", original_format="%Y-%m-%d", new_format="%d/%m/%Y")
-        ]
-        transformed_value = service._transform_value("2023-01-15", mapping_config)
-        self.assertEqual(transformed_value, "15/01/2023")
-
-    def test_transform_value_regex_replace(self):
-        service = ImportService(self.import_run)
-        mapping_config = version_1.ColumnMapping(target="description", source="Desc")
-        mapping_config.transformations = [
-            version_1.ReplaceTransformationRule(type="regex", pattern=r"\\d+", replacement="NUM")
-        ]
-        transformed_value = service._transform_value("abc123xyz456", mapping_config)
-        self.assertEqual(transformed_value, "abcNUMxyzNUM")
-
-    # Tests for _coerce_type
-    def test_coerce_type_string_to_decimal(self):
-        service = ImportService(self.import_run)
-        # TransactionAmountMapping has coerce_to="positive_decimal" by default
-        mapping_config = version_1.TransactionAmountMapping(target="amount", source="Amt")
-
-        coerced = service._coerce_type("123.45", mapping_config)
-        self.assertEqual(coerced, Decimal("123.45"))
-
-        coerced_neg = service._coerce_type("-123.45", mapping_config)
-        self.assertEqual(coerced_neg, Decimal("123.45")) # positive_decimal behavior
-
-        # Test with coerce_to="decimal"
-        mapping_config_decimal = version_1.TransactionAmountMapping(target="amount", source="Amt", coerce_to="decimal")
-        coerced_neg_decimal = service._coerce_type("-123.45", mapping_config_decimal)
-        self.assertEqual(coerced_neg_decimal, Decimal("-123.45"))
-
-
-    def test_coerce_type_string_to_date(self):
-        service = ImportService(self.import_run)
-        mapping_config = version_1.TransactionDateMapping(target="date", source="Dt", format="%Y-%m-%d")
-        coerced = service._coerce_type("2023-01-15", mapping_config)
-        self.assertEqual(coerced, date(2023, 1, 15))
-
-    def test_coerce_type_string_to_transaction_type_sign(self):
-        service = ImportService(self.import_run)
-        mapping_config = version_1.TransactionTypeMapping(target="type", source="TType", detection_method="sign")
-
-        self.assertEqual(service._coerce_type("100.00", mapping_config), Transaction.Type.INCOME)
-        self.assertEqual(service._coerce_type("-100.00", mapping_config), Transaction.Type.EXPENSE)
-        self.assertEqual(service._coerce_type("0.00", mapping_config), Transaction.Type.EXPENSE) # Sign detection treats 0 as expense
-        self.assertEqual(service._coerce_type("+200", mapping_config), Transaction.Type.INCOME)
-
-    def test_coerce_type_string_to_transaction_type_keywords(self):
-        service = ImportService(self.import_run)
-        mapping_config = version_1.TransactionTypeMapping(
-            target="type",
-            source="TType",
-            detection_method="keywords",
-            income_keywords=["credit", "dep"],
-            expense_keywords=["debit", "wdrl"]
-        )
-        self.assertEqual(service._coerce_type("Monthly Credit", mapping_config), Transaction.Type.INCOME)
-        self.assertEqual(service._coerce_type("ATM WDRL", mapping_config), Transaction.Type.EXPENSE)
-        self.assertIsNone(service._coerce_type("Unknown Type", mapping_config)) # No keyword match
-
-    @patch('apps.import_app.services.v1.os.remove')
-    def test_process_file_simple_csv_transactions(self, mock_os_remove):
-        simple_transactions_yaml = """
-settings:
-  file_type: csv
-  importing: transactions
-  delimiter: ','
-  skip_lines: 0
-mapping:
-  date: {target: date, source: Date, format: '%Y-%m-%d'}
-  amount: {target: amount, source: Amount}
-  description: {target: description, source: Description}
-  type: {target: type, source: Type, detection_method: always_income}
-  account: {target: account, source: AccountName, type: name}
-"""
-        self.profile.yaml_config = simple_transactions_yaml
-        self.profile.save()
-        self.import_run.refresh_from_db() # Ensure import_run has the latest profile reference if needed
-
-        csv_content = "Date,Amount,Description,Type,AccountName\n2023-01-01,100.00,Test Deposit,INCOME,TestAcc"
-
-        temp_file_path = None
-        try:
-            # Ensure TEMP_DIR exists if ImportService relies on it being pre-existing
-            # For NamedTemporaryFile, dir just needs to be a valid directory path.
-            # If ImportService.TEMP_DIR is a class variable pointing to a specific path,
-            # it should be created or mocked if it doesn't exist by default.
-            # For simplicity, let's assume it exists or tempfile handles it gracefully.
-            # If ImportService.TEMP_DIR is not guaranteed, use default temp dir.
-            temp_dir = getattr(ImportService, 'TEMP_DIR', None)
-            if temp_dir and not os.path.exists(temp_dir):
-                os.makedirs(temp_dir, exist_ok=True)
-
-            with tempfile.NamedTemporaryFile(mode='w+', delete=False, dir=temp_dir, suffix='.csv', encoding='utf-8') as tmp_file:
-                tmp_file.write(csv_content)
-                temp_file_path = tmp_file.name
-
-            self.addCleanup(lambda: os.remove(temp_file_path) if temp_file_path and os.path.exists(temp_file_path) else None)
-
-            service = ImportService(self.import_run)
-
-            with patch.object(service, '_create_transaction') as mock_create_transaction:
-                service.process_file(temp_file_path)
-
-                self.import_run.refresh_from_db() # Refresh to get updated status and counts
-                self.assertEqual(self.import_run.status, ImportRun.Status.FINISHED)
-                self.assertEqual(self.import_run.total_rows, 1)
-                self.assertEqual(self.import_run.successful_rows, 1)
-
-                mock_create_transaction.assert_called_once()
-
-                # The first argument to _create_transaction is the row_data dictionary
-                args_dict = mock_create_transaction.call_args[0][0]
-
-                self.assertEqual(args_dict['date'], date(2023, 1, 1))
-                self.assertEqual(args_dict['amount'], Decimal('100.00'))
-                self.assertEqual(args_dict['description'], "Test Deposit")
-                self.assertEqual(args_dict['type'], Transaction.Type.INCOME)
-
-                # Account 'TestAcc' does not exist, so _map_row should resolve 'account' to None.
-                # This assumes the default behavior of AccountMapping(type='name') when an account is not found
-                # and creation of new accounts from mapping is not enabled/implemented in _map_row for this test.
-                self.assertIsNone(args_dict.get('account'),
-                                  "Account should be None as 'TestAcc' is not created in this test setup.")
-
-            mock_os_remove.assert_called_once_with(temp_file_path)
-
-        finally:
-            # This cleanup is now handled by self.addCleanup, but kept for safety if addCleanup fails early.
-            if temp_file_path and os.path.exists(temp_file_path) and not mock_os_remove.called:
-                 # If mock_os_remove was not called (e.g., an error before service.process_file finished),
-                 # we might need to manually clean up if addCleanup didn't register or run.
-                 # However, addCleanup is generally robust.
-                 pass
+# Create your tests here.

app/apps/insights/tests.py

@@ -1,303 +1,3 @@
 from django.test import TestCase
-from django.contrib.auth.models import User
-from django.utils.translation import gettext_lazy as _
-from decimal import Decimal
-from datetime import date, timedelta
 
-from apps.accounts.models import Account, AccountGroup
-from apps.currencies.models import Currency
-from apps.transactions.models import TransactionCategory, Transaction
-from apps.insights.utils.category_explorer import get_category_sums_by_account, get_category_sums_by_currency
-from apps.insights.utils.sankey import generate_sankey_data_by_account
-
-class InsightsUtilsTests(TestCase):
-    def setUp(self):
-        self.user = User.objects.create_user(username='testinsightsuser', password='password')
-
-        self.currency_usd = Currency.objects.create(code="USD", name="US Dollar", decimal_places=2)
-        self.currency_eur = Currency.objects.create(code="EUR", name="Euro", decimal_places=2)
-
-        # It's good practice to have an AccountGroup for accounts
-        self.account_group = AccountGroup.objects.create(name="Test Group", owner=self.user)
-
-        self.category_food = TransactionCategory.objects.create(name="Food", owner=self.user, type=TransactionCategory.TransactionType.EXPENSE)
-        self.category_salary = TransactionCategory.objects.create(name="Salary", owner=self.user, type=TransactionCategory.TransactionType.INCOME)
-
-        self.account_usd_1 = Account.objects.create(name="USD Account 1", owner=self.user, currency=self.currency_usd, group=self.account_group)
-        self.account_usd_2 = Account.objects.create(name="USD Account 2", owner=self.user, currency=self.currency_usd, group=self.account_group)
-        self.account_eur_1 = Account.objects.create(name="EUR Account 1", owner=self.user, currency=self.currency_eur, group=self.account_group)
-
-        today = date.today()
-
-        # T1: Acc USD1, Food, Expense 50 (paid)
-        Transaction.objects.create(
-            description="Groceries USD1 Food Paid", account=self.account_usd_1, category=self.category_food,
-            type=Transaction.Type.EXPENSE, amount=Decimal('50.00'), date=today, is_paid=True, owner=self.user
-        )
-        # T2: Acc USD1, Food, Expense 20 (unpaid/projected)
-        Transaction.objects.create(
-            description="Restaurant USD1 Food Unpaid", account=self.account_usd_1, category=self.category_food,
-            type=Transaction.Type.EXPENSE, amount=Decimal('20.00'), date=today, is_paid=False, owner=self.user
-        )
-        # T3: Acc USD2, Food, Expense 30 (paid)
-        Transaction.objects.create(
-            description="Snacks USD2 Food Paid", account=self.account_usd_2, category=self.category_food,
-            type=Transaction.Type.EXPENSE, amount=Decimal('30.00'), date=today, is_paid=True, owner=self.user
-        )
-        # T4: Acc USD1, Salary, Income 1000 (paid)
-        Transaction.objects.create(
-            description="Salary USD1 Paid", account=self.account_usd_1, category=self.category_salary,
-            type=Transaction.Type.INCOME, amount=Decimal('1000.00'), date=today, is_paid=True, owner=self.user
-        )
-        # T5: Acc EUR1, Food, Expense 40 (paid, different currency)
-        Transaction.objects.create(
-            description="Groceries EUR1 Food Paid", account=self.account_eur_1, category=self.category_food,
-            type=Transaction.Type.EXPENSE, amount=Decimal('40.00'), date=today, is_paid=True, owner=self.user
-        )
-        # T6: Acc USD2, Salary, Income 200 (unpaid/projected)
-        Transaction.objects.create(
-            description="Bonus USD2 Salary Unpaid", account=self.account_usd_2, category=self.category_salary,
-            type=Transaction.Type.INCOME, amount=Decimal('200.00'), date=today, is_paid=False, owner=self.user
-        )
-
-    def test_get_category_sums_by_account_for_food(self):
-        qs = Transaction.objects.filter(owner=self.user) # Filter by user for safety in shared DB environments
-        result = get_category_sums_by_account(qs, category=self.category_food)
-
-        expected_labels = sorted([self.account_eur_1.name, self.account_usd_1.name, self.account_usd_2.name])
-        self.assertEqual(result['labels'], expected_labels)
-
-        # Expected data structure: {account_name: {'current_income': D('0'), ...}, ...}
-        # Then the util function transforms this.
-        # Let's map labels to their expected index for easier assertion
-        label_to_idx = {name: i for i, name in enumerate(expected_labels)}
-
-        # Initialize expected data arrays based on sorted labels length
-        num_labels = len(expected_labels)
-        expected_current_income = [Decimal('0.00')] * num_labels
-        expected_current_expenses = [Decimal('0.00')] * num_labels
-        expected_projected_income = [Decimal('0.00')] * num_labels
-        expected_projected_expenses = [Decimal('0.00')] * num_labels
-
-        # Populate expected data based on transactions for FOOD category
-        # T1: Acc USD1, Food, Expense 50 (paid) -> account_usd_1, current_expenses = -50
-        expected_current_expenses[label_to_idx[self.account_usd_1.name]] = Decimal('-50.00')
-        # T2: Acc USD1, Food, Expense 20 (unpaid/projected) -> account_usd_1, projected_expenses = -20
-        expected_projected_expenses[label_to_idx[self.account_usd_1.name]] = Decimal('-20.00')
-        # T3: Acc USD2, Food, Expense 30 (paid) -> account_usd_2, current_expenses = -30
-        expected_current_expenses[label_to_idx[self.account_usd_2.name]] = Decimal('-30.00')
-        # T5: Acc EUR1, Food, Expense 40 (paid) -> account_eur_1, current_expenses = -40
-        expected_current_expenses[label_to_idx[self.account_eur_1.name]] = Decimal('-40.00')
-
-        self.assertEqual(result['datasets'][0]['data'], [float(x) for x in expected_current_income]) # Current Income
-        self.assertEqual(result['datasets'][1]['data'], [float(x) for x in expected_current_expenses]) # Current Expenses
-        self.assertEqual(result['datasets'][2]['data'], [float(x) for x in expected_projected_income]) # Projected Income
-        self.assertEqual(result['datasets'][3]['data'], [float(x) for x in expected_projected_expenses]) # Projected Expenses
-
-        self.assertEqual(result['datasets'][0]['label'], "Current Income")
-        self.assertEqual(result['datasets'][1]['label'], "Current Expenses")
-        self.assertEqual(result['datasets'][2]['label'], "Projected Income")
-        self.assertEqual(result['datasets'][3]['label'], "Projected Expenses")
-
-    def test_generate_sankey_data_by_account(self):
-        qs = Transaction.objects.filter(owner=self.user)
-        result = generate_sankey_data_by_account(qs)
-
-        nodes = result['nodes']
-        flows = result['flows']
-
-        # Helper to find a node by a unique part of its ID
-        def find_node_by_id_part(id_part):
-            found_nodes = [n for n in nodes if id_part in n['id']]
-            self.assertEqual(len(found_nodes), 1, f"Node with ID part '{id_part}' not found or not unique. Found: {found_nodes}")
-            return found_nodes[0]
-
-        # Helper to find a flow by unique parts of its source and target node IDs
-        def find_flow_by_node_id_parts(from_id_part, to_id_part):
-            found_flows = [
-                f for f in flows
-                if from_id_part in f['from_node'] and to_id_part in f['to_node']
-            ]
-            self.assertEqual(len(found_flows), 1, f"Flow from '{from_id_part}' to '{to_id_part}' not found or not unique. Found: {found_flows}")
-            return found_flows[0]
-
-        # Calculate total volumes by currency (sum of absolute amounts of ALL transactions)
-        total_volume_usd = sum(abs(t.amount) for t in qs if t.account.currency == self.currency_usd) # 50+20+30+1000+200 = 1300
-        total_volume_eur = sum(abs(t.amount) for t in qs if t.account.currency == self.currency_eur) # 40
-
-        self.assertEqual(total_volume_usd, Decimal('1300.00'))
-        self.assertEqual(total_volume_eur, Decimal('40.00'))
-
-        # --- Assertions for Account USD 1 ---
-        acc_usd_1_id_part = f"_{self.account_usd_1.id}"
-
-        node_income_salary_usd1 = find_node_by_id_part(f"income_{self.category_salary.name.lower()}{acc_usd_1_id_part}")
-        self.assertEqual(node_income_salary_usd1['name'], self.category_salary.name)
-
-        node_account_usd1 = find_node_by_id_part(f"account_{self.account_usd_1.name.lower().replace(' ', '_')}{acc_usd_1_id_part}")
-        self.assertEqual(node_account_usd1['name'], self.account_usd_1.name)
-
-        node_expense_food_usd1 = find_node_by_id_part(f"expense_{self.category_food.name.lower()}{acc_usd_1_id_part}")
-        self.assertEqual(node_expense_food_usd1['name'], self.category_food.name)
-
-        node_saved_usd1 = find_node_by_id_part(f"savings_saved{acc_usd_1_id_part}")
-        self.assertEqual(node_saved_usd1['name'], _("Saved"))
-
-        # Flow 1: Salary (T4) to account_usd_1
-        flow_salary_to_usd1 = find_flow_by_node_id_parts(node_income_salary_usd1['id'], node_account_usd1['id'])
-        self.assertEqual(flow_salary_to_usd1['original_amount'], 1000.0)
-        self.assertEqual(flow_salary_to_usd1['currency']['code'], self.currency_usd.code)
-        self.assertAlmostEqual(flow_salary_to_usd1['percentage'], (1000.0 / float(total_volume_usd)) * 100, places=2)
-        self.assertAlmostEqual(flow_salary_to_usd1['flow'], (1000.0 / float(total_volume_usd)), places=4)
-
-        # Flow 2: account_usd_1 to Food (T1)
-        flow_usd1_to_food = find_flow_by_node_id_parts(node_account_usd1['id'], node_expense_food_usd1['id'])
-        self.assertEqual(flow_usd1_to_food['original_amount'], 50.0) # T1 is 50
-        self.assertEqual(flow_usd1_to_food['currency']['code'], self.currency_usd.code)
-        self.assertAlmostEqual(flow_usd1_to_food['percentage'], (50.0 / float(total_volume_usd)) * 100, places=2)
-
-        # Flow 3: account_usd_1 to Saved
-        # Net paid for account_usd_1: 1000 (T4 income) - 50 (T1 expense) = 950
-        flow_usd1_to_saved = find_flow_by_node_id_parts(node_account_usd1['id'], node_saved_usd1['id'])
-        self.assertEqual(flow_usd1_to_saved['original_amount'], 950.0)
-        self.assertEqual(flow_usd1_to_saved['currency']['code'], self.currency_usd.code)
-        self.assertAlmostEqual(flow_usd1_to_saved['percentage'], (950.0 / float(total_volume_usd)) * 100, places=2)
-
-        # --- Assertions for Account USD 2 ---
-        acc_usd_2_id_part = f"_{self.account_usd_2.id}"
-        node_account_usd2 = find_node_by_id_part(f"account_{self.account_usd_2.name.lower().replace(' ', '_')}{acc_usd_2_id_part}")
-        node_expense_food_usd2 = find_node_by_id_part(f"expense_{self.category_food.name.lower()}{acc_usd_2_id_part}")
-        # T6 (Salary for USD2) is unpaid, so no income node/flow for it.
-        # Net paid for account_usd_2 is -30 (T3 expense). So no "Saved" node.
-
-        # Flow: account_usd_2 to Food (T3)
-        flow_usd2_to_food = find_flow_by_node_id_parts(node_account_usd2['id'], node_expense_food_usd2['id'])
-        self.assertEqual(flow_usd2_to_food['original_amount'], 30.0) # T3 is 30
-        self.assertEqual(flow_usd2_to_food['currency']['code'], self.currency_usd.code)
-        self.assertAlmostEqual(flow_usd2_to_food['percentage'], (30.0 / float(total_volume_usd)) * 100, places=2)
-
-        # Check no "Saved" node for account_usd_2
-        saved_nodes_usd2 = [n for n in nodes if f"savings_saved{acc_usd_2_id_part}" in n['id']]
-        self.assertEqual(len(saved_nodes_usd2), 0, "Should be no 'Saved' node for account_usd_2 as net is negative.")
-
-        # --- Assertions for Account EUR 1 ---
-        acc_eur_1_id_part = f"_{self.account_eur_1.id}"
-        node_account_eur1 = find_node_by_id_part(f"account_{self.account_eur_1.name.lower().replace(' ', '_')}{acc_eur_1_id_part}")
-        node_expense_food_eur1 = find_node_by_id_part(f"expense_{self.category_food.name.lower()}{acc_eur_1_id_part}")
-        # Net paid for account_eur_1 is -40 (T5 expense). No "Saved" node.
-
-        # Flow: account_eur_1 to Food (T5)
-        flow_eur1_to_food = find_flow_by_node_id_parts(node_account_eur1['id'], node_expense_food_eur1['id'])
-        self.assertEqual(flow_eur1_to_food['original_amount'], 40.0) # T5 is 40
-        self.assertEqual(flow_eur1_to_food['currency']['code'], self.currency_eur.code)
-        self.assertAlmostEqual(flow_eur1_to_food['percentage'], (40.0 / float(total_volume_eur)) * 100, places=2) # (40/40)*100 = 100%
-
-        # Check no "Saved" node for account_eur_1
-        saved_nodes_eur1 = [n for n in nodes if f"savings_saved{acc_eur_1_id_part}" in n['id']]
-        self.assertEqual(len(saved_nodes_eur1), 0, "Should be no 'Saved' node for account_eur_1 as net is negative.")
-
-    def test_get_category_sums_by_currency_for_food(self):
-        qs = Transaction.objects.filter(owner=self.user)
-        result = get_category_sums_by_currency(qs, category=self.category_food)
-
-        expected_labels = sorted([self.currency_eur.name, self.currency_usd.name])
-        self.assertEqual(result['labels'], expected_labels)
-
-        label_to_idx = {name: i for i, name in enumerate(expected_labels)}
-        num_labels = len(expected_labels)
-
-        expected_current_income = [Decimal('0.00')] * num_labels
-        expected_current_expenses = [Decimal('0.00')] * num_labels
-        expected_projected_income = [Decimal('0.00')] * num_labels
-        expected_projected_expenses = [Decimal('0.00')] * num_labels
-
-        # Food Transactions:
-        # T1: USD Account 1, Food, Expense 50 (paid)
-        # T2: USD Account 1, Food, Expense 20 (unpaid/projected)
-        # T3: USD Account 2, Food, Expense 30 (paid)
-        # T5: EUR Account 1, Food, Expense 40 (paid)
-
-        # Current Expenses:
-        expected_current_expenses[label_to_idx[self.currency_eur.name]] = Decimal('-40.00') # T5
-        expected_current_expenses[label_to_idx[self.currency_usd.name]] = Decimal('-50.00') + Decimal('-30.00') # T1 + T3
-
-        # Projected Expenses:
-        expected_projected_expenses[label_to_idx[self.currency_usd.name]] = Decimal('-20.00') # T2
-
-        self.assertEqual(result['datasets'][0]['data'], [float(x) for x in expected_current_income])
-        self.assertEqual(result['datasets'][1]['data'], [float(x) for x in expected_current_expenses])
-        self.assertEqual(result['datasets'][2]['data'], [float(x) for x in expected_projected_income])
-        self.assertEqual(result['datasets'][3]['data'], [float(x) for x in expected_projected_expenses])
-
-        self.assertEqual(result['datasets'][0]['label'], "Current Income")
-        self.assertEqual(result['datasets'][1]['label'], "Current Expenses")
-        self.assertEqual(result['datasets'][2]['label'], "Projected Income")
-        self.assertEqual(result['datasets'][3]['label'], "Projected Expenses")
-
-    def test_get_category_sums_by_currency_for_salary(self):
-        qs = Transaction.objects.filter(owner=self.user)
-        result = get_category_sums_by_currency(qs, category=self.category_salary)
-
-        # Salary Transactions:
-        # T4: USD Account 1, Salary, Income 1000 (paid)
-        # T6: USD Account 2, Salary, Income 200 (unpaid/projected)
-        # All are USD
-        expected_labels = [self.currency_usd.name] # Only USD has salary transactions
-        self.assertEqual(result['labels'], expected_labels)
-
-        label_to_idx = {name: i for i, name in enumerate(expected_labels)}
-        num_labels = len(expected_labels)
-
-        expected_current_income = [Decimal('0.00')] * num_labels
-        expected_current_expenses = [Decimal('0.00')] * num_labels
-        expected_projected_income = [Decimal('0.00')] * num_labels
-        expected_projected_expenses = [Decimal('0.00')] * num_labels
-
-        # Current Income:
-        expected_current_income[label_to_idx[self.currency_usd.name]] = Decimal('1000.00') # T4
-
-        # Projected Income:
-        expected_projected_income[label_to_idx[self.currency_usd.name]] = Decimal('200.00') # T6
-
-        self.assertEqual(result['datasets'][0]['data'], [float(x) for x in expected_current_income])
-        self.assertEqual(result['datasets'][1]['data'], [float(x) for x in expected_current_expenses])
-        self.assertEqual(result['datasets'][2]['data'], [float(x) for x in expected_projected_income])
-        self.assertEqual(result['datasets'][3]['data'], [float(x) for x in expected_projected_expenses])
-
-        self.assertEqual(result['datasets'][0]['label'], "Current Income")
-        self.assertEqual(result['datasets'][1]['label'], "Current Expenses")
-        self.assertEqual(result['datasets'][2]['label'], "Projected Income")
-        self.assertEqual(result['datasets'][3]['label'], "Projected Expenses")
-
-
-    def test_get_category_sums_by_account_for_salary(self):
-        qs = Transaction.objects.filter(owner=self.user)
-        result = get_category_sums_by_account(qs, category=self.category_salary)
-
-        # Only accounts with salary transactions should appear
-        expected_labels = sorted([self.account_usd_1.name, self.account_usd_2.name])
-        self.assertEqual(result['labels'], expected_labels)
-
-        label_to_idx = {name: i for i, name in enumerate(expected_labels)}
-        num_labels = len(expected_labels)
-
-        expected_current_income = [Decimal('0.00')] * num_labels
-        expected_current_expenses = [Decimal('0.00')] * num_labels
-        expected_projected_income = [Decimal('0.00')] * num_labels
-        expected_projected_expenses = [Decimal('0.00')] * num_labels
-
-        # Populate expected data based on transactions for SALARY category
-        # T4: Acc USD1, Salary, Income 1000 (paid) -> account_usd_1, current_income = 1000
-        expected_current_income[label_to_idx[self.account_usd_1.name]] = Decimal('1000.00')
-        # T6: Acc USD2, Salary, Income 200 (unpaid/projected) -> account_usd_2, projected_income = 200
-        expected_projected_income[label_to_idx[self.account_usd_2.name]] = Decimal('200.00')
-
-        self.assertEqual(result['datasets'][0]['data'], [float(x) for x in expected_current_income])
-        self.assertEqual(result['datasets'][1]['data'], [float(x) for x in expected_current_expenses])
-        self.assertEqual(result['datasets'][2]['data'], [float(x) for x in expected_projected_income])
-        self.assertEqual(result['datasets'][3]['data'], [float(x) for x in expected_projected_expenses])
-
-        self.assertEqual(result['datasets'][0]['label'], "Current Income")
-        self.assertEqual(result['datasets'][1]['label'], "Current Expenses")
-        self.assertEqual(result['datasets'][2]['label'], "Projected Income")
-        self.assertEqual(result['datasets'][3]['label'], "Projected Expenses")
+# Create your tests here.

app/apps/mini_tools/tests.py

@@ -1,165 +1,3 @@
 from django.test import TestCase
-from django.contrib.auth.models import User
-from django.utils import timezone
-from unittest.mock import patch
-from decimal import Decimal
-from datetime import date
-from django.test import Client # Added
-from django.urls import reverse # Added
 
-from apps.currencies.models import Currency, ExchangeRate
-from apps.mini_tools.utils.exchange_rate_map import get_currency_exchange_map
-
-class MiniToolsUtilsTests(TestCase):
-    def setUp(self):
-        # User is not strictly necessary for this utility but good practice for test setup
-        self.user = User.objects.create_user(username='testuser', password='password')
-
-        self.usd = Currency.objects.create(name="US Dollar", code="USD", decimal_places=2, prefix="$")
-        self.eur = Currency.objects.create(name="Euro", code="EUR", decimal_places=2, prefix="€")
-        self.gbp = Currency.objects.create(name="British Pound", code="GBP", decimal_places=2, prefix="£")
-
-        # USD -> EUR rates
-        # Rate for 2023-01-10 (will be processed last for USD->EUR due to ordering)
-        ExchangeRate.objects.create(from_currency=self.usd, to_currency=self.eur, rate=Decimal("0.90"), date=date(2023, 1, 10))
-        # Rate for 2023-01-15 (closer to target_date 2023-01-16, processed first for USD->EUR)
-        ExchangeRate.objects.create(from_currency=self.usd, to_currency=self.eur, rate=Decimal("0.92"), date=date(2023, 1, 15))
-
-        # GBP -> USD rate
-        self.gbp_usd_rate = ExchangeRate.objects.create(from_currency=self.gbp, to_currency=self.usd, rate=Decimal("1.25"), date=date(2023, 1, 12))
-
-    def test_get_currency_exchange_map_structure_and_rates(self):
-        target_date = date(2023, 1, 16)
-        rate_map = get_currency_exchange_map(date=target_date)
-
-        # Assert USD in map
-        self.assertIn("US Dollar", rate_map)
-        usd_data = rate_map["US Dollar"]
-        self.assertEqual(usd_data["decimal_places"], 2)
-        self.assertEqual(usd_data["prefix"], "$")
-        self.assertIn("rates", usd_data)
-
-        # USD -> EUR: Expecting rate from 2023-01-10 (0.90)
-        # Query order: (USD,EUR,2023-01-15), (USD,EUR,2023-01-10)
-        # Loop overwrite means the last one processed (0.90) sticks.
-        self.assertIn("Euro", usd_data["rates"])
-        self.assertEqual(usd_data["rates"]["Euro"]["rate"], Decimal("0.90"))
-
-        # USD -> GBP: Inverse of GBP->USD rate from 2023-01-12 (1.25)
-        # Query for GBP->USD, date 2023-01-12, diff 4 days.
-        self.assertIn("British Pound", usd_data["rates"])
-        self.assertEqual(usd_data["rates"]["British Pound"]["rate"], Decimal("1") / self.gbp_usd_rate.rate)
-
-        # Assert EUR in map
-        self.assertIn("Euro", rate_map)
-        eur_data = rate_map["Euro"]
-        self.assertEqual(eur_data["decimal_places"], 2)
-        self.assertEqual(eur_data["prefix"], "€")
-        self.assertIn("rates", eur_data)
-
-        # EUR -> USD: Inverse of USD->EUR rate from 2023-01-10 (0.90)
-        self.assertIn("US Dollar", eur_data["rates"])
-        self.assertEqual(eur_data["rates"]["US Dollar"]["rate"], Decimal("1") / Decimal("0.90"))
-
-        # Assert GBP in map
-        self.assertIn("British Pound", rate_map)
-        gbp_data = rate_map["British Pound"]
-        self.assertEqual(gbp_data["decimal_places"], 2)
-        self.assertEqual(gbp_data["prefix"], "£")
-        self.assertIn("rates", gbp_data)
-
-        # GBP -> USD: Direct rate from 2023-01-12 (1.25)
-        self.assertIn("US Dollar", gbp_data["rates"])
-        self.assertEqual(gbp_data["rates"]["US Dollar"]["rate"], self.gbp_usd_rate.rate)
-
-    @patch('apps.mini_tools.utils.exchange_rate_map.timezone')
-    def test_get_currency_exchange_map_uses_today_if_no_date(self, mock_django_timezone):
-        # Mock timezone.localtime().date() to return a specific date
-        mock_today = date(2023, 1, 16)
-        mock_django_timezone.localtime.return_value.date.return_value = mock_today
-
-        rate_map = get_currency_exchange_map() # No date argument, should use mocked "today"
-
-        # Re-assert one key rate to confirm the mocked date was used.
-        # Based on test_get_currency_exchange_map_structure_and_rates, with target_date 2023-01-16,
-        # USD -> EUR should be 0.90.
-        self.assertIn("US Dollar", rate_map)
-        self.assertIn("Euro", rate_map["US Dollar"]["rates"])
-        self.assertEqual(rate_map["US Dollar"]["rates"]["Euro"]["rate"], Decimal("0.90"))
-
-        # Verify that timezone.localtime().date() was called
-        mock_django_timezone.localtime.return_value.date.assert_called_once()
-
-
-class MiniToolsViewTests(TestCase):
-    def setUp(self):
-        self.user = User.objects.create_user(username='viewtestuser', password='password')
-        self.client = Client()
-        self.client.login(username='viewtestuser', password='password')
-
-        self.usd = Currency.objects.create(name="US Dollar Test", code="USDTEST", decimal_places=2, prefix="$T ")
-        self.eur = Currency.objects.create(name="Euro Test", code="EURTEST", decimal_places=2, prefix="€T ")
-
-    @patch('apps.mini_tools.views.convert')
-    def test_currency_converter_convert_view_successful(self, mock_convert):
-        mock_convert.return_value = (Decimal("85.00"), "€T ", "", 2) # prefix, suffix, dp
-
-        get_params = {
-            'from_value': "100",
-            'from_currency': self.usd.id,
-            'to_currency': self.eur.id
-        }
-        response = self.client.get(reverse('mini_tools:currency_converter_convert'), data=get_params)
-
-        self.assertEqual(response.status_code, 200)
-
-        mock_convert.assert_called_once()
-        args, kwargs = mock_convert.call_args
-
-        # The view calls: convert(amount=amount_decimal, from_currency=from_currency_obj, to_currency=to_currency_obj)
-        # So, these are keyword arguments.
-        self.assertEqual(kwargs['amount'], Decimal('100'))
-        self.assertEqual(kwargs['from_currency'], self.usd)
-        self.assertEqual(kwargs['to_currency'], self.eur)
-
-        self.assertEqual(response.context['converted_amount'], Decimal("85.00"))
-        self.assertEqual(response.context['prefix'], "€T ")
-        self.assertEqual(response.context['suffix'], "")
-        self.assertEqual(response.context['decimal_places'], 2)
-        self.assertEqual(response.context['from_value'], "100") # Check original value passed through
-        self.assertEqual(response.context['from_currency_selected'], str(self.usd.id))
-        self.assertEqual(response.context['to_currency_selected'], str(self.eur.id))
-
-
-    @patch('apps.mini_tools.views.convert')
-    def test_currency_converter_convert_view_missing_params(self, mock_convert):
-        get_params = {
-            'from_value': "100",
-            'from_currency': self.usd.id
-            # 'to_currency' is missing
-        }
-        response = self.client.get(reverse('mini_tools:currency_converter_convert'), data=get_params)
-
-        self.assertEqual(response.status_code, 200)
-        mock_convert.assert_not_called()
-        self.assertIsNone(response.context.get('converted_amount')) # Use .get() for safety if key might be absent
-        self.assertEqual(response.context['from_value'], "100")
-        self.assertEqual(response.context['from_currency_selected'], str(self.usd.id))
-        self.assertIsNone(response.context.get('to_currency_selected'))
-
-
-    @patch('apps.mini_tools.views.convert')
-    def test_currency_converter_convert_view_invalid_currency_id(self, mock_convert):
-        get_params = {
-            'from_value': "100",
-            'from_currency': self.usd.id,
-            'to_currency': 999 # Non-existent currency ID
-        }
-        response = self.client.get(reverse('mini_tools:currency_converter_convert'), data=get_params)
-
-        self.assertEqual(response.status_code, 200)
-        mock_convert.assert_not_called()
-        self.assertIsNone(response.context.get('converted_amount'))
-        self.assertEqual(response.context['from_value'], "100")
-        self.assertEqual(response.context['from_currency_selected'], str(self.usd.id))
-        self.assertEqual(response.context['to_currency_selected'], '999') # View passes invalid ID to context
+# Create your tests here.

app/apps/monthly_overview/tests.py

@@ -1,131 +0,0 @@
-from django.test import TestCase, Client
-from django.contrib.auth.models import User
-from django.urls import reverse
-from django.utils import timezone # Though specific dates are used, good for general test setup
-from decimal import Decimal
-from datetime import date
-
-from apps.accounts.models import Account, AccountGroup
-from apps.currencies.models import Currency
-from apps.transactions.models import TransactionCategory, TransactionTag, Transaction
-
-class MonthlyOverviewViewTests(TestCase): # Renamed from MonthlyOverviewTestCase
-    def setUp(self):
-        self.user = User.objects.create_user(username='testmonthlyuser', password='password')
-        self.client = Client()
-        self.client.login(username='testmonthlyuser', password='password')
-
-        self.currency_usd = Currency.objects.create(name="MO USD", code="MOUSD", decimal_places=2, prefix="$MO ")
-        self.account_group = AccountGroup.objects.create(name="MO Group", owner=self.user)
-        self.account_usd1 = Account.objects.create(
-            name="MO Account USD 1",
-            currency=self.currency_usd,
-            owner=self.user,
-            group=self.account_group
-        )
-        self.category_food = TransactionCategory.objects.create(
-            name="MO Food",
-            owner=self.user,
-            type=TransactionCategory.TransactionType.EXPENSE
-        )
-        self.category_salary = TransactionCategory.objects.create(
-            name="MO Salary",
-            owner=self.user,
-            type=TransactionCategory.TransactionType.INCOME
-        )
-        self.tag_urgent = TransactionTag.objects.create(name="Urgent", owner=self.user)
-
-        # Transactions for March 2023
-        self.t_food1 = Transaction.objects.create(
-            owner=self.user, account=self.account_usd1, category=self.category_food,
-            date=date(2023, 3, 5), amount=Decimal("50.00"),
-            type=Transaction.Type.EXPENSE, description="Groceries March", is_paid=True
-        )
-        self.t_food1.tags.add(self.tag_urgent)
-
-        self.t_food2 = Transaction.objects.create(
-            owner=self.user, account=self.account_usd1, category=self.category_food,
-            date=date(2023, 3, 10), amount=Decimal("25.00"),
-            type=Transaction.Type.EXPENSE, description="Lunch March", is_paid=True
-        )
-        self.t_salary1 = Transaction.objects.create(
-            owner=self.user, account=self.account_usd1, category=self.category_salary,
-            date=date(2023, 3, 1), amount=Decimal("1000.00"),
-            type=Transaction.Type.INCOME, description="March Salary", is_paid=True
-        )
-        # Transaction for April 2023
-        self.t_april_food = Transaction.objects.create(
-            owner=self.user, account=self.account_usd1, category=self.category_food,
-            date=date(2023, 4, 5), amount=Decimal("30.00"),
-            type=Transaction.Type.EXPENSE, description="April Groceries", is_paid=True
-        )
-        # URL for the main overview page for March 2023, used in the adapted test
-        self.url_main_overview_march = reverse('monthly_overview:monthly_overview', kwargs={'month': 3, 'year': 2023})
-
-
-    def test_transactions_list_no_filters(self):
-        url = reverse('monthly_overview:monthly_transactions_list', kwargs={'month': 3, 'year': 2023})
-        response = self.client.get(url, HTTP_HX_REQUEST='true')
-        self.assertEqual(response.status_code, 200)
-        context_txns = response.context['transactions']
-        self.assertIn(self.t_food1, context_txns)
-        self.assertIn(self.t_food2, context_txns)
-        self.assertIn(self.t_salary1, context_txns)
-        self.assertNotIn(self.t_april_food, context_txns)
-        self.assertEqual(len(context_txns), 3)
-
-    def test_transactions_list_filter_by_description(self):
-        url = reverse('monthly_overview:monthly_transactions_list', kwargs={'month': 3, 'year': 2023})
-        response = self.client.get(url + "?description=Groceries", HTTP_HX_REQUEST='true') # Filter for "Groceries March"
-        self.assertEqual(response.status_code, 200)
-        context_txns = response.context['transactions']
-        self.assertIn(self.t_food1, context_txns)
-        self.assertNotIn(self.t_food2, context_txns)
-        self.assertNotIn(self.t_salary1, context_txns)
-        self.assertEqual(len(context_txns), 1)
-
-    def test_transactions_list_filter_by_type_income(self):
-        url = reverse('monthly_overview:monthly_transactions_list', kwargs={'month': 3, 'year': 2023})
-        response = self.client.get(url + "?type=IN", HTTP_HX_REQUEST='true')
-        self.assertEqual(response.status_code, 200)
-        context_txns = response.context['transactions']
-        self.assertIn(self.t_salary1, context_txns)
-        self.assertEqual(len(context_txns), 1)
-
-    def test_transactions_list_filter_by_tag(self):
-        url = reverse('monthly_overview:monthly_transactions_list', kwargs={'month': 3, 'year': 2023})
-        response = self.client.get(url + f"?tags={self.tag_urgent.name}", HTTP_HX_REQUEST='true')
-        self.assertEqual(response.status_code, 200)
-        context_txns = response.context['transactions']
-        self.assertIn(self.t_food1, context_txns)
-        self.assertEqual(len(context_txns), 1)
-
-    def test_transactions_list_filter_by_category(self):
-        url = reverse('monthly_overview:monthly_transactions_list', kwargs={'month': 3, 'year': 2023})
-        response = self.client.get(url + f"?category={self.category_food.name}", HTTP_HX_REQUEST='true')
-        self.assertEqual(response.status_code, 200)
-        context_txns = response.context['transactions']
-        self.assertIn(self.t_food1, context_txns)
-        self.assertIn(self.t_food2, context_txns)
-        self.assertEqual(len(context_txns), 2)
-
-    def test_transactions_list_ordering_amount_desc(self):
-        url = reverse('monthly_overview:monthly_transactions_list', kwargs={'month': 3, 'year': 2023})
-        response = self.client.get(url + "?order=-amount", HTTP_HX_REQUEST='true')
-        self.assertEqual(response.status_code, 200)
-        context_txns = list(response.context['transactions'])
-        self.assertEqual(context_txns[0], self.t_salary1) # Amount 1000 (INCOME)
-        self.assertEqual(context_txns[1], self.t_food1)   # Amount 50 (EXPENSE)
-        self.assertEqual(context_txns[2], self.t_food2)   # Amount 25 (EXPENSE)
-
-    def test_monthly_overview_main_view_authenticated_user(self):
-        # This test checks general access and basic context for the main monthly overview page.
-        response = self.client.get(self.url_main_overview_march)
-        self.assertEqual(response.status_code, 200)
-        self.assertIn('current_month_date', response.context)
-        self.assertEqual(response.context['current_month_date'], date(2023,3,1))
-        # Check for other expected context variables if necessary for this main view.
-        # For example, if it also lists transactions or summaries directly in its initial context.
-        self.assertIn('transactions_by_day', response.context) # Assuming this is part of the main view context as well
-        self.assertIn('total_income_current_month', response.context)
-        self.assertIn('total_expenses_current_month', response.context)

app/apps/net_worth/tests.py

@@ -1,153 +1,3 @@
 from django.test import TestCase
-from django.contrib.auth.models import User
-from django.utils import timezone
-from decimal import Decimal
-from datetime import date
-from collections import OrderedDict
 
-from apps.accounts.models import Account, AccountGroup
-from apps.currencies.models import Currency
-from apps.transactions.models import TransactionCategory, Transaction
-from apps.net_worth.utils.calculate_net_worth import calculate_historical_currency_net_worth, calculate_historical_account_balance
-from apps.common.middleware.thread_local import set_current_user, get_current_user
-
-class NetWorthUtilsTests(TestCase):
-    def setUp(self):
-        self.user = User.objects.create_user(username='testnetworthuser', password='password')
-
-        # Clean up current_user after each test
-        self.addCleanup(set_current_user, None)
-
-        self.usd = Currency.objects.create(name="US Dollar", code="USD", decimal_places=2, prefix="$")
-        self.eur = Currency.objects.create(name="Euro", code="EUR", decimal_places=2, prefix="€")
-
-        self.category = TransactionCategory.objects.create(name="Test Cat", owner=self.user, type=TransactionCategory.TransactionType.INFO)
-        self.account_group = AccountGroup.objects.create(name="NetWorth Test Group", owner=self.user)
-
-        self.account_usd1 = Account.objects.create(name="USD Account 1", currency=self.usd, owner=self.user, group=self.account_group)
-        self.account_eur1 = Account.objects.create(name="EUR Account 1", currency=self.eur, owner=self.user, group=self.account_group)
-
-        # --- Transactions for Jan 2023 ---
-        # USD1: +1000 (Income)
-        Transaction.objects.create(
-            description="Jan Salary USD1", account=self.account_usd1, category=self.category,
-            type=Transaction.Type.INCOME, amount=Decimal('1000.00'), date=date(2023, 1, 10), is_paid=True, owner=self.user
-        )
-        # USD1: -50 (Expense)
-        Transaction.objects.create(
-            description="Jan Food USD1", account=self.account_usd1, category=self.category,
-            type=Transaction.Type.EXPENSE, amount=Decimal('50.00'), date=date(2023, 1, 15), is_paid=True, owner=self.user
-        )
-        # EUR1: +500 (Income)
-        Transaction.objects.create(
-            description="Jan Bonus EUR1", account=self.account_eur1, category=self.category,
-            type=Transaction.Type.INCOME, amount=Decimal('500.00'), date=date(2023, 1, 20), is_paid=True, owner=self.user
-        )
-
-        # --- Transactions for Feb 2023 ---
-        # USD1: +200 (Income)
-        Transaction.objects.create(
-            description="Feb Salary USD1", account=self.account_usd1, category=self.category,
-            type=Transaction.Type.INCOME, amount=Decimal('200.00'), date=date(2023, 2, 5), is_paid=True, owner=self.user
-        )
-        # EUR1: -100 (Expense)
-        Transaction.objects.create(
-            description="Feb Rent EUR1", account=self.account_eur1, category=self.category,
-            type=Transaction.Type.EXPENSE, amount=Decimal('100.00'), date=date(2023, 2, 12), is_paid=True, owner=self.user
-        )
-        # EUR1: +50 (Income)
-        Transaction.objects.create(
-            description="Feb Side Gig EUR1", account=self.account_eur1, category=self.category,
-            type=Transaction.Type.INCOME, amount=Decimal('50.00'), date=date(2023, 2, 18), is_paid=True, owner=self.user
-        )
-        # No transactions in Mar 2023 for this setup
-
-    def test_calculate_historical_currency_net_worth(self):
-        # Set current user for the utility function to access
-        set_current_user(self.user)
-
-        qs = Transaction.objects.filter(owner=self.user).order_by('date') # Ensure order for consistent processing
-
-        # The function determines start_date from the earliest transaction (Jan 2023)
-        # and end_date from the latest transaction (Feb 2023), then extends end_date by one month (Mar 2023).
-        result = calculate_historical_currency_net_worth(qs)
-
-        self.assertIsInstance(result, OrderedDict)
-
-        # Expected months: Jan 2023, Feb 2023, Mar 2023
-        # The function formats keys as "YYYY-MM-DD" (first day of month)
-
-        expected_keys = [
-            date(2023, 1, 1).strftime('%Y-%m-%d'),
-            date(2023, 2, 1).strftime('%Y-%m-%d'),
-            date(2023, 3, 1).strftime('%Y-%m-%d') # Extended by one month
-        ]
-        self.assertEqual(list(result.keys()), expected_keys)
-
-        # --- Jan 2023 ---
-        # USD1: +1000 - 50 = 950
-        # EUR1: +500
-        jan_data = result[expected_keys[0]]
-        self.assertEqual(jan_data[self.usd.name], Decimal('950.00'))
-        self.assertEqual(jan_data[self.eur.name], Decimal('500.00'))
-
-        # --- Feb 2023 ---
-        # USD1: 950 (prev) + 200 = 1150
-        # EUR1: 500 (prev) - 100 + 50 = 450
-        feb_data = result[expected_keys[1]]
-        self.assertEqual(feb_data[self.usd.name], Decimal('1150.00'))
-        self.assertEqual(feb_data[self.eur.name], Decimal('450.00'))
-
-        # --- Mar 2023 (Carries over from Feb) ---
-        # USD1: 1150
-        # EUR1: 450
-        mar_data = result[expected_keys[2]]
-        self.assertEqual(mar_data[self.usd.name], Decimal('1150.00'))
-        self.assertEqual(mar_data[self.eur.name], Decimal('450.00'))
-
-        # Ensure no other currencies are present
-        for month_data in result.values():
-            self.assertEqual(len(month_data), 2) # Only USD and EUR should be present
-            self.assertIn(self.usd.name, month_data)
-            self.assertIn(self.eur.name, month_data)
-
-    def test_calculate_historical_account_balance(self):
-        set_current_user(self.user)
-
-        qs = Transaction.objects.filter(owner=self.user).order_by('date')
-        result = calculate_historical_account_balance(qs)
-
-        self.assertIsInstance(result, OrderedDict)
-
-        expected_keys = [
-            date(2023, 1, 1).strftime('%Y-%m-%d'),
-            date(2023, 2, 1).strftime('%Y-%m-%d'),
-            date(2023, 3, 1).strftime('%Y-%m-%d')
-        ]
-        self.assertEqual(list(result.keys()), expected_keys)
-
-        # Jan 2023 data
-        jan_data = result[expected_keys[0]]
-        self.assertEqual(jan_data.get(self.account_usd1.name), Decimal('950.00'))
-        self.assertEqual(jan_data.get(self.account_eur1.name), Decimal('500.00'))
-        # Ensure only these two accounts are present, as per setUp
-        self.assertEqual(len(jan_data), 2)
-        self.assertIn(self.account_usd1.name, jan_data)
-        self.assertIn(self.account_eur1.name, jan_data)
-
-
-        # Feb 2023 data
-        feb_data = result[expected_keys[1]]
-        self.assertEqual(feb_data.get(self.account_usd1.name), Decimal('1150.00'))
-        self.assertEqual(feb_data.get(self.account_eur1.name), Decimal('450.00'))
-        self.assertEqual(len(feb_data), 2)
-        self.assertIn(self.account_usd1.name, feb_data)
-        self.assertIn(self.account_eur1.name, feb_data)
-
-        # Mar 2023 data (carried over)
-        mar_data = result[expected_keys[2]]
-        self.assertEqual(mar_data.get(self.account_usd1.name), Decimal('1150.00'))
-        self.assertEqual(mar_data.get(self.account_eur1.name), Decimal('450.00'))
-        self.assertEqual(len(mar_data), 2)
-        self.assertIn(self.account_usd1.name, mar_data)
-        self.assertIn(self.account_eur1.name, mar_data)
+# Create your tests here.

app/apps/rules/tests.py

@@ -1,200 +0,0 @@
-from django.test import TestCase
-from django.contrib.auth.models import User
-from decimal import Decimal
-from datetime import date
-
-from apps.accounts.models import Account, AccountGroup
-from apps.currencies.models import Currency
-from apps.transactions.models import TransactionCategory, TransactionTag, Transaction, TransactionEntity # Added TransactionEntity just in case, though not used in these specific tests
-from apps.rules.models import TransactionRule, TransactionRuleAction, UpdateOrCreateTransactionRuleAction
-from apps.rules.tasks import check_for_transaction_rules
-from apps.common.middleware.thread_local import set_current_user, delete_current_user
-from django.db.models import Q
-from unittest.mock import MagicMock
-
-
-class RulesTasksTests(TestCase):
-    def setUp(self):
-        self.user = User.objects.create_user(username='rulestestuser', email='rules@example.com', password='password')
-
-        set_current_user(self.user)
-        self.addCleanup(delete_current_user)
-
-        self.currency = Currency.objects.create(code="RTUSD", name="Rules Test USD", decimal_places=2)
-        self.account_group = AccountGroup.objects.create(name="Rules Group", owner=self.user)
-        self.account = Account.objects.create(
-            name="Rules Account",
-            currency=self.currency,
-            owner=self.user,
-            group=self.account_group
-        )
-        self.initial_category = TransactionCategory.objects.create(name="Groceries", owner=self.user, type=TransactionCategory.TransactionType.EXPENSE)
-        self.new_category = TransactionCategory.objects.create(name="Entertainment", owner=self.user, type=TransactionCategory.TransactionType.EXPENSE)
-
-        self.tag_fun = TransactionTag.objects.create(name="Fun", owner=self.user)
-        self.tag_work = TransactionTag.objects.create(name="Work", owner=self.user) # Created but not used in these tests
-
-    def test_rule_changes_category_and_adds_tag_on_create(self):
-        rule1 = TransactionRule.objects.create(
-            name="Categorize Coffee",
-            owner=self.user,
-            active=True,
-            on_create=True,
-            on_update=False,
-            trigger="instance.description == 'Coffee Shop'"
-        )
-        TransactionRuleAction.objects.create(
-            rule=rule1,
-            field=TransactionRuleAction.Field.CATEGORY,
-            value=str(self.new_category.pk) # Use PK for category
-        )
-        TransactionRuleAction.objects.create(
-            rule=rule1,
-            field=TransactionRuleAction.Field.TAGS,
-            value=f"['{self.tag_fun.name}']" # List of tag names as a string representation of a list
-        )
-
-        transaction = Transaction.objects.create(
-            account=self.account,
-            owner=self.user,
-            type=Transaction.Type.EXPENSE,
-            date=date(2023,1,1),
-            amount=Decimal("5.00"),
-            description="Coffee Shop",
-            category=self.initial_category
-        )
-
-        self.assertEqual(transaction.category, self.initial_category)
-        self.assertNotIn(self.tag_fun, transaction.tags.all())
-
-        # Call the task directly, simulating the signal handler
-        check_for_transaction_rules(instance_id=transaction.id, user_id=self.user.id, signal_type="transaction_created")
-
-        transaction.refresh_from_db()
-        self.assertEqual(transaction.category, self.new_category)
-        self.assertIn(self.tag_fun, transaction.tags.all())
-        self.assertEqual(transaction.tags.count(), 1)
-
-    def test_rule_trigger_condition_not_met(self):
-        rule2 = TransactionRule.objects.create(
-            name="Irrelevant Rule",
-            owner=self.user,
-            active=True,
-            on_create=True,
-            trigger="instance.description == 'Specific NonMatch'"
-        )
-        TransactionRuleAction.objects.create(
-            rule=rule2,
-            field=TransactionRuleAction.Field.CATEGORY,
-            value=str(self.new_category.pk)
-        )
-
-        transaction = Transaction.objects.create(
-            account=self.account,
-            owner=self.user,
-            type=Transaction.Type.EXPENSE,
-            date=date(2023,1,2),
-            amount=Decimal("10.00"),
-            description="Other item",
-            category=self.initial_category
-        )
-
-        check_for_transaction_rules(instance_id=transaction.id, user_id=self.user.id, signal_type="transaction_created")
-
-        transaction.refresh_from_db()
-        self.assertEqual(transaction.category, self.initial_category)
-
-    def test_rule_on_update_not_on_create(self):
-        rule3 = TransactionRule.objects.create(
-            name="Update Only Rule",
-            owner=self.user,
-            active=True,
-            on_create=False,
-            on_update=True,
-            trigger="instance.description == 'Updated Item'"
-        )
-        TransactionRuleAction.objects.create(
-            rule=rule3,
-            field=TransactionRuleAction.Field.CATEGORY,
-            value=str(self.new_category.pk)
-        )
-
-        transaction = Transaction.objects.create(
-            account=self.account,
-            owner=self.user,
-            type=Transaction.Type.EXPENSE,
-            date=date(2023,1,3),
-            amount=Decimal("15.00"),
-            description="Updated Item",
-            category=self.initial_category
-        )
-
-        # Check on create signal
-        check_for_transaction_rules(instance_id=transaction.id, user_id=self.user.id, signal_type="transaction_created")
-        transaction.refresh_from_db()
-        self.assertEqual(transaction.category, self.initial_category, "Rule should not run on create signal.")
-
-        # Simulate an update by sending the update signal
-        check_for_transaction_rules(instance_id=transaction.id, user_id=self.user.id, signal_type="transaction_updated")
-        transaction.refresh_from_db()
-        self.assertEqual(transaction.category, self.new_category, "Rule should run on update signal.")
-
-    # Example of previous test class that might have been in the file
-    # Kept for context if needed, but the new tests are in RulesTasksTests
-    # class RulesTestCase(TestCase):
-    #     def test_example(self):
-    #         self.assertEqual(1 + 1, 2)
-
-    #     def test_rules_index_view_authenticated_user(self):
-    #         # ... (implementation from old file) ...
-    #         pass
-
-    def test_update_or_create_action_build_search_query(self):
-        rule = TransactionRule.objects.create(
-            name="Search Rule For Action Test",
-            owner=self.user,
-            trigger="True" # Simple trigger, not directly used by this action method
-        )
-        action = UpdateOrCreateTransactionRuleAction.objects.create(
-            rule=rule,
-            search_description="Coffee",
-            search_description_operator=UpdateOrCreateTransactionRuleAction.SearchOperator.CONTAINS,
-            search_amount="5", # This will be evaluated by simple_eval
-            search_amount_operator=UpdateOrCreateTransactionRuleAction.SearchOperator.EXACT
-            # Other search fields can be None or empty
-        )
-
-        mock_simple_eval = MagicMock()
-
-        def eval_side_effect(expression_string):
-            if expression_string == "Coffee":
-                return "Coffee"
-            if expression_string == "5": # The value stored in search_amount
-                return Decimal("5.00")
-            # Add more conditions if other search_ fields are being tested with expressions
-            return expression_string # Default pass-through for other potential expressions
-
-        mock_simple_eval.eval = MagicMock(side_effect=eval_side_effect)
-
-        q_object = action.build_search_query(simple_eval=mock_simple_eval)
-
-        self.assertIsInstance(q_object, Q)
-
-        # Convert Q object children to a set of tuples for easier unordered comparison
-        # Q objects can be nested. For this specific case, we expect a flat AND structure.
-        # (AND: ('description__contains', 'Coffee'), ('amount__exact', Decimal('5.00')))
-
-        children_set = set(q_object.children)
-
-        expected_children = {
-            ('description__contains', 'Coffee'),
-            ('amount__exact', Decimal('5.00'))
-        }
-
-        self.assertEqual(q_object.connector, Q.AND)
-        self.assertEqual(children_set, expected_children)
-
-        # Verify that simple_eval.eval was called for 'Coffee' and '5'
-        # Check calls to the mock_simple_eval.eval mock specifically
-        mock_simple_eval.eval.assert_any_call("Coffee")
-        mock_simple_eval.eval.assert_any_call("5")

app/apps/transactions/forms.py

@@ -7,6 +7,7 @@ from crispy_forms.layout import (
     Column,
     Field,
     Div,
+    HTML,
 )
 from django import forms
 from django.db.models import Q
@@ -29,8 +30,8 @@ from apps.transactions.models import (
     InstallmentPlan,
     RecurringTransaction,
     TransactionEntity,
+    QuickTransaction,
 )
-from apps.common.middleware.thread_local import get_current_user
 
 
 class TransactionForm(forms.ModelForm):
@@ -247,6 +248,140 @@ class TransactionForm(forms.ModelForm):
         return instance
 
 
+class QuickTransactionForm(forms.ModelForm):
+    category = DynamicModelChoiceField(
+        create_field="name",
+        model=TransactionCategory,
+        required=False,
+        label=_("Category"),
+        queryset=TransactionCategory.objects.filter(active=True),
+    )
+    tags = DynamicModelMultipleChoiceField(
+        model=TransactionTag,
+        to_field_name="name",
+        create_field="name",
+        required=False,
+        label=_("Tags"),
+        queryset=TransactionTag.objects.filter(active=True),
+    )
+    entities = DynamicModelMultipleChoiceField(
+        model=TransactionEntity,
+        to_field_name="name",
+        create_field="name",
+        required=False,
+        label=_("Entities"),
+    )
+    account = forms.ModelChoiceField(
+        queryset=Account.objects.filter(is_archived=False),
+        label=_("Account"),
+        widget=TomSelect(clear_button=False, group_by="group"),
+    )
+
+    class Meta:
+        model = QuickTransaction
+        fields = [
+            "name",
+            "account",
+            "type",
+            "is_paid",
+            "amount",
+            "description",
+            "notes",
+            "category",
+            "tags",
+            "entities",
+        ]
+        widgets = {
+            "notes": forms.Textarea(attrs={"rows": 3}),
+            "account": TomSelect(clear_button=False, group_by="group"),
+        }
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # if editing a transaction display non-archived items and it's own item even if it's archived
+        if self.instance.id:
+            self.fields["account"].queryset = Account.objects.filter(
+                Q(is_archived=False) | Q(transactions=self.instance.id),
+            )
+
+            self.fields["category"].queryset = TransactionCategory.objects.filter(
+                Q(active=True) | Q(transaction=self.instance.id)
+            )
+
+            self.fields["tags"].queryset = TransactionTag.objects.filter(
+                Q(active=True) | Q(transaction=self.instance.id)
+            )
+
+            self.fields["entities"].queryset = TransactionEntity.objects.filter(
+                Q(active=True) | Q(transactions=self.instance.id)
+            )
+        else:
+            self.fields["account"].queryset = Account.objects.filter(
+                is_archived=False,
+            )
+
+            self.fields["category"].queryset = TransactionCategory.objects.filter(
+                active=True
+            )
+            self.fields["tags"].queryset = TransactionTag.objects.filter(active=True)
+            self.fields["entities"].queryset = TransactionEntity.objects.all()
+
+        self.helper = FormHelper()
+        self.helper.form_tag = False
+        self.helper.form_method = "post"
+        self.helper.layout = Layout(
+            Field(
+                "type",
+                template="transactions/widgets/income_expense_toggle_buttons.html",
+            ),
+            Field("is_paid", template="transactions/widgets/paid_toggle_button.html"),
+            "name",
+            HTML("<hr />"),
+            Row(
+                Column("account", css_class="form-group col-md-6 mb-0"),
+                Column("entities", css_class="form-group col-md-6 mb-0"),
+                css_class="form-row",
+            ),
+            Row(
+                Column(Field("date"), css_class="form-group col-md-6 mb-0"),
+                Column(Field("reference_date"), css_class="form-group col-md-6 mb-0"),
+                css_class="form-row",
+            ),
+            "description",
+            Field("amount", inputmode="decimal"),
+            Row(
+                Column("category", css_class="form-group col-md-6 mb-0"),
+                Column("tags", css_class="form-group col-md-6 mb-0"),
+                css_class="form-row",
+            ),
+            "notes",
+        )
+
+        if self.instance and self.instance.pk:
+            decimal_places = self.instance.account.currency.decimal_places
+            self.fields["amount"].widget = ArbitraryDecimalDisplayNumberInput(
+                decimal_places=decimal_places
+            )
+            self.helper.layout.append(
+                FormActions(
+                    NoClassSubmit(
+                        "submit", _("Update"), css_class="btn btn-outline-primary w-100"
+                    ),
+                ),
+            )
+        else:
+            self.fields["amount"].widget = ArbitraryDecimalDisplayNumberInput()
+            self.helper.layout.append(
+                Div(
+                    NoClassSubmit(
+                        "submit", _("Add"), css_class="btn btn-outline-primary"
+                    ),
+                    css_class="d-grid gap-2",
+                ),
+            )
+
+
 class BulkEditTransactionForm(TransactionForm):
     is_paid = forms.NullBooleanField(required=False)
 

app/apps/transactions/migrations/0043_quicktransaction.py

@@ -0,0 +1,45 @@
+# Generated by Django 5.1.11 on 2025-06-20 03:57
+
+import apps.transactions.validators
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0014_alter_account_options_alter_accountgroup_options'),
+        ('transactions', '0042_alter_transactioncategory_options_and_more'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='QuickTransaction',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100, verbose_name='Name')),
+                ('type', models.CharField(choices=[('IN', 'Income'), ('EX', 'Expense')], default='EX', max_length=2, verbose_name='Type')),
+                ('is_paid', models.BooleanField(default=True, verbose_name='Paid')),
+                ('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')),
+                ('description', models.CharField(blank=True, max_length=500, verbose_name='Description')),
+                ('notes', models.TextField(blank=True, verbose_name='Notes')),
+                ('internal_note', models.TextField(blank=True, verbose_name='Internal Note')),
+                ('internal_id', models.TextField(blank=True, null=True, unique=True, verbose_name='Internal ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('account', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='quick_transactions', to='accounts.account', verbose_name='Account')),
+                ('category', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='transactions.transactioncategory', verbose_name='Category')),
+                ('entities', models.ManyToManyField(blank=True, related_name='quick_transactions', to='transactions.transactionentity', verbose_name='Entities')),
+                ('owner', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)s_owned', to=settings.AUTH_USER_MODEL)),
+                ('tags', models.ManyToManyField(blank=True, to='transactions.transactiontag', verbose_name='Tags')),
+            ],
+            options={
+                'verbose_name': 'Quick Transaction',
+                'verbose_name_plural': 'Quick Transactions',
+                'db_table': 'quick_transactions',
+                'default_manager_name': 'objects',
+            },
+        ),
+    ]

app/apps/transactions/migrations/0044_alter_quicktransaction_unique_together.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.1.11 on 2025-06-20 04:02
+
+from django.conf import settings
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('transactions', '0043_quicktransaction'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='quicktransaction',
+            unique_together={('name', 'owner')},
+        ),
+    ]

app/apps/transactions/models.py

@@ -16,7 +16,12 @@ from apps.common.templatetags.decimal import localize_number, drop_trailing_zero
 from apps.currencies.utils.convert import convert
 from apps.transactions.validators import validate_decimal_places, validate_non_negative
 from apps.common.middleware.thread_local import get_current_user
-from apps.common.models import SharedObject, SharedObjectManager, OwnedObject
+from apps.common.models import (
+    SharedObject,
+    SharedObjectManager,
+    OwnedObject,
+    OwnedObjectManager,
+)
 
 logger = logging.getLogger()
 
@@ -886,3 +891,86 @@ class RecurringTransaction(models.Model):
         """
         today = timezone.localdate(timezone.now())
         self.transactions.filter(is_paid=False, date__gt=today).delete()
+
+
+class QuickTransaction(OwnedObject):
+    class Type(models.TextChoices):
+        INCOME = "IN", _("Income")
+        EXPENSE = "EX", _("Expense")
+
+    name = models.CharField(
+        max_length=100,
+        null=False,
+        blank=False,
+        verbose_name=_("Name"),
+    )
+
+    account = models.ForeignKey(
+        "accounts.Account",
+        on_delete=models.CASCADE,
+        verbose_name=_("Account"),
+        related_name="quick_transactions",
+    )
+    type = models.CharField(
+        max_length=2,
+        choices=Type,
+        default=Type.EXPENSE,
+        verbose_name=_("Type"),
+    )
+    is_paid = models.BooleanField(default=True, verbose_name=_("Paid"))
+
+    amount = models.DecimalField(
+        max_digits=42,
+        decimal_places=30,
+        verbose_name=_("Amount"),
+        validators=[validate_non_negative, validate_decimal_places],
+    )
+
+    description = models.CharField(
+        max_length=500, verbose_name=_("Description"), blank=True
+    )
+    notes = models.TextField(blank=True, verbose_name=_("Notes"))
+    category = models.ForeignKey(
+        TransactionCategory,
+        on_delete=models.SET_NULL,
+        verbose_name=_("Category"),
+        blank=True,
+        null=True,
+    )
+    tags = models.ManyToManyField(
+        TransactionTag,
+        verbose_name=_("Tags"),
+        blank=True,
+    )
+    entities = models.ManyToManyField(
+        TransactionEntity,
+        verbose_name=_("Entities"),
+        blank=True,
+        related_name="quick_transactions",
+    )
+
+    internal_note = models.TextField(blank=True, verbose_name=_("Internal Note"))
+    internal_id = models.TextField(
+        blank=True, null=True, unique=True, verbose_name=_("Internal ID")
+    )
+
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    objects = OwnedObjectManager()
+    all_objects = models.Manager()  # Unfiltered manager
+
+    class Meta:
+        verbose_name = _("Quick Transaction")
+        verbose_name_plural = _("Quick Transactions")
+        unique_together = ("name", "owner")
+        db_table = "quick_transactions"
+        default_manager_name = "objects"
+
+    def save(self, *args, **kwargs):
+        self.amount = truncate_decimal(
+            value=self.amount, decimal_places=self.account.currency.decimal_places
+        )
+
+        self.full_clean()
+        super().save(*args, **kwargs)

app/apps/transactions/tests.py

@@ -2,23 +2,13 @@ import datetime
 from decimal import Decimal
 from datetime import date, timedelta
 
-import datetime
-from decimal import Decimal
-from datetime import date, timedelta
-from unittest.mock import patch # Added
-
-from django.test import TestCase, override_settings
+from django.test import TestCase
 from django.core.exceptions import ValidationError
 from django.utils import timezone
-from django.contrib.auth.models import User
-from django.db import IntegrityError
-from django.conf import settings # Added
-from apps.transactions.signals import transaction_deleted # Added
 
 from apps.transactions.models import (
     TransactionCategory,
     TransactionTag,
-    TransactionEntity,
     Transaction,
     InstallmentPlan,
     RecurringTransaction,
@@ -28,111 +18,31 @@ from apps.currencies.models import Currency, ExchangeRate
 
 
 class TransactionCategoryTests(TestCase):
-    def setUp(self):
-        self.owner1 = User.objects.create_user(username='owner1', password='password1')
-        self.owner2 = User.objects.create_user(username='owner2', password='password2')
-
     def test_category_creation(self):
         """Test basic category creation"""
-        category = TransactionCategory.objects.create(name="Groceries", owner=self.owner1)
+        category = TransactionCategory.objects.create(name="Groceries")
         self.assertEqual(str(category), "Groceries")
         self.assertFalse(category.mute)
-        self.assertEqual(category.owner, self.owner1)
-
-    def test_category_name_unique_per_owner(self):
-        """Test that category names must be unique per owner."""
-        TransactionCategory.objects.create(name="Groceries", owner=self.owner1)
-
-        with self.assertRaises(ValidationError) as cm: # Should be caught by full_clean due to unique_together
-            category_dup = TransactionCategory(name="Groceries", owner=self.owner1)
-            category_dup.full_clean()
-        # Check the error dict
-        self.assertIn('__all__', cm.exception.error_dict) # unique_together errors are non-field errors
-        self.assertTrue(any("already exists" in e.message for e in cm.exception.error_dict['__all__']))
-
-        # Test with IntegrityError on save if full_clean isn't strict enough or bypassed
-        with self.assertRaises(IntegrityError):
-            TransactionCategory.objects.create(name="Groceries", owner=self.owner1)
-
-        # Should succeed for a different owner
-        try:
-            TransactionCategory.objects.create(name="Groceries", owner=self.owner2)
-        except (IntegrityError, ValidationError):
-            self.fail("Creating category with same name but different owner failed unexpectedly.")
 
 
 class TransactionTagTests(TestCase):
-    def setUp(self):
-        self.owner1 = User.objects.create_user(username='tagowner1', password='password1')
-        self.owner2 = User.objects.create_user(username='tagowner2', password='password2')
-
     def test_tag_creation(self):
         """Test basic tag creation"""
-        tag = TransactionTag.objects.create(name="Essential", owner=self.owner1)
+        tag = TransactionTag.objects.create(name="Essential")
         self.assertEqual(str(tag), "Essential")
-        self.assertEqual(tag.owner, self.owner1)
-
-    def test_tag_name_unique_per_owner(self):
-        """Test that tag names must be unique per owner."""
-        TransactionTag.objects.create(name="Essential", owner=self.owner1)
-
-        with self.assertRaises(ValidationError):
-            tag_dup = TransactionTag(name="Essential", owner=self.owner1)
-            tag_dup.full_clean()
-
-        with self.assertRaises(IntegrityError):
-            TransactionTag.objects.create(name="Essential", owner=self.owner1)
-
-        try:
-            TransactionTag.objects.create(name="Essential", owner=self.owner2)
-        except (IntegrityError, ValidationError):
-            self.fail("Creating tag with same name but different owner failed unexpectedly.")
-
-
-class TransactionEntityTests(TestCase):
-    def setUp(self):
-        self.owner1 = User.objects.create_user(username='entityowner1', password='password1')
-        self.owner2 = User.objects.create_user(username='entityowner2', password='password2')
-
-    def test_entity_creation(self):
-        """Test basic entity creation"""
-        entity = TransactionEntity.objects.create(name="Supermarket X", owner=self.owner1)
-        self.assertEqual(str(entity), "Supermarket X")
-        self.assertEqual(entity.owner, self.owner1)
-
-    def test_entity_name_unique_per_owner(self):
-        """Test that entity names must be unique per owner."""
-        TransactionEntity.objects.create(name="Supermarket X", owner=self.owner1)
-
-        with self.assertRaises(ValidationError):
-            entity_dup = TransactionEntity(name="Supermarket X", owner=self.owner1)
-            entity_dup.full_clean()
-
-        with self.assertRaises(IntegrityError):
-            TransactionEntity.objects.create(name="Supermarket X", owner=self.owner1)
-
-        try:
-            TransactionEntity.objects.create(name="Supermarket X", owner=self.owner2)
-        except (IntegrityError, ValidationError):
-            self.fail("Creating entity with same name but different owner failed unexpectedly.")
 
 
 class TransactionTests(TestCase):
     def setUp(self):
         """Set up test data"""
-        self.owner = User.objects.create_user(username='transowner', password='password')
-
-        self.usd = Currency.objects.create( # Renamed self.currency to self.usd for clarity
+        self.currency = Currency.objects.create(
             code="USD", name="US Dollar", decimal_places=2, prefix="$ "
         )
-        self.eur = Currency.objects.create( # Added EUR for exchange tests
-            code="EUR", name="Euro", decimal_places=2, prefix="€ "
-        )
-        self.account_group = AccountGroup.objects.create(name="Test Group", owner=self.owner) # Added owner
+        self.account_group = AccountGroup.objects.create(name="Test Group")
         self.account = Account.objects.create(
-            name="Test Account", group=self.account_group, currency=self.usd, owner=self.owner # Added owner
+            name="Test Account", group=self.account_group, currency=self.currency
         )
-        self.category = TransactionCategory.objects.create(name="Test Category", owner=self.owner) # Added owner
+        self.category = TransactionCategory.objects.create(name="Test Category")
 
     def test_transaction_creation(self):
         """Test basic transaction creation with required fields"""
@@ -149,16 +59,18 @@ class TransactionTests(TestCase):
 
     def test_transaction_with_exchange_currency(self):
         """Test transaction with exchange currency"""
-        # This test is now superseded by more specific exchanged_amount tests with mocks.
-        # Keeping it for now as it tests actual rate lookup if needed, but can be removed if redundant.
-        self.account.exchange_currency = self.eur
+        eur = Currency.objects.create(
+            code="EUR", name="Euro", decimal_places=2, prefix="€"
+        )
+        self.account.exchange_currency = eur
         self.account.save()
 
+        # Create exchange rate
         ExchangeRate.objects.create(
-            from_currency=self.usd, # Use self.usd
-            to_currency=self.eur,
+            from_currency=self.currency,
+            to_currency=eur,
             rate=Decimal("0.85"),
-            date=timezone.now().date(), # Ensure date matches for lookup
+            date=timezone.now(),
         )
 
         transaction = Transaction.objects.create(
@@ -167,13 +79,11 @@ class TransactionTests(TestCase):
             date=timezone.now().date(),
             amount=Decimal("100.00"),
             description="Test transaction",
-            owner=self.owner # Added owner
         )
 
         exchanged = transaction.exchanged_amount()
         self.assertIsNotNone(exchanged)
-        self.assertEqual(exchanged["amount"], Decimal("85.00")) # 100 * 0.85
-        self.assertEqual(exchanged["prefix"], "€ ") # Check prefix from self.eur
+        self.assertEqual(exchanged["prefix"], "€")
 
     def test_truncating_amount(self):
         """Test amount truncating based on account.currency decimal places"""
@@ -183,17 +93,10 @@ class TransactionTests(TestCase):
             date=timezone.now().date(),
             amount=Decimal(
                 "100.0100001"
-            ),
+            ),  # account currency has two decimal places, the last 1 should be removed
             description="Test transaction",
-            owner=self.owner # Added owner
         )
-        # The model's save() method truncates based on currency's decimal_places.
-        # If USD has 2 decimal_places, 100.0100001 becomes 100.01.
-        # The original test asserted 100.0100000, which means the field might store more,
-        # but the *value* used for calculations should be truncated.
-        # Let's assume the save method correctly truncates to currency precision.
-        self.assertEqual(transaction.amount, Decimal("100.01"))
-
+        self.assertEqual(transaction.amount, Decimal("100.0100000"))
 
     def test_automatic_reference_date(self):
         """Test reference_date from date"""
@@ -203,7 +106,6 @@ class TransactionTests(TestCase):
             date=datetime.datetime(day=20, month=1, year=2000).date(),
             amount=Decimal("100"),
             description="Test transaction",
-            owner=self.owner # Added owner
         )
         self.assertEqual(
             transaction.reference_date,
@@ -212,8 +114,6 @@ class TransactionTests(TestCase):
 
     def test_reference_date_is_always_on_first_day(self):
         """Test reference_date is always on the first day"""
-        # This test is essentially the same as test_transaction_save_reference_date_adjusts_to_first_of_month
-        # It verifies that the save() method correctly adjusts an explicitly set reference_date.
         transaction = Transaction.objects.create(
             account=self.account,
             type=Transaction.Type.EXPENSE,
@@ -221,177 +121,27 @@ class TransactionTests(TestCase):
             reference_date=datetime.datetime(day=20, month=2, year=2000).date(),
             amount=Decimal("100"),
             description="Test transaction",
-            owner=self.owner # Added owner
         )
         self.assertEqual(
             transaction.reference_date,
             datetime.datetime(day=1, month=2, year=2000).date(),
         )
 
-    # New tests for exchanged_amount with mocks
-    @patch('apps.transactions.models.convert')
-    def test_exchanged_amount_with_account_exchange_currency(self, mock_convert):
-        self.account.exchange_currency = self.eur
-        self.account.save()
-        mock_convert.return_value = (Decimal("85.00"), "€T ", "", 2) # amount, prefix, suffix, dp
-
-        transaction = Transaction.objects.create(
-            account=self.account, type=Transaction.Type.EXPENSE, date=date(2023,1,1),
-            amount=Decimal("100.00"), description="Test", owner=self.owner
-        )
-        exchanged = transaction.exchanged_amount()
-
-        mock_convert.assert_called_once_with(
-            amount=Decimal("100.00"),
-            from_currency=self.usd,
-            to_currency=self.eur,
-            date=date(2023,1,1)
-        )
-        self.assertIsNotNone(exchanged)
-        self.assertEqual(exchanged['amount'], Decimal("85.00"))
-        self.assertEqual(exchanged['prefix'], "€T ")
-
-    @patch('apps.transactions.models.convert')
-    def test_exchanged_amount_with_currency_exchange_currency(self, mock_convert):
-        self.account.exchange_currency = None # Ensure account has no direct exchange currency
-        self.account.save()
-        self.usd.exchange_currency = self.eur # Set exchange currency on the Transaction's currency
-        self.usd.save()
-        mock_convert.return_value = (Decimal("88.00"), "€T ", "", 2)
-
-        transaction = Transaction.objects.create(
-            account=self.account, type=Transaction.Type.EXPENSE, date=date(2023,1,1),
-            amount=Decimal("100.00"), description="Test", owner=self.owner
-        )
-        exchanged = transaction.exchanged_amount()
-
-        mock_convert.assert_called_once_with(
-            amount=Decimal("100.00"),
-            from_currency=self.usd,
-            to_currency=self.eur,
-            date=date(2023,1,1)
-        )
-        self.assertIsNotNone(exchanged)
-        self.assertEqual(exchanged['amount'], Decimal("88.00"))
-        self.assertEqual(exchanged['prefix'], "€T ")
-
-        # Cleanup
-        self.usd.exchange_currency = None
-        self.usd.save()
-
-
-    @patch('apps.transactions.models.convert')
-    def test_exchanged_amount_no_exchange_currency_defined(self, mock_convert):
-        self.account.exchange_currency = None
-        self.account.save()
-        self.usd.exchange_currency = None # Ensure currency also has no exchange currency
-        self.usd.save()
-
-        transaction = Transaction.objects.create(
-            account=self.account, type=Transaction.Type.EXPENSE, date=date(2023,1,1),
-            amount=Decimal("100.00"), description="Test", owner=self.owner
-        )
-        exchanged = transaction.exchanged_amount()
-
-        mock_convert.assert_not_called()
-        self.assertIsNone(exchanged)
-
-    # Soft Delete Tests (assuming default or explicit settings.ENABLE_SOFT_DELETE = True)
-    # These tests were added in the previous step and are assumed to be correct.
-    # Skipping their diff for brevity unless specifically asked to review them.
-    # ... (soft delete tests from previous step, confirmed as already present) ...
-    # For brevity, not repeating the soft delete tests in this diff.
-    # Ensure they are maintained from the previous step's output.
-
-    # @patch.object(transaction_deleted, 'send') # This decorator was duplicated
-    # def test_transaction_soft_delete_first_call(self, mock_transaction_deleted_send): # This test is already defined above.
-    # ...
-        with self.settings(ENABLE_SOFT_DELETE=True):
-            t1 = Transaction.objects.create(
-                account=self.account, type=Transaction.Type.EXPENSE, date=date(2023,1,10),
-                amount=Decimal("10.00"), description="Soft Delete Test 1", owner=self.owner
-            )
-
-            t1.delete()
-
-            # Refresh from all_objects manager
-            t1_refreshed = Transaction.all_objects.get(pk=t1.pk)
-
-            self.assertTrue(t1_refreshed.deleted)
-            self.assertIsNotNone(t1_refreshed.deleted_at)
-
-            self.assertNotIn(t1_refreshed, Transaction.objects.all())
-            self.assertIn(t1_refreshed, Transaction.all_objects.all())
-
-            mock_transaction_deleted_send.assert_called_once_with(sender=Transaction, instance=t1_refreshed, soft_delete=True)
-
-    def test_transaction_soft_delete_second_call_hard_deletes(self):
-        with self.settings(ENABLE_SOFT_DELETE=True):
-            t2 = Transaction.objects.create(
-                account=self.account, type=Transaction.Type.EXPENSE, date=date(2023,1,11),
-                amount=Decimal("20.00"), description="Soft Delete Test 2", owner=self.owner
-            )
-
-            t2.delete() # First call: soft delete
-            t2.delete() # Second call: hard delete
-
-            self.assertNotIn(t2, Transaction.all_objects.all())
-            with self.assertRaises(Transaction.DoesNotExist):
-                Transaction.all_objects.get(pk=t2.pk)
-
-    def test_transaction_manager_deleted_objects(self):
-        with self.settings(ENABLE_SOFT_DELETE=True):
-            t3 = Transaction.objects.create(
-                account=self.account, type=Transaction.Type.EXPENSE, date=date(2023,1,12),
-                amount=Decimal("30.00"), description="Soft Delete Test 3", owner=self.owner
-            )
-            t3.delete() # Soft delete
-
-            t4 = Transaction.objects.create(
-                account=self.account, type=Transaction.Type.INCOME, date=date(2023,1,13),
-                amount=Decimal("40.00"), description="Soft Delete Test 4", owner=self.owner
-            )
-
-            self.assertIn(t3, Transaction.deleted_objects.all())
-            self.assertNotIn(t4, Transaction.deleted_objects.all())
-
-    # Hard Delete Test
-    def test_transaction_hard_delete_when_soft_delete_disabled(self):
-        with self.settings(ENABLE_SOFT_DELETE=False):
-            t5 = Transaction.objects.create(
-                account=self.account, type=Transaction.Type.EXPENSE, date=date(2023,1,14),
-                amount=Decimal("50.00"), description="Hard Delete Test 5", owner=self.owner
-            )
-
-            t5.delete() # Should hard delete directly
-
-            self.assertNotIn(t5, Transaction.all_objects.all())
-            with self.assertRaises(Transaction.DoesNotExist):
-                Transaction.all_objects.get(pk=t5.pk)
-
-
-from dateutil.relativedelta import relativedelta # Added
 
 class InstallmentPlanTests(TestCase):
     def setUp(self):
         """Set up test data"""
-        self.owner = User.objects.create_user(username='installowner', password='password')
         self.currency = Currency.objects.create(
             code="USD", name="US Dollar", decimal_places=2, prefix="$ "
         )
-        self.account_group = AccountGroup.objects.create(name="Installment Group", owner=self.owner)
         self.account = Account.objects.create(
-            name="Test Account", currency=self.currency, owner=self.owner, group=self.account_group
+            name="Test Account", currency=self.currency
         )
-        self.category = TransactionCategory.objects.create(name="Installments", owner=self.owner, type=TransactionCategory.TransactionType.EXPENSE)
-
 
     def test_installment_plan_creation(self):
         """Test basic installment plan creation"""
         plan = InstallmentPlan.objects.create(
             account=self.account,
-            owner=self.owner,
-            category=self.category,
             type=Transaction.Type.EXPENSE,
             description="Test Plan",
             number_of_installments=12,
@@ -400,212 +150,24 @@ class InstallmentPlanTests(TestCase):
             recurrence=InstallmentPlan.Recurrence.MONTHLY,
         )
         self.assertEqual(plan.number_of_installments, 12)
-        self.assertEqual(plan.installment_start, 1) # Default
-        self.assertEqual(plan.account.currency.code, "USD")
-        self.assertEqual(plan.owner, self.owner)
-        self.assertIsNotNone(plan.end_date) # end_date should be calculated on save
-
-    # Tests for save() - end_date calculation
-    def test_installment_plan_save_calculates_end_date_monthly(self):
-        plan = InstallmentPlan(account=self.account, owner=self.owner, category=self.category, type=Transaction.Type.EXPENSE, description="Monthly Plan", number_of_installments=3, start_date=date(2023,1,15), installment_amount=Decimal("100"), recurrence=InstallmentPlan.Recurrence.MONTHLY)
-        plan.save()
-        self.assertEqual(plan.end_date, date(2023,3,15))
-
-    def test_installment_plan_save_calculates_end_date_yearly(self):
-        plan = InstallmentPlan(account=self.account, owner=self.owner, category=self.category, type=Transaction.Type.EXPENSE, description="Yearly Plan", number_of_installments=3, start_date=date(2023,1,15), installment_amount=Decimal("100"), recurrence=InstallmentPlan.Recurrence.YEARLY)
-        plan.save()
-        self.assertEqual(plan.end_date, date(2025,1,15))
-
-    def test_installment_plan_save_calculates_end_date_weekly(self):
-        plan = InstallmentPlan(account=self.account, owner=self.owner, category=self.category, type=Transaction.Type.EXPENSE, description="Weekly Plan", number_of_installments=3, start_date=date(2023,1,1), installment_amount=Decimal("100"), recurrence=InstallmentPlan.Recurrence.WEEKLY)
-        plan.save()
-        self.assertEqual(plan.end_date, date(2023,1,1) + relativedelta(weeks=2)) # date(2023,1,15)
-
-    def test_installment_plan_save_calculates_end_date_daily(self):
-        plan = InstallmentPlan(account=self.account, owner=self.owner, category=self.category, type=Transaction.Type.EXPENSE, description="Daily Plan", number_of_installments=3, start_date=date(2023,1,1), installment_amount=Decimal("100"), recurrence=InstallmentPlan.Recurrence.DAILY)
-        plan.save()
-        self.assertEqual(plan.end_date, date(2023,1,1) + relativedelta(days=2)) # date(2023,1,3)
-
-    def test_installment_plan_save_calculates_installment_total_number(self):
-        plan = InstallmentPlan(account=self.account, owner=self.owner, category=self.category, type=Transaction.Type.EXPENSE, description="Total Num Plan", number_of_installments=12, installment_start=3, start_date=date(2023,1,1), installment_amount=Decimal("100"))
-        plan.save()
-        self.assertEqual(plan.installment_total_number, 14)
-
-    def test_installment_plan_save_default_reference_date_and_start(self):
-        plan = InstallmentPlan(account=self.account, owner=self.owner, category=self.category, type=Transaction.Type.EXPENSE, description="Default Ref Plan", number_of_installments=12, start_date=date(2023,1,15), installment_amount=Decimal("100"), reference_date=None, installment_start=None)
-        plan.save()
-        self.assertEqual(plan.reference_date, date(2023,1,15))
         self.assertEqual(plan.installment_start, 1)
-
-    # Tests for create_transactions()
-    def test_installment_plan_create_transactions_monthly(self):
-        plan = InstallmentPlan.objects.create(account=self.account, owner=self.owner, type=Transaction.Type.EXPENSE, description="Create Monthly", number_of_installments=3, start_date=date(2023,1,10), installment_amount=Decimal("50"), recurrence=InstallmentPlan.Recurrence.MONTHLY, category=self.category)
-        plan.create_transactions()
-        self.assertEqual(plan.transactions.count(), 3)
-        transactions = list(plan.transactions.order_by('installment_id'))
-        self.assertEqual(transactions[0].date, date(2023,1,10))
-        self.assertEqual(transactions[0].reference_date, date(2023,1,1))
-        self.assertEqual(transactions[0].installment_id, 1)
-        self.assertEqual(transactions[1].date, date(2023,2,10))
-        self.assertEqual(transactions[1].reference_date, date(2023,2,1))
-        self.assertEqual(transactions[1].installment_id, 2)
-        self.assertEqual(transactions[2].date, date(2023,3,10))
-        self.assertEqual(transactions[2].reference_date, date(2023,3,1))
-        self.assertEqual(transactions[2].installment_id, 3)
-        for t in transactions:
-            self.assertEqual(t.amount, Decimal("50"))
-            self.assertFalse(t.is_paid)
-            self.assertEqual(t.owner, self.owner)
-            self.assertEqual(t.category, self.category)
-
-    def test_installment_plan_create_transactions_yearly(self):
-        plan = InstallmentPlan.objects.create(account=self.account, owner=self.owner, type=Transaction.Type.EXPENSE, description="Create Yearly", number_of_installments=2, start_date=date(2023,1,10), installment_amount=Decimal("500"), recurrence=InstallmentPlan.Recurrence.YEARLY, category=self.category)
-        plan.create_transactions()
-        self.assertEqual(plan.transactions.count(), 2)
-        transactions = list(plan.transactions.order_by('installment_id'))
-        self.assertEqual(transactions[0].date, date(2023,1,10))
-        self.assertEqual(transactions[1].date, date(2024,1,10))
-
-    def test_installment_plan_create_transactions_weekly(self):
-        plan = InstallmentPlan.objects.create(account=self.account, owner=self.owner, type=Transaction.Type.EXPENSE, description="Create Weekly", number_of_installments=3, start_date=date(2023,1,1), installment_amount=Decimal("20"), recurrence=InstallmentPlan.Recurrence.WEEKLY, category=self.category)
-        plan.create_transactions()
-        self.assertEqual(plan.transactions.count(), 3)
-        transactions = list(plan.transactions.order_by('installment_id'))
-        self.assertEqual(transactions[0].date, date(2023,1,1))
-        self.assertEqual(transactions[1].date, date(2023,1,8))
-        self.assertEqual(transactions[2].date, date(2023,1,15))
-
-    def test_installment_plan_create_transactions_daily(self):
-        plan = InstallmentPlan.objects.create(account=self.account, owner=self.owner, type=Transaction.Type.EXPENSE, description="Create Daily", number_of_installments=4, start_date=date(2023,1,1), installment_amount=Decimal("10"), recurrence=InstallmentPlan.Recurrence.DAILY, category=self.category)
-        plan.create_transactions()
-        self.assertEqual(plan.transactions.count(), 4)
-        transactions = list(plan.transactions.order_by('installment_id'))
-        self.assertEqual(transactions[0].date, date(2023,1,1))
-        self.assertEqual(transactions[1].date, date(2023,1,2))
-        self.assertEqual(transactions[2].date, date(2023,1,3))
-        self.assertEqual(transactions[3].date, date(2023,1,4))
-
-    def test_create_transactions_with_installment_start_offset(self):
-        plan = InstallmentPlan.objects.create(account=self.account, owner=self.owner, type=Transaction.Type.EXPENSE, description="Offset Start", number_of_installments=2, start_date=date(2023,1,10), installment_start=3, installment_amount=Decimal("50"), category=self.category)
-        plan.create_transactions()
-        self.assertEqual(plan.transactions.count(), 2)
-        transactions = list(plan.transactions.order_by('installment_id'))
-        self.assertEqual(transactions[0].installment_id, 3)
-        self.assertEqual(transactions[0].date, date(2023,1,10)) # First transaction is on start_date
-        self.assertEqual(transactions[1].installment_id, 4)
-        self.assertEqual(transactions[1].date, date(2023,2,10)) # Assuming monthly for this offset test
-
-    def test_create_transactions_deletes_existing_linked_transactions(self):
-        plan = InstallmentPlan.objects.create(account=self.account, owner=self.owner, type=Transaction.Type.EXPENSE, description="Delete Existing Test", number_of_installments=2, start_date=date(2023,1,1), installment_amount=Decimal("100"), category=self.category)
-        plan.create_transactions() # Creates 2 transactions
-
-        # Manually create an extra transaction linked to this plan
-        extra_tx = Transaction.objects.create(account=self.account, owner=self.owner, category=self.category, type=Transaction.Type.EXPENSE, amount=Decimal("999"), date=date(2023,1,1), installment_plan=plan, installment_id=99)
-        self.assertEqual(plan.transactions.count(), 3)
-
-        plan.create_transactions() # Should delete all 3 and recreate 2
-        self.assertEqual(plan.transactions.count(), 2)
-        with self.assertRaises(Transaction.DoesNotExist):
-            Transaction.objects.get(pk=extra_tx.pk)
-
-    # Test for delete()
-    def test_installment_plan_delete_cascades_to_transactions(self):
-        plan = InstallmentPlan.objects.create(account=self.account, owner=self.owner, type=Transaction.Type.EXPENSE, description="Cascade Delete Test", number_of_installments=2, start_date=date(2023,1,1), installment_amount=Decimal("100"), category=self.category)
-        plan.create_transactions()
-
-        transaction_count = plan.transactions.count()
-        self.assertTrue(transaction_count > 0)
-
-        plan_pk = plan.pk
-        plan.delete()
-
-        self.assertFalse(InstallmentPlan.objects.filter(pk=plan_pk).exists())
-        self.assertEqual(Transaction.objects.filter(installment_plan_id=plan_pk).count(), 0)
-
-    # Tests for update_transactions()
-    def test_update_transactions_amount_change(self):
-        plan = InstallmentPlan.objects.create(account=self.account, owner=self.owner, type=Transaction.Type.EXPENSE, description="Update Amount", number_of_installments=2, start_date=date(2023,1,1), installment_amount=Decimal("100"), category=self.category)
-        plan.create_transactions()
-        t1 = plan.transactions.first()
-
-        plan.installment_amount = Decimal("120.00")
-        plan.save() # Save plan first
-        plan.update_transactions()
-
-        t1.refresh_from_db()
-        self.assertEqual(t1.amount, Decimal("120.00"))
-        self.assertFalse(t1.is_paid) # Should remain unpaid
-
-    def test_update_transactions_change_num_installments_increase(self):
-        plan = InstallmentPlan.objects.create(account=self.account, owner=self.owner, type=Transaction.Type.EXPENSE, description="Increase Installments", number_of_installments=2, start_date=date(2023,1,1), installment_amount=Decimal("100"), category=self.category)
-        plan.create_transactions()
-        self.assertEqual(plan.transactions.count(), 2)
-
-        plan.number_of_installments = 3
-        plan.save() # This should update end_date and installment_total_number
-        plan.update_transactions()
-
-        self.assertEqual(plan.transactions.count(), 3)
-        # Check the new transaction
-        last_tx = plan.transactions.order_by('installment_id').last()
-        self.assertEqual(last_tx.installment_id, 3)
-        self.assertEqual(last_tx.date, date(2023,1,1) + relativedelta(months=2)) # Assuming monthly
-
-    def test_update_transactions_change_num_installments_decrease_unpaid_deleted(self):
-        plan = InstallmentPlan.objects.create(account=self.account, owner=self.owner, type=Transaction.Type.EXPENSE, description="Decrease Installments", number_of_installments=3, start_date=date(2023,1,1), installment_amount=Decimal("100"), category=self.category)
-        plan.create_transactions()
-        self.assertEqual(plan.transactions.count(), 3)
-
-        plan.number_of_installments = 2
-        plan.save()
-        plan.update_transactions()
-
-        self.assertEqual(plan.transactions.count(), 2)
-        # Check that the third transaction (installment_id=3) is deleted
-        self.assertFalse(Transaction.objects.filter(installment_plan=plan, installment_id=3).exists())
-
-    def test_update_transactions_paid_transaction_amount_not_changed(self):
-        plan = InstallmentPlan.objects.create(account=self.account, owner=self.owner, type=Transaction.Type.EXPENSE, description="Paid No Change", number_of_installments=2, start_date=date(2023,1,1), installment_amount=Decimal("100"), category=self.category)
-        plan.create_transactions()
-
-        t1 = plan.transactions.order_by('installment_id').first()
-        t1.is_paid = True
-        t1.save()
-
-        original_amount_t1 = t1.amount # Should be 100
-
-        plan.installment_amount = Decimal("150.00")
-        plan.save()
-        plan.update_transactions()
-
-        t1.refresh_from_db()
-        self.assertEqual(t1.amount, original_amount_t1, "Paid transaction amount should not change.")
-
-        # Check that unpaid transactions are updated
-        t2 = plan.transactions.order_by('installment_id').last()
-        self.assertEqual(t2.amount, Decimal("150.00"), "Unpaid transaction amount should update.")
+        self.assertEqual(plan.account.currency.code, "USD")
 
 
 class RecurringTransactionTests(TestCase):
     def setUp(self):
         """Set up test data"""
-        self.owner = User.objects.create_user(username='rtowner', password='password')
         self.currency = Currency.objects.create(
             code="USD", name="US Dollar", decimal_places=2, prefix="$ "
         )
-        self.account_group = AccountGroup.objects.create(name="RT Group", owner=self.owner)
         self.account = Account.objects.create(
-            name="Test Account", currency=self.currency, owner=self.owner, group=self.account_group
-        )
-        self.category = TransactionCategory.objects.create(
-            name="Recurring Cat", owner=self.owner, type=TransactionCategory.TransactionType.INFO
+            name="Test Account", currency=self.currency
         )
 
     def test_recurring_transaction_creation(self):
         """Test basic recurring transaction creation"""
-        rt = RecurringTransaction.objects.create(
+        recurring = RecurringTransaction.objects.create(
             account=self.account,
-            category=self.category, # Added category
             type=Transaction.Type.EXPENSE,
             amount=Decimal("100.00"),
             description="Monthly Payment",
@@ -613,157 +175,6 @@ class RecurringTransactionTests(TestCase):
             recurrence_type=RecurringTransaction.RecurrenceType.MONTH,
             recurrence_interval=1,
         )
-        self.assertFalse(rt.paused)
-        self.assertEqual(rt.recurrence_interval, 1)
-        self.assertEqual(rt.account.currency.code, "USD")
-        self.assertEqual(rt.account.owner, self.owner) # Check owner via account
-
-    def test_get_recurrence_delta(self):
-        """Test get_recurrence_delta for various recurrence types."""
-        rt = RecurringTransaction() # Minimal instance
-
-        rt.recurrence_type = RecurringTransaction.RecurrenceType.DAY
-        rt.recurrence_interval = 5
-        self.assertEqual(rt.get_recurrence_delta(), relativedelta(days=5))
-
-        rt.recurrence_type = RecurringTransaction.RecurrenceType.WEEK
-        rt.recurrence_interval = 2
-        self.assertEqual(rt.get_recurrence_delta(), relativedelta(weeks=2))
-
-        rt.recurrence_type = RecurringTransaction.RecurrenceType.MONTH
-        rt.recurrence_interval = 3
-        self.assertEqual(rt.get_recurrence_delta(), relativedelta(months=3))
-
-        rt.recurrence_type = RecurringTransaction.RecurrenceType.YEAR
-        rt.recurrence_interval = 1
-        self.assertEqual(rt.get_recurrence_delta(), relativedelta(years=1))
-
-    def test_get_next_date(self):
-        """Test get_next_date calculation."""
-        rt = RecurringTransaction(recurrence_type=RecurringTransaction.RecurrenceType.MONTH, recurrence_interval=1)
-        current_date = date(2023, 1, 15)
-        expected_next_date = date(2023, 2, 15)
-        self.assertEqual(rt.get_next_date(current_date), expected_next_date)
-
-        rt.recurrence_type = RecurringTransaction.RecurrenceType.YEAR
-        rt.recurrence_interval = 2
-        current_date_yearly = date(2023, 3, 1)
-        expected_next_date_yearly = date(2025, 3, 1)
-        self.assertEqual(rt.get_next_date(current_date_yearly), expected_next_date_yearly)
-
-    def test_create_transaction_instance_method(self):
-        """Test the create_transaction instance method of RecurringTransaction."""
-        rt = RecurringTransaction.objects.create(
-            account=self.account,
-            type=Transaction.Type.EXPENSE,
-            amount=Decimal("50.00"),
-            description="Test RT Description",
-            start_date=date(2023,1,1),
-            recurrence_type=RecurringTransaction.RecurrenceType.MONTH,
-            recurrence_interval=1,
-            category=self.category,
-            # owner is implicitly through account
-        )
-
-        transaction_date = date(2023, 2, 10) # Specific date for the new transaction
-        reference_date_for_tx = date(2023, 2, 10) # Date to base reference_date on
-
-        created_tx = rt.create_transaction(transaction_date, reference_date_for_tx)
-
-        self.assertIsInstance(created_tx, Transaction)
-        self.assertEqual(created_tx.account, rt.account)
-        self.assertEqual(created_tx.type, rt.type)
-        self.assertEqual(created_tx.amount, rt.amount)
-        self.assertEqual(created_tx.description, rt.description)
-        self.assertEqual(created_tx.category, rt.category)
-        self.assertEqual(created_tx.date, transaction_date)
-        self.assertEqual(created_tx.reference_date, reference_date_for_tx.replace(day=1))
-        self.assertFalse(created_tx.is_paid) # Default for created transactions
-        self.assertEqual(created_tx.recurring_transaction, rt)
-        self.assertEqual(created_tx.owner, rt.account.owner)
-
-    # Tests for update_unpaid_transactions()
-    def test_update_unpaid_transactions_updates_details(self):
-        category1 = TransactionCategory.objects.create(name="Old Category", owner=self.owner, type=TransactionCategory.TransactionType.INFO)
-        category2 = TransactionCategory.objects.create(name="New Category", owner=self.owner, type=TransactionCategory.TransactionType.INFO)
-
-        rt = RecurringTransaction.objects.create(
-            account=self.account,
-            type=Transaction.Type.EXPENSE,
-            amount=Decimal("100.00"),
-            description="Old Desc",
-            start_date=date(2023,1,1),
-            recurrence_type=RecurringTransaction.RecurrenceType.MONTH,
-            recurrence_interval=1,
-            category=category1, # Initial category
-        )
-        # Create some transactions linked to this RT
-        t1_date = date(2023,1,1)
-        t1_ref_date = date(2023,1,1)
-        t1 = rt.create_transaction(t1_date, t1_ref_date)
-        t1.is_paid = True
-        t1.save()
-
-        t2_date = date(2023,2,1)
-        t2_ref_date = date(2023,2,1)
-        t2 = rt.create_transaction(t2_date, t2_ref_date) # Unpaid
-
-        # Update RecurringTransaction
-        rt.amount = Decimal("120.00")
-        rt.description = "New Desc"
-        rt.category = category2
-        rt.save()
-
-        rt.update_unpaid_transactions()
-
-        t1.refresh_from_db()
-        t2.refresh_from_db()
-
-        # Paid transaction should not change
-        self.assertEqual(t1.amount, Decimal("100.00"))
-        self.assertEqual(t1.description, "Old Desc") # Description on RT is for future, not existing
-        self.assertEqual(t1.category, category1)
-
-        # Unpaid transaction should be updated
-        self.assertEqual(t2.amount, Decimal("120.00"))
-        self.assertEqual(t2.description, "New Desc") # Description should update
-        self.assertEqual(t2.category, category2)
-
-
-    # Tests for delete_unpaid_transactions()
-    @patch('apps.transactions.models.timezone.now')
-    def test_delete_unpaid_transactions_leaves_paid_and_past(self, mock_now):
-        mock_now.return_value.date.return_value = date(2023, 2, 15) # "today"
-
-        rt = RecurringTransaction.objects.create(
-            account=self.account,
-            type=Transaction.Type.EXPENSE,
-            amount=Decimal("50.00"),
-            description="Test Deletion RT",
-            start_date=date(2023,1,1),
-            recurrence_type=RecurringTransaction.RecurrenceType.MONTH,
-            recurrence_interval=1,
-            category=self.category,
-        )
-
-        # Create transactions
-        t_past_paid = rt.create_transaction(date(2023, 1, 1), date(2023,1,1))
-        t_past_paid.is_paid = True
-        t_past_paid.save()
-
-        t_past_unpaid = rt.create_transaction(date(2023, 2, 1), date(2023,2,1)) # Unpaid, before "today"
-
-        t_future_unpaid1 = rt.create_transaction(date(2023, 3, 1), date(2023,3,1)) # Unpaid, after "today"
-        t_future_unpaid2 = rt.create_transaction(date(2023, 4, 1), date(2023,4,1)) # Unpaid, after "today"
-
-        initial_count = rt.transactions.count()
-        self.assertEqual(initial_count, 4)
-
-        rt.delete_unpaid_transactions()
-
-        self.assertTrue(Transaction.objects.filter(pk=t_past_paid.pk).exists())
-        self.assertTrue(Transaction.objects.filter(pk=t_past_unpaid.pk).exists())
-        self.assertFalse(Transaction.objects.filter(pk=t_future_unpaid1.pk).exists())
-        self.assertFalse(Transaction.objects.filter(pk=t_future_unpaid2.pk).exists())
-
-        self.assertEqual(rt.transactions.count(), 2)
+        self.assertFalse(recurring.paused)
+        self.assertEqual(recurring.recurrence_interval, 1)
+        self.assertEqual(recurring.account.currency.code, "USD")

app/apps/transactions/urls.py

@@ -307,4 +307,39 @@ urlpatterns = [
         views.recurring_transaction_finish,
         name="recurring_transaction_finish",
     ),
+    path(
+        "quick-transactions/",
+        views.quick_transactions_index,
+        name="quick_transactions_index",
+    ),
+    path(
+        "quick-transactions/list/",
+        views.quick_transactions_list,
+        name="quick_transactions_list",
+    ),
+    path(
+        "quick-transactions/add/",
+        views.quick_transaction_add,
+        name="quick_transaction_add",
+    ),
+    path(
+        "quick-transactions/<int:quick_transaction_id>/edit/",
+        views.quick_transaction_edit,
+        name="quick_transaction_edit",
+    ),
+    path(
+        "quick-transactions/<int:quick_transaction_id>/delete/",
+        views.quick_transaction_delete,
+        name="quick_transaction_delete",
+    ),
+    path(
+        "quick-transactions/create-menu/",
+        views.quick_transactions_create_menu,
+        name="quick_transactions_create_menu",
+    ),
+    path(
+        "quick-transactions/<int:quick_transaction_id>/create/",
+        views.quick_transaction_add_as_transaction,
+        name="quick_transaction_add_as_transaction",
+    ),
 ]

app/apps/transactions/views/__init__.py

@@ -5,3 +5,4 @@ from .categories import *
 from .actions import *
 from .installment_plans import *
 from .recurring_transactions import *
+from .quick_transactions import *

app/apps/transactions/views/quick_transactions.py

@@ -0,0 +1,154 @@
+from django.contrib import messages
+from django.contrib.auth.decorators import login_required
+from django.forms import model_to_dict
+from django.http import HttpResponse
+from django.shortcuts import render, get_object_or_404
+from django.utils import timezone
+from django.utils.translation import gettext_lazy as _
+from django.views.decorators.http import require_http_methods
+
+from apps.common.decorators.htmx import only_htmx
+from apps.transactions.forms import QuickTransactionForm
+from apps.transactions.models import QuickTransaction, transaction_created
+from apps.transactions.models import Transaction
+
+
+@login_required
+@require_http_methods(["GET"])
+def quick_transactions_index(request):
+    return render(
+        request,
+        "quick_transactions/pages/index.html",
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def quick_transactions_list(request):
+    quick_transactions = QuickTransaction.objects.all().order_by("name")
+    return render(
+        request,
+        "quick_transactions/fragments/list.html",
+        context={"quick_transactions": quick_transactions},
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET", "POST"])
+def quick_transaction_add(request):
+    if request.method == "POST":
+        form = QuickTransactionForm(request.POST)
+        if form.is_valid():
+            form.save()
+            messages.success(request, _("Item added successfully"))
+
+            return HttpResponse(
+                status=204,
+                headers={
+                    "HX-Trigger": "updated, hide_offcanvas",
+                },
+            )
+    else:
+        form = QuickTransactionForm()
+
+    return render(
+        request,
+        "quick_transactions/fragments/add.html",
+        {"form": form},
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET", "POST"])
+def quick_transaction_edit(request, quick_transaction_id):
+    quick_transaction = get_object_or_404(QuickTransaction, id=quick_transaction_id)
+
+    if request.method == "POST":
+        form = QuickTransactionForm(request.POST, instance=quick_transaction)
+        if form.is_valid():
+            form.save()
+            messages.success(request, _("Item updated successfully"))
+
+            return HttpResponse(
+                status=204,
+                headers={
+                    "HX-Trigger": "updated, hide_offcanvas",
+                },
+            )
+    else:
+        form = QuickTransactionForm(instance=quick_transaction)
+
+    return render(
+        request,
+        "quick_transactions/fragments/edit.html",
+        {"form": form, "quick_transaction": quick_transaction},
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["DELETE"])
+def quick_transaction_delete(request, quick_transaction_id):
+    quick_transaction = get_object_or_404(QuickTransaction, id=quick_transaction_id)
+
+    quick_transaction.delete()
+
+    messages.success(request, _("Item deleted successfully"))
+
+    return HttpResponse(
+        status=204,
+        headers={
+            "HX-Trigger": "updated, hide_offcanvas",
+        },
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def quick_transactions_create_menu(request):
+    quick_transactions = QuickTransaction.objects.all().order_by("name")
+    return render(
+        request,
+        "quick_transactions/fragments/create_menu.html",
+        context={"quick_transactions": quick_transactions},
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def quick_transaction_add_as_transaction(request, quick_transaction_id):
+    quick_transaction: QuickTransaction = get_object_or_404(
+        QuickTransaction, id=quick_transaction_id
+    )
+    today = timezone.localdate(timezone.now())
+
+    quick_transaction_data = model_to_dict(
+        quick_transaction,
+        exclude=["id", "name", "owner", "account", "category", "tags", "entities"],
+    )
+
+    new_transaction = Transaction(**quick_transaction_data)
+    new_transaction.account = quick_transaction.account
+    new_transaction.category = quick_transaction.category
+
+    new_transaction.date = today
+    new_transaction.reference_date = today.replace(day=1)
+    new_transaction.save()
+    new_transaction.tags.set(quick_transaction.tags.all())
+    new_transaction.entities.set(quick_transaction.entities.all())
+
+    transaction_created.send(sender=new_transaction)
+
+    messages.success(request, _("Transaction added successfully"))
+
+    return HttpResponse(
+        status=204,
+        headers={
+            "HX-Trigger": "updated, hide_offcanvas",
+        },
+    )

app/apps/users/forms.py

@@ -2,7 +2,7 @@ from crispy_forms.bootstrap import (
     FormActions,
 )
 from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Layout, Submit, Row, Column, Field, Div
+from crispy_forms.layout import Layout, Submit, Row, Column, Field, Div, HTML
 from django import forms
 from django.contrib.auth import get_user_model
 from django.contrib.auth.forms import (
@@ -115,6 +115,7 @@ class UserSettingsForm(forms.ModelForm):
             "date_format",
             "datetime_format",
             "number_format",
+            "volume",
         ]
 
     def __init__(self, *args, **kwargs):
@@ -126,10 +127,14 @@ class UserSettingsForm(forms.ModelForm):
         self.helper.layout = Layout(
             "language",
             "timezone",
+            HTML("<hr />"),
             "date_format",
             "datetime_format",
             "number_format",
+            HTML("<hr />"),
             "start_page",
+            HTML("<hr />"),
+            "volume",
             FormActions(
                 NoClassSubmit(
                     "submit", _("Save"), css_class="btn btn-outline-primary w-100"

app/apps/users/migrations/0022_usersettings_volume_alter_usersettings_timezone.py

@@ -0,0 +1,479 @@
+# Generated by Django 5.1.1 on 2025-06-29 00:48
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("users", "0021_alter_usersettings_timezone"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="usersettings",
+            name="volume",
+            field=models.PositiveIntegerField(
+                default=10,
+                validators=[
+                    django.core.validators.MinValueValidator(1),
+                    django.core.validators.MaxValueValidator(10),
+                ],
+                verbose_name="Volume",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="usersettings",
+            name="timezone",
+            field=models.CharField(
+                choices=[
+                    ("auto", "Auto"),
+                    ("Africa/Abidjan", "Africa/Abidjan"),
+                    ("Africa/Accra", "Africa/Accra"),
+                    ("Africa/Addis_Ababa", "Africa/Addis_Ababa"),
+                    ("Africa/Algiers", "Africa/Algiers"),
+                    ("Africa/Asmara", "Africa/Asmara"),
+                    ("Africa/Bamako", "Africa/Bamako"),
+                    ("Africa/Bangui", "Africa/Bangui"),
+                    ("Africa/Banjul", "Africa/Banjul"),
+                    ("Africa/Bissau", "Africa/Bissau"),
+                    ("Africa/Blantyre", "Africa/Blantyre"),
+                    ("Africa/Brazzaville", "Africa/Brazzaville"),
+                    ("Africa/Bujumbura", "Africa/Bujumbura"),
+                    ("Africa/Cairo", "Africa/Cairo"),
+                    ("Africa/Casablanca", "Africa/Casablanca"),
+                    ("Africa/Ceuta", "Africa/Ceuta"),
+                    ("Africa/Conakry", "Africa/Conakry"),
+                    ("Africa/Dakar", "Africa/Dakar"),
+                    ("Africa/Dar_es_Salaam", "Africa/Dar_es_Salaam"),
+                    ("Africa/Djibouti", "Africa/Djibouti"),
+                    ("Africa/Douala", "Africa/Douala"),
+                    ("Africa/El_Aaiun", "Africa/El_Aaiun"),
+                    ("Africa/Freetown", "Africa/Freetown"),
+                    ("Africa/Gaborone", "Africa/Gaborone"),
+                    ("Africa/Harare", "Africa/Harare"),
+                    ("Africa/Johannesburg", "Africa/Johannesburg"),
+                    ("Africa/Juba", "Africa/Juba"),
+                    ("Africa/Kampala", "Africa/Kampala"),
+                    ("Africa/Khartoum", "Africa/Khartoum"),
+                    ("Africa/Kigali", "Africa/Kigali"),
+                    ("Africa/Kinshasa", "Africa/Kinshasa"),
+                    ("Africa/Lagos", "Africa/Lagos"),
+                    ("Africa/Libreville", "Africa/Libreville"),
+                    ("Africa/Lome", "Africa/Lome"),
+                    ("Africa/Luanda", "Africa/Luanda"),
+                    ("Africa/Lubumbashi", "Africa/Lubumbashi"),
+                    ("Africa/Lusaka", "Africa/Lusaka"),
+                    ("Africa/Malabo", "Africa/Malabo"),
+                    ("Africa/Maputo", "Africa/Maputo"),
+                    ("Africa/Maseru", "Africa/Maseru"),
+                    ("Africa/Mbabane", "Africa/Mbabane"),
+                    ("Africa/Mogadishu", "Africa/Mogadishu"),
+                    ("Africa/Monrovia", "Africa/Monrovia"),
+                    ("Africa/Nairobi", "Africa/Nairobi"),
+                    ("Africa/Ndjamena", "Africa/Ndjamena"),
+                    ("Africa/Niamey", "Africa/Niamey"),
+                    ("Africa/Nouakchott", "Africa/Nouakchott"),
+                    ("Africa/Ouagadougou", "Africa/Ouagadougou"),
+                    ("Africa/Porto-Novo", "Africa/Porto-Novo"),
+                    ("Africa/Sao_Tome", "Africa/Sao_Tome"),
+                    ("Africa/Tripoli", "Africa/Tripoli"),
+                    ("Africa/Tunis", "Africa/Tunis"),
+                    ("Africa/Windhoek", "Africa/Windhoek"),
+                    ("America/Adak", "America/Adak"),
+                    ("America/Anchorage", "America/Anchorage"),
+                    ("America/Anguilla", "America/Anguilla"),
+                    ("America/Antigua", "America/Antigua"),
+                    ("America/Araguaina", "America/Araguaina"),
+                    (
+                        "America/Argentina/Buenos_Aires",
+                        "America/Argentina/Buenos_Aires",
+                    ),
+                    ("America/Argentina/Catamarca", "America/Argentina/Catamarca"),
+                    ("America/Argentina/Cordoba", "America/Argentina/Cordoba"),
+                    ("America/Argentina/Jujuy", "America/Argentina/Jujuy"),
+                    ("America/Argentina/La_Rioja", "America/Argentina/La_Rioja"),
+                    ("America/Argentina/Mendoza", "America/Argentina/Mendoza"),
+                    (
+                        "America/Argentina/Rio_Gallegos",
+                        "America/Argentina/Rio_Gallegos",
+                    ),
+                    ("America/Argentina/Salta", "America/Argentina/Salta"),
+                    ("America/Argentina/San_Juan", "America/Argentina/San_Juan"),
+                    ("America/Argentina/San_Luis", "America/Argentina/San_Luis"),
+                    ("America/Argentina/Tucuman", "America/Argentina/Tucuman"),
+                    ("America/Argentina/Ushuaia", "America/Argentina/Ushuaia"),
+                    ("America/Aruba", "America/Aruba"),
+                    ("America/Asuncion", "America/Asuncion"),
+                    ("America/Atikokan", "America/Atikokan"),
+                    ("America/Bahia", "America/Bahia"),
+                    ("America/Bahia_Banderas", "America/Bahia_Banderas"),
+                    ("America/Barbados", "America/Barbados"),
+                    ("America/Belem", "America/Belem"),
+                    ("America/Belize", "America/Belize"),
+                    ("America/Blanc-Sablon", "America/Blanc-Sablon"),
+                    ("America/Boa_Vista", "America/Boa_Vista"),
+                    ("America/Bogota", "America/Bogota"),
+                    ("America/Boise", "America/Boise"),
+                    ("America/Cambridge_Bay", "America/Cambridge_Bay"),
+                    ("America/Campo_Grande", "America/Campo_Grande"),
+                    ("America/Cancun", "America/Cancun"),
+                    ("America/Caracas", "America/Caracas"),
+                    ("America/Cayenne", "America/Cayenne"),
+                    ("America/Cayman", "America/Cayman"),
+                    ("America/Chicago", "America/Chicago"),
+                    ("America/Chihuahua", "America/Chihuahua"),
+                    ("America/Ciudad_Juarez", "America/Ciudad_Juarez"),
+                    ("America/Costa_Rica", "America/Costa_Rica"),
+                    ("America/Creston", "America/Creston"),
+                    ("America/Cuiaba", "America/Cuiaba"),
+                    ("America/Curacao", "America/Curacao"),
+                    ("America/Danmarkshavn", "America/Danmarkshavn"),
+                    ("America/Dawson", "America/Dawson"),
+                    ("America/Dawson_Creek", "America/Dawson_Creek"),
+                    ("America/Denver", "America/Denver"),
+                    ("America/Detroit", "America/Detroit"),
+                    ("America/Dominica", "America/Dominica"),
+                    ("America/Edmonton", "America/Edmonton"),
+                    ("America/Eirunepe", "America/Eirunepe"),
+                    ("America/El_Salvador", "America/El_Salvador"),
+                    ("America/Fort_Nelson", "America/Fort_Nelson"),
+                    ("America/Fortaleza", "America/Fortaleza"),
+                    ("America/Glace_Bay", "America/Glace_Bay"),
+                    ("America/Goose_Bay", "America/Goose_Bay"),
+                    ("America/Grand_Turk", "America/Grand_Turk"),
+                    ("America/Grenada", "America/Grenada"),
+                    ("America/Guadeloupe", "America/Guadeloupe"),
+                    ("America/Guatemala", "America/Guatemala"),
+                    ("America/Guayaquil", "America/Guayaquil"),
+                    ("America/Guyana", "America/Guyana"),
+                    ("America/Halifax", "America/Halifax"),
+                    ("America/Havana", "America/Havana"),
+                    ("America/Hermosillo", "America/Hermosillo"),
+                    ("America/Indiana/Indianapolis", "America/Indiana/Indianapolis"),
+                    ("America/Indiana/Knox", "America/Indiana/Knox"),
+                    ("America/Indiana/Marengo", "America/Indiana/Marengo"),
+                    ("America/Indiana/Petersburg", "America/Indiana/Petersburg"),
+                    ("America/Indiana/Tell_City", "America/Indiana/Tell_City"),
+                    ("America/Indiana/Vevay", "America/Indiana/Vevay"),
+                    ("America/Indiana/Vincennes", "America/Indiana/Vincennes"),
+                    ("America/Indiana/Winamac", "America/Indiana/Winamac"),
+                    ("America/Inuvik", "America/Inuvik"),
+                    ("America/Iqaluit", "America/Iqaluit"),
+                    ("America/Jamaica", "America/Jamaica"),
+                    ("America/Juneau", "America/Juneau"),
+                    ("America/Kentucky/Louisville", "America/Kentucky/Louisville"),
+                    ("America/Kentucky/Monticello", "America/Kentucky/Monticello"),
+                    ("America/Kralendijk", "America/Kralendijk"),
+                    ("America/La_Paz", "America/La_Paz"),
+                    ("America/Lima", "America/Lima"),
+                    ("America/Los_Angeles", "America/Los_Angeles"),
+                    ("America/Lower_Princes", "America/Lower_Princes"),
+                    ("America/Maceio", "America/Maceio"),
+                    ("America/Managua", "America/Managua"),
+                    ("America/Manaus", "America/Manaus"),
+                    ("America/Marigot", "America/Marigot"),
+                    ("America/Martinique", "America/Martinique"),
+                    ("America/Matamoros", "America/Matamoros"),
+                    ("America/Mazatlan", "America/Mazatlan"),
+                    ("America/Menominee", "America/Menominee"),
+                    ("America/Merida", "America/Merida"),
+                    ("America/Metlakatla", "America/Metlakatla"),
+                    ("America/Mexico_City", "America/Mexico_City"),
+                    ("America/Miquelon", "America/Miquelon"),
+                    ("America/Moncton", "America/Moncton"),
+                    ("America/Monterrey", "America/Monterrey"),
+                    ("America/Montevideo", "America/Montevideo"),
+                    ("America/Montserrat", "America/Montserrat"),
+                    ("America/Nassau", "America/Nassau"),
+                    ("America/New_York", "America/New_York"),
+                    ("America/Nome", "America/Nome"),
+                    ("America/Noronha", "America/Noronha"),
+                    ("America/North_Dakota/Beulah", "America/North_Dakota/Beulah"),
+                    ("America/North_Dakota/Center", "America/North_Dakota/Center"),
+                    (
+                        "America/North_Dakota/New_Salem",
+                        "America/North_Dakota/New_Salem",
+                    ),
+                    ("America/Nuuk", "America/Nuuk"),
+                    ("America/Ojinaga", "America/Ojinaga"),
+                    ("America/Panama", "America/Panama"),
+                    ("America/Paramaribo", "America/Paramaribo"),
+                    ("America/Phoenix", "America/Phoenix"),
+                    ("America/Port-au-Prince", "America/Port-au-Prince"),
+                    ("America/Port_of_Spain", "America/Port_of_Spain"),
+                    ("America/Porto_Velho", "America/Porto_Velho"),
+                    ("America/Puerto_Rico", "America/Puerto_Rico"),
+                    ("America/Punta_Arenas", "America/Punta_Arenas"),
+                    ("America/Rankin_Inlet", "America/Rankin_Inlet"),
+                    ("America/Recife", "America/Recife"),
+                    ("America/Regina", "America/Regina"),
+                    ("America/Resolute", "America/Resolute"),
+                    ("America/Rio_Branco", "America/Rio_Branco"),
+                    ("America/Santarem", "America/Santarem"),
+                    ("America/Santiago", "America/Santiago"),
+                    ("America/Santo_Domingo", "America/Santo_Domingo"),
+                    ("America/Sao_Paulo", "America/Sao_Paulo"),
+                    ("America/Scoresbysund", "America/Scoresbysund"),
+                    ("America/Sitka", "America/Sitka"),
+                    ("America/St_Barthelemy", "America/St_Barthelemy"),
+                    ("America/St_Johns", "America/St_Johns"),
+                    ("America/St_Kitts", "America/St_Kitts"),
+                    ("America/St_Lucia", "America/St_Lucia"),
+                    ("America/St_Thomas", "America/St_Thomas"),
+                    ("America/St_Vincent", "America/St_Vincent"),
+                    ("America/Swift_Current", "America/Swift_Current"),
+                    ("America/Tegucigalpa", "America/Tegucigalpa"),
+                    ("America/Thule", "America/Thule"),
+                    ("America/Tijuana", "America/Tijuana"),
+                    ("America/Toronto", "America/Toronto"),
+                    ("America/Tortola", "America/Tortola"),
+                    ("America/Vancouver", "America/Vancouver"),
+                    ("America/Whitehorse", "America/Whitehorse"),
+                    ("America/Winnipeg", "America/Winnipeg"),
+                    ("America/Yakutat", "America/Yakutat"),
+                    ("Antarctica/Casey", "Antarctica/Casey"),
+                    ("Antarctica/Davis", "Antarctica/Davis"),
+                    ("Antarctica/DumontDUrville", "Antarctica/DumontDUrville"),
+                    ("Antarctica/Macquarie", "Antarctica/Macquarie"),
+                    ("Antarctica/Mawson", "Antarctica/Mawson"),
+                    ("Antarctica/McMurdo", "Antarctica/McMurdo"),
+                    ("Antarctica/Palmer", "Antarctica/Palmer"),
+                    ("Antarctica/Rothera", "Antarctica/Rothera"),
+                    ("Antarctica/Syowa", "Antarctica/Syowa"),
+                    ("Antarctica/Troll", "Antarctica/Troll"),
+                    ("Antarctica/Vostok", "Antarctica/Vostok"),
+                    ("Arctic/Longyearbyen", "Arctic/Longyearbyen"),
+                    ("Asia/Aden", "Asia/Aden"),
+                    ("Asia/Almaty", "Asia/Almaty"),
+                    ("Asia/Amman", "Asia/Amman"),
+                    ("Asia/Anadyr", "Asia/Anadyr"),
+                    ("Asia/Aqtau", "Asia/Aqtau"),
+                    ("Asia/Aqtobe", "Asia/Aqtobe"),
+                    ("Asia/Ashgabat", "Asia/Ashgabat"),
+                    ("Asia/Atyrau", "Asia/Atyrau"),
+                    ("Asia/Baghdad", "Asia/Baghdad"),
+                    ("Asia/Bahrain", "Asia/Bahrain"),
+                    ("Asia/Baku", "Asia/Baku"),
+                    ("Asia/Bangkok", "Asia/Bangkok"),
+                    ("Asia/Barnaul", "Asia/Barnaul"),
+                    ("Asia/Beirut", "Asia/Beirut"),
+                    ("Asia/Bishkek", "Asia/Bishkek"),
+                    ("Asia/Brunei", "Asia/Brunei"),
+                    ("Asia/Chita", "Asia/Chita"),
+                    ("Asia/Colombo", "Asia/Colombo"),
+                    ("Asia/Damascus", "Asia/Damascus"),
+                    ("Asia/Dhaka", "Asia/Dhaka"),
+                    ("Asia/Dili", "Asia/Dili"),
+                    ("Asia/Dubai", "Asia/Dubai"),
+                    ("Asia/Dushanbe", "Asia/Dushanbe"),
+                    ("Asia/Famagusta", "Asia/Famagusta"),
+                    ("Asia/Gaza", "Asia/Gaza"),
+                    ("Asia/Hebron", "Asia/Hebron"),
+                    ("Asia/Ho_Chi_Minh", "Asia/Ho_Chi_Minh"),
+                    ("Asia/Hong_Kong", "Asia/Hong_Kong"),
+                    ("Asia/Hovd", "Asia/Hovd"),
+                    ("Asia/Irkutsk", "Asia/Irkutsk"),
+                    ("Asia/Jakarta", "Asia/Jakarta"),
+                    ("Asia/Jayapura", "Asia/Jayapura"),
+                    ("Asia/Jerusalem", "Asia/Jerusalem"),
+                    ("Asia/Kabul", "Asia/Kabul"),
+                    ("Asia/Kamchatka", "Asia/Kamchatka"),
+                    ("Asia/Karachi", "Asia/Karachi"),
+                    ("Asia/Kathmandu", "Asia/Kathmandu"),
+                    ("Asia/Khandyga", "Asia/Khandyga"),
+                    ("Asia/Kolkata", "Asia/Kolkata"),
+                    ("Asia/Krasnoyarsk", "Asia/Krasnoyarsk"),
+                    ("Asia/Kuala_Lumpur", "Asia/Kuala_Lumpur"),
+                    ("Asia/Kuching", "Asia/Kuching"),
+                    ("Asia/Kuwait", "Asia/Kuwait"),
+                    ("Asia/Macau", "Asia/Macau"),
+                    ("Asia/Magadan", "Asia/Magadan"),
+                    ("Asia/Makassar", "Asia/Makassar"),
+                    ("Asia/Manila", "Asia/Manila"),
+                    ("Asia/Muscat", "Asia/Muscat"),
+                    ("Asia/Nicosia", "Asia/Nicosia"),
+                    ("Asia/Novokuznetsk", "Asia/Novokuznetsk"),
+                    ("Asia/Novosibirsk", "Asia/Novosibirsk"),
+                    ("Asia/Omsk", "Asia/Omsk"),
+                    ("Asia/Oral", "Asia/Oral"),
+                    ("Asia/Phnom_Penh", "Asia/Phnom_Penh"),
+                    ("Asia/Pontianak", "Asia/Pontianak"),
+                    ("Asia/Pyongyang", "Asia/Pyongyang"),
+                    ("Asia/Qatar", "Asia/Qatar"),
+                    ("Asia/Qostanay", "Asia/Qostanay"),
+                    ("Asia/Qyzylorda", "Asia/Qyzylorda"),
+                    ("Asia/Riyadh", "Asia/Riyadh"),
+                    ("Asia/Sakhalin", "Asia/Sakhalin"),
+                    ("Asia/Samarkand", "Asia/Samarkand"),
+                    ("Asia/Seoul", "Asia/Seoul"),
+                    ("Asia/Shanghai", "Asia/Shanghai"),
+                    ("Asia/Singapore", "Asia/Singapore"),
+                    ("Asia/Srednekolymsk", "Asia/Srednekolymsk"),
+                    ("Asia/Taipei", "Asia/Taipei"),
+                    ("Asia/Tashkent", "Asia/Tashkent"),
+                    ("Asia/Tbilisi", "Asia/Tbilisi"),
+                    ("Asia/Tehran", "Asia/Tehran"),
+                    ("Asia/Thimphu", "Asia/Thimphu"),
+                    ("Asia/Tokyo", "Asia/Tokyo"),
+                    ("Asia/Tomsk", "Asia/Tomsk"),
+                    ("Asia/Ulaanbaatar", "Asia/Ulaanbaatar"),
+                    ("Asia/Urumqi", "Asia/Urumqi"),
+                    ("Asia/Ust-Nera", "Asia/Ust-Nera"),
+                    ("Asia/Vientiane", "Asia/Vientiane"),
+                    ("Asia/Vladivostok", "Asia/Vladivostok"),
+                    ("Asia/Yakutsk", "Asia/Yakutsk"),
+                    ("Asia/Yangon", "Asia/Yangon"),
+                    ("Asia/Yekaterinburg", "Asia/Yekaterinburg"),
+                    ("Asia/Yerevan", "Asia/Yerevan"),
+                    ("Atlantic/Azores", "Atlantic/Azores"),
+                    ("Atlantic/Bermuda", "Atlantic/Bermuda"),
+                    ("Atlantic/Canary", "Atlantic/Canary"),
+                    ("Atlantic/Cape_Verde", "Atlantic/Cape_Verde"),
+                    ("Atlantic/Faroe", "Atlantic/Faroe"),
+                    ("Atlantic/Madeira", "Atlantic/Madeira"),
+                    ("Atlantic/Reykjavik", "Atlantic/Reykjavik"),
+                    ("Atlantic/South_Georgia", "Atlantic/South_Georgia"),
+                    ("Atlantic/St_Helena", "Atlantic/St_Helena"),
+                    ("Atlantic/Stanley", "Atlantic/Stanley"),
+                    ("Australia/Adelaide", "Australia/Adelaide"),
+                    ("Australia/Brisbane", "Australia/Brisbane"),
+                    ("Australia/Broken_Hill", "Australia/Broken_Hill"),
+                    ("Australia/Darwin", "Australia/Darwin"),
+                    ("Australia/Eucla", "Australia/Eucla"),
+                    ("Australia/Hobart", "Australia/Hobart"),
+                    ("Australia/Lindeman", "Australia/Lindeman"),
+                    ("Australia/Lord_Howe", "Australia/Lord_Howe"),
+                    ("Australia/Melbourne", "Australia/Melbourne"),
+                    ("Australia/Perth", "Australia/Perth"),
+                    ("Australia/Sydney", "Australia/Sydney"),
+                    ("Canada/Atlantic", "Canada/Atlantic"),
+                    ("Canada/Central", "Canada/Central"),
+                    ("Canada/Eastern", "Canada/Eastern"),
+                    ("Canada/Mountain", "Canada/Mountain"),
+                    ("Canada/Newfoundland", "Canada/Newfoundland"),
+                    ("Canada/Pacific", "Canada/Pacific"),
+                    ("Europe/Amsterdam", "Europe/Amsterdam"),
+                    ("Europe/Andorra", "Europe/Andorra"),
+                    ("Europe/Astrakhan", "Europe/Astrakhan"),
+                    ("Europe/Athens", "Europe/Athens"),
+                    ("Europe/Belgrade", "Europe/Belgrade"),
+                    ("Europe/Berlin", "Europe/Berlin"),
+                    ("Europe/Bratislava", "Europe/Bratislava"),
+                    ("Europe/Brussels", "Europe/Brussels"),
+                    ("Europe/Bucharest", "Europe/Bucharest"),
+                    ("Europe/Budapest", "Europe/Budapest"),
+                    ("Europe/Busingen", "Europe/Busingen"),
+                    ("Europe/Chisinau", "Europe/Chisinau"),
+                    ("Europe/Copenhagen", "Europe/Copenhagen"),
+                    ("Europe/Dublin", "Europe/Dublin"),
+                    ("Europe/Gibraltar", "Europe/Gibraltar"),
+                    ("Europe/Guernsey", "Europe/Guernsey"),
+                    ("Europe/Helsinki", "Europe/Helsinki"),
+                    ("Europe/Isle_of_Man", "Europe/Isle_of_Man"),
+                    ("Europe/Istanbul", "Europe/Istanbul"),
+                    ("Europe/Jersey", "Europe/Jersey"),
+                    ("Europe/Kaliningrad", "Europe/Kaliningrad"),
+                    ("Europe/Kirov", "Europe/Kirov"),
+                    ("Europe/Kyiv", "Europe/Kyiv"),
+                    ("Europe/Lisbon", "Europe/Lisbon"),
+                    ("Europe/Ljubljana", "Europe/Ljubljana"),
+                    ("Europe/London", "Europe/London"),
+                    ("Europe/Luxembourg", "Europe/Luxembourg"),
+                    ("Europe/Madrid", "Europe/Madrid"),
+                    ("Europe/Malta", "Europe/Malta"),
+                    ("Europe/Mariehamn", "Europe/Mariehamn"),
+                    ("Europe/Minsk", "Europe/Minsk"),
+                    ("Europe/Monaco", "Europe/Monaco"),
+                    ("Europe/Moscow", "Europe/Moscow"),
+                    ("Europe/Oslo", "Europe/Oslo"),
+                    ("Europe/Paris", "Europe/Paris"),
+                    ("Europe/Podgorica", "Europe/Podgorica"),
+                    ("Europe/Prague", "Europe/Prague"),
+                    ("Europe/Riga", "Europe/Riga"),
+                    ("Europe/Rome", "Europe/Rome"),
+                    ("Europe/Samara", "Europe/Samara"),
+                    ("Europe/San_Marino", "Europe/San_Marino"),
+                    ("Europe/Sarajevo", "Europe/Sarajevo"),
+                    ("Europe/Saratov", "Europe/Saratov"),
+                    ("Europe/Simferopol", "Europe/Simferopol"),
+                    ("Europe/Skopje", "Europe/Skopje"),
+                    ("Europe/Sofia", "Europe/Sofia"),
+                    ("Europe/Stockholm", "Europe/Stockholm"),
+                    ("Europe/Tallinn", "Europe/Tallinn"),
+                    ("Europe/Tirane", "Europe/Tirane"),
+                    ("Europe/Ulyanovsk", "Europe/Ulyanovsk"),
+                    ("Europe/Vaduz", "Europe/Vaduz"),
+                    ("Europe/Vatican", "Europe/Vatican"),
+                    ("Europe/Vienna", "Europe/Vienna"),
+                    ("Europe/Vilnius", "Europe/Vilnius"),
+                    ("Europe/Volgograd", "Europe/Volgograd"),
+                    ("Europe/Warsaw", "Europe/Warsaw"),
+                    ("Europe/Zagreb", "Europe/Zagreb"),
+                    ("Europe/Zurich", "Europe/Zurich"),
+                    ("GMT", "GMT"),
+                    ("Indian/Antananarivo", "Indian/Antananarivo"),
+                    ("Indian/Chagos", "Indian/Chagos"),
+                    ("Indian/Christmas", "Indian/Christmas"),
+                    ("Indian/Cocos", "Indian/Cocos"),
+                    ("Indian/Comoro", "Indian/Comoro"),
+                    ("Indian/Kerguelen", "Indian/Kerguelen"),
+                    ("Indian/Mahe", "Indian/Mahe"),
+                    ("Indian/Maldives", "Indian/Maldives"),
+                    ("Indian/Mauritius", "Indian/Mauritius"),
+                    ("Indian/Mayotte", "Indian/Mayotte"),
+                    ("Indian/Reunion", "Indian/Reunion"),
+                    ("Pacific/Apia", "Pacific/Apia"),
+                    ("Pacific/Auckland", "Pacific/Auckland"),
+                    ("Pacific/Bougainville", "Pacific/Bougainville"),
+                    ("Pacific/Chatham", "Pacific/Chatham"),
+                    ("Pacific/Chuuk", "Pacific/Chuuk"),
+                    ("Pacific/Easter", "Pacific/Easter"),
+                    ("Pacific/Efate", "Pacific/Efate"),
+                    ("Pacific/Fakaofo", "Pacific/Fakaofo"),
+                    ("Pacific/Fiji", "Pacific/Fiji"),
+                    ("Pacific/Funafuti", "Pacific/Funafuti"),
+                    ("Pacific/Galapagos", "Pacific/Galapagos"),
+                    ("Pacific/Gambier", "Pacific/Gambier"),
+                    ("Pacific/Guadalcanal", "Pacific/Guadalcanal"),
+                    ("Pacific/Guam", "Pacific/Guam"),
+                    ("Pacific/Honolulu", "Pacific/Honolulu"),
+                    ("Pacific/Kanton", "Pacific/Kanton"),
+                    ("Pacific/Kiritimati", "Pacific/Kiritimati"),
+                    ("Pacific/Kosrae", "Pacific/Kosrae"),
+                    ("Pacific/Kwajalein", "Pacific/Kwajalein"),
+                    ("Pacific/Majuro", "Pacific/Majuro"),
+                    ("Pacific/Marquesas", "Pacific/Marquesas"),
+                    ("Pacific/Midway", "Pacific/Midway"),
+                    ("Pacific/Nauru", "Pacific/Nauru"),
+                    ("Pacific/Niue", "Pacific/Niue"),
+                    ("Pacific/Norfolk", "Pacific/Norfolk"),
+                    ("Pacific/Noumea", "Pacific/Noumea"),
+                    ("Pacific/Pago_Pago", "Pacific/Pago_Pago"),
+                    ("Pacific/Palau", "Pacific/Palau"),
+                    ("Pacific/Pitcairn", "Pacific/Pitcairn"),
+                    ("Pacific/Pohnpei", "Pacific/Pohnpei"),
+                    ("Pacific/Port_Moresby", "Pacific/Port_Moresby"),
+                    ("Pacific/Rarotonga", "Pacific/Rarotonga"),
+                    ("Pacific/Saipan", "Pacific/Saipan"),
+                    ("Pacific/Tahiti", "Pacific/Tahiti"),
+                    ("Pacific/Tarawa", "Pacific/Tarawa"),
+                    ("Pacific/Tongatapu", "Pacific/Tongatapu"),
+                    ("Pacific/Wake", "Pacific/Wake"),
+                    ("Pacific/Wallis", "Pacific/Wallis"),
+                    ("US/Alaska", "US/Alaska"),
+                    ("US/Arizona", "US/Arizona"),
+                    ("US/Central", "US/Central"),
+                    ("US/Eastern", "US/Eastern"),
+                    ("US/Hawaii", "US/Hawaii"),
+                    ("US/Mountain", "US/Mountain"),
+                    ("US/Pacific", "US/Pacific"),
+                    ("UTC", "UTC"),
+                ],
+                default="auto",
+                max_length=50,
+                verbose_name="Time Zone",
+            ),
+        ),
+    ]

app/apps/users/models.py

@@ -2,11 +2,449 @@ import pytz
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import AbstractUser, Group
+from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
 from apps.users.managers import UserManager
 
+timezones = [
+    ("auto", _("Auto")),
+    ("Africa/Abidjan", "Africa/Abidjan"),
+    ("Africa/Accra", "Africa/Accra"),
+    ("Africa/Addis_Ababa", "Africa/Addis_Ababa"),
+    ("Africa/Algiers", "Africa/Algiers"),
+    ("Africa/Asmara", "Africa/Asmara"),
+    ("Africa/Bamako", "Africa/Bamako"),
+    ("Africa/Bangui", "Africa/Bangui"),
+    ("Africa/Banjul", "Africa/Banjul"),
+    ("Africa/Bissau", "Africa/Bissau"),
+    ("Africa/Blantyre", "Africa/Blantyre"),
+    ("Africa/Brazzaville", "Africa/Brazzaville"),
+    ("Africa/Bujumbura", "Africa/Bujumbura"),
+    ("Africa/Cairo", "Africa/Cairo"),
+    ("Africa/Casablanca", "Africa/Casablanca"),
+    ("Africa/Ceuta", "Africa/Ceuta"),
+    ("Africa/Conakry", "Africa/Conakry"),
+    ("Africa/Dakar", "Africa/Dakar"),
+    ("Africa/Dar_es_Salaam", "Africa/Dar_es_Salaam"),
+    ("Africa/Djibouti", "Africa/Djibouti"),
+    ("Africa/Douala", "Africa/Douala"),
+    ("Africa/El_Aaiun", "Africa/El_Aaiun"),
+    ("Africa/Freetown", "Africa/Freetown"),
+    ("Africa/Gaborone", "Africa/Gaborone"),
+    ("Africa/Harare", "Africa/Harare"),
+    ("Africa/Johannesburg", "Africa/Johannesburg"),
+    ("Africa/Juba", "Africa/Juba"),
+    ("Africa/Kampala", "Africa/Kampala"),
+    ("Africa/Khartoum", "Africa/Khartoum"),
+    ("Africa/Kigali", "Africa/Kigali"),
+    ("Africa/Kinshasa", "Africa/Kinshasa"),
+    ("Africa/Lagos", "Africa/Lagos"),
+    ("Africa/Libreville", "Africa/Libreville"),
+    ("Africa/Lome", "Africa/Lome"),
+    ("Africa/Luanda", "Africa/Luanda"),
+    ("Africa/Lubumbashi", "Africa/Lubumbashi"),
+    ("Africa/Lusaka", "Africa/Lusaka"),
+    ("Africa/Malabo", "Africa/Malabo"),
+    ("Africa/Maputo", "Africa/Maputo"),
+    ("Africa/Maseru", "Africa/Maseru"),
+    ("Africa/Mbabane", "Africa/Mbabane"),
+    ("Africa/Mogadishu", "Africa/Mogadishu"),
+    ("Africa/Monrovia", "Africa/Monrovia"),
+    ("Africa/Nairobi", "Africa/Nairobi"),
+    ("Africa/Ndjamena", "Africa/Ndjamena"),
+    ("Africa/Niamey", "Africa/Niamey"),
+    ("Africa/Nouakchott", "Africa/Nouakchott"),
+    ("Africa/Ouagadougou", "Africa/Ouagadougou"),
+    ("Africa/Porto-Novo", "Africa/Porto-Novo"),
+    ("Africa/Sao_Tome", "Africa/Sao_Tome"),
+    ("Africa/Tripoli", "Africa/Tripoli"),
+    ("Africa/Tunis", "Africa/Tunis"),
+    ("Africa/Windhoek", "Africa/Windhoek"),
+    ("America/Adak", "America/Adak"),
+    ("America/Anchorage", "America/Anchorage"),
+    ("America/Anguilla", "America/Anguilla"),
+    ("America/Antigua", "America/Antigua"),
+    ("America/Araguaina", "America/Araguaina"),
+    ("America/Argentina/Buenos_Aires", "America/Argentina/Buenos_Aires"),
+    ("America/Argentina/Catamarca", "America/Argentina/Catamarca"),
+    ("America/Argentina/Cordoba", "America/Argentina/Cordoba"),
+    ("America/Argentina/Jujuy", "America/Argentina/Jujuy"),
+    ("America/Argentina/La_Rioja", "America/Argentina/La_Rioja"),
+    ("America/Argentina/Mendoza", "America/Argentina/Mendoza"),
+    ("America/Argentina/Rio_Gallegos", "America/Argentina/Rio_Gallegos"),
+    ("America/Argentina/Salta", "America/Argentina/Salta"),
+    ("America/Argentina/San_Juan", "America/Argentina/San_Juan"),
+    ("America/Argentina/San_Luis", "America/Argentina/San_Luis"),
+    ("America/Argentina/Tucuman", "America/Argentina/Tucuman"),
+    ("America/Argentina/Ushuaia", "America/Argentina/Ushuaia"),
+    ("America/Aruba", "America/Aruba"),
+    ("America/Asuncion", "America/Asuncion"),
+    ("America/Atikokan", "America/Atikokan"),
+    ("America/Bahia", "America/Bahia"),
+    ("America/Bahia_Banderas", "America/Bahia_Banderas"),
+    ("America/Barbados", "America/Barbados"),
+    ("America/Belem", "America/Belem"),
+    ("America/Belize", "America/Belize"),
+    ("America/Blanc-Sablon", "America/Blanc-Sablon"),
+    ("America/Boa_Vista", "America/Boa_Vista"),
+    ("America/Bogota", "America/Bogota"),
+    ("America/Boise", "America/Boise"),
+    ("America/Cambridge_Bay", "America/Cambridge_Bay"),
+    ("America/Campo_Grande", "America/Campo_Grande"),
+    ("America/Cancun", "America/Cancun"),
+    ("America/Caracas", "America/Caracas"),
+    ("America/Cayenne", "America/Cayenne"),
+    ("America/Cayman", "America/Cayman"),
+    ("America/Chicago", "America/Chicago"),
+    ("America/Chihuahua", "America/Chihuahua"),
+    ("America/Ciudad_Juarez", "America/Ciudad_Juarez"),
+    ("America/Costa_Rica", "America/Costa_Rica"),
+    ("America/Coyhaique", "America/Coyhaique"),
+    ("America/Creston", "America/Creston"),
+    ("America/Cuiaba", "America/Cuiaba"),
+    ("America/Curacao", "America/Curacao"),
+    ("America/Danmarkshavn", "America/Danmarkshavn"),
+    ("America/Dawson", "America/Dawson"),
+    ("America/Dawson_Creek", "America/Dawson_Creek"),
+    ("America/Denver", "America/Denver"),
+    ("America/Detroit", "America/Detroit"),
+    ("America/Dominica", "America/Dominica"),
+    ("America/Edmonton", "America/Edmonton"),
+    ("America/Eirunepe", "America/Eirunepe"),
+    ("America/El_Salvador", "America/El_Salvador"),
+    ("America/Fort_Nelson", "America/Fort_Nelson"),
+    ("America/Fortaleza", "America/Fortaleza"),
+    ("America/Glace_Bay", "America/Glace_Bay"),
+    ("America/Goose_Bay", "America/Goose_Bay"),
+    ("America/Grand_Turk", "America/Grand_Turk"),
+    ("America/Grenada", "America/Grenada"),
+    ("America/Guadeloupe", "America/Guadeloupe"),
+    ("America/Guatemala", "America/Guatemala"),
+    ("America/Guayaquil", "America/Guayaquil"),
+    ("America/Guyana", "America/Guyana"),
+    ("America/Halifax", "America/Halifax"),
+    ("America/Havana", "America/Havana"),
+    ("America/Hermosillo", "America/Hermosillo"),
+    ("America/Indiana/Indianapolis", "America/Indiana/Indianapolis"),
+    ("America/Indiana/Knox", "America/Indiana/Knox"),
+    ("America/Indiana/Marengo", "America/Indiana/Marengo"),
+    ("America/Indiana/Petersburg", "America/Indiana/Petersburg"),
+    ("America/Indiana/Tell_City", "America/Indiana/Tell_City"),
+    ("America/Indiana/Vevay", "America/Indiana/Vevay"),
+    ("America/Indiana/Vincennes", "America/Indiana/Vincennes"),
+    ("America/Indiana/Winamac", "America/Indiana/Winamac"),
+    ("America/Inuvik", "America/Inuvik"),
+    ("America/Iqaluit", "America/Iqaluit"),
+    ("America/Jamaica", "America/Jamaica"),
+    ("America/Juneau", "America/Juneau"),
+    ("America/Kentucky/Louisville", "America/Kentucky/Louisville"),
+    ("America/Kentucky/Monticello", "America/Kentucky/Monticello"),
+    ("America/Kralendijk", "America/Kralendijk"),
+    ("America/La_Paz", "America/La_Paz"),
+    ("America/Lima", "America/Lima"),
+    ("America/Los_Angeles", "America/Los_Angeles"),
+    ("America/Lower_Princes", "America/Lower_Princes"),
+    ("America/Maceio", "America/Maceio"),
+    ("America/Managua", "America/Managua"),
+    ("America/Manaus", "America/Manaus"),
+    ("America/Marigot", "America/Marigot"),
+    ("America/Martinique", "America/Martinique"),
+    ("America/Matamoros", "America/Matamoros"),
+    ("America/Mazatlan", "America/Mazatlan"),
+    ("America/Menominee", "America/Menominee"),
+    ("America/Merida", "America/Merida"),
+    ("America/Metlakatla", "America/Metlakatla"),
+    ("America/Mexico_City", "America/Mexico_City"),
+    ("America/Miquelon", "America/Miquelon"),
+    ("America/Moncton", "America/Moncton"),
+    ("America/Monterrey", "America/Monterrey"),
+    ("America/Montevideo", "America/Montevideo"),
+    ("America/Montserrat", "America/Montserrat"),
+    ("America/Nassau", "America/Nassau"),
+    ("America/New_York", "America/New_York"),
+    ("America/Nome", "America/Nome"),
+    ("America/Noronha", "America/Noronha"),
+    ("America/North_Dakota/Beulah", "America/North_Dakota/Beulah"),
+    ("America/North_Dakota/Center", "America/North_Dakota/Center"),
+    ("America/North_Dakota/New_Salem", "America/North_Dakota/New_Salem"),
+    ("America/Nuuk", "America/Nuuk"),
+    ("America/Ojinaga", "America/Ojinaga"),
+    ("America/Panama", "America/Panama"),
+    ("America/Paramaribo", "America/Paramaribo"),
+    ("America/Phoenix", "America/Phoenix"),
+    ("America/Port-au-Prince", "America/Port-au-Prince"),
+    ("America/Port_of_Spain", "America/Port_of_Spain"),
+    ("America/Porto_Velho", "America/Porto_Velho"),
+    ("America/Puerto_Rico", "America/Puerto_Rico"),
+    ("America/Punta_Arenas", "America/Punta_Arenas"),
+    ("America/Rankin_Inlet", "America/Rankin_Inlet"),
+    ("America/Recife", "America/Recife"),
+    ("America/Regina", "America/Regina"),
+    ("America/Resolute", "America/Resolute"),
+    ("America/Rio_Branco", "America/Rio_Branco"),
+    ("America/Santarem", "America/Santarem"),
+    ("America/Santiago", "America/Santiago"),
+    ("America/Santo_Domingo", "America/Santo_Domingo"),
+    ("America/Sao_Paulo", "America/Sao_Paulo"),
+    ("America/Scoresbysund", "America/Scoresbysund"),
+    ("America/Sitka", "America/Sitka"),
+    ("America/St_Barthelemy", "America/St_Barthelemy"),
+    ("America/St_Johns", "America/St_Johns"),
+    ("America/St_Kitts", "America/St_Kitts"),
+    ("America/St_Lucia", "America/St_Lucia"),
+    ("America/St_Thomas", "America/St_Thomas"),
+    ("America/St_Vincent", "America/St_Vincent"),
+    ("America/Swift_Current", "America/Swift_Current"),
+    ("America/Tegucigalpa", "America/Tegucigalpa"),
+    ("America/Thule", "America/Thule"),
+    ("America/Tijuana", "America/Tijuana"),
+    ("America/Toronto", "America/Toronto"),
+    ("America/Tortola", "America/Tortola"),
+    ("America/Vancouver", "America/Vancouver"),
+    ("America/Whitehorse", "America/Whitehorse"),
+    ("America/Winnipeg", "America/Winnipeg"),
+    ("America/Yakutat", "America/Yakutat"),
+    ("Antarctica/Casey", "Antarctica/Casey"),
+    ("Antarctica/Davis", "Antarctica/Davis"),
+    ("Antarctica/DumontDUrville", "Antarctica/DumontDUrville"),
+    ("Antarctica/Macquarie", "Antarctica/Macquarie"),
+    ("Antarctica/Mawson", "Antarctica/Mawson"),
+    ("Antarctica/McMurdo", "Antarctica/McMurdo"),
+    ("Antarctica/Palmer", "Antarctica/Palmer"),
+    ("Antarctica/Rothera", "Antarctica/Rothera"),
+    ("Antarctica/Syowa", "Antarctica/Syowa"),
+    ("Antarctica/Troll", "Antarctica/Troll"),
+    ("Antarctica/Vostok", "Antarctica/Vostok"),
+    ("Arctic/Longyearbyen", "Arctic/Longyearbyen"),
+    ("Asia/Aden", "Asia/Aden"),
+    ("Asia/Almaty", "Asia/Almaty"),
+    ("Asia/Amman", "Asia/Amman"),
+    ("Asia/Anadyr", "Asia/Anadyr"),
+    ("Asia/Aqtau", "Asia/Aqtau"),
+    ("Asia/Aqtobe", "Asia/Aqtobe"),
+    ("Asia/Ashgabat", "Asia/Ashgabat"),
+    ("Asia/Atyrau", "Asia/Atyrau"),
+    ("Asia/Baghdad", "Asia/Baghdad"),
+    ("Asia/Bahrain", "Asia/Bahrain"),
+    ("Asia/Baku", "Asia/Baku"),
+    ("Asia/Bangkok", "Asia/Bangkok"),
+    ("Asia/Barnaul", "Asia/Barnaul"),
+    ("Asia/Beirut", "Asia/Beirut"),
+    ("Asia/Bishkek", "Asia/Bishkek"),
+    ("Asia/Brunei", "Asia/Brunei"),
+    ("Asia/Chita", "Asia/Chita"),
+    ("Asia/Colombo", "Asia/Colombo"),
+    ("Asia/Damascus", "Asia/Damascus"),
+    ("Asia/Dhaka", "Asia/Dhaka"),
+    ("Asia/Dili", "Asia/Dili"),
+    ("Asia/Dubai", "Asia/Dubai"),
+    ("Asia/Dushanbe", "Asia/Dushanbe"),
+    ("Asia/Famagusta", "Asia/Famagusta"),
+    ("Asia/Gaza", "Asia/Gaza"),
+    ("Asia/Hebron", "Asia/Hebron"),
+    ("Asia/Ho_Chi_Minh", "Asia/Ho_Chi_Minh"),
+    ("Asia/Hong_Kong", "Asia/Hong_Kong"),
+    ("Asia/Hovd", "Asia/Hovd"),
+    ("Asia/Irkutsk", "Asia/Irkutsk"),
+    ("Asia/Jakarta", "Asia/Jakarta"),
+    ("Asia/Jayapura", "Asia/Jayapura"),
+    ("Asia/Jerusalem", "Asia/Jerusalem"),
+    ("Asia/Kabul", "Asia/Kabul"),
+    ("Asia/Kamchatka", "Asia/Kamchatka"),
+    ("Asia/Karachi", "Asia/Karachi"),
+    ("Asia/Kathmandu", "Asia/Kathmandu"),
+    ("Asia/Khandyga", "Asia/Khandyga"),
+    ("Asia/Kolkata", "Asia/Kolkata"),
+    ("Asia/Krasnoyarsk", "Asia/Krasnoyarsk"),
+    ("Asia/Kuala_Lumpur", "Asia/Kuala_Lumpur"),
+    ("Asia/Kuching", "Asia/Kuching"),
+    ("Asia/Kuwait", "Asia/Kuwait"),
+    ("Asia/Macau", "Asia/Macau"),
+    ("Asia/Magadan", "Asia/Magadan"),
+    ("Asia/Makassar", "Asia/Makassar"),
+    ("Asia/Manila", "Asia/Manila"),
+    ("Asia/Muscat", "Asia/Muscat"),
+    ("Asia/Nicosia", "Asia/Nicosia"),
+    ("Asia/Novokuznetsk", "Asia/Novokuznetsk"),
+    ("Asia/Novosibirsk", "Asia/Novosibirsk"),
+    ("Asia/Omsk", "Asia/Omsk"),
+    ("Asia/Oral", "Asia/Oral"),
+    ("Asia/Phnom_Penh", "Asia/Phnom_Penh"),
+    ("Asia/Pontianak", "Asia/Pontianak"),
+    ("Asia/Pyongyang", "Asia/Pyongyang"),
+    ("Asia/Qatar", "Asia/Qatar"),
+    ("Asia/Qostanay", "Asia/Qostanay"),
+    ("Asia/Qyzylorda", "Asia/Qyzylorda"),
+    ("Asia/Riyadh", "Asia/Riyadh"),
+    ("Asia/Sakhalin", "Asia/Sakhalin"),
+    ("Asia/Samarkand", "Asia/Samarkand"),
+    ("Asia/Seoul", "Asia/Seoul"),
+    ("Asia/Shanghai", "Asia/Shanghai"),
+    ("Asia/Singapore", "Asia/Singapore"),
+    ("Asia/Srednekolymsk", "Asia/Srednekolymsk"),
+    ("Asia/Taipei", "Asia/Taipei"),
+    ("Asia/Tashkent", "Asia/Tashkent"),
+    ("Asia/Tbilisi", "Asia/Tbilisi"),
+    ("Asia/Tehran", "Asia/Tehran"),
+    ("Asia/Thimphu", "Asia/Thimphu"),
+    ("Asia/Tokyo", "Asia/Tokyo"),
+    ("Asia/Tomsk", "Asia/Tomsk"),
+    ("Asia/Ulaanbaatar", "Asia/Ulaanbaatar"),
+    ("Asia/Urumqi", "Asia/Urumqi"),
+    ("Asia/Ust-Nera", "Asia/Ust-Nera"),
+    ("Asia/Vientiane", "Asia/Vientiane"),
+    ("Asia/Vladivostok", "Asia/Vladivostok"),
+    ("Asia/Yakutsk", "Asia/Yakutsk"),
+    ("Asia/Yangon", "Asia/Yangon"),
+    ("Asia/Yekaterinburg", "Asia/Yekaterinburg"),
+    ("Asia/Yerevan", "Asia/Yerevan"),
+    ("Atlantic/Azores", "Atlantic/Azores"),
+    ("Atlantic/Bermuda", "Atlantic/Bermuda"),
+    ("Atlantic/Canary", "Atlantic/Canary"),
+    ("Atlantic/Cape_Verde", "Atlantic/Cape_Verde"),
+    ("Atlantic/Faroe", "Atlantic/Faroe"),
+    ("Atlantic/Madeira", "Atlantic/Madeira"),
+    ("Atlantic/Reykjavik", "Atlantic/Reykjavik"),
+    ("Atlantic/South_Georgia", "Atlantic/South_Georgia"),
+    ("Atlantic/St_Helena", "Atlantic/St_Helena"),
+    ("Atlantic/Stanley", "Atlantic/Stanley"),
+    ("Australia/Adelaide", "Australia/Adelaide"),
+    ("Australia/Brisbane", "Australia/Brisbane"),
+    ("Australia/Broken_Hill", "Australia/Broken_Hill"),
+    ("Australia/Darwin", "Australia/Darwin"),
+    ("Australia/Eucla", "Australia/Eucla"),
+    ("Australia/Hobart", "Australia/Hobart"),
+    ("Australia/Lindeman", "Australia/Lindeman"),
+    ("Australia/Lord_Howe", "Australia/Lord_Howe"),
+    ("Australia/Melbourne", "Australia/Melbourne"),
+    ("Australia/Perth", "Australia/Perth"),
+    ("Australia/Sydney", "Australia/Sydney"),
+    ("Canada/Atlantic", "Canada/Atlantic"),
+    ("Canada/Central", "Canada/Central"),
+    ("Canada/Eastern", "Canada/Eastern"),
+    ("Canada/Mountain", "Canada/Mountain"),
+    ("Canada/Newfoundland", "Canada/Newfoundland"),
+    ("Canada/Pacific", "Canada/Pacific"),
+    ("Europe/Amsterdam", "Europe/Amsterdam"),
+    ("Europe/Andorra", "Europe/Andorra"),
+    ("Europe/Astrakhan", "Europe/Astrakhan"),
+    ("Europe/Athens", "Europe/Athens"),
+    ("Europe/Belgrade", "Europe/Belgrade"),
+    ("Europe/Berlin", "Europe/Berlin"),
+    ("Europe/Bratislava", "Europe/Bratislava"),
+    ("Europe/Brussels", "Europe/Brussels"),
+    ("Europe/Bucharest", "Europe/Bucharest"),
+    ("Europe/Budapest", "Europe/Budapest"),
+    ("Europe/Busingen", "Europe/Busingen"),
+    ("Europe/Chisinau", "Europe/Chisinau"),
+    ("Europe/Copenhagen", "Europe/Copenhagen"),
+    ("Europe/Dublin", "Europe/Dublin"),
+    ("Europe/Gibraltar", "Europe/Gibraltar"),
+    ("Europe/Guernsey", "Europe/Guernsey"),
+    ("Europe/Helsinki", "Europe/Helsinki"),
+    ("Europe/Isle_of_Man", "Europe/Isle_of_Man"),
+    ("Europe/Istanbul", "Europe/Istanbul"),
+    ("Europe/Jersey", "Europe/Jersey"),
+    ("Europe/Kaliningrad", "Europe/Kaliningrad"),
+    ("Europe/Kirov", "Europe/Kirov"),
+    ("Europe/Kyiv", "Europe/Kyiv"),
+    ("Europe/Lisbon", "Europe/Lisbon"),
+    ("Europe/Ljubljana", "Europe/Ljubljana"),
+    ("Europe/London", "Europe/London"),
+    ("Europe/Luxembourg", "Europe/Luxembourg"),
+    ("Europe/Madrid", "Europe/Madrid"),
+    ("Europe/Malta", "Europe/Malta"),
+    ("Europe/Mariehamn", "Europe/Mariehamn"),
+    ("Europe/Minsk", "Europe/Minsk"),
+    ("Europe/Monaco", "Europe/Monaco"),
+    ("Europe/Moscow", "Europe/Moscow"),
+    ("Europe/Oslo", "Europe/Oslo"),
+    ("Europe/Paris", "Europe/Paris"),
+    ("Europe/Podgorica", "Europe/Podgorica"),
+    ("Europe/Prague", "Europe/Prague"),
+    ("Europe/Riga", "Europe/Riga"),
+    ("Europe/Rome", "Europe/Rome"),
+    ("Europe/Samara", "Europe/Samara"),
+    ("Europe/San_Marino", "Europe/San_Marino"),
+    ("Europe/Sarajevo", "Europe/Sarajevo"),
+    ("Europe/Saratov", "Europe/Saratov"),
+    ("Europe/Simferopol", "Europe/Simferopol"),
+    ("Europe/Skopje", "Europe/Skopje"),
+    ("Europe/Sofia", "Europe/Sofia"),
+    ("Europe/Stockholm", "Europe/Stockholm"),
+    ("Europe/Tallinn", "Europe/Tallinn"),
+    ("Europe/Tirane", "Europe/Tirane"),
+    ("Europe/Ulyanovsk", "Europe/Ulyanovsk"),
+    ("Europe/Vaduz", "Europe/Vaduz"),
+    ("Europe/Vatican", "Europe/Vatican"),
+    ("Europe/Vienna", "Europe/Vienna"),
+    ("Europe/Vilnius", "Europe/Vilnius"),
+    ("Europe/Volgograd", "Europe/Volgograd"),
+    ("Europe/Warsaw", "Europe/Warsaw"),
+    ("Europe/Zagreb", "Europe/Zagreb"),
+    ("Europe/Zurich", "Europe/Zurich"),
+    ("GMT", "GMT"),
+    ("Indian/Antananarivo", "Indian/Antananarivo"),
+    ("Indian/Chagos", "Indian/Chagos"),
+    ("Indian/Christmas", "Indian/Christmas"),
+    ("Indian/Cocos", "Indian/Cocos"),
+    ("Indian/Comoro", "Indian/Comoro"),
+    ("Indian/Kerguelen", "Indian/Kerguelen"),
+    ("Indian/Mahe", "Indian/Mahe"),
+    ("Indian/Maldives", "Indian/Maldives"),
+    ("Indian/Mauritius", "Indian/Mauritius"),
+    ("Indian/Mayotte", "Indian/Mayotte"),
+    ("Indian/Reunion", "Indian/Reunion"),
+    ("Pacific/Apia", "Pacific/Apia"),
+    ("Pacific/Auckland", "Pacific/Auckland"),
+    ("Pacific/Bougainville", "Pacific/Bougainville"),
+    ("Pacific/Chatham", "Pacific/Chatham"),
+    ("Pacific/Chuuk", "Pacific/Chuuk"),
+    ("Pacific/Easter", "Pacific/Easter"),
+    ("Pacific/Efate", "Pacific/Efate"),
+    ("Pacific/Fakaofo", "Pacific/Fakaofo"),
+    ("Pacific/Fiji", "Pacific/Fiji"),
+    ("Pacific/Funafuti", "Pacific/Funafuti"),
+    ("Pacific/Galapagos", "Pacific/Galapagos"),
+    ("Pacific/Gambier", "Pacific/Gambier"),
+    ("Pacific/Guadalcanal", "Pacific/Guadalcanal"),
+    ("P2025-06-29T01:43:14.671389745Z acific/Guam", "Pacific/Guam"),
+    ("Pacific/Honolulu", "Pacific/Honolulu"),
+    ("Pacific/Kanton", "Pacific/Kanton"),
+    ("Pacific/Kiritimati", "Pacific/Kiritimati"),
+    ("Pacific/Kosrae", "Pacific/Kosrae"),
+    ("Pacific/Kwajalein", "Pacific/Kwajalein"),
+    ("Pacific/Majuro", "Pacific/Majuro"),
+    ("Pacific/Marquesas", "Pacific/Marquesas"),
+    ("Pacific/Midway", "Pacific/Midway"),
+    ("Pacific/Nauru", "Pacific/Nauru"),
+    ("Pacific/Niue", "Pacific/Niue"),
+    ("Pacific/Norfolk", "Pacific/Norfolk"),
+    ("Pacific/Noumea", "Pacific/Noumea"),
+    ("Pacific/Pago_Pago", "Pacific/Pago_Pago"),
+    ("Pacific/Palau", "Pacific/Palau"),
+    ("Pacific/Pitcairn", "Pacific/Pitcairn"),
+    ("Pacific/Pohnpei", "Pacific/Pohnpei"),
+    ("Pacific/Port_Moresby", "Pacific/Port_Moresby"),
+    ("Pacific/Rarotonga", "Pacific/Rarotonga"),
+    ("Pacific/Saipan", "Pacific/Saipan"),
+    ("Pacific/Tahiti", "Pacific/Tahiti"),
+    ("Pacific/Tarawa", "Pacific/Tarawa"),
+    ("Pacific/Tongatapu", "Pacific/Tongatapu"),
+    ("Pacific/Wake", "Pacific/Wake"),
+    ("Pacific/Wallis", "Pacific/Wallis"),
+    ("US/Alaska", "US/Alaska"),
+    ("US/Arizona", "US/Arizona"),
+    ("US/Central", "US/Central"),
+    ("US/Eastern", "US/Eastern"),
+    ("US/Hawaii", "US/Hawaii"),
+    ("US/Mountain", "US/Mountain"),
+    ("US/Pacific", "US/Pacific"),
+    ("UTC", "UTC"),
+]
+
 
 class User(AbstractUser):
     username = None
@@ -36,6 +474,11 @@ class UserSettings(models.Model):
     )
     hide_amounts = models.BooleanField(default=False)
     mute_sounds = models.BooleanField(default=False)
+    volume = models.PositiveIntegerField(
+        default=10,
+        validators=[MinValueValidator(1), MaxValueValidator(10)],
+        verbose_name=_("Volume"),
+    )
 
     date_format = models.CharField(
         max_length=100, default="SHORT_DATE_FORMAT", verbose_name=_("Date Format")
@@ -57,7 +500,7 @@ class UserSettings(models.Model):
     )
     timezone = models.CharField(
         max_length=50,
-        choices=[("auto", _("Auto"))] + [(tz, tz) for tz in pytz.common_timezones],
+        choices=timezones,
         default="auto",
         verbose_name=_("Time Zone"),
     )

app/apps/users/tests.py

@@ -1,29 +0,0 @@
-from django.test import TestCase, Client
-from django.contrib.auth.models import User
-from django.urls import reverse
-
-class UsersTestCase(TestCase):
-    def test_example(self):
-        self.assertEqual(1 + 1, 2)
-
-    def test_users_index_view_superuser(self):
-        # Create a superuser
-        superuser = User.objects.create_user(
-            username='superuser',
-            password='superpassword',
-            is_staff=True,
-            is_superuser=True
-        )
-
-        # Create a Client instance
-        client = Client()
-
-        # Log in the superuser
-        client.login(username='superuser', password='superpassword')
-
-        # Make a GET request to the users_index view
-        # Assuming your users_index view is named 'users_index' in the 'users' app namespace
-        response = client.get(reverse('users:users_index'))
-
-        # Assert that the response status code is 200
-        self.assertEqual(response.status_code, 200)

app/apps/yearly_overview/tests.py

@@ -1,26 +0,0 @@
-from django.test import TestCase, Client
-from django.contrib.auth.models import User
-from django.urls import reverse
-
-class YearlyOverviewTestCase(TestCase):
-    def test_example(self):
-        self.assertEqual(1 + 1, 2)
-
-    def test_yearly_overview_by_currency_view_authenticated_user(self):
-        # Create a test user
-        user = User.objects.create_user(username='testuser', password='testpassword')
-
-        # Create a Client instance
-        client = Client()
-
-        # Log in the test user
-        client.login(username='testuser', password='testpassword')
-
-        # Make a GET request to the yearly_overview_currency view (e.g., for year 2023)
-        # Assuming your view is named 'yearly_overview_currency' in urls.py
-        # and takes year as an argument.
-        # Adjust the view name and arguments if necessary.
-        response = client.get(reverse('yearly_overview:yearly_overview_currency', args=[2023]))
-
-        # Assert that the response status code is 200
-        self.assertEqual(response.status_code, 200)

app/templates/account_groups/fragments/list.html

@@ -1,9 +1,9 @@
 {% load i18n %}
 <div class="container px-md-3 py-3 column-gap-5">
-  <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+  <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
     {% spaceless %}
       <div>{% translate 'Account Groups' %}<span>
-      <a class="text-decoration-none tw-text-2xl p-1 category-action"
+      <a class="text-decoration-none tw:text-2xl p-1 category-action"
          role="button"
          data-bs-toggle="tooltip"
          data-bs-title="{% translate "Add" %}"

app/templates/accounts/fragments/list.html

@@ -1,9 +1,9 @@
 {% load i18n %}
 <div class="container px-md-3 py-3 column-gap-5">
-  <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+  <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
     {% spaceless %}
     <div>{% translate 'Accounts' %}<span>
-      <a class="text-decoration-none tw-text-2xl p-1 category-action"
+      <a class="text-decoration-none tw:text-2xl p-1 category-action"
                 role="button"
                 data-bs-toggle="tooltip"
                 data-bs-title="{% translate "Add" %}"

app/templates/calendar_view/fragments/list.html

@@ -2,7 +2,7 @@
 {% load i18n %}
 
 <div>
-  <div class="tw-hidden lg:tw-grid lg:tw-grid-cols-7 tw-gap-4 lg:tw-gap-0">
+  <div class="tw:hidden tw:lg:grid tw:lg:grid-cols-7 tw:gap-4 tw:lg:gap-0">
     <div class="border-start border-top border-bottom p-2 text-center">
       {% translate 'MON' %}
     </div>
@@ -25,44 +25,44 @@
       {% translate 'SUN' %}
     </div>
   </div>
-  <div class="tw-grid tw-grid-cols-1 tw-grid-rows-1 lg:tw-grid-cols-7 lg:tw-grid-rows-6 tw-gap-4 lg:tw-gap-0">
+  <div class="tw:grid tw:grid-cols-1 tw:grid-rows-1 tw:lg:grid-cols-7 tw:lg:grid-rows-6 tw:gap-4 tw:lg:gap-0">
     {% for date in dates %}
       {% if date %}
-      <div class="card h-100 hover:tw-bg-zinc-900 rounded-0{% if not date.transactions %} !tw-hidden lg:!tw-flex{% endif %}{% if today == date.date %} tw-border-yellow-300 border-primary{% endif %} " role="button"
+      <div class="card h-100 tw:hover:bg-zinc-900! rounded-0{% if not date.transactions %} tw:hidden! tw:lg:flex!{% endif %}{% if today == date.date %} tw:border-yellow-300 border-primary{% endif %} " role="button"
         hx-get="{% url 'calendar_transactions_list' day=date.date.day month=date.date.month year=date.date.year %}"
         hx-target="#persistent-generic-offcanvas-left">
-        <div class="card-header border-0 bg-transparent text-end tw-flex justify-content-between p-2 w-100">
-          <div class="lg:tw-hidden text-start w-100">{{ date.date|date:"l"|lower }}</div>
+        <div class="card-header border-0 bg-transparent text-end tw:flex justify-content-between p-2 w-100">
+          <div class="tw:lg:hidden text-start w-100">{{ date.date|date:"l"|lower }}</div>
           <div class="text-end w-100">{{ date.day }}</div>
         </div>
         <div class="card-body p-2">
           {% for transaction in date.transactions %}
             {% if transaction.is_paid %}
               {% if transaction.type == "IN" and not transaction.account.is_asset %}
-                <i class="fa-solid fa-circle-check tw-text-green-400" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Income' %}{% endif %}"></i>
+                <i class="fa-solid fa-circle-check tw:text-green-400" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Income' %}{% endif %}"></i>
               {% elif transaction.type == "IN" and transaction.account.is_asset %}
-                <i class="fa-solid fa-circle-check tw-text-green-300" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Income' %}{% endif %}"></i>
+                <i class="fa-solid fa-circle-check tw:text-green-300" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Income' %}{% endif %}"></i>
               {% elif transaction.type == "EX" and not transaction.account.is_asset %}
-                <i class="fa-solid fa-circle-check tw-text-red-400" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Expense' %}{% endif %}"></i>
+                <i class="fa-solid fa-circle-check tw:text-red-400" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Expense' %}{% endif %}"></i>
               {% elif transaction.type == "EX" and transaction.account.is_asset %}
-                <i class="fa-solid fa-circle-check tw-text-red-300" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Expense' %}{% endif %}"></i>
+                <i class="fa-solid fa-circle-check tw:text-red-300" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Expense' %}{% endif %}"></i>
               {% endif %}
             {% else %}
               {% if transaction.type == "IN" and not transaction.account.is_asset %}
-                <i class="fa-regular fa-circle tw-text-green-400" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Income' %}{% endif %}"></i>
+                <i class="fa-regular fa-circle tw:text-green-400" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Income' %}{% endif %}"></i>
               {% elif transaction.type == "IN" and transaction.account.is_asset %}
-                <i class="fa-regular fa-circle tw-text-green-300" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Income' %}{% endif %}"></i>
+                <i class="fa-regular fa-circle tw:text-green-300" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Income' %}{% endif %}"></i>
               {% elif transaction.type == "EX" and not transaction.account.is_asset %}
-                <i class="fa-regular fa-circle tw-text-red-400" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Expense' %}{% endif %}"></i>
+                <i class="fa-regular fa-circle tw:text-red-400" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Expense' %}{% endif %}"></i>
               {% elif transaction.type == "EX" and transaction.account.is_asset %}
-                <i class="fa-regular fa-circle tw-text-red-300" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Expense' %}{% endif %}"></i>
+                <i class="fa-regular fa-circle tw:text-red-300" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Expense' %}{% endif %}"></i>
               {% endif %}
             {% endif %}
           {% endfor %}
         </div>
       </div>
       {% else %}
-        <div class="!tw-hidden lg:!tw-block card h-100 rounded-0"></div>
+        <div class="tw:hidden! tw:lg:block! card h-100 rounded-0"></div>
       {% endif %}
     {% endfor %}
   </div>

app/templates/calendar_view/pages/calendar.html

@@ -17,7 +17,7 @@
     <div class="row mb-3 gx-xl-4 gy-3 mb-4">
       {#    Date picker#}
       <div class="col-12 col-xl-4 flex-row align-items-center d-flex">
-      <div class="tw-text-base h-100 align-items-center d-flex">
+        <div class="tw:text-base h-100 align-items-center d-flex">
           <a role="button"
              class="pe-4 py-2"
              hx-boost="true"
@@ -25,14 +25,14 @@
              href="{% url 'calendar' month=previous_month year=previous_year %}"><i
               class="fa-solid fa-chevron-left"></i></a>
         </div>
-      <div class="tw-text-3xl fw-bold font-monospace tw-w-full text-center"
+        <div class="tw:text-3xl fw-bold font-monospace tw:w-full text-center"
              hx-get="{% url 'month_year_picker' %}"
              hx-target="#generic-offcanvas-left"
              hx-trigger="click, date_picker from:window"
              hx-vals='{"month": {{ month }}, "year": {{ year }}, "for": "calendar", "field": "date"}' role="button">
           {{ month|month_name }} {{ year }}
         </div>
-      <div class="tw-text-base mx-2 h-100 align-items-center d-flex">
+        <div class="tw:text-base mx-2 h-100 align-items-center d-flex">
           <a role="button"
              class="ps-3 py-2"
              hx-boost="true"
@@ -44,14 +44,16 @@
       </div>
       {#    Action buttons#}
       <div class="col-12 col-xl-8">
-      <c-ui.quick-transactions-buttons
-        :year="year"
-        :month="month"
-      ></c-ui.quick-transactions-buttons>
+        {#      <c-ui.quick-transactions-buttons#}
+        {#        :year="year"#}
+        {#        :month="month"#}
+        {#      ></c-ui.quick-transactions-buttons>#}
       </div>
     </div>
     <div class="row">
-    <div class="show-loading" hx-get="{% url 'calendar_list' month=month year=year %}" hx-trigger="load, updated from:window, selective_update from:window"></div>
+      <div class="show-loading" hx-get="{% url 'calendar_list' month=month year=year %}"
+           hx-trigger="load, updated from:window, selective_update from:window"></div>
     </div>
   </div>
+  <c-ui.transactions_fab></c-ui.transactions_fab>
 {% endblock %}

app/templates/categories/fragments/list.html

@@ -1,9 +1,9 @@
 {% load i18n %}
 <div class="container px-md-3 py-3 column-gap-5">
-  <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+  <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
     {% spaceless %}
     <div>{% translate 'Categories' %}<span>
-      <a class="text-decoration-none tw-text-2xl p-1 category-action"
+      <a class="text-decoration-none tw:text-2xl p-1 category-action"
                 role="button"
                 data-bs-toggle="tooltip"
                 data-bs-title="{% translate "Add" %}"

app/templates/common/fragments/month_year_picker.html

@@ -32,7 +32,7 @@
        tabindex="0">
     <ul class="list-group list-group-flush" id="month-year-list">
       {% for month_data in x.list %}
-      <li class="list-group-item hover:tw-bg-zinc-900
+      <li class="list-group-item tw:hover:bg-zinc-900
             {% if month_data.month == current_month and month_data.year == current_year %} disabled bg-primary{% endif %}"
           {% if month_data.month == current_month and month_data.year == current_year %}aria-disabled="true"{% endif %}>
         <div class="d-flex justify-content-between">

app/templates/cotton/amount/display.html

@@ -3,7 +3,7 @@
 {% if not divless %}
 <div class="{% if text_end %}text-end{% elif text_start %}text-start{% endif %}">
 {% endif %}
-  <span class="amount{% if color == 'grey' or color == "gray" %} tw-text-gray-500{% elif color == 'green' %} tw-text-green-400{% elif color == 'red' %} tw-text-red-400{% endif %} {{ custom_class }}"
+  <span class="amount{% if color == 'grey' or color == "gray" %} tw:text-gray-500{% elif color == 'green' %} tw:text-green-400{% elif color == 'red' %} tw:text-red-400{% endif %} {{ custom_class }}"
        data-original-value="{% currency_display amount=amount prefix=prefix suffix=suffix decimal_places=decimal_places %}"
        data-amount="{{ amount|floatformat:"-40u" }}">
   </span><span>{{ slot }}</span>

app/templates/cotton/components/fab.html

@@ -0,0 +1,33 @@
+<div class="tw:min-h-16">
+<div
+    id="fab-wrapper"
+    class="tw:fixed tw:bottom-5 tw:right-5 tw:ml-auto tw:w-max tw:flex tw:flex-col tw:items-end mt-5">
+  <div
+      id="menu"
+      class="tw:flex tw:flex-col tw:items-end tw:space-y-6 tw:transition-all tw:duration-300 tw:ease-in-out tw:opacity-0 tw:invisible tw:hidden tw:mb-2">
+
+    {{ slot }}
+  </div>
+
+  <button
+      class="btn btn-primary rounded-circle p-0 tw:w-12 tw:h-12 tw:flex tw:items-center tw:justify-center tw:shadow-lg tw:hover:shadow-xl tw:focus:shadow-xl tw:transition-all tw:duration-300 tw:ease-in-out"
+      _="
+          on click or focusout
+             if #menu.classList.contains('tw:invisible') and event.type === 'click'
+               add .{'tw:rotate-45'} to #fab-icon
+               remove .{'tw:invisible'} from #menu
+               remove .{'tw:hidden'} from #menu
+               remove .{'tw:opacity-0'} from #menu
+             else
+               wait 0.2s
+               remove .{'tw:rotate-45'} from #fab-icon
+               add .{'tw:invisible'} to #menu
+               add .{'tw:hidden'} to #menu
+               add .{'tw:opacity-0'} to #menu
+             end
+          "
+  >
+    <i id="fab-icon" class="fa-solid fa-plus tw:text-3xl tw:transition-transform tw:duration-300 tw:ease-in-out"></i>
+  </button>
+</div>
+</div>

app/templates/cotton/components/fab_menu_button.html

@@ -0,0 +1,11 @@
+{% load i18n %}
+<div class="tw:relative fab-item">
+  <button class="btn btn-sm btn-{{ color }}"
+          hx-get="{{ url }}"
+          hx-trigger="{{ hx_trigger }}"
+          hx-target="{{ hx_target }}"
+          hx-vals='{{ hx_vals }}'>
+    <i class="{{ icon }} me-2"></i>
+    {{ title }}
+  </button>
+</div>

app/templates/cotton/msg/empty.html

@@ -1,9 +1,9 @@
 <div class="row {% if not remove_padding %}p-5{% endif %}">
   <div class="col {% if not remove_padding %}p-5{% endif %}">
     <div class="text-center">
-      <i class="{% if icon %}{{ icon }}{% else %}fa-solid fa-circle-xmark{% endif %} tw-text-6xl"></i>
+      <i class="{% if icon %}{{ icon }}{% else %}fa-solid fa-circle-xmark{% endif %} tw:text-6xl"></i>
       <p class="lead mt-4 mb-0">{{ title }}</p>
-      <p class="tw-text-gray-500">{{ subtitle }}</p>
+      <p class="tw:text-gray-500">{{ subtitle }}</p>
     </div>
   </div>
 </div>

app/templates/cotton/transaction/item.html

@@ -8,16 +8,17 @@
                id="check-{{ transaction.id }}" aria-label="{% translate 'Select' %}" hx-preserve>
       </label>
     {% endif %}
-    <div class="tw-border-s-6 tw-border-e-0 tw-border-t-0 tw-border-b-0 border-bottom
-  hover:tw-bg-zinc-900 p-2 {% if transaction.account.is_asset %}tw-border-dashed{% else %}tw-border-solid{% endif %}
-  {% if transaction.type == "EX" %}tw-border-red-500{% else %}tw-border-green-500{% endif %} tw-relative
+    <div class="tw:border-s-4 tw:border-e-0 tw:border-t-0 tw:border-b-0 border-bottom
+  tw:hover:bg-zinc-900 p-2 {% if transaction.account.is_asset %}tw:border-dashed{% else %}tw:border-solid{% endif %}
+  {% if transaction.type == "EX" %}tw:border-red-500{% else %}tw:border-green-500{% endif %} tw:relative
   w-100 transaction-item"
-         _="on mouseover remove .tw-invisible from the first .transaction-actions in me end
-        on mouseout add .tw-invisible to the first .transaction-actions in me end">
-      <div class="row font-monospace tw-text-sm align-items-center">
-        <div class="col-lg-auto col-12 d-flex align-items-center tw-text-2xl lg:tw-text-xl text-lg-center text-center p-0 ps-1">
+         _="on mouseover remove .{'tw:invisible'} from the first .transaction-actions in me end
+        on mouseout add .{'tw:invisible'} to the first .transaction-actions in me end">
+      <div class="row font-monospace tw:text-sm align-items-center">
+        <div
+            class="col-lg-auto col-12 d-flex align-items-center tw:text-2xl tw:lg:text-xl text-lg-center text-center p-0 ps-1">
           {% if not transaction.deleted %}
-            <a class="text-decoration-none p-3 tw-text-gray-500"
+            <a class="text-decoration-none p-3 tw:text-gray-500!"
                title="{% if transaction.is_paid %}{% trans 'Paid' %}{% else %}{% trans 'Projected' %}{% endif %}"
                role="button"
                hx-get="{% url 'transaction_pay' transaction_id=transaction.id %}"
@@ -27,7 +28,7 @@
                   class="fa-regular fa-circle"></i>{% endif %}
             </a>
           {% else %}
-            <div class="text-decoration-none p-3 tw-text-gray-500"
+            <div class="text-decoration-none p-3 tw:text-gray-500!"
                  title="{% if transaction.is_paid %}{% trans 'Paid' %}{% else %}{% trans 'Projected' %}{% endif %}">
               {% if transaction.is_paid %}<i class="fa-regular fa-circle-check"></i>{% else %}<i
                   class="fa-regular fa-circle"></i>{% endif %}
@@ -36,13 +37,13 @@
         </div>
         <div class="col-lg col-12">
           {#      Date#}
-          <div class="row mb-2 mb-lg-1 tw-text-gray-400">
+          <div class="row mb-2 mb-lg-1 tw:text-gray-400">
             <div class="col-auto pe-1"><i class="fa-solid fa-calendar fa-fw me-1 fa-xs"></i></div>
             <div
                 class="col ps-0">{{ transaction.date|date:"SHORT_DATE_FORMAT" }} • {{ transaction.reference_date|date:"b/Y" }}</div>
           </div>
           {#      Description#}
-          <div class="mb-2 mb-lg-1 text-white tw-text-base">
+          <div class="mb-2 mb-lg-1 text-body tw:text-base">
             {% spaceless %}
               <span class="{% if transaction.description %}me-2{% endif %}">{{ transaction.description }}</span>
               {% if transaction.installment_plan and transaction.installment_id %}
@@ -50,18 +51,18 @@
                     class="badge text-bg-secondary">{{ transaction.installment_id }}/{{ transaction.installment_plan.installment_total_number }}</span>
               {% endif %}
               {% if transaction.recurring_transaction %}
-                <span class="text-primary tw-text-xs"><i class="fa-solid fa-arrows-rotate fa-fw"></i></span>
+                <span class="text-primary tw:text-xs"><i class="fa-solid fa-arrows-rotate fa-fw"></i></span>
               {% endif %}
               {% if transaction.dca_expense_entries.all or transaction.dca_income_entries.all %}
                 <span class="badge text-bg-secondary">{% trans 'DCA' %}</span>
               {% endif %}
             {% endspaceless %}
           </div>
-          <div class="tw-text-gray-400 tw-text-sm">
+          <div class="tw:text-gray-400 tw:text-sm">
             {#        Entities #}
             {% with transaction.entities.all as entities %}
               {% if entities %}
-                <div class="row mb-2 mb-lg-1 tw-text-gray-400">
+                <div class="row mb-2 mb-lg-1 tw:text-gray-400">
                   <div class="col-auto pe-1"><i class="fa-solid fa-user-group fa-fw me-1 fa-xs"></i></div>
                   <div class="col ps-0">{{ entities|join:", " }}</div>
                 </div>
@@ -69,14 +70,14 @@
             {% endwith %}
             {#        Notes#}
             {% if transaction.notes %}
-              <div class="row mb-2 mb-lg-1 tw-text-gray-400">
+              <div class="row mb-2 mb-lg-1 tw:text-gray-400">
                 <div class="col-auto pe-1"><i class="fa-solid fa-align-left fa-fw me-1 fa-xs"></i></div>
                 <div class="col ps-0">{{ transaction.notes | limited_markdown | linebreaksbr }}</div>
               </div>
             {% endif %}
             {#        Category#}
             {% if transaction.category %}
-              <div class="row mb-2 mb-lg-1 tw-text-gray-400">
+              <div class="row mb-2 mb-lg-1 tw:text-gray-400">
                 <div class="col-auto pe-1"><i class="fa-solid fa-icons fa-fw me-1 fa-xs"></i></div>
                 <div class="col ps-0">{{ transaction.category.name }}</div>
               </div>
@@ -84,7 +85,7 @@
             {#        Tags#}
             {% with transaction.tags.all as tags %}
               {% if tags %}
-                <div class="row mb-2 mb-lg-1 tw-text-gray-400">
+                <div class="row mb-2 mb-lg-1 tw:text-gray-400">
                   <div class="col-auto pe-1"><i class="fa-solid fa-hashtag fa-fw me-1 fa-xs"></i></div>
                   <div class="col ps-0">{{ tags|join:", " }}</div>
                 </div>
@@ -121,7 +122,7 @@
         <div>
           {#      Item actions#}
           <div
-              class="transaction-actions !tw-absolute tw-left-1/2 tw-top-0 tw--translate-x-1/2 tw--translate-y-1/2 tw-invisible d-flex flex-row card">
+              class="transaction-actions tw:absolute! tw:left-1/2 tw:top-0 tw:-translate-x-1/2 tw:-translate-y-1/2 tw:invisible d-flex flex-row card">
             <div class="card-body p-1 shadow-lg">
               {% if not transaction.deleted %}
                 <a class="btn btn-secondary btn-sm transaction-action"

app/templates/cotton/transaction/small_item.html

@@ -1,9 +1,9 @@
 <div class="card mb-2 transaction-item">
-    <div class="card-body p-2 tw-flex tw-items-center tw-gap-3" data-bs-toggle="collapse" data-bs-target="#{{ transaction.id }}" role="button" aria-expanded="false" aria-controls="{{ transaction.id }}">
+    <div class="card-body p-2 tw:flex tw:items-center tw:gap-3" data-bs-toggle="collapse" data-bs-target="#{{ transaction.id }}" role="button" aria-expanded="false" aria-controls="{{ transaction.id }}">
         <!-- Main visible content -->
-        <div class="tw-flex flex-lg-row flex-column lg:tw-items-center tw-w-full tw-gap-3">
+        <div class="tw:flex flex-lg-row flex-column tw:lg:items-center tw:w-full tw:gap-3">
             <!-- Type indicator -->
-            <div class="tw-w-8">
+            <div class="tw:w-8">
                 {% if transaction.type == 'IN' %}
                     <span class="badge bg-success">↑</span>
                 {% else %}
@@ -12,7 +12,7 @@
             </div>
 
             <!-- Payment status -->
-            <div class="tw-w-8">
+            <div class="tw:w-8">
                 {% if transaction.is_paid %}
                     <span class="badge bg-success">✓</span>
                 {% else %}
@@ -21,13 +21,13 @@
             </div>
 
             <!-- Description -->
-            <div class="tw-flex-grow">
-                <span class="tw-font-medium">{{ transaction.description }}</span>
+            <div class="tw:flex-grow">
+                <span class="tw:font-medium">{{ transaction.description }}</span>
             </div>
 
             <!-- Amount -->
-            <div class="tw-text-right tw-whitespace-nowrap">
-                <span class="{% if transaction.type == 'IN' %}tw-text-green-400{% else %}tw-text-red-400{% endif %}">
+            <div class="tw:text-right tw:whitespace-nowrap">
+                <span class="{% if transaction.type == 'IN' %}tw:text-green-400{% else %}tw:text-red-400{% endif %}">
                     {{ transaction.amount }}
                 </span>
                 {% if transaction.exchanged_amount %}

app/templates/cotton/ui/account_card.html

@@ -3,7 +3,7 @@
 <div class="col card shadow">
   <div class="card-body">
     {% if account.account.group %}
-      <div class="tw-text-sm mb-2">
+      <div class="tw:text-sm mb-2">
         <span class="badge text-bg-primary ">{{ account.account.group }}</span>
       </div>
     {% endif %}
@@ -12,11 +12,11 @@
     </h5>
     <div class="d-flex justify-content-between align-items-baseline mt-2">
       <div class="text-end font-monospace">
-        <div class="tw-text-gray-400">{% translate 'projected income' %}</div>
+        <div class="tw:text-gray-400">{% translate 'projected income' %}</div>
       </div>
       <div class="dotted-line flex-grow-1"></div>
       {% if account.income_projected != 0 %}
-      <div class="text-end font-monospace tw-text-green-400">
+      <div class="text-end font-monospace tw:text-green-400">
         <c-amount.display
             :amount="account.income_projected"
             :prefix="account.currency.prefix"
@@ -28,7 +28,7 @@
       {% endif %}
     </div>
     {% if account.exchanged and account.exchanged.income_projected %}
-      <div class="text-end font-monospace tw-text-gray-500">
+      <div class="text-end font-monospace tw:text-gray-500">
         <c-amount.display
             :amount="account.exchanged.income_projected"
             :prefix="account.exchanged.currency.prefix"
@@ -38,12 +38,12 @@
     {% endif %}
     <div class="d-flex justify-content-between align-items-baseline mt-2">
       <div class="text-end font-monospace">
-        <div class="tw-text-gray-400">{% translate 'projected expenses' %}</div>
+        <div class="tw:text-gray-400">{% translate 'projected expenses' %}</div>
       </div>
       <div class="dotted-line flex-grow-1"></div>
       <div>
         {% if account.expense_projected != 0 %}
-        <div class="text-end font-monospace tw-text-red-400">
+        <div class="text-end font-monospace tw:text-red-400">
           <c-amount.display
               :amount="account.expense_projected"
               :prefix="account.currency.prefix"
@@ -56,7 +56,7 @@
       </div>
     </div>
     {% if account.exchanged and account.exchanged.expense_projected %}
-      <div class="text-end font-monospace tw-text-gray-500">
+      <div class="text-end font-monospace tw:text-gray-500">
         <c-amount.display
             :amount="account.exchanged.expense_projected"
             :prefix="account.exchanged.currency.prefix"
@@ -66,7 +66,7 @@
     {% endif %}
     <div class="d-flex justify-content-between align-items-baseline mt-2">
       <div class="text-end font-monospace">
-        <div class="tw-text-gray-400">{% translate 'projected total' %}</div>
+        <div class="tw:text-gray-400">{% translate 'projected total' %}</div>
       </div>
       <div class="dotted-line flex-grow-1"></div>
       <div
@@ -80,7 +80,7 @@
       </div>
     </div>
     {% if account.exchanged.total_projected and account.exchanged.total_projected %}
-      <div class="text-end font-monospace tw-text-gray-500">
+      <div class="text-end font-monospace tw:text-gray-500">
         <c-amount.display
             :amount="account.exchanged.total_projected"
             :prefix="account.exchanged.currency.prefix"
@@ -91,11 +91,11 @@
     <hr class="my-3">
     <div class="d-flex justify-content-between align-items-baseline mt-2">
       <div class="text-end font-monospace">
-        <div class="tw-text-gray-400">{% translate 'current income' %}</div>
+        <div class="tw:text-gray-400">{% translate 'current income' %}</div>
       </div>
       <div class="dotted-line flex-grow-1"></div>
       {% if account.income_current != 0 %}
-      <div class="text-end font-monospace tw-text-green-400">
+      <div class="text-end font-monospace tw:text-green-400">
         <c-amount.display
             :amount="account.income_current"
             :prefix="account.currency.prefix"
@@ -107,7 +107,7 @@
       {% endif %}
     </div>
     {% if account.exchanged and account.exchanged.income_current %}
-      <div class="text-end font-monospace tw-text-gray-500">
+      <div class="text-end font-monospace tw:text-gray-500">
         <c-amount.display
             :amount="account.exchanged.income_current"
             :prefix="account.exchanged.currency.prefix"
@@ -117,11 +117,11 @@
     {% endif %}
     <div class="d-flex justify-content-between align-items-baseline mt-2">
       <div class="text-end font-monospace">
-        <div class="tw-text-gray-400">{% translate 'current expenses' %}</div>
+        <div class="tw:text-gray-400">{% translate 'current expenses' %}</div>
       </div>
       <div class="dotted-line flex-grow-1"></div>
       {% if account.expense_current != 0 %}
-      <div class="text-end font-monospace tw-text-red-400">
+      <div class="text-end font-monospace tw:text-red-400">
         <c-amount.display
             :amount="account.expense_current"
             :prefix="account.currency.prefix"
@@ -133,7 +133,7 @@
       {% endif %}
     </div>
     {% if account.exchanged and account.exchanged.expense_current %}
-      <div class="text-end font-monospace tw-text-gray-500">
+      <div class="text-end font-monospace tw:text-gray-500">
         <c-amount.display
             :amount="account.exchanged.expense_current"
             :prefix="account.exchanged.currency.prefix"
@@ -143,7 +143,7 @@
     {% endif %}
     <div class="d-flex justify-content-between align-items-baseline mt-2">
       <div class="text-end font-monospace">
-        <div class="tw-text-gray-400">{% translate 'current total' %}</div>
+        <div class="tw:text-gray-400">{% translate 'current total' %}</div>
       </div>
       <div class="dotted-line flex-grow-1"></div>
       <div class="text-end font-monospace">
@@ -156,7 +156,7 @@
       </div>
     </div>
     {% if account.exchanged and account.exchanged.total_current %}
-      <div class="text-end font-monospace tw-text-gray-500">
+      <div class="text-end font-monospace tw:text-gray-500">
         <c-amount.display
             :amount="account.exchanged.total_current"
             :prefix="account.exchanged.currency.prefix"
@@ -168,7 +168,7 @@
       <hr class="my-3">
       <div class="d-flex justify-content-between align-items-baseline mt-2">
         <div class="text-end font-monospace">
-          <div class="tw-text-gray-400">{% translate 'final total' %}</div>
+          <div class="tw:text-gray-400">{% translate 'final total' %}</div>
         </div>
         <div class="dotted-line flex-grow-1"></div>
         <div class="text-end font-monospace">
@@ -181,7 +181,7 @@
         </div>
       </div>
       {% if account.exchanged and account.exchanged.total_final %}
-        <div class="text-end font-monospace tw-text-gray-500">
+        <div class="text-end font-monospace tw:text-gray-500">
           <c-amount.display
               :amount="account.exchanged.total_final"
               :prefix="account.exchanged.currency.prefix"

app/templates/cotton/ui/card.html

@@ -1,4 +1,4 @@
-<div class="card tw-relative h-100 shadow">
+<div class="card tw:relative h-100 shadow">
   <div class="card-body">
     {{ slot }}
   </div>

app/templates/cotton/ui/currency_card.html

@@ -7,11 +7,11 @@
     </h5>
     <div class="d-flex justify-content-between align-items-baseline mt-2">
       <div class="text-end font-monospace">
-        <div class="tw-text-gray-400">{% translate 'projected income' %}</div>
+        <div class="tw:text-gray-400">{% translate 'projected income' %}</div>
       </div>
       <div class="dotted-line flex-grow-1"></div>
       {% if currency.income_projected != 0 %}
-      <div class="text-end font-monospace tw-text-green-400">
+      <div class="text-end font-monospace tw:text-green-400">
         <c-amount.display
             :amount="currency.income_projected"
             :prefix="currency.currency.prefix"
@@ -23,7 +23,7 @@
       {% endif %}
     </div>
     {% if currency.exchanged and currency.exchanged.income_projected %}
-      <div class="text-end font-monospace tw-text-gray-500">
+      <div class="text-end font-monospace tw:text-gray-500">
         <c-amount.display
             :amount="currency.exchanged.income_projected"
             :prefix="currency.exchanged.currency.prefix"
@@ -33,12 +33,12 @@
     {% endif %}
     <div class="d-flex justify-content-between align-items-baseline mt-2">
       <div class="text-end font-monospace">
-        <div class="tw-text-gray-400">{% translate 'projected expenses' %}</div>
+        <div class="tw:text-gray-400">{% translate 'projected expenses' %}</div>
       </div>
       <div class="dotted-line flex-grow-1"></div>
       <div>
         {% if currency.expense_projected != 0 %}
-        <div class="text-end font-monospace tw-text-red-400">
+        <div class="text-end font-monospace tw:text-red-400">
           <c-amount.display
               :amount="currency.expense_projected"
               :prefix="currency.currency.prefix"
@@ -51,7 +51,7 @@
       </div>
     </div>
     {% if currency.exchanged and currency.exchanged.expense_projected %}
-      <div class="text-end font-monospace tw-text-gray-500">
+      <div class="text-end font-monospace tw:text-gray-500">
         <c-amount.display
             :amount="currency.exchanged.expense_projected"
             :prefix="currency.exchanged.currency.prefix"
@@ -61,7 +61,7 @@
     {% endif %}
     <div class="d-flex justify-content-between align-items-baseline mt-2">
       <div class="text-end font-monospace">
-        <div class="tw-text-gray-400">{% translate 'projected total' %}</div>
+        <div class="tw:text-gray-400">{% translate 'projected total' %}</div>
       </div>
       <div class="dotted-line flex-grow-1"></div>
       <div class="text-end font-monospace">
@@ -74,7 +74,7 @@
       </div>
     </div>
     {% if currency.exchanged.total_projected and currency.exchanged.total_projected %}
-      <div class="text-end font-monospace tw-text-gray-500">
+      <div class="text-end font-monospace tw:text-gray-500">
         <c-amount.display
             :amount="currency.exchanged.total_projected"
             :prefix="currency.exchanged.currency.prefix"
@@ -85,11 +85,11 @@
     <hr class="my-3">
     <div class="d-flex justify-content-between align-items-baseline mt-2">
       <div class="text-end font-monospace">
-        <div class="tw-text-gray-400">{% translate 'current income' %}</div>
+        <div class="tw:text-gray-400">{% translate 'current income' %}</div>
       </div>
       <div class="dotted-line flex-grow-1"></div>
       {% if currency.income_current != 0 %}
-      <div class="text-end font-monospace tw-text-green-400">
+      <div class="text-end font-monospace tw:text-green-400">
         <c-amount.display
             :amount="currency.income_current"
             :prefix="currency.currency.prefix"
@@ -101,7 +101,7 @@
       {% endif %}
     </div>
     {% if currency.exchanged and currency.exchanged.income_current %}
-      <div class="text-end font-monospace tw-text-gray-500">
+      <div class="text-end font-monospace tw:text-gray-500">
         <c-amount.display
             :amount="currency.exchanged.income_current"
             :prefix="currency.exchanged.currency.prefix"
@@ -111,11 +111,11 @@
     {% endif %}
     <div class="d-flex justify-content-between align-items-baseline mt-2">
       <div class="text-end font-monospace">
-        <div class="tw-text-gray-400">{% translate 'current expenses' %}</div>
+        <div class="tw:text-gray-400">{% translate 'current expenses' %}</div>
       </div>
       <div class="dotted-line flex-grow-1"></div>
       {% if currency.expense_current != 0 %}
-      <div class="text-end font-monospace tw-text-red-400">
+      <div class="text-end font-monospace tw:text-red-400">
         <c-amount.display
             :amount="currency.expense_current"
             :prefix="currency.currency.prefix"
@@ -127,7 +127,7 @@
       {% endif %}
     </div>
     {% if currency.exchanged and currency.exchanged.expense_current %}
-      <div class="text-end font-monospace tw-text-gray-500">
+      <div class="text-end font-monospace tw:text-gray-500">
         <c-amount.display
             :amount="currency.exchanged.expense_current"
             :prefix="currency.exchanged.currency.prefix"
@@ -137,7 +137,7 @@
     {% endif %}
     <div class="d-flex justify-content-between align-items-baseline mt-2">
       <div class="text-end font-monospace">
-        <div class="tw-text-gray-400">{% translate 'current total' %}</div>
+        <div class="tw:text-gray-400">{% translate 'current total' %}</div>
       </div>
       <div class="dotted-line flex-grow-1"></div>
       <div class="text-end font-monospace">
@@ -150,7 +150,7 @@
       </div>
     </div>
     {% if currency.exchanged and currency.exchanged.total_current %}
-      <div class="text-end font-monospace tw-text-gray-500">
+      <div class="text-end font-monospace tw:text-gray-500">
         <c-amount.display
             :amount="currency.exchanged.total_current"
             :prefix="currency.exchanged.currency.prefix"
@@ -162,7 +162,7 @@
       <hr class="my-3">
       <div class="d-flex justify-content-between align-items-baseline mt-2">
         <div class="text-end font-monospace">
-          <div class="tw-text-gray-400">{% translate 'final total' %}</div>
+          <div class="tw:text-gray-400">{% translate 'final total' %}</div>
         </div>
         <div class="dotted-line flex-grow-1"></div>
         <div class="text-end font-monospace">
@@ -175,7 +175,7 @@
         </div>
       </div>
       {% if currency.exchanged and currency.exchanged.total_final %}
-        <div class="text-end font-monospace tw-text-gray-500">
+        <div class="text-end font-monospace tw:text-gray-500">
           <c-amount.display
               :amount="currency.exchanged.total_final"
               :prefix="currency.exchanged.currency.prefix"

app/templates/cotton/ui/deleted_transactions_action_bar.html

@@ -1,16 +1,16 @@
 {% load i18n %}
-<div class="tw-sticky tw-bottom-4 tw-left-0 tw-right-0 tw-z-50 tw-hidden mx-auto tw-w-fit" id="actions-bar"
+<div class="tw:sticky tw:bottom-4 tw:left-0 tw:right-0 tw:z-50 tw:hidden mx-auto tw:w-fit" id="actions-bar"
      _="on change from #transactions-list or htmx:afterSettle from window
         if #actions-bar then
             if no <input[type='checkbox']:checked/> in #transactions-list
               if #actions-bar
                 add .slide-in-bottom-reverse then settle
-                then add .tw-hidden to #actions-bar
+                then add .tw:hidden to #actions-bar
                 then remove .slide-in-bottom-reverse
               end
             else
               if #actions-bar
-                remove .tw-hidden from #actions-bar
+                remove .tw:hidden from #actions-bar
                 then trigger selected_transactions_updated
               end
             end
@@ -26,20 +26,20 @@
           </button>
           <ul class="dropdown-menu">
             <li>
-              <div class="dropdown-item px-3 tw-cursor-pointer"
+              <div class="dropdown-item px-3 tw:cursor-pointer"
                    _="on click set <#transactions-list input[type='checkbox']/>'s checked to true then call me.blur() then trigger change">
-                <i class="fa-regular fa-square-check tw-text-green-400 me-3"></i>{% translate 'Select All' %}
+                <i class="fa-regular fa-square-check tw:text-green-400 me-3"></i>{% translate 'Select All' %}
               </div>
             </li>
             <li>
-              <div class="dropdown-item px-3 tw-cursor-pointer"
+              <div class="dropdown-item px-3 tw:cursor-pointer"
                    _="on click set <#transactions-list input[type='checkbox']/>'s checked to false then call me.blur() then trigger change">
-                <i class="fa-regular fa-square tw-text-red-400 me-3"></i>{% translate 'Unselect All' %}
+                <i class="fa-regular fa-square tw:text-red-400 me-3"></i>{% translate 'Unselect All' %}
               </div>
             </li>
           </ul>
         </div>
-        <div class="vr tw-align-middle"></div>
+        <div class="vr tw:align-middle"></div>
         <button class="btn btn-secondary btn-sm"
                 hx-get="{% url 'transactions_bulk_undelete' %}"
                 hx-include=".transaction"
@@ -60,7 +60,7 @@
                 _="install prompt_swal">
           <i class="fa-solid fa-trash text-danger"></i>
         </button>
-        <div class="vr tw-align-middle"></div>
+        <div class="vr tw:align-middle"></div>
         <div class="btn-group"
              _="on selected_transactions_updated from #actions-bar
                   set realTotal to math.bignumber(0)
@@ -118,10 +118,10 @@
             <li>
               <div class="dropdown-item-text p-0">
                 <div>
-                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                  <div class="text-body-secondary tw:text-xs tw:font-medium px-3">
                     {% trans "Flat Total" %}
                   </div>
-                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                  <div class="dropdown-item px-3 tw:cursor-pointer"
                        id="calc-menu-flat-total"
                        _="on click
                             set original_value to my innerText
@@ -138,10 +138,10 @@
             <li>
               <div class="dropdown-item-text p-0">
                 <div>
-                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                  <div class="text-body-secondary tw:text-xs tw:font-medium px-3">
                     {% trans "Real Total" %}
                   </div>
-                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                  <div class="dropdown-item px-3 tw:cursor-pointer"
                        id="calc-menu-real-total"
                        _="on click
                             set original_value to my innerText
@@ -158,10 +158,10 @@
             <li>
               <div class="dropdown-item-text p-0">
                 <div>
-                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                  <div class="text-body-secondary tw:text-xs tw:font-medium px-3">
                     {% trans "Mean" %}
                   </div>
-                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                  <div class="dropdown-item px-3 tw:cursor-pointer"
                        id="calc-menu-mean"
                        _="on click
                             set original_value to my innerText
@@ -178,10 +178,10 @@
             <li>
               <div class="dropdown-item-text p-0">
                 <div>
-                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                  <div class="text-body-secondary tw:text-xs tw:font-medium px-3">
                     {% trans "Max" %}
                   </div>
-                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                  <div class="dropdown-item px-3 tw:cursor-pointer"
                        id="calc-menu-max"
                        _="on click
                             set original_value to my innerText
@@ -198,10 +198,10 @@
             <li>
               <div class="dropdown-item-text p-0">
                 <div>
-                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                  <div class="text-body-secondary tw:text-xs tw:font-medium px-3">
                     {% trans "Min" %}
                   </div>
-                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                  <div class="dropdown-item px-3 tw:cursor-pointer"
                        id="calc-menu-min"
                        _="on click
                             set original_value to my innerText
@@ -218,10 +218,10 @@
             <li>
               <div class="dropdown-item-text p-0">
                 <div>
-                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                  <div class="text-body-secondary tw:text-xs tw:font-medium px-3">
                     {% trans "Count" %}
                   </div>
-                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                  <div class="dropdown-item px-3 tw:cursor-pointer"
                        id="calc-menu-count"
                        _="on click
                             set original_value to my innerText

app/templates/cotton/ui/help_icon.html

@@ -1,6 +1,6 @@
 {% spaceless %}
 {% load i18n %}
-<span class="tw-text-xs text-white-50 mx-1"
+<span class="tw:text-xs text-white-50 mx-1"
       data-bs-toggle="tooltip"
       data-bs-title="{{ content }}">
   <i class="{% if not icon %}fa-solid fa-circle-question{% else %}{{ icon }}{% endif %} fa-fw"></i>

app/templates/cotton/ui/info_card.html

@@ -1,9 +1,9 @@
-<div class="card tw-relative h-100 shadow">
-  <div class="tw-absolute tw-h-8 tw-w-8 tw-right-2 tw-top-2 tw-bg-{{ color }}-300 tw-text-{{ color }}-800 text-center align-items-center d-flex justify-content-center rounded-2">
+<div class="card tw:relative h-100 shadow">
+  <div class="tw:absolute tw:h-8 tw:w-8 tw:right-2 tw:top-2 tw:bg-{{ color }}-300 tw:text-{{ color }}-800 text-center align-items-center d-flex justify-content-center rounded-2">
     {% if icon %}<i class="{{ icon }}"></i>{% else %}<span class="fw-bold">{{ title.0 }}</span>{% endif %}
   </div>
   <div class="card-body">
-    <h5 class="tw-text-{{ color }}-400 fw-bold tw-mr-[50px]" {{ attrs }}>{{ title }}{% if help_text %}<c-ui.help-icon :content="help_text" icon=""></c-ui.help-icon>{% endif %}</h5>
+    <h5 class="tw:text-{{ color }}-400 fw-bold tw:mr-[50px]" {{ attrs }}>{{ title }}{% if help_text %}<c-ui.help-icon :content="help_text" icon=""></c-ui.help-icon>{% endif %}</h5>
     {{ slot }}
   </div>
 </div>

app/templates/cotton/ui/percentage_distribution.html

@@ -1,28 +1,28 @@
 {% load i18n %}
 <div class="progress-stacked">
   <div class="progress position-relative" role="progressbar" aria-label="{% trans 'Projected Income' %} ({{ percentage.percentages.income_projected|floatformat:2 }}%)" aria-valuenow="{{ percentage.percentages.expense_projected|floatformat:0 }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ percentage.percentages.income_projected|floatformat:"2u" }}%">
-    <div class="progress-bar progress-bar-striped !tw-bg-green-300"
+    <div class="progress-bar progress-bar-striped tw:bg-green-300!"
          data-bs-toggle="tooltip"
          data-bs-placement="top"
          title="{% trans 'Projected Income' %} ({{ percentage.percentages.income_projected|floatformat:2 }}%)">
     </div>
   </div>
   <div class="progress position-relative" role="progressbar" aria-label="{% trans 'Current Income' %} ({{ percentage.percentages.income_current|floatformat:2 }}%)" aria-valuenow="{{ percentage.percentages.expense_projected|floatformat:0 }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ percentage.percentages.income_current|floatformat:"2u" }}%">
-    <div class="progress-bar !tw-bg-green-400"
+    <div class="progress-bar tw:bg-green-400!"
          data-bs-toggle="tooltip"
          data-bs-placement="top"
          title="{% trans 'Current Income' %} ({{ p.percentages.income_current|floatformat:2 }}%)">
     </div>
   </div>
   <div class="progress position-relative" role="progressbar" aria-label="{% trans 'Projected Expenses' %} ({{ percentage.percentages.expense_projected|floatformat:2 }}%)" aria-valuenow="{{ percentage.percentages.expense_projected|floatformat:0 }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ percentage.percentages.expense_projected|floatformat:"2u" }}%">
-    <div class="progress-bar progress-bar-striped !tw-bg-red-300"
+    <div class="progress-bar progress-bar-striped tw:bg-red-300!"
          data-bs-toggle="tooltip"
          data-bs-placement="top"
          title="{% trans 'Projected Expenses' %} ({{ percentage.percentages.expense_projected|floatformat:2 }}%)">
     </div>
   </div>
   <div class="progress position-relative" role="progressbar" aria-label="{% trans 'Current Expenses' %} ({{ percentage.percentages.expense_current|floatformat:2 }}%)" aria-valuenow="{{ percentage.percentages.expense_projected|floatformat:0 }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ percentage.percentages.expense_current|floatformat:"2u" }}%">
-    <div class="progress-bar !tw-bg-red-400"
+    <div class="progress-bar tw:bg-red-400!"
          data-bs-toggle="tooltip"
          data-bs-placement="top"
          title="{% trans 'Current Expenses' %} ({{ percentage.percentages.expense_current|floatformat:2 }}%)">

app/templates/cotton/ui/transactions_action_bar.html

@@ -1,16 +1,16 @@
 {% load i18n %}
-<div class="tw-sticky tw-bottom-4 tw-left-0 tw-right-0 tw-z-50 tw-hidden mx-auto tw-w-fit" id="actions-bar"
+<div class="tw:sticky tw:bottom-4 tw:left-0 tw:right-0 tw:z-50 tw:hidden mx-auto tw:w-fit" id="actions-bar"
      _="on change from #transactions-list or htmx:afterSettle from window
         if #actions-bar then
             if no <input[type='checkbox']:checked/> in #transactions-list
               if #actions-bar
                 add .slide-in-bottom-reverse then settle
-                then add .tw-hidden to #actions-bar
+                then add .tw:hidden to #actions-bar
                 then remove .slide-in-bottom-reverse
               end
             else
               if #actions-bar
-                remove .tw-hidden from #actions-bar
+                remove .tw:hidden from #actions-bar
                 then trigger selected_transactions_updated
               end
             end
@@ -26,20 +26,20 @@
           </button>
           <ul class="dropdown-menu">
             <li>
-              <div class="dropdown-item px-3 tw-cursor-pointer"
+              <div class="dropdown-item px-3 tw:cursor-pointer"
                    _="on click set <#transactions-list .transaction:not([style*='display: none']) input[type='checkbox']/>'s checked to true then call me.blur() then trigger change">
-                <i class="fa-regular fa-square-check tw-text-green-400 me-3"></i>{% translate 'Select All' %}
+                <i class="fa-regular fa-square-check tw:text-green-400 me-3"></i>{% translate 'Select All' %}
               </div>
             </li>
             <li>
-              <div class="dropdown-item px-3 tw-cursor-pointer"
+              <div class="dropdown-item px-3 tw:cursor-pointer"
                    _="on click set <#transactions-list input[type='checkbox']/>'s checked to false then call me.blur() then trigger change">
-                <i class="fa-regular fa-square tw-text-red-400 me-3"></i>{% translate 'Unselect All' %}
+                <i class="fa-regular fa-square tw:text-red-400 me-3"></i>{% translate 'Unselect All' %}
               </div>
             </li>
           </ul>
         </div>
-        <div class="vr tw-align-middle"></div>
+        <div class="vr tw:align-middle"></div>
         <div class="btn-group">
           <button class="btn btn-secondary btn-sm"
                   hx-get="{% url 'transactions_bulk_edit' %}"
@@ -56,17 +56,17 @@
 
           <ul class="dropdown-menu">
             <li>
-              <div class="dropdown-item px-3 tw-cursor-pointer"
+              <div class="dropdown-item px-3 tw:cursor-pointer"
                    hx-get="{% url 'transactions_bulk_unpay' %}"
                    hx-include=".transaction">
-                <i class="fa-regular fa-circle tw-text-red-400 fa-fw me-3"></i>{% translate 'Mark as unpaid' %}
+                <i class="fa-regular fa-circle tw:text-red-400 fa-fw me-3"></i>{% translate 'Mark as unpaid' %}
               </div>
             </li>
             <li>
-              <div class="dropdown-item px-3 tw-cursor-pointer"
+              <div class="dropdown-item px-3 tw:cursor-pointer"
                    hx-get="{% url 'transactions_bulk_pay' %}"
                    hx-include=".transaction">
-                <i class="fa-regular fa-circle-check tw-text-green-400 fa-fw me-3"></i>{% translate 'Mark as paid' %}
+                <i class="fa-regular fa-circle-check tw:text-green-400 fa-fw me-3"></i>{% translate 'Mark as paid' %}
               </div>
             </li>
           </ul>
@@ -91,7 +91,7 @@
                 _="install prompt_swal">
           <i class="fa-solid fa-trash text-danger"></i>
         </button>
-        <div class="vr tw-align-middle"></div>
+        <div class="vr tw:align-middle"></div>
         <div class="btn-group"
              _="on selected_transactions_updated from #actions-bar
                   set realTotal to math.bignumber(0)
@@ -149,10 +149,10 @@
             <li>
               <div class="dropdown-item-text p-0">
                 <div>
-                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                  <div class="text-body-secondary tw:text-xs tw:font-medium px-3">
                     {% trans "Flat Total" %}
                   </div>
-                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                  <div class="dropdown-item px-3 tw:cursor-pointer"
                        id="calc-menu-flat-total"
                        _="on click
                             set original_value to my innerText
@@ -169,10 +169,10 @@
             <li>
               <div class="dropdown-item-text p-0">
                 <div>
-                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                  <div class="text-body-secondary tw:text-xs tw:font-medium px-3">
                     {% trans "Real Total" %}
                   </div>
-                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                  <div class="dropdown-item px-3 tw:cursor-pointer"
                        id="calc-menu-real-total"
                        _="on click
                             set original_value to my innerText
@@ -189,10 +189,10 @@
             <li>
               <div class="dropdown-item-text p-0">
                 <div>
-                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                  <div class="text-body-secondary tw:text-xs tw:font-medium px-3">
                     {% trans "Mean" %}
                   </div>
-                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                  <div class="dropdown-item px-3 tw:cursor-pointer"
                        id="calc-menu-mean"
                        _="on click
                             set original_value to my innerText
@@ -209,10 +209,10 @@
             <li>
               <div class="dropdown-item-text p-0">
                 <div>
-                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                  <div class="text-body-secondary tw:text-xs tw:font-medium px-3">
                     {% trans "Max" %}
                   </div>
-                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                  <div class="dropdown-item px-3 tw:cursor-pointer"
                        id="calc-menu-max"
                        _="on click
                             set original_value to my innerText
@@ -229,10 +229,10 @@
             <li>
               <div class="dropdown-item-text p-0">
                 <div>
-                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                  <div class="text-body-secondary tw:text-xs tw:font-medium px-3">
                     {% trans "Min" %}
                   </div>
-                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                  <div class="dropdown-item px-3 tw:cursor-pointer"
                        id="calc-menu-min"
                        _="on click
                             set original_value to my innerText
@@ -249,10 +249,10 @@
             <li>
               <div class="dropdown-item-text p-0">
                 <div>
-                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                  <div class="text-body-secondary tw:text-xs tw:font-medium px-3">
                     {% trans "Count" %}
                   </div>
-                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                  <div class="dropdown-item px-3 tw:cursor-pointer"
                        id="calc-menu-count"
                        _="on click
                             set original_value to my innerText

app/templates/cotton/ui/transactions_fab.html

@@ -0,0 +1,60 @@
+{% load i18n %}
+<c-components.fab>
+  <c-components.fab_menu_button
+            color="success"
+            hx_target="#generic-offcanvas"
+            hx_trigger="click, add_income from:window"
+            hx_vals='{"year": {{ year }}, {% if month %}"month": {{ month }},{% endif %} "type": "IN"}'
+            url="{% url 'transaction_add' %}"
+            icon="fa-solid fa-arrow-right-to-bracket"
+            title="{% translate "Income" %}"></c-components.fab_menu_button>
+
+  <c-components.fab_menu_button
+            color="danger"
+            hx_target="#generic-offcanvas"
+            hx_trigger="click, add_income from:window"
+            hx_vals='{"year": {{ year }}, {% if month %}"month": {{ month }},{% endif %} "type": "EX"}'
+            url="{% url 'transaction_add' %}"
+            icon="fa-solid fa-arrow-right-from-bracket"
+            title="{% translate "Expense" %}"></c-components.fab_menu_button>
+
+  <c-components.fab_menu_button
+            color="warning"
+            hx_target="#generic-offcanvas"
+            hx_trigger="click, installment from:window"
+            url="{% url 'installment_plan_add' %}"
+            icon="fa-solid fa-divide"
+            title="{% translate "Installment" %}"></c-components.fab_menu_button>
+
+  <c-components.fab_menu_button
+            color="warning"
+            hx_target="#generic-offcanvas"
+            hx_trigger="click, recurring from:window"
+            url="{% url 'recurring_transaction_add' %}"
+            icon="fa-solid fa-repeat"
+            title="{% translate "Recurring" %}"></c-components.fab_menu_button>
+
+  <c-components.fab_menu_button
+            color="info"
+            hx_target="#generic-offcanvas"
+            hx_trigger="click, transfer from:window"
+            hx_vals='{"year": {{ year }} {% if month %}, "month": {{ month }}{% endif %}}'
+            url="{% url 'transactions_transfer' %}"
+            icon="fa-solid fa-money-bill-transfer"
+            title="{% translate "Transfer" %}"></c-components.fab_menu_button>
+
+  <c-components.fab_menu_button
+            color="info"
+            hx_target="#generic-offcanvas"
+            hx_trigger="click, balance from:window"
+            url="{% url 'account_reconciliation' %}"
+            icon="fa-solid fa-scale-balanced"
+            title="{% translate "Balance" %}"></c-components.fab_menu_button>
+    <c-components.fab_menu_button
+            color="secondary"
+            hx_target="#generic-offcanvas"
+            hx_trigger="click, quick_transaction from:window"
+            url="{% url 'quick_transactions_create_menu' %}"
+            icon="fa-solid fa-person-running"
+            title="{% translate "Quick Transaction" %}"></c-components.fab_menu_button>
+</c-components.fab>

app/templates/currencies/fragments/list.html

@@ -1,9 +1,9 @@
 {% load i18n %}
 <div class="container px-md-3 py-3 column-gap-5">
-  <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+  <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
     {% spaceless %}
     <div>{% translate 'Currencies' %}<span>
-      <a class="text-decoration-none tw-text-2xl p-1 category-action"
+      <a class="text-decoration-none tw:text-2xl p-1 category-action"
                 role="button"
                 data-bs-toggle="tooltip"
                 data-bs-title="{% translate "Add" %}"

app/templates/dca/fragments/strategy/details.html

@@ -2,10 +2,10 @@
 {% load i18n %}
 <div class="container-fluid px-md-3 py-3 column-gap-5">
   <div class="d-lg-flex justify-content-between mb-3 w-100">
-    <div class="tw-text-3xl fw-bold font-monospace d-flex align-items-center">
+    <div class="tw:text-3xl fw-bold font-monospace d-flex align-items-center">
       {{ strategy.name }}
     </div>
-    <div class="tw-text-sm text-lg-end mt-2 mt-lg-0">
+    <div class="tw:text-sm text-lg-end mt-2 mt-lg-0">
       <div class="mb-2">
         <span class="badge rounded-pill text-bg-secondary">{{ strategy.payment_currency.name }}</span> x <span class="badge rounded-pill text-bg-secondary">{{ strategy.target_currency.name }}</span>
       </div>
@@ -19,7 +19,7 @@
            • {{ strategy.current_price.1|date:"SHORT_DATETIME_FORMAT" }}
           </c-amount.display>
           {% else %}
-          <div class="tw-text-red-400">{% trans "No exchange rate available" %}</div>
+          <div class="tw:text-red-400">{% trans "No exchange rate available" %}</div>
           {% endif %}
       </div>
     </div>
@@ -30,7 +30,7 @@
       <div class="card">
         <div class="card-body">
           {% spaceless %}
-            <div class="card-title tw-text-xl">{% trans "Entries" %}<span>
+            <div class="card-title tw:text-xl">{% trans "Entries" %}<span>
                 <a class="text-decoration-none p-1 category-action"
                    role="button"
                    data-bs-toggle="tooltip"
@@ -190,7 +190,7 @@
             <div class="card-body">
               <h5 class="card-title">{% trans "Total P/L" %}</h5>
               <div
-                  class="card-text {% if strategy.total_profit_loss >= 0 %}tw-text-green-400{% else %}tw-text-red-400{% endif %}">
+                  class="card-text {% if strategy.total_profit_loss >= 0 %}tw:text-green-400{% else %}tw:text-red-400{% endif %}">
                 <c-amount.display
                     :amount="strategy.total_profit_loss"
                     :prefix="strategy.payment_currency.prefix"
@@ -206,7 +206,7 @@
             <div class="card-body">
               <h5 class="card-title">{% trans "Total % P/L" %}</h5>
               <div
-                  class="card-text {% if strategy.total_profit_loss >= 0 %}tw-text-green-400{% else %}tw-text-red-400{% endif %}">
+                  class="card-text {% if strategy.total_profit_loss >= 0 %}tw:text-green-400{% else %}tw:text-red-400{% endif %}">
                 {{ strategy.total_profit_loss_percentage|floatformat:2 }}%
               </div>
             </div>
@@ -451,7 +451,7 @@
           <div class="card">
             <div class="card-body">
               <h5 class="card-title">{% trans "Investment Frequency" %}</h5>
-              <p class="card-text tw-text-gray-400">
+              <p class="card-text tw:text-gray-400">
                 {% trans "The straighter the blue line, the more consistent your DCA strategy is." %}
               </p>
               <canvas id="frequencyChart"></canvas>

app/templates/dca/fragments/strategy/list.html

@@ -1,9 +1,9 @@
 {% load i18n %}
 <div class="container px-md-3 py-3 column-gap-5">
-  <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+  <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
     {% spaceless %}
       <div>{% translate 'Dollar Cost Average Strategies' %}<span>
-      <a class="text-decoration-none tw-text-2xl p-1 category-action"
+      <a class="text-decoration-none tw:text-2xl p-1 category-action"
          role="button"
          data-bs-toggle="tooltip"
          data-bs-title="{% translate "Add" %}"
@@ -25,12 +25,12 @@
           <a href="{% url 'dca_strategy_detail_index' strategy_id=strategy.id %}" hx-boost="true"
              class="text-decoration-none card-body">
             <div class="">
-              <div class="card-title tw-text-xl">{{ strategy.name }}</div>
-              <div class="card-text tw-text-gray-400">{{ strategy.notes }}</div>
+              <div class="card-title tw:text-xl">{{ strategy.name }}</div>
+              <div class="card-text tw:text-gray-400">{{ strategy.notes }}</div>
             </div>
           </a>
           <div class="card-footer text-end">
-            <a class="text-decoration-none tw-text-gray-400 p-1"
+            <a class="text-decoration-none tw:text-gray-400 p-1"
                role="button"
                data-bs-toggle="tooltip"
                data-bs-title="{% translate "Edit" %}"

app/templates/entities/fragments/list.html

@@ -1,9 +1,9 @@
 {% load i18n %}
 <div class="container px-md-3 py-3 column-gap-5">
-  <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+  <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
     {% spaceless %}
     <div>{% translate 'Entities' %}<span>
-      <a class="text-decoration-none tw-text-2xl p-1 category-action"
+      <a class="text-decoration-none tw:text-2xl p-1 category-action"
                 role="button"
                 data-bs-toggle="tooltip"
                 data-bs-title="{% translate "Add" %}"

app/templates/exchange_rates/fragments/list.html

@@ -1,10 +1,10 @@
 {% load currency_display %}
 {% load i18n %}
 <div class="container px-md-3 py-3 column-gap-5">
-  <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+  <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
     {% spaceless %}
       <div>{% translate 'Exchange Rates' %}<span>
-      <a class="text-decoration-none tw-text-2xl p-1 category-action"
+      <a class="text-decoration-none tw:text-2xl p-1 category-action"
          role="button"
          data-bs-toggle="tooltip"
          data-bs-title="{% translate "Add" %}"

app/templates/exchange_rates/fragments/table.html

@@ -58,7 +58,7 @@
     <nav aria-label="{% translate 'Page navigation' %}">
     <ul class="pagination justify-content-center mt-5">
       <li class="page-item">
-        <a class="page-link tw-cursor-pointer {% if not page_obj.has_previous %}disabled{% endif %}"
+        <a class="page-link tw:cursor-pointer {% if not page_obj.has_previous %}disabled{% endif %}"
            hx-get="{% if page_obj.has_previous %}{% url 'exchange_rates_list_pair' %}{% endif %}"
            hx-vals='{"page": 1, "from": "{{ from_currency|default_if_none:"" }}", "to": "{{ to_currency|default_if_none:"" }}"}'
            hx-include="#filter, #order"
@@ -79,13 +79,13 @@
               {% if page_number <= page_obj.number|add:3 and page_number >= page_obj.number|add:-3 %}
                   {% if page_obj.number == page_number %}
                       <li class="page-item active">
-                          <a class="page-link tw-cursor-pointer">
+                          <a class="page-link tw:cursor-pointer">
                               {{ page_number }}
                           </a>
                       </li>
                   {% else %}
                       <li class="page-item">
-                          <a class="page-link tw-cursor-pointer"
+                          <a class="page-link tw:cursor-pointer"
                              hx-get="{% url 'exchange_rates_list_pair' %}"
                              hx-vals='{"page": {{ page_number }}, "from": "{{ from_currency|default_if_none:"" }}", "to": "{{ to_currency|default_if_none:"" }}"}'
                              hx-target="#exchange-rates-table"
@@ -104,7 +104,7 @@
           </a>
         </li>
         <li class="page-item">
-          <a class="page-link tw-cursor-pointer"
+          <a class="page-link tw:cursor-pointer"
              hx-get="{% url 'exchange_rates_list_pair' %}" hx-target="#exchange-rates-table"
              hx-vals='{"page": {{ page_obj.paginator.num_pages }}, "from": "{{ from_currency|default_if_none:"" }}", "to": "{{ to_currency|default_if_none:"" }}"}'
              hx-include="#filter, #order"
@@ -115,7 +115,7 @@
         </li>
       {% endif %}
       <li class="page-item">
-        <a class="page-link {% if not page_obj.has_next %}disabled{% endif %} tw-cursor-pointer"
+        <a class="page-link {% if not page_obj.has_next %}disabled{% endif %} tw:cursor-pointer"
            hx-get="{% if page_obj.has_next %}{% url 'exchange_rates_list_pair' %}{% endif %}"
            hx-vals='{"page": {{ page_obj.paginator.num_pages }}, "from": "{{ from_currency|default_if_none:"" }}", "to": "{{ to_currency|default_if_none:"" }}"}'
            hx-include="#filter, #order"

app/templates/exchange_rates_services/fragments/list.html

@@ -1,10 +1,10 @@
 {% load currency_display %}
 {% load i18n %}
 <div class="container px-md-3 py-3 column-gap-5">
-  <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+  <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
     {% spaceless %}
       <div>{% translate 'Automatic Exchange Rates' %}<span>
-      <a class="text-decoration-none tw-text-2xl p-1 category-action"
+      <a class="text-decoration-none tw:text-2xl p-1 category-action"
          role="button"
          data-bs-toggle="tooltip"
          data-bs-title="{% translate "Add" %}"

app/templates/exchange_rates_services/fragments/table.html

@@ -58,7 +58,7 @@
     <nav aria-label="{% translate 'Page navigation' %}">
     <ul class="pagination justify-content-center mt-5">
       <li class="page-item">
-        <a class="page-link tw-cursor-pointer {% if not page_obj.has_previous %}disabled{% endif %}"
+        <a class="page-link tw:cursor-pointer {% if not page_obj.has_previous %}disabled{% endif %}"
            hx-get="{% if page_obj.has_previous %}{% url 'exchange_rates_list_pair' %}{% endif %}"
            hx-vals='{"page": 1, "from": "{{ from_currency|default_if_none:"" }}", "to": "{{ to_currency|default_if_none:"" }}"}'
            hx-include="#filter, #order"
@@ -79,13 +79,13 @@
               {% if page_number <= page_obj.number|add:3 and page_number >= page_obj.number|add:-3 %}
                   {% if page_obj.number == page_number %}
                       <li class="page-item active">
-                          <a class="page-link tw-cursor-pointer">
+                          <a class="page-link tw:cursor-pointer">
                               {{ page_number }}
                           </a>
                       </li>
                   {% else %}
                       <li class="page-item">
-                          <a class="page-link tw-cursor-pointer"
+                          <a class="page-link tw:cursor-pointer"
                              hx-get="{% url 'exchange_rates_list_pair' %}"
                              hx-vals='{"page": {{ page_number }}, "from": "{{ from_currency|default_if_none:"" }}", "to": "{{ to_currency|default_if_none:"" }}"}'
                              hx-target="#exchange-rates-table"
@@ -104,7 +104,7 @@
           </a>
         </li>
         <li class="page-item">
-          <a class="page-link tw-cursor-pointer"
+          <a class="page-link tw:cursor-pointer"
              hx-get="{% url 'exchange_rates_list_pair' %}" hx-target="#exchange-rates-table"
              hx-vals='{"page": {{ page_obj.paginator.num_pages }}, "from": "{{ from_currency|default_if_none:"" }}", "to": "{{ to_currency|default_if_none:"" }}"}'
              hx-include="#filter, #order"
@@ -115,7 +115,7 @@
         </li>
       {% endif %}
       <li class="page-item">
-        <a class="page-link {% if not page_obj.has_next %}disabled{% endif %} tw-cursor-pointer"
+        <a class="page-link {% if not page_obj.has_next %}disabled{% endif %} tw:cursor-pointer"
            hx-get="{% if page_obj.has_next %}{% url 'exchange_rates_list_pair' %}{% endif %}"
            hx-vals='{"page": {{ page_obj.paginator.num_pages }}, "from": "{{ from_currency|default_if_none:"" }}", "to": "{{ to_currency|default_if_none:"" }}"}'
            hx-include="#filter, #order"

app/templates/import_app/fragments/profiles/add.html

@@ -8,7 +8,7 @@
 {% block body %}
 {% if message %}
 <div class="alert alert-info" role="alert" id="msg" hx-preserve="true">
-  <h6 class="alert-heading tw-italic tw-font-bold">{% trans 'A message from the author' %}</h6>
+  <h6 class="alert-heading tw:italic tw:font-bold">{% trans 'A message from the author' %}</h6>
   <hr>
   <p class="mb-0">{{ message|linebreaksbr }}</p>
 </div>

app/templates/import_app/fragments/profiles/list.html

@@ -1,11 +1,11 @@
 {% load i18n %}
 <div class="container px-md-3 py-3 column-gap-5">
-  <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+  <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
     {% spaceless %}
     <div>{% translate 'Import Profiles' %}<span>
       <span class="dropdown" data-bs-toggle="tooltip"
                 data-bs-title="{% translate "Add" %}">
-        <a class="text-decoration-none tw-text-2xl p-1" role="button"
+        <a class="text-decoration-none tw:text-2xl p-1" role="button"
                 data-bs-toggle="dropdown"
                 data-bs-title="{% translate "Add" %}" aria-expanded="false">
           <i class="fa-solid fa-circle-plus fa-fw"></i>

app/templates/import_app/fragments/runs/list.html

@@ -15,20 +15,20 @@
     {% for run in runs %}
       <div class="col">
         <div class="card">
-          <div class="card-header tw-text-sm {% if run.status == run.Status.QUEUED %}tw-text-white{% elif run.status == run.Status.PROCESSING %}text-warning{% elif run.status == run.Status.FINISHED %}text-success{% else %}text-danger{% endif %}">
+          <div class="card-header tw:text-sm {% if run.status == run.Status.QUEUED %}text-body{% elif run.status == run.Status.PROCESSING %}text-warning{% elif run.status == run.Status.FINISHED %}text-success{% else %}text-danger{% endif %}">
             <span><i class="fa-solid {% if run.status == run.Status.QUEUED %}fa-hourglass-half{% elif run.status == run.Status.PROCESSING %}fa-spinner{% elif run.status == run.Status.FINISHED %}fa-check{% else %}fa-xmark{% endif %} fa-fw me-2"></i>{{ run.get_status_display }}</span>
           </div>
           <div class="card-body">
-            <h5 class="card-title"><i class="fa-solid fa-hashtag me-1 tw-text-xs tw-text-gray-400"></i>{{ run.id }}<span class="tw-text-xs tw-text-gray-400 ms-1">({{ run.file_name }})</span></h5>
+            <h5 class="card-title"><i class="fa-solid fa-hashtag me-1 tw:text-xs tw:text-gray-400"></i>{{ run.id }}<span class="tw:text-xs tw:text-gray-400 ms-1">({{ run.file_name }})</span></h5>
             <hr>
             <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 w-100 g-4">
               <div class="col">
                 <div class="d-flex flex-row">
                   <div class="d-flex flex-column">
-                    <div class="text-body-secondary tw-text-xs tw-font-medium">
+                    <div class="text-body-secondary tw:text-xs tw:font-medium">
                       {% trans 'Total Items' %}
                     </div>
-                    <div class="tw-text-sm">
+                    <div class="tw:text-sm">
                       {{ run.total_rows }}
                     </div>
                   </div>
@@ -38,10 +38,10 @@
               <div class="col">
                 <div class="d-flex flex-row">
                   <div class="d-flex flex-column">
-                    <div class="text-body-secondary tw-text-xs tw-font-medium">
+                    <div class="text-body-secondary tw:text-xs tw:font-medium">
                       {% trans 'Processed Items' %}
                     </div>
-                    <div class="tw-text-sm">
+                    <div class="tw:text-sm">
                       {{ run.processed_rows }}
                     </div>
                   </div>
@@ -51,10 +51,10 @@
               <div class="col">
                 <div class="d-flex flex-row">
                   <div class="d-flex flex-column">
-                    <div class="text-body-secondary tw-text-xs tw-font-medium">
+                    <div class="text-body-secondary tw:text-xs tw:font-medium">
                       {% trans 'Skipped Items' %}
                     </div>
-                    <div class="tw-text-sm">
+                    <div class="tw:text-sm">
                       {{ run.skipped_rows }}
                     </div>
                   </div>
@@ -64,10 +64,10 @@
               <div class="col">
                 <div class="d-flex flex-row">
                   <div class="d-flex flex-column">
-                    <div class="text-body-secondary tw-text-xs tw-font-medium">
+                    <div class="text-body-secondary tw:text-xs tw:font-medium">
                       {% trans 'Failed Items' %}
                     </div>
-                    <div class="tw-text-sm">
+                    <div class="tw:text-sm">
                       {{ run.failed_rows }}
                     </div>
                   </div>
@@ -77,10 +77,10 @@
               <div class="col">
                 <div class="d-flex flex-row">
                   <div class="d-flex flex-column">
-                    <div class="text-body-secondary tw-text-xs tw-font-medium">
+                    <div class="text-body-secondary tw:text-xs tw:font-medium">
                       {% trans 'Successful Items' %}
                     </div>
-                    <div class="tw-text-sm">
+                    <div class="tw:text-sm">
                       {{ run.successful_rows }}
                     </div>
                   </div>

app/templates/import_app/fragments/runs/log.html

@@ -5,7 +5,7 @@
 {% block title %}{% translate 'Logs for' %} #{{ run.id }}{% endblock %}
 
 {% block body %}
-<div class="card tw-max-h-full tw-overflow-auto">
+<div class="card tw:max-h-full tw:overflow-auto">
   <div class="card-body">
     {{ run.logs|linebreaks }}
   </div>

app/templates/includes/navbar.html

@@ -12,7 +12,7 @@
       <span class="navbar-toggler-icon"></span>
     </button>
     <div class="collapse navbar-collapse" id="navbarContent">
-      <ul class="navbar-nav me-auto mb-2 mb-lg-0 nav-underline" hx-push-url="true">
+      <ul class="navbar-nav me-auto mb-3 mb-lg-0 nav-underline" hx-push-url="true">
         <li class="nav-item dropdown">
           <a class="nav-link dropdown-toggle {% active_link views='monthly_overview||yearly_overview_currency||yearly_overview_account||calendar' %}"
              href="#"
@@ -50,7 +50,7 @@
           <a class="nav-link {% active_link views='insights_index' %}" href="{% url 'insights_index' %}">{% trans 'Insights' %}</a>
         </li>
         <li class="nav-item dropdown">
-          <a class="nav-link dropdown-toggle {% active_link views='installment_plans_index||recurring_trasanctions_index||transactions_all_index||transactions_trash_index' %}"
+          <a class="nav-link dropdown-toggle {% active_link views='installment_plans_index||quick_transactions_index||recurring_trasanctions_index||transactions_all_index||transactions_trash_index' %}"
              href="#" role="button"
              data-bs-toggle="dropdown"
              aria-expanded="false">
@@ -68,6 +68,8 @@
             {% endif %}
             <hr class="dropdown-divider">
             </li>
+            <li><a class="dropdown-item {% active_link views='quick_transactions_index' %}"
+                   href="{% url 'quick_transactions_index' %}">{% translate 'Quick Transactions' %}</a></li>
             <li><a class="dropdown-item {% active_link views='installment_plans_index' %}"
                    href="{% url 'installment_plans_index' %}">{% translate 'Installment Plans' %}</a></li>
             <li><a class="dropdown-item {% active_link views='recurring_trasanctions_index' %}"
@@ -159,16 +161,16 @@
           </ul>
         </li>
       </ul>
-      <ul class="navbar-nav mt-3 mb-2 mb-lg-0 mt-lg-0">
-        <li class="nav-item text-center w-100">
-          <a class="nav-item tw-text-2xl tw-cursor-pointer me-lg-4"
+      <ul class="navbar-nav mb-2 mb-lg-0 gap-3">
+        <li class="nav-item">
+          <div class="nav-link tw:lg:text-2xl! tw:cursor-pointer"
              data-bs-toggle="tooltip" data-bs-placement="left" data-bs-title="{% trans "Calculator" %}"
              _="on click trigger show on #calculator">
             <i class="fa-solid fa-calculator"></i>
-          </a>
+            <span class="d-lg-none d-inline">{% trans "Calculator" %}</span>
+          </div>
         </li>
-        <li class="text-center w-100">{% include 'includes/navbar/user_menu.html' %}</li>
-
+        <li class="w-100">{% include 'includes/navbar/user_menu.html' %}</li>
       </ul>
     </div>
   </div>

app/templates/includes/navbar/user_menu.html

@@ -1,9 +1,10 @@
 {% load settings %}
 {% load i18n %}
 <div class="dropdown">
-  <a class="tw-text-2xl" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+  <div class="nav-link tw:lg:text-2xl! tw:cursor-pointer" type="button" data-bs-toggle="dropdown" aria-expanded="false">
     <i class="fa-solid fa-user"></i>
-  </a>
+    <span class="d-lg-none d-inline">{% trans "Profile" %}</span>
+  </div>
   <ul class="dropdown-menu dropdown-menu-start dropdown-menu-lg-end">
     <li class="dropdown-item-text">{{ user.email }}</li>
     <li><hr class="dropdown-divider"></li>

app/templates/includes/placeholders.html

@@ -1,14 +1,14 @@
 {# We use this to preload dynamically generated tailwind classes so the compiler can build them ahead of time #}
 
-<div class="tw-text-blue-800"></div>
-<div class="tw-text-yellow-800"></div>
-<div class="tw-text-red-800"></div>
-<div class="tw-text-green-800"></div>
-<div class="tw-text-blue-400"></div>
-<div class="tw-text-yellow-400"></div>
-<div class="tw-text-red-400"></div>
-<div class="tw-text-green-400"></div>
-<div class="tw-bg-blue-300"></div>
-<div class="tw-bg-yellow-300"></div>
-<div class="tw-bg-red-300"></div>
-<div class="tw-bg-green-300"></div>
+<div class="tw:text-blue-800"></div>
+<div class="tw:text-yellow-800"></div>
+<div class="tw:text-red-800"></div>
+<div class="tw:text-green-800"></div>
+<div class="tw:text-blue-400"></div>
+<div class="tw:text-yellow-400"></div>
+<div class="tw:text-red-400"></div>
+<div class="tw:text-green-400"></div>
+<div class="tw:bg-blue-300"></div>
+<div class="tw:bg-yellow-300"></div>
+<div class="tw:bg-red-300"></div>
+<div class="tw:bg-green-300"></div>

app/templates/includes/scripts/hyperscript/sounds.html

@@ -1,15 +1,19 @@
 <script type="text/hyperscript">
 on paid if body do not include #settings-mute-sound
   js
+    volume = JSON.parse(document.getElementById('volume').textContent) / 10
     paidSound.pause()
     paidSound.currentTime = 0
+    paidSound.volume = volume
     paidSound.play()
   end
 end
 on unpaid if body do not include #settings-mute-sound
   js
+    volume = JSON.parse(document.getElementById('volume').textContent) / 10
     unpaidSound.pause()
     unpaidSound.currentTime = 0
+    unpaidSound.volume = volume
     unpaidSound.play()
   end
 end

app/templates/includes/styles.html

@@ -1,4 +1,3 @@
 {% load webpack_loader %}
 
 {% stylesheet_pack 'style' %}
-{#{% stylesheet_pack 'select' %}#}

app/templates/includes/toasts.html

@@ -1,6 +1,5 @@
 <div id="toasts">
-  <div class="toast-container position-fixed bottom-0 end-0 p-3" hx-trigger="load, updated from:window, toasts from:window" hx-get="{% url 'toasts' %}" hx-swap="beforeend">
+  <div class="toast-container position-fixed bottom-0 start-50 translate-middle-x p-3" hx-trigger="load, updated from:window, toasts from:window" hx-get="{% url 'toasts' %}" hx-swap="beforeend">
 
   </div>
 </div>
-

app/templates/includes/tools/calculator.html

@@ -1,5 +1,5 @@
 {% load formats %}
-<div class="tw-hidden tw-w-[60vw] lg:tw-w-[30vw] xl:tw-w-[20vw] position-fixed shadow rounded-3 bg-body tw-border-gray-700 tw-border tw-border-solid tw-text-center tw-align-middle tw-z-[2000] tw-touch-none user-select-none"
+<div class="tw:hidden tw:w-[60vw] tw:lg:w-[30vw] tw:xl:w-[20vw] position-fixed shadow rounded-3 bg-body tw:border-gray-700 tw:border tw:border-solid tw:text-center tw:align-middle tw:z-[2000] tw:touch-none user-select-none"
      id="calculator"
      hx-preserve
      _="
@@ -13,8 +13,8 @@
           on focusin halt the event end -- this prevents bootstrap's static offcanvas from hijacking the focus from the input when open end
 
           on show or keyup[code is 'KeyC' and altKey is true] from body
-            if my.classList.contains('tw-hidden')
-              remove .tw-hidden from me
+            if my.classList.contains('tw:hidden')
+              remove .{'tw:hidden'} from me
               measure my width, height
               set xoff to (window.innerWidth/2) - (width/2)
               set yoff to (window.innerHeight/2) - (height)
@@ -23,7 +23,7 @@
               then call #calculator-input.focus()
             else
               add .scale-out-center to me then wait for animationend then remove .scale-out-center from me
-              add .tw-hidden to me
+              add .{'tw:hidden'} to me
             end
           end
 
@@ -48,7 +48,7 @@
           end">
 
       <div id="calculator-handle"
-           class="position-absolute bg-secondary rounded-top-2 tw-cursor-move d-flex align-items-center justify-content-center tw-top-[-20px] tw-left-[3px] tw-w-[2em] tw-h-[20px]">
+           class="position-absolute bg-secondary rounded-top-2 tw:cursor-move d-flex align-items-center justify-content-center tw:top-[-20px] tw:left-[3px] tw:w-[2em] tw:h-[20px]">
         <i class="fa-solid fa-grip"></i>
       </div>
 
@@ -73,31 +73,31 @@
                   end
                   then set localizedResult to it
                   set #calculator-result.innerText to localizedResult
-                  then remove .tw-hidden from #calculator-result-container
+                  then remove .{'tw:hidden'} from #calculator-result-container
                   then add .swing-in-top-fwd to #calculator-result-container
                   then settle
                   then remove .swing-in-top-fwd from #calculator-result-container
                 else
                   add .swing-out-top-bck to #calculator-result-container
                   then settle
-                  then add .tw-hidden to #calculator-result-container
+                  then add .{'tw:hidden'} to #calculator-result-container
                   then remove .swing-out-top-bck from #calculator-result-container
                 end
               catch e
                 add .swing-out-top-bck to #calculator-result-container
                 then settle
-                then add .tw-hidden to #calculator-result-container
+                then add .{'tw:hidden'} to #calculator-result-container
                 then remove .swing-out-top-bck from #calculator-result-container
               end"
              placeholder="2 + 2">
-      <div class="tw-hidden" id="calculator-result-container">
+      <div class="tw:hidden" id="calculator-result-container">
         <div class="d-flex flex-row p-2 justify-content-between">
-          <div class="tw-text-gray-400">=</div>
+          <div class="tw:text-gray-400">=</div>
           <div id="calculator-result" class="user-select-all"></div>
         </div>
       </div>
-      <div class="position-absolute tw-cursor-pointer top-0 start-100 translate-middle tw-p-0 text-bg-primary border border-light rounded-circle tw-flex tw-items-center tw-justify-center tw-w-5 tw-h-5"
+      <div class="position-absolute tw:cursor-pointer top-0 start-100 translate-middle tw:p-0 text-bg-primary border border-light rounded-circle tw:flex tw:items-center tw:justify-center tw:w-5 tw:h-5"
             _="on click trigger show on #calculator">
-        <i class="fa-solid fa-xmark tw-flex tw-items-center tw-justify-center tw-w-full tw-h-full"></i>
+        <i class="fa-solid fa-xmark tw:flex tw:items-center tw:justify-center tw:w-full tw:h-full"></i>
       </div>
     </div>

app/templates/insights/fragments/emergency_fund.html

@@ -12,17 +12,17 @@
                     data-bs-target="#flush-collapse-{{ id }}" aria-expanded="false"
                     aria-controls="flush-collapse-{{ id }}">
               <span>
-                <span class="tw-text-gray-300">{% trans "You've spent an average of" %}</span>
+                <span class="tw:text-gray-300">{% trans "You've spent an average of" %}</span>
                 <c-amount.display
                     :amount="data.average"
                     :prefix="data.currency.prefix"
                     :suffix="data.currency.suffix"
                     :decimal_places="data.currency.decimal_places"
-                    custom_class="tw-text-3xl"
+                    custom_class="tw:text-3xl"
                     divless></c-amount.display>
-                <span class="tw-text-gray-300">{% trans 'on the last 12 months, at this rate you could go by' %}</span>
-                <span class="tw-text-3xl">{{ data.months }}</span>
-                <span class="tw-text-gray-300">{% trans 'months without any income.' %}</span>
+                <span class="tw:text-gray-300">{% trans 'on the last 12 months, at this rate you could go by' %}</span>
+                <span class="tw:text-3xl">{{ data.months }}</span>
+                <span class="tw:text-gray-300">{% trans 'months without any income.' %}</span>
               </span>
             </button>
           </h2>
@@ -31,7 +31,7 @@
             <div class="accordion-body">
               <div class="d-flex justify-content-between align-items-baseline mt-2">
                 <div class="text-end font-monospace">
-                  <div class="tw-text-gray-400">{% translate 'average expenses' %}</div>
+                  <div class="tw:text-gray-400">{% translate 'average expenses' %}</div>
                 </div>
                 <div class="dotted-line flex-grow-1"></div>
                 <div class="text-end font-monospace">
@@ -45,7 +45,7 @@
               </div>
               <div class="d-flex justify-content-between align-items-baseline mt-2">
                 <div class="text-end font-monospace">
-                  <div class="tw-text-gray-400">{% translate 'liquid total' %}</div>
+                  <div class="tw:text-gray-400">{% translate 'liquid total' %}</div>
                 </div>
                 <div class="dotted-line flex-grow-1"></div>
                 <div class="text-end font-monospace">
@@ -59,7 +59,7 @@
               </div>
               <div class="d-flex justify-content-between align-items-baseline mt-2">
                 <div class="text-end font-monospace">
-                  <div class="tw-text-gray-400">{% translate 'months left' %}</div>
+                  <div class="tw:text-gray-400">{% translate 'months left' %}</div>
                 </div>
                 <div class="dotted-line flex-grow-1"></div>
                 <div class="text-end font-monospace">

app/templates/insights/fragments/sankey.html

@@ -7,7 +7,7 @@
   <div class="show-loading" hx-get="{% url 'insights_sankey_by_currency' %}" hx-trigger="updated from:window"
        hx-swap="outerHTML" hx-include="#picker-form, #picker-type">
 {% endif %}
-<div class="chart-container position-relative tw-min-h-[85vh] tw-max-h-[85vh] tw-h-full tw-w-full"
+<div class="chart-container position-relative tw:min-h-[85vh] tw:max-h-[85vh] tw:h-full tw:w-full"
      id="sankeyContainer"
      _="init call setupSankeyChart() end">
   <canvas id="sankeyChart"></canvas>

app/templates/insights/pages/index.html

@@ -8,27 +8,27 @@
   <div class="container-fluid">
     <div class="row my-3 h-100">
       <div class="col-lg-2 col-md-3 mb-3 mb-md-0">
-        <div class="position-sticky tw-top-3">
+        <div class="position-sticky tw:top-3">
           <div class="">
             <div class="mb-2 w-100 d-lg-inline-flex d-grid gap-2 flex-wrap justify-content-lg-center" role="group"
                  _="on change
                     set type to event.target.value
-                    add .tw-hidden to <#picker-form > div:not(.tw-hidden)/>
+                    add .tw:hidden to <#picker-form > div:not(.tw:hidden)/>
 
                     if type == 'month'
-                      remove .tw-hidden from #month-form
+                      remove .tw:hidden from #month-form
                     end
                     if type == 'year'
-                      remove .tw-hidden from #year-form
+                      remove .tw:hidden from #year-form
                     end
                     if type == 'month-range'
-                      remove .tw-hidden from #month-range-form
+                      remove .tw:hidden from #month-range-form
                     end
                     if type == 'year-range'
-                      remove .tw-hidden from #year-range-form
+                      remove .tw:hidden from #year-range-form
                     end
                     if type == 'date-range'
-                      remove .tw-hidden from #date-range-form
+                      remove .tw:hidden from #date-range-form
                     end
                     then trigger updated"
                  id="picker-type">
@@ -60,16 +60,16 @@
               <div id="month-form" class="">
                 {% crispy month_form %}
               </div>
-              <div id="year-form" class="tw-hidden">
+              <div id="year-form" class="tw:hidden">
                 {% crispy year_form %}
               </div>
-              <div id="month-range-form" class="tw-hidden">
+              <div id="month-range-form" class="tw:hidden">
                 {% crispy month_range_form %}
               </div>
-              <div id="year-range-form" class="tw-hidden">
+              <div id="year-range-form" class="tw:hidden">
                 {% crispy year_range_form %}
               </div>
-              <div id="date-range-form" class="tw-hidden">
+              <div id="date-range-form" class="tw:hidden">
                 {% crispy date_range_form %}
               </div>
             </form>

app/templates/installment_plans/fragments/list.html

@@ -1,9 +1,9 @@
 {% load i18n %}
 <div class="container px-md-3 py-3 column-gap-5">
-  <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+  <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
     {% spaceless %}
     <div>{% translate 'Installment Plans' %}<span>
-      <a class="text-decoration-none tw-text-2xl p-1 category-action"
+      <a class="text-decoration-none tw:text-2xl p-1 category-action"
                 role="button"
                 data-bs-toggle="tooltip"
                 data-bs-title="{% translate "Add" %}"

app/templates/installment_plans/fragments/table.html

@@ -64,10 +64,10 @@
             </div>
           </td>
           <td class="col">
-            <div class="{% if installment_plan.type == 'EX' %}tw-text-red-400{% else %}tw-text-green-400{% endif %}">
+            <div class="{% if installment_plan.type == 'EX' %}tw:text-red-400{% else %}tw:text-green-400{% endif %}">
               {{ installment_plan.description }}
             </div>
-            <div class="tw-text-sm tw-text-gray-400">{{ installment_plan.notes|linebreaksbr }}</div>
+            <div class="tw:text-sm tw:text-gray-400">{{ installment_plan.notes|linebreaksbr }}</div>
           </td>
         </tr>
         {% endfor %}

app/templates/mini_tools/currency_converter/currency_converter.html

@@ -11,7 +11,7 @@
   <div class="container px-md-3 py-3 column-gap-5"
        _="install init_tom_select
           install init_datepicker">
-    <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+    <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
       <div>{% translate 'Currency Converter' %}</div>
     </div>
     <div class="row">
@@ -27,7 +27,7 @@
         </div>
         <div>{{ form.from_currency|as_crispy_field }}</div>
       </div>
-      <div class="col text-primary tw-flex tw-items-center tw-justify-center my-3 my-lg-0">
+      <div class="col text-primary tw:flex tw:items-center tw:justify-center my-3 my-lg-0">
         <i class="fa-solid fa-equals"></i>
       </div>
       <div class="col-12 col-lg-5">
@@ -45,7 +45,7 @@
       </div>
     </div>
     <div class="row">
-      <div class="tw-cursor-pointer text-primary text-end"
+      <div class="tw:cursor-pointer text-primary text-end"
            _="on click
                 set from_value to #id_from_currency's value
                 set to_value to #id_to_currency's value
@@ -66,7 +66,7 @@
             {% for rate in data.rates.values %}
               <div class="d-flex justify-content-between align-items-baseline mt-2">
                 <div class="text-end font-monospace">
-                  <div class="tw-text-gray-400">
+                  <div class="tw:text-gray-400">
 {#                    <c-amount.display#}
 {#                        :amount="1"#}
 {#                        :prefix="data.prefix"#}
@@ -76,7 +76,7 @@
                 </div>
                 <div class="dotted-line flex-grow-1"></div>
                 {% if currency.income_projected != 0 %}
-                  <div class="text-end font-monospace tw-text-green-400">
+                  <div class="text-end font-monospace tw:text-green-400">
                     <c-amount.display
                         :amount="rate.rate"
                         :prefix="rate.prefix"

app/templates/mini_tools/unit_price_calculator.html

@@ -6,7 +6,7 @@
 
 {% block content %}
   <div class="container px-md-3 py-3 column-gap-5">
-    <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+    <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
       <div>{% translate 'Unit Price Calculator' %}</div>
     </div>
     <div class="card mb-3 d-none" id="card-placeholder">
@@ -36,7 +36,7 @@
           </div>
           <div class="col-lg">
             <label class="form-label">{% trans 'Unit price' %}</label>
-            <div class="unit-price tw-text-xl" data-amount="0">0</div>
+            <div class="unit-price tw:text-xl" data-amount="0">0</div>
           </div>
         </div>
       </div>
@@ -109,7 +109,7 @@
             </div>
             <div class="col-lg">
               <label class="form-label">{% trans 'Unit price' %}</label>
-              <div class="unit-price tw-text-xl" data-amount="0">0</div>
+              <div class="unit-price tw:text-xl" data-amount="0">0</div>
             </div>
           </div>
         </div>
@@ -134,7 +134,7 @@
             </div>
             <div class="col-lg">
               <label class="form-label">{% trans 'Unit price' %}</label>
-              <div class="unit-price tw-text-xl" data-amount="0">0</div>
+              <div class="unit-price tw:text-xl" data-amount="0">0</div>
             </div>
           </div>
         </div>

app/templates/monthly_overview/fragments/list.html

@@ -6,7 +6,7 @@
   {% for x in transactions_by_date %}
     <div id="{{ x.grouper|slugify }}" class="transactions-divider"
          _="on htmx:afterSwap from #transactions if sessionStorage.getItem(my id) is null then sessionStorage.setItem(my id, 'true')">
-      <div class="mt-3 mb-1 w-100 tw-text-base border-bottom bg-body transactions-divider-title">
+      <div class="mt-3 mb-1 w-100 tw:text-base border-bottom bg-body transactions-divider-title">
         <a class="text-decoration-none d-inline-block w-100"
            role="button"
            data-bs-toggle="collapse"

app/templates/monthly_overview/fragments/monthly_summary.html

@@ -6,7 +6,7 @@
     <c-ui.info-card color="yellow" icon="fa-solid fa-calendar-day" title="{% trans 'Daily Spending Allowance' %}" help_text={% trans "This is the final total divided by the remaining days in the month" %}>
       <div class="d-flex justify-content-between mt-3">
           <div class="text-end font-monospace">
-            <div class="tw-text-gray-400">{% translate 'today' %}</div>
+            <div class="tw:text-gray-400">{% translate 'today' %}</div>
           </div>
           <div class="text-end font-monospace">
             {% for currency in daily_spending_allowance.values %}
@@ -39,7 +39,7 @@
       <c-ui.info-card color="green" icon="fa-solid fa-arrow-right-to-bracket" title="{% trans 'Income' %}">
         <div class="d-flex justify-content-between mt-3">
           <div class="text-end font-monospace">
-            <div class="tw-text-gray-400">{% translate 'current' %}</div>
+            <div class="tw:text-gray-400">{% translate 'current' %}</div>
           </div>
           <div class="text-end font-monospace">
             {% for currency in income_current.values %}
@@ -69,7 +69,7 @@
         <hr class="my-1">
         <div class="d-flex justify-content-between">
           <div class="text-end font-monospace">
-            <div class="tw-text-gray-400">{% translate 'projected' %}</div>
+            <div class="tw:text-gray-400">{% translate 'projected' %}</div>
           </div>
           <div class="text-end font-monospace">
             {% for currency in income_projected.values %}
@@ -103,7 +103,7 @@
       <c-ui.info-card color="red" icon="fa-solid fa-arrow-right-from-bracket" title="{% trans 'Expenses' %}">
         <div class="d-flex justify-content-between mt-3">
           <div class="text-end font-monospace">
-            <div class="tw-text-gray-400">{% translate 'current' %}</div>
+            <div class="tw:text-gray-400">{% translate 'current' %}</div>
           </div>
           <div class="text-end font-monospace">
             {% for currency in expense_current.values %}
@@ -133,7 +133,7 @@
         <hr class="my-1">
         <div class="d-flex justify-content-between">
           <div class="text-end font-monospace">
-            <div class="tw-text-gray-400">{% translate 'projected' %}</div>
+            <div class="tw:text-gray-400">{% translate 'projected' %}</div>
           </div>
           <div class="text-end font-monospace">
             {% for currency in expense_projected.values %}
@@ -167,7 +167,7 @@
     <c-ui.info-card color="blue" icon="fa-solid fa-scale-balanced" title="{% trans 'Total' %}">
         <div class="d-flex justify-content-between mt-3">
           <div class="text-end font-monospace">
-            <div class="tw-text-gray-400">{% translate 'current' %}</div>
+            <div class="tw:text-gray-400">{% translate 'current' %}</div>
           </div>
           <div class="text-end font-monospace">
             {% for currency in total_current.values %}
@@ -196,7 +196,7 @@
         </div>
         <div class="d-flex justify-content-between mt-3">
           <div class="text-end font-monospace">
-            <div class="tw-text-gray-400">{% translate 'projected' %}</div>
+            <div class="tw:text-gray-400">{% translate 'projected' %}</div>
           </div>
           <div class="text-end font-monospace">
             {% for currency in total_projected.values %}
@@ -256,7 +256,7 @@
   <div class="col">
     <c-ui.info-card color="yellow" icon="fa-solid fa-percent" title="{% trans 'Distribution' %}">
       {% for p in percentages.values %}
-        <p class="tw-text-gray-400 mb-2 {% if not forloop.first %}mt-3{% endif %}">{{ p.currency.name }}</p>
+        <p class="tw:text-gray-400 mb-2 {% if not forloop.first %}mt-3{% endif %}">{{ p.currency.name }}</p>
         <c-ui.percentage-distribution :percentage="p"></c-ui.percentage-distribution>
       {% endfor %}
     </c-ui.info-card>

app/templates/monthly_overview/pages/overview.html

@@ -17,7 +17,7 @@
     <div class="row mb-3 gx-xl-4 gy-3 mb-4">
       {#    Date picker#}
       <div class="col-12 col-xl-4 flex-row align-items-center d-flex">
-        <div class="tw-text-base h-100 align-items-center d-flex">
+        <div class="tw:text-base h-100 align-items-center d-flex">
           <a role="button"
              class="pe-4 py-2"
              hx-boost="true"
@@ -25,7 +25,7 @@
              href="{% url 'monthly_overview' month=previous_month year=previous_year %}"><i
               class="fa-solid fa-chevron-left"></i></a>
         </div>
-        <div class="tw-text-3xl fw-bold font-monospace tw-w-full text-center"
+        <div class="tw:text-3xl fw-bold font-monospace tw:w-full text-center"
              hx-get="{% url 'month_year_picker' %}"
              hx-target="#generic-offcanvas-left"
              hx-trigger="click, date_picker from:window"
@@ -33,7 +33,7 @@
              role="button">
           {{ month|month_name }} {{ year }}
         </div>
-        <div class="tw-text-base mx-2 h-100 align-items-center d-flex">
+        <div class="tw:text-base mx-2 h-100 align-items-center d-flex">
           <a role="button"
              class="ps-3 py-2"
              hx-boost="true"
@@ -44,12 +44,12 @@
         </div>
       </div>
       {#    Action buttons#}
-      <div class="col-12 col-xl-8">
-        <c-ui.quick-transactions-buttons
-            :year="year"
-            :month="month"
-        ></c-ui.quick-transactions-buttons>
-      </div>
+{#      <div class="col-12 col-xl-8">#}
+{#        <c-ui.quick-transactions-buttons#}
+{#            :year="year"#}
+{#            :month="month"#}
+{#        ></c-ui.quick-transactions-buttons>#}
+{#      </div>#}
     </div>
     {#  Monthly summary#}
     <div class="row gx-xl-4 gy-3">
@@ -143,11 +143,11 @@
             </button>
           </div>
           {#        Ordering button#}
-          <div class="col-sm-6 col-12 tw-content-center my-3 my-sm-0">
+          <div class="col-sm-6 col-12 tw:content-center my-3 my-sm-0">
             <div class="text-sm-end" _="on change trigger updated on window">
               <label for="order">{% translate "Order by" %}</label>
               <select
-                  class="tw-border-0 focus-visible:tw-outline-0 w-full pe-2 tw-leading-normal text-bg-tertiary tw-font-medium rounded"
+                  class="tw:border-0 tw:focus-visible:outline-0 w-full pe-2 tw:leading-normal text-bg-tertiary tw:font-medium rounded bg-body text-body"
                   name="order" id="order">
                 <option value="default"
                         {% if order == 'default' %}selected{% endif %}>{% translate 'Default' %}</option>
@@ -174,7 +174,8 @@
         </div>
         <div id="search" class="my-3">
           <label class="w-100">
-          <input type="search" class="form-control" placeholder="{% translate 'Search' %}" hx-preserve id="quick-search"
+            <input type="search" class="form-control" placeholder="{% translate 'Search' %}" hx-preserve
+                   id="quick-search"
                    _="on input or search or htmx:afterSwap from window
                       if my value is empty
                         trigger toggle on <.transactions-divider-collapse/>
@@ -195,4 +196,7 @@
       </div>
     </div>
   </div>
+
+  <c-ui.transactions_fab></c-ui.transactions_fab>
+
 {% endblock %}

app/templates/net_worth/net_worth.html

@@ -19,7 +19,7 @@
               {% for currency in currency_net_worth.values %}
                 <div class="d-flex justify-content-between mt-2">
                   <div class="d-flex align-items-baseline w-100">
-                    <div class="currency-name text-start font-monospace tw-text-gray-300"
+                    <div class="currency-name text-start font-monospace tw:text-gray-300"
                          _="on click showOnlyCurrencyDataset('{{ currency.currency.name }}')">
                       {{ currency.currency.name }}
                     </div>
@@ -48,7 +48,7 @@
                 {% endif %}
                 {% if currency.consolidated and currency.consolidated.total_final != currency.total_final %}
                   <div class="d-flex align-items-baseline w-100">
-                        <div class="account-name text-start font-monospace tw-text-gray-300">
+                        <div class="account-name text-start font-monospace tw:text-gray-300">
                           <span class="hierarchy-line-icon"></span>{% trans 'Consolidated' %}</div>
                         <div class="dotted-line flex-grow-1"></div>
                         <div class="">
@@ -68,7 +68,7 @@
         </div>
       </div>
       <div class="col-12 col-xl-7">
-        <div class="chart-container position-relative tw-min-h-[40vh] tw-h-full">
+        <div class="chart-container position-relative tw:min-h-[40vh] tw:h-full">
           <canvas id="currencyBalanceChart"></canvas>
         </div>
       </div>
@@ -85,14 +85,14 @@
                 {% if data.grouper %}
                   <div class="d-flex justify-content-between mt-2">
                     <div class="d-flex align-items-baseline w-100">
-                      <div class="text-start font-monospace tw-text-gray-300"><span class="badge text-bg-primary">
+                      <div class="text-start font-monospace tw:text-gray-300"><span class="badge text-bg-primary">
                         {{ data.grouper }}</span></div>
                     </div>
                   </div>
                   {% for account in data.list %}
                     <div class="d-flex justify-content-between mt-2">
                       <div class="d-flex align-items-baseline w-100">
-                        <div class="account-name text-start font-monospace tw-text-gray-300"
+                        <div class="account-name text-start font-monospace tw:text-gray-300"
                              _="on click showOnlyAccountDataset('{{ account.account.name }}')">
                           <span class="hierarchy-line-icon"></span>{{ account.account.name }}</div>
                         <div class="dotted-line flex-grow-1"></div>
@@ -120,7 +120,7 @@
                   {% for account in data.list %}
                     <div class="d-flex justify-content-between mt-2">
                       <div class="d-flex align-items-baseline w-100">
-                        <div class="account-name text-start font-monospace tw-text-gray-300"
+                        <div class="account-name text-start font-monospace tw:text-gray-300"
                              _="on click showOnlyAccountDataset('{{ account.account.name }}')">
                           {{ account.account.name }}
                         </div>
@@ -152,7 +152,7 @@
         </div>
       </div>
       <div class="col-12 col-xl-7">
-        <div class="chart-container position-relative tw-min-h-[40vh] tw-h-full">
+        <div class="chart-container position-relative tw:min-h-[40vh] tw:h-full">
           <canvas id="accountBalanceChart"></canvas>
         </div>
       </div>

app/templates/quick_transactions/fragments/add.html

@@ -0,0 +1,11 @@
+{% extends 'extends/offcanvas.html' %}
+{% load i18n %}
+{% load crispy_forms_tags %}
+
+{% block title %}{% translate 'Add quick transaction' %}{% endblock %}
+
+{% block body %}
+<form hx-post="{% url 'quick_transaction_add' %}" hx-target="#generic-offcanvas" novalidate>
+    {% crispy form %}
+</form>
+{% endblock %}

app/templates/quick_transactions/fragments/create_menu.html

@@ -0,0 +1,17 @@
+{% extends 'extends/offcanvas.html' %}
+{% load i18n %}
+{% load crispy_forms_tags %}
+
+{% block title %}{% translate 'Add quick transaction' %}{% endblock %}
+
+{% block body %}
+  <div class="list-group list-group-flush">
+    {% for qt in quick_transactions %}
+      <a hx-get="{% url 'quick_transaction_add_as_transaction' quick_transaction_id=qt.id %}"
+         class="list-group-item list-group-item-action tw:cursor-pointer {% if qt.type == 'EX' %}tw:text-red-400!{% else %}tw:text-green-400!{% endif %}">{{ qt.name }}</a>
+    {% empty %}
+      <c-msg.empty title="{% translate "Nothing to see here..." %}" remove-padding></c-msg.empty>
+    {% endfor %}
+  </div>
+
+{% endblock %}

app/templates/quick_transactions/fragments/edit.html

@@ -0,0 +1,13 @@
+{% extends 'extends/offcanvas.html' %}
+{% load i18n %}
+{% load crispy_forms_tags %}
+
+{% block title %}{% translate 'Edit quick transaction' %}{% endblock %}
+
+{% block body %}
+<form hx-post="{% url 'quick_transaction_edit' quick_transaction_id=quick_transaction.id %}"
+      hx-target="#generic-offcanvas"
+      novalidate>
+    {% crispy form %}
+</form>
+{% endblock %}