Merge pull request #128

fix: changing startpage to networth breaks homepage

.env.example

@@ -1,6 +1,5 @@
 SERVER_NAME=wygiwyh_server
 DB_NAME=wygiwyh_pg
-PROCRASTINATE_NAME=wygiwyh_procrastinate
 
 DEBUG=false
 URL = https://...
@@ -9,7 +8,6 @@ SECRET_KEY=<GENERATE A SAFE SECRET KEY AND PLACE IT HERE>
 DJANGO_ALLOWED_HOSTS=localhost 127.0.0.1 [::1]
 OUTBOUND_PORT=9005
 
-SQL_ENGINE=django.db.backends.postgresql
 SQL_DATABASE=wygiwyh
 SQL_USER=wygiwyh
 SQL_PASSWORD=<INSERT A SAFE PASSWORD HERE>
@@ -18,3 +16,11 @@ SQL_PORT=5432
 
 # Gunicorn
 WEB_CONCURRENCY=4
+
+# App Configs
+# Enable this if you want to keep deleted transactions in the database
+ENABLE_SOFT_DELETE=false
+# If ENABLE_SOFT_DELETE is true, transactions deleted for more than KEEP_DELETED_TRANSACTIONS_FOR days will be truly deleted. Set to 0 to keep all.
+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.

.github/workflows/release.yml

@@ -2,7 +2,20 @@ name: Release Pipeline
 
 on:
   release:
-    types: [created]
+    types: [ created ]
+  push:
+    branches: [ main ]
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Custom tag name for the image'
+        required: true
+        type: string
+      ref:
+        description: 'Git ref to checkout (branch, tag, or SHA)'
+        required: true
+        default: 'main'
+        type: string
 
 env:
   IMAGE_NAME: wygiwyh
@@ -16,6 +29,13 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.inputs.ref }}
+        if: github.event_name == 'workflow_dispatch'
+
+      - name: Checkout code (non-manual)
+        uses: actions/checkout@v4
+        if: github.event_name != 'workflow_dispatch'
 
       - name: Log in to Docker Hub
         uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
@@ -29,16 +49,49 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Build and push image
+      - name: Build and push nightly image
+        if: github.event_name == 'push'
         uses: docker/build-push-action@v6
         with:
           context: .
           file: ./docker/prod/django/Dockerfile
           push: true
           provenance: false
+          build-args: |
+            VERSION=nightly
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:nightly
+          platforms: linux/amd64,linux/arm64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Build and push release image
+        if: github.event_name == 'release'
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./docker/prod/django/Dockerfile
+          push: true
+          provenance: false
+          build-args: |
+            VERSION=${{ github.event.release.tag_name }}
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${{ github.event.release.tag_name }}
           platforms: linux/amd64,linux/arm64
           cache-from: type=gha
           cache-to: type=gha,mode=max
+
+      - name: Build and push custom image
+        if: github.event_name == 'workflow_dispatch'
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./docker/prod/django/Dockerfile
+          push: true
+          provenance: false
+          build-args: |
+            VERSION=${{ github.event.inputs.tag }}
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${{ github.event.inputs.tag }}
+          platforms: linux/amd64,linux/arm64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

README.md

@@ -6,17 +6,21 @@
   <br>
 </h1>
 
-<h4 align="center">An optionated and powerful finance tracker.</h4>
+<h4 align="center">An opinionated and powerful finance tracker.</h4>
 
 <p align="center">
   <a href="#why-wygiwyh">Why</a> •
   <a href="#key-features">Features</a> •
   <a href="#how-to-use">Usage</a> •
-  <a href="#how-it-works">How</a>
+  <a href="#how-it-works">How</a> •
+  <a href="#caveats-and-warnings">Caveats and Warnings</a> •
+  <a href="#built-with">Built with</a>
 </p>
 
 **WYGIWYH** (_What You Get Is What You Have_) is a powerful, principles-first finance tracker designed for people who prefer a no-budget, straightforward approach to managing their money. With features like multi-currency support, customizable transactions, and a built-in dollar-cost averaging tracker, WYGIWYH helps you take control of your finances with simplicity and flexibility.
 
+<img src=".github/img/monthly_view.png" width="18%"></img> <img src=".github/img/yearly.png" width="18%"></img> <img src=".github/img/networth.png" width="18%"></img> <img src=".github/img/calendar.png" width="18%"></img> <img src=".github/img/all_transactions.png" width="18%"></img> 
+
 # Why WYGIWYH?
 Managing money can feel unnecessarily complex, but it doesn’t have to be. WYGIWYH (pronounced "wiggy-wih") is based on a simple principle:
 
@@ -53,10 +57,10 @@ To run this application, you'll need [Docker](https://docs.docker.com/engine/ins
 From your command line:
 
 ```bash
-# Clone this repository
+# Create a folder for WYGIWYH (optional)
 $ mkdir WYGIWYH
 
-# Go into the repository
+# Go into the folder
 $ cd WYGIWYH
 
 $ touch docker-compose.yml
@@ -75,277 +79,72 @@ $ docker compose up -d
 $ docker compose exec -it web python manage.py createsuperuser
 ```
 
-# How it works
+## Running locally
 
-## Models
+If you want to run WYGIWYH locally, on your env file:
 
-### Transactions
+1. Remove `URL`
+2. Set `HTTPS_ENABLED` to `false`
+3. Leave the default `DJANGO_ALLOWED_HOSTS` (localhost 127.0.0.1 [::1])
 
-Transactions are the core feature of WYGIWYH, representing expenses or income in your accounts. Each transaction consists of the following fields:
-
-#### Type
-
-- **Income**: A positive amount entering your account
-- **Expense**: A negative amount exiting your account
-
-#### Paid Status
-
-A transaction can be either:
-
-- **Current**: When marked as paid
-- **Projected**: When marked as unpaid
-
-#### Account
-
-The account associated with the transaction. Required, limited to one account per transaction.
-
-#### Entity
-
-The party involved in the transaction:
-
-- For **Income**: The paying entity
-- For **Expense**: The receiving entity
-
-Optional field.
-
-#### Date
-
-The date when the transaction occurred. Required.
-
-#### Reference Date
-
-One of **WYGIWYH**'s key features. The reference date determines which month a transaction should count towards. For example, you can have a transaction that occurred on January 26th count towards February's finances.
-
-Optional - defaults to the transaction date's month if not specified.
-
-> [!CAUTION]
-> While designed primarily for credit card closing dates, this feature allows for debt rolling across months. Use responsibly to maintain accurate financial tracking.
-
-#### Type
-
-- Income, meaning a positive amount (usually) entering your account
-- Expense, meaning a negative amount exiting your account
-
-#### Description
-
-The name or purpose of the transaction. Required.
-
-#### Amount
-
-The monetary value of the transaction. Required.
-
-#### Category
-
-The primary classification of the transaction. Optional.
-
-#### Tags
-
-Additional labels for transaction categorization. Optional.
-
-#### Notes
-
-Additional information about the transaction. Optional.
-
-![img_4.png](.github/img/readme_transaction.png)
-
-### Installment Plan
-
-An Installment Plan is a helper model that generates a series of recurring transactions over a fixed period.
-
-#### Core Fields
-
-- **Account**: The account for all transactions in the plan. Required.
-- **Entity**: The paying or receiving party for all transactions. Optional.
-- **Description**: The name of the installment plan, used for all transactions. Required.
-- **Notes**: Additional information applied to all transactions. Optional.
-
-#### Installment Configuration
-
-- **Number of Installments**: Total number of transactions to create (e.g., 1/10, 2/10)
-- **Installment Start**: Initial counting point
-- **Start Date**: Date of the first transaction
-- **Reference Date**: Reference date for the first transaction
-- **Recurrence**: Frequency of transactions (e.g., Monthly)
-
-![img_1.png](.github/img/readme_installment_plan.png)
-
-### Transaction Details
-
-- **Amount**: Value for each transaction. Required.
-- **Category**: Primary classification for all transactions. Optional.
-- **Tags**: Labels applied to all transactions. Optional.
-
-### Recurring Transaction
-A Recurring Transaction is a helper model that generates recurring transactions indefinitely or until a certain date.
-
-#### Core Fields
-
-- **Account**: The account for all transactions in the plan. Required.
-- **Entity**: The paying or receiving party for all transactions. Optional.
-- **Description**: The name of the recurring transaction, used for all transactions. Required.
-- **Notes**: Additional information applied to all transactions. Optional.
-
-#### Recurring Transaction Configuration
-
-- **Start Date**: Date of the first transaction. Required.
-- **Reference Date**: Reference date for the first transaction. Optional.
-- **Recurrence Type**: Frequency of transactions (e.g., Monthly). Required.
-- **Recurrence Interval**: The interval between transactions (e.g. every 1 month, every 2 weeks, etc.). Required.
-- **End date**: When new transactions should stop being created. Optional.
-
-#### Transaction Details
-
-- **Amount**: Value for each transaction. Required.
-- **Category**: Primary classification for all transactions. Optional.
-- **Tags**: Labels applied to all transactions. Optional.
-
-#### Other information
-
-- Recurring transactions are checked and created every midnight using Procrastinate.
-- **WYGIWYH** tries to keep at most **6** future transactions created at any time.
-- If you delete a recurring transaction it will not be recreated.
-- You can stop or pause a recurring transaction at any time on the config page (/recurring-trasanctions/)
-
-![img_3.png](.github/img/readme_recurring_transaction.png)
-
-### Account
-
-TO-DO
-
-### Account Groups
-
-TO-DO
-
-### Currency
-
-TO-DO
-
-### Exchange Rate
-
-TO-DO
-
-### Category
-
-TO-DO
-
-### Tag
-
-TO-DO
-
-### Entity
-
-TO-DO
-
-### Rule
-
-TO-DO
-
----
-
-## Helper actions
-
-### Transfer
-
-A transfer happens when you move a monetary value from one account to another. This will create two transactions, one expense and one income with the values set by the user.
-
-Contrary to other finance trackers, due to our multi-currency support, **WYGIWYH**'s transfer system allows for non-zero transfers.
-
-![img.png](.github/img/readme_transfer.png)
-
-### Balance (Account Reconciliation)
-
-A balance is a easy way of updating your accounts balance. It creates a transaction with the difference between the balance currently in **WYGIWYH** and the new balance informed by you.
-
-This can be useful for savings accounts or other interest accruing investments.![img_2.png](.github/img/readme_balance.png)
-
----
-
-## Views
-
-### Monthly
-
-TO-DO
-
-### Yearly by currency
-
-TO-DO
-
-### Yearly by account
-
-TO-DO
-
-### Calendar
-
-TO-DO
-
-### Networh
-
-#### Current
-
-TO-DO
-
-#### Projected
-
-TO-DO
-
-### All Transactions
-
-TO-DO
-
-### Configuration and Management
-
-TO-DO
-
----
-
-## Tools
-
-### Calculator
-
-The calculator is a floating widget that can be toggled by clicking the calculator icon on the navbar.
-
-It allows for any math expression supported by [math.js](https://mathjs.org).
-
-![calculator](.github/img/readme_calculator.gif)
-
-### Dollar Cost Average Tracker
-
-The DCA Tracker can be accessed from the navbar's **Tools** menu.
-
-It allows for tracking DCA strategies and getting helpful information and insights.
-
-> [!IMPORTANT]
-> Currently DCA exists separately from your main transactions. You will need to add your entries manually.
-
-<img src=".github/img/readme_dca_1.png" width="45%"></img> <img src=".github/img/readme_dca_2.png" width="45%"></img>
-
-### Unit Price Calculator
-
-The Unit Price Calculator can be accessed from the navbar's **Tools** menu.
-
-This is a self-contained tool for comparing and finding the most cost-efficient item quickly and easily.
-
-Input the price and the amount of each item, the cheapeast will be highlighted in green, and the most expensive in red.
-
-You can add additional items by clicking the _Add_ button at the end of the page.
+You can now access localhost:OUTBOUND_PORT
 
 > [!NOTE]
-> This doesn't do unit convertion. The amount of all items needs to be on the same the unit for proper functioning.
+> - If you're planning on running this behind Tailscale or other similar service also add your machine given IP to `DJANGO_ALLOWED_HOSTS`
+> - If you're going to use another IP that isn't localhost, add it to `DJANGO_ALLOWED_HOSTS`, without `http://`
 
-![img.png](.github/img/readme_unit_price_calculator.png)
 
-### Currency Converter
+## Latest changes
+Features are only added to `main` when ready, if you want to run the latest version, you must build from source or use the `:nightly` tag on docker. Keep in mind that there can be undocumented breaking changes.
 
-TO-DO
+All the required Dockerfiles are [here](https://github.com/eitchtee/WYGIWYH/tree/main/docker/prod).
+
+## Unraid
+
+[nwithan8](https://github.com/nwithan8) has kindly provided a Unraid template for WYGIWYH, have a look at the [unraid_templates](https://github.com/nwithan8/unraid_templates) repo.
+
+WYGIWYH is available on the Unraid Store. You'll need to provision your own postgres (version 15 or up) database.
+
+## Enviroment Variables
+
+| variable                      | type        | default                           | explanation                                                                                                                                                                                                                              |
+|-------------------------------|-------------|-----------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| DJANGO_ALLOWED_HOSTS          | string      | localhost 127.0.0.1               | A list of space separated domains and IPs representing the host/domain names that WYGIWYH site can serve. [Click here](https://docs.djangoproject.com/en/5.1/ref/settings/#allowed-hosts) for more details                               |
+| HTTPS_ENABLED                 | true\|false | false                             | Whether to use secure cookies. If this is set to true, the cookie will be marked as “secure”, which means browsers may ensure that the cookie is only sent under an HTTPS connection                                                     |
+|              URL              | string      | http://localhost http://127.0.0.1 | A list of space separated domains and IPs (with the protocol) representing the trusted origins for unsafe requests (e.g. POST). [Click here](https://docs.djangoproject.com/en/5.1/ref/settings/#csrf-trusted-origins ) for more details |
+| SECRET_KEY                    | string      | ""                                | This is used to provide cryptographic signing, and should be set to a unique, unpredictable value.                                                                                                                                       |
+| DEBUG                         | true\|false | false                             | Turns DEBUG mode on or off, this is useful to gather more data about possible errors you're having. Don't use in production.                                                                                                             |
+| SQL_DATABASE                  | string      | None *required                    | The name of your postgres database                                                                                                                                                                                                       |
+| SQL_USER                      | string      | user                              | The username used to connect to your postgres database                                                                                                                                                                                   |
+| SQL_PASSWORD                  | string      | password                          | The password used to connect to your postgres database                                                                                                                                                                                   |
+| SQL_HOST                      | string      | localhost                         | The adress used to connect to your postgres database                                                                                                                                                                                     |
+| SQL_PORT                      | string      | 5432                              | The port used to connect to your postgres database                                                                                                                                                                                       |
+| SESSION_EXPIRY_TIME           | int         | 2678400 (31 days)                 | The age of session cookies, in seconds. E.g. how long you will stay logged in                                                                                                                                                            |
+| ENABLE_SOFT_DELETE            | true\|false | false                             | Whether to enable transactions soft delete, if enabled, deleted transactions will remain in the database. Useful for imports and avoiding duplicate entries.                                                                             |
+| KEEP_DELETED_TRANSACTIONS_FOR | int         | 365                               | Time in days to keep soft deleted transactions for. If 0, will keep all transactions indefinitely. Only works if ENABLE_SOFT_DELETE is true.                                                                                             |
+| TASK_WORKERS                  | int         | 1                                 | How many workers to have for async tasks. One should be enough for most use cases                                                                                                                                                        |
+
+# How it works
+
+Check out our [Wiki](https://github.com/eitchtee/WYGIWYH/wiki) for more information.
+
+# Caveats and Warnings
+
+- I'm not an accountant, some terms and even calculations might be wrong. Make sure to open an issue if you see anything that could be improved.
+- Pretty much all calculations are done at run time, this can lead to some performance degradation. On my personal instance, I have 3000+ transactions over 4+ years and 4000+ exchange rates, and load times average at around 500ms for each page, not bad overall.
+- This isn't a budgeting or double-entry-accounting application, if you need those features there's a lot of options out there, if you really need them in WYGIWYH, open a discussion.
 
 # Built with
 
 WYGIWYH is possible thanks to a lot of amazing open source tools, to name a few:
 
-- Django
-- HTMX
-- _hyperscript
-- Procrastinate
-- Bootstrap
-- Tailwind
-- Webpack
+* Django
+* HTMX
+* _hyperscript
+* Procrastinate
+* Bootstrap
+* Tailwind
+* Webpack
+* PostgreSQL
+* Django REST framework
+* Alpine.js

app/WYGIWYH/settings.py

@@ -26,15 +26,13 @@ ROOT_DIR = Path(__file__).resolve().parent.parent.parent
 # See https://docs.djangoproject.com/en/5.1/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = "django-insecure-##6^&g49xwn7s67xc&33vf&=*4ibqfzn#xa*p-1sy8ag+zjjb9"
+SECRET_KEY = os.getenv("SECRET_KEY", "")
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = os.getenv("DEBUG", "false").lower() == "true"
 
-ALLOWED_HOSTS = os.environ.get("DJANGO_ALLOWED_HOSTS", "localhost 127.0.0.1").split(" ")
-CSRF_TRUSTED_ORIGINS = os.environ.get("URL", "http://localhost http://127.0.0.1").split(
-    " "
-)
+ALLOWED_HOSTS = os.getenv("DJANGO_ALLOWED_HOSTS", "localhost 127.0.0.1").split(" ")
+CSRF_TRUSTED_ORIGINS = os.getenv("URL", "http://localhost http://127.0.0.1").split(" ")
 
 # Application definition
 
@@ -64,6 +62,7 @@ INSTALLED_APPS = [
     "apps.accounts.apps.AccountsConfig",
     "apps.common.apps.CommonConfig",
     "apps.net_worth.apps.NetWorthConfig",
+    "apps.import_app.apps.ImportConfig",
     "apps.api.apps.ApiConfig",
     "cachalot",
     "rest_framework",
@@ -72,9 +71,11 @@ INSTALLED_APPS = [
     "apps.rules.apps.RulesConfig",
     "apps.calendar_view.apps.CalendarViewConfig",
     "apps.dca.apps.DcaConfig",
+    "pwa",
 ]
 
 MIDDLEWARE = [
+    "apps.common.middleware.thread_local.ThreadLocalMiddleware",
     "debug_toolbar.middleware.DebugToolbarMiddleware",
     "django.middleware.security.SecurityMiddleware",
     "whitenoise.middleware.WhiteNoiseMiddleware",
@@ -124,12 +125,12 @@ WSGI_APPLICATION = "WYGIWYH.wsgi.application"
 
 DATABASES = {
     "default": {
-        "ENGINE": os.environ.get("SQL_ENGINE", "django.db.backends.sqlite3"),
-        "NAME": os.environ.get("SQL_DATABASE", BASE_DIR / "db.sqlite3"),
-        "USER": os.environ.get("SQL_USER", "user"),
-        "PASSWORD": os.environ.get("SQL_PASSWORD", "password"),
-        "HOST": os.environ.get("SQL_HOST", "localhost"),
-        "PORT": "5432",
+        "ENGINE": "django.db.backends.postgresql",
+        "NAME": os.getenv("SQL_DATABASE"),
+        "USER": os.getenv("SQL_USER", "user"),
+        "PASSWORD": os.getenv("SQL_PASSWORD", "password"),
+        "HOST": os.getenv("SQL_HOST", "localhost"),
+        "PORT": os.getenv("SQL_PORT", "5432"),
     }
 }
 
@@ -161,6 +162,7 @@ AUTH_USER_MODEL = "users.User"
 LANGUAGE_CODE = "en"
 LANGUAGES = (
     ("en", "English"),
+    ("nl", "Nederlands"),
     ("pt-br", "Português (Brasil)"),
 )
 
@@ -218,7 +220,7 @@ SESSION_COOKIE_SECURE = os.getenv("HTTPS_ENABLED", "false").lower() == "true"
 
 DEBUG_TOOLBAR_CONFIG = {
     "ROOT_TAG_EXTRA_ATTRS": "hx-preserve",
-    "SHOW_TOOLBAR_CALLBACK": lambda r: False,  # disables it}
+    # "SHOW_TOOLBAR_CALLBACK": lambda r: False,  # disables it
 }
 DEBUG_TOOLBAR_PANELS = [
     "debug_toolbar.panels.history.HistoryPanel",
@@ -334,3 +336,54 @@ else:
     }
 
 CACHALOT_UNCACHABLE_TABLES = ("django_migrations", "procrastinate_jobs")
+
+
+# PWA
+PWA_APP_NAME = SITE_TITLE
+PWA_APP_DESCRIPTION = "A simple and powerful finance tracker"
+PWA_APP_THEME_COLOR = "#fbb700"
+PWA_APP_BACKGROUND_COLOR = "#222222"
+PWA_APP_DISPLAY = "standalone"
+PWA_APP_SCOPE = "/"
+PWA_APP_ORIENTATION = "any"
+PWA_APP_START_URL = "/"
+PWA_APP_STATUS_BAR_COLOR = "default"
+PWA_APP_ICONS = [
+    {"src": "/static/img/favicon/android-icon-192x192.png", "sizes": "192x192"}
+]
+PWA_APP_ICONS_APPLE = [
+    {"src": "/static/img/favicon/apple-icon-180x180.png", "sizes": "180x180"}
+]
+PWA_APP_SPLASH_SCREEN = [
+    {
+        "src": "/static/img/pwa/splash-640x1136.png",
+        "media": "(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2)",
+    }
+]
+PWA_APP_DIR = "ltr"
+PWA_APP_LANG = "en-US"
+PWA_APP_SHORTCUTS = [
+    {
+        "name": "New Transaction",
+        "url": "/add/",
+        "description": "Add new transaction",
+    }
+]
+PWA_APP_SCREENSHOTS = [
+    {
+        "src": "/static/img/pwa/splash-750x1334.png",
+        "sizes": "750x1334",
+        "type": "image/png",
+        "form_factor": "wide",
+    },
+    {
+        "src": "/static/img/pwa/splash-750x1334.png",
+        "sizes": "750x1334",
+        "type": "image/png",
+    },
+]
+PWA_SERVICE_WORKER_PATH = BASE_DIR / "templates" / "pwa" / "serviceworker.js"
+
+ENABLE_SOFT_DELETE = os.getenv("ENABLE_SOFT_DELETE", "false").lower() == "true"
+KEEP_DELETED_TRANSACTIONS_FOR = int(os.getenv("KEEP_DELETED_ENTRIES_FOR", "365"))
+APP_VERSION = os.getenv("APP_VERSION", "unknown")

app/WYGIWYH/urls.py

@@ -27,6 +27,7 @@ urlpatterns = [
     path("hijack/", include("hijack.urls")),
     path("__debug__/", include("debug_toolbar.urls")),
     path("__reload__/", include("django_browser_reload.urls")),
+    path("", include("pwa.urls")),
     # path("api/", include("rest_framework.urls")),
     path("api/", include("apps.api.urls")),
     path("api/schema/", SpectacularAPIView.as_view(), name="schema"),
@@ -47,4 +48,5 @@ urlpatterns = [
     path("", include("apps.calendar_view.urls")),
     path("", include("apps.dca.urls")),
     path("", include("apps.mini_tools.urls")),
+    path("", include("apps.import_app.urls")),
 ]

app/apps/accounts/migrations/0007_make_account_names_unique.py

@@ -0,0 +1,38 @@
+from django.db import migrations, models
+
+
+def make_names_unique(apps, schema_editor):
+    Account = apps.get_model("accounts", "Account")
+
+    # Get all accounts ordered by id
+    accounts = Account.objects.all().order_by("id")
+
+    # Track seen names
+    seen_names = {}
+
+    for account in accounts:
+        original_name = account.name
+        counter = seen_names.get(original_name, 0)
+
+        while account.name in seen_names:
+            counter += 1
+            account.name = f"{original_name} ({counter})"
+
+        seen_names[account.name] = counter
+        account.save()
+
+
+def reverse_migration(apps, schema_editor):
+    # Can't restore original names, so do nothing
+    pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("accounts", "0006_rename_archived_account_is_archived_and_more"),
+    ]
+
+    operations = [
+        migrations.RunPython(make_names_unique, reverse_migration),
+    ]

app/apps/accounts/migrations/0008_alter_account_name.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.5 on 2025-01-24 00:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0007_make_account_names_unique'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='account',
+            name='name',
+            field=models.CharField(max_length=255, unique=True, verbose_name='Name'),
+        ),
+    ]

app/apps/accounts/models.py

@@ -18,7 +18,7 @@ class AccountGroup(models.Model):
 
 
 class Account(models.Model):
-    name = models.CharField(max_length=255, verbose_name=_("Name"))
+    name = models.CharField(max_length=255, verbose_name=_("Name"), unique=True)
     group = models.ForeignKey(
         AccountGroup,
         on_delete=models.SET_NULL,

app/apps/accounts/views/account_groups.py

@@ -2,9 +2,7 @@ from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse
 from django.shortcuts import render, get_object_or_404
-from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
-from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_http_methods
 
 from apps.accounts.forms import AccountGroupForm
@@ -89,7 +87,6 @@ def account_group_edit(request, pk):
 
 @only_htmx
 @login_required
-@csrf_exempt
 @require_http_methods(["DELETE"])
 def account_group_delete(request, pk):
     account_group = get_object_or_404(AccountGroup, id=pk)

app/apps/accounts/views/accounts.py

@@ -2,9 +2,7 @@ from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse
 from django.shortcuts import render, get_object_or_404
-from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
-from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_http_methods
 
 from apps.accounts.forms import AccountForm
@@ -89,7 +87,6 @@ def account_edit(request, pk):
 
 @only_htmx
 @login_required
-@csrf_exempt
 @require_http_methods(["DELETE"])
 def account_delete(request, pk):
     account = get_object_or_404(Account, id=pk)

app/apps/api/serializers/transactions.py

@@ -120,6 +120,11 @@ class RecurringTransactionSerializer(serializers.ModelSerializer):
         instance.create_upcoming_transactions()
         return instance
 
+    def update(self, instance, validated_data):
+        instance = super().update(instance, validated_data)
+        instance.update_unpaid_transactions()
+        return instance
+
 
 class TransactionSerializer(serializers.ModelSerializer):
     category = TransactionCategoryField(required=False)

app/apps/common/fields/forms/dynamic_select.py

@@ -61,7 +61,6 @@ class DynamicModelChoiceField(forms.ModelChoiceField):
                         self._created_instance = instance
                         return instance
                 except Exception as e:
-                    print(e)
                     raise ValidationError(
                         self.error_messages["invalid_choice"], code="invalid_choice"
                     )

app/apps/common/fields/month_year.py

@@ -1,9 +1,11 @@
 import datetime
 
 from django import forms
-from django.db import models
 from django.core.exceptions import ValidationError
+from django.db import models
+from django.utils.translation import gettext_lazy as _
 
+from apps.common.widgets.datepicker import AirMonthYearPickerInput
 from apps.common.widgets.month_year import MonthYearWidget
 
 
@@ -27,7 +29,7 @@ class MonthYearModelField(models.DateField):
 
 
 class MonthYearFormField(forms.DateField):
-    widget = MonthYearWidget
+    widget = AirMonthYearPickerInput
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -42,7 +44,11 @@ class MonthYearFormField(forms.DateField):
             date = datetime.datetime.strptime(value, "%Y-%m")
             return date.replace(day=1).date()
         except ValueError:
-            raise ValidationError(_("Invalid date format. Use YYYY-MM."))
+            try:
+                date = datetime.datetime.strptime(value, "%Y-%m-%d")
+                return date.replace(day=1).date()
+            except ValueError:
+                raise ValidationError(_("Invalid date format. Use YYYY-MM."))
 
     def prepare_value(self, value):
         if isinstance(value, datetime.date):

app/apps/common/functions/format.py

@@ -0,0 +1,31 @@
+from apps.common.middleware.thread_local import get_current_user
+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"):
+        user_settings = user.settings
+        if format_type == "THOUSAND_SEPARATOR":
+            number_format = getattr(user_settings, "number_format", None)
+            if number_format == "DC":
+                return "."
+            elif number_format == "CD":
+                return ","
+        elif format_type == "DECIMAL_SEPARATOR":
+            number_format = getattr(user_settings, "number_format", None)
+            if number_format == "DC":
+                return ","
+            elif number_format == "CD":
+                return "."
+        elif format_type == "SHORT_DATE_FORMAT":
+            date_format = getattr(user_settings, "date_format", None)
+            if date_format and date_format != "SHORT_DATE_FORMAT":
+                return date_format
+        elif format_type == "SHORT_DATETIME_FORMAT":
+            datetime_format = getattr(user_settings, "datetime_format", None)
+            if datetime_format and datetime_format != "SHORT_DATETIME_FORMAT":
+                return datetime_format
+
+    return original_get_format(format_type, lang, use_l10n)

app/apps/common/middleware/localization.py

@@ -1,14 +1,17 @@
 import zoneinfo
 
+from django.utils import formats
 from django.utils import timezone, translation
-from django.utils.translation import activate
+from django.utils.functional import lazy
 
+from apps.common.functions.format import get_format as custom_get_format
 from apps.users.models import UserSettings
 
 
 class LocalizationMiddleware:
     def __init__(self, get_response):
         self.get_response = get_response
+        self.patch_get_format()
 
     def __call__(self, request):
         tz = request.COOKIES.get("mytz")
@@ -33,9 +36,14 @@ class LocalizationMiddleware:
             timezone.activate(zoneinfo.ZoneInfo("UTC"))
 
         if user_language and user_language != "auto":
-            activate(user_language)
+            translation.activate(user_language)
         else:
             detected_language = translation.get_language_from_request(request)
-            activate(detected_language)
+            translation.activate(detected_language)
 
         return self.get_response(request)
+
+    @staticmethod
+    def patch_get_format():
+        formats.get_format = custom_get_format
+        formats.get_format_lazy = lazy(custom_get_format, str, list, tuple)

app/apps/common/middleware/thread_local.py

@@ -0,0 +1,73 @@
+"""
+    threadlocals middleware
+    ~~~~~~~~~~~~~~~~~~~~~~~
+
+    make the request object everywhere available (e.g. in model instance).
+
+    based on: http://code.djangoproject.com/wiki/CookBookThreadlocalsAndUser
+
+    Put this into your settings:
+    --------------------------------------------------------------------------
+        MIDDLEWARE_CLASSES = (
+            ...
+            'django_tools.middlewares.ThreadLocal.ThreadLocalMiddleware',
+            ...
+        )
+    --------------------------------------------------------------------------
+
+
+    Usage:
+    --------------------------------------------------------------------------
+    from django_tools.middlewares import ThreadLocal
+
+    # Get the current request object:
+    request = ThreadLocal.get_current_request()
+
+    # You can get the current user directly with:
+    user = ThreadLocal.get_current_user()
+    --------------------------------------------------------------------------
+
+    :copyleft: 2009-2017 by the django-tools team, see AUTHORS for more details.
+    :license: GNU GPL v3 or above, see LICENSE for more details.
+"""
+
+try:
+    from threading import local
+except ImportError:
+    from django.utils._threading_local import local
+
+try:
+    from django.utils.deprecation import MiddlewareMixin
+except ImportError:
+    MiddlewareMixin = object  # fallback for Django < 1.10
+
+
+_thread_locals = local()
+
+
+def get_current_request():
+    """returns the request object for this thread"""
+    return getattr(_thread_locals, "request", None)
+
+
+def get_current_user():
+    """returns the current user, if exist, otherwise returns None"""
+    request = get_current_request()
+    if request:
+        return getattr(request, "user", None)
+
+
+class ThreadLocalMiddleware(MiddlewareMixin):
+    """Simple middleware that adds the request object in thread local storage."""
+
+    def process_request(self, request):
+        _thread_locals.request = request
+
+    def process_response(self, request, response):
+        if hasattr(_thread_locals, "request"):
+            del _thread_locals.request
+        return response
+
+    def process_exception(self, request, exception):
+        if hasattr(_thread_locals, "request"):
+            del _thread_locals.request

app/apps/common/tasks.py

@@ -1,5 +1,8 @@
 import logging
 
+from asgiref.sync import sync_to_async
+from django.core import management
+
 from procrastinate import builtin_tasks
 from procrastinate.contrib.django import app
 
@@ -24,3 +27,16 @@ async def remove_old_jobs(context, timestamp):
             exc_info=True,
         )
         raise e
+
+
+@app.periodic(cron="0 6 1 * *")
+@app.task(queueing_lock="remove_expired_sessions")
+async def remove_expired_sessions(timestamp=None):
+    """Cleanup expired sessions by using Django management command."""
+    try:
+        await sync_to_async(management.call_command)("clearsessions", verbosity=0)
+    except Exception:
+        logger.error(
+            "Error while executing 'remove_expired_sessions' task",
+            exc_info=True,
+        )

app/apps/common/templatetags/formats.py

@@ -1,6 +1,6 @@
 from django import template
-from django.utils.formats import get_format
 
+from apps.common.functions.format import get_format
 
 register = template.Library()
 

app/apps/common/templatetags/json.py

@@ -0,0 +1,11 @@
+import json
+
+from django import template
+
+
+register = template.Library()
+
+
+@register.filter("json")
+def convert_to_json(value):
+    return json.dumps(value)

app/apps/common/templatetags/markdown.py

@@ -0,0 +1,52 @@
+from typing import Optional
+
+import mistune
+from django import template
+from django.utils.safestring import mark_safe
+from mistune import HTMLRenderer, Markdown, BlockParser, InlineParser, safe_entity
+from mistune.plugins.formatting import strikethrough as plugin_strikethrough
+from mistune.plugins.url import url as plugin_url
+
+
+register = template.Library()
+
+
+class CustomRenderer(HTMLRenderer):
+    def link(self, text: str, url: str, title: Optional[str] = None) -> str:
+        s = '<a rel="nofollow" target="_blank" href="' + self.safe_url(url) + '"'
+        if title:
+            s += ' title="' + safe_entity(title) + '"'
+        return s + ">" + text + "</a>"
+
+    def paragraph(self, text: str) -> str:
+        return text + "\n"
+
+    def softbreak(self) -> str:
+        return "\n"
+
+    def blank_line(self) -> str:
+        return "\n"
+
+
+block = BlockParser()
+block.rules = ["blank_line"]
+inline = InlineParser(hard_wrap=False)
+inline.rules = [
+    "emphasis",
+    "link",
+    "auto_link",
+    "auto_email",
+    "linebreak",
+    "softbreak",
+]
+markdown = Markdown(
+    renderer=CustomRenderer(escape=False),
+    block=block,
+    inline=inline,
+    plugins=[plugin_strikethrough, plugin_url],
+)
+
+
+@register.filter(name="limited_markdown")
+def limited_markdown(value):
+    return mark_safe(markdown(value))

app/apps/common/templatetags/settings.py

@@ -0,0 +1,9 @@
+from django import template
+from django.conf import settings
+
+register = template.Library()
+
+
+@register.simple_tag(name="settings")
+def settings_value(name):
+    return getattr(settings, name, "")

app/apps/common/urls.py

@@ -13,4 +13,9 @@ urlpatterns = [
         views.month_year_picker,
         name="month_year_picker",
     ),
+    path(
+        "cache/invalidate/",
+        views.invalidate_cache,
+        name="invalidate_cache",
+    ),
 ]

app/apps/common/utils/django.py

@@ -0,0 +1,161 @@
+def django_to_python_datetime(django_format):
+    mapping = {
+        # Day
+        "j": "%d",  # Day of the month without leading zeros
+        "d": "%d",  # Day of the month with leading zeros
+        "D": "%a",  # Day of the week, short version
+        "l": "%A",  # Day of the week, full version
+        # Month
+        "n": "%m",  # Month without leading zeros
+        "m": "%m",  # Month with leading zeros
+        "M": "%b",  # Month, short version
+        "F": "%B",  # Month, full version
+        # Year
+        "y": "%y",  # Year, 2 digits
+        "Y": "%Y",  # Year, 4 digits
+        # Time
+        "g": "%I",  # Hour (12-hour), without leading zeros
+        "G": "%H",  # Hour (24-hour), without leading zeros
+        "h": "%I",  # Hour (12-hour), with leading zeros
+        "H": "%H",  # Hour (24-hour), with leading zeros
+        "i": "%M",  # Minutes
+        "s": "%S",  # Seconds
+        "a": "%p",  # am/pm
+        "A": "%p",  # AM/PM
+        "P": "%I:%M %p",
+    }
+
+    python_format = django_format
+    for django_code, python_code in mapping.items():
+        python_format = python_format.replace(django_code, python_code)
+
+    return python_format
+
+
+def django_to_airdatepicker_datetime(django_format):
+    format_map = {
+        # Time
+        "h": "hh",  # Hour (12-hour)
+        "H": "H",  # Hour (24-hour)
+        "i": "m",  # Minutes
+        "A": "AA",  # AM/PM uppercase
+        "a": "aa",  # am/pm lowercase
+        "P": "h:mm AA",  # Localized time format (e.g., "2:30 PM")
+        # Date
+        "D": "E",  # Short weekday name
+        "l": "EEEE",  # Full weekday name
+        "j": "d",  # Day of month without leading zero
+        "d": "dd",  # Day of month with leading zero
+        "n": "M",  # Month without leading zero
+        "m": "MM",  # Month with leading zero
+        "M": "MMM",  # Short month name
+        "F": "MMMM",  # Full month name
+        "y": "yy",  # Year, 2 digits
+        "Y": "yyyy",  # Year, 4 digits
+    }
+
+    result = ""
+    i = 0
+    while i < len(django_format):
+        char = django_format[i]
+        if char == "\\":  # Handle escaped characters
+            if i + 1 < len(django_format):
+                result += django_format[i + 1]
+                i += 2
+            continue
+
+        if char in format_map:
+            result += format_map[char]
+        else:
+            result += char
+        i += 1
+
+    return result
+
+
+def django_to_airdatepicker_datetime_separated(django_format):
+    format_map = {
+        # Time formats
+        "h": "hh",  # Hour (12-hour)
+        "H": "HH",  # Hour (24-hour)
+        "i": "mm",  # Minutes
+        "A": "AA",  # AM/PM uppercase
+        "a": "aa",  # am/pm lowercase
+        "P": "h:mm aa",  # Localized time format
+        # Date formats
+        "D": "E",  # Short weekday name
+        "l": "EEEE",  # Full weekday name
+        "j": "d",  # Day of month without leading zero
+        "d": "dd",  # Day of month with leading zero
+        "n": "M",  # Month without leading zero
+        "m": "MM",  # Month with leading zero
+        "M": "MMM",  # Short month name
+        "F": "MMMM",  # Full month name
+        "y": "yy",  # Year, 2 digits
+        "Y": "yyyy",  # Year, 4 digits
+    }
+
+    # Define which characters belong to time format
+    time_chars = {"h", "H", "i", "A", "a", "P"}
+    date_chars = {"D", "l", "j", "d", "n", "m", "M", "F", "y", "Y"}
+
+    date_parts = []
+    time_parts = []
+    current_part = []
+    is_time = False
+
+    i = 0
+    while i < len(django_format):
+        char = django_format[i]
+
+        if char == "\\":  # Handle escaped characters
+            if i + 1 < len(django_format):
+                current_part.append(django_format[i + 1])
+                i += 2
+            continue
+
+        if char in format_map:
+            if char in time_chars:
+                # If we were building a date part, save it and start a time part
+                if current_part and not is_time:
+                    date_parts.append("".join(current_part))
+                    current_part = []
+                is_time = True
+                current_part.append(format_map[char])
+            elif char in date_chars:
+                # If we were building a time part, save it and start a date part
+                if current_part and is_time:
+                    time_parts.append("".join(current_part))
+                    current_part = []
+                is_time = False
+                current_part.append(format_map[char])
+        else:
+            # Handle separators
+            if char in "/:.-":
+                current_part.append(char)
+            elif char == " ":
+                if current_part:
+                    if is_time:
+                        time_parts.append("".join(current_part))
+                    else:
+                        date_parts.append("".join(current_part))
+                    current_part = []
+                current_part.append(char)
+
+        i += 1
+
+    # Don't forget the last part
+    if current_part:
+        if is_time:
+            time_parts.append("".join(current_part))
+        else:
+            date_parts.append("".join(current_part))
+
+    date_format = "".join(date_parts)
+    time_format = "".join(time_parts)
+
+    # Clean up multiple spaces while preserving necessary ones
+    date_format = " ".join(filter(None, date_format.split()))
+    time_format = " ".join(filter(None, time_format.split()))
+
+    return date_format, time_format

app/apps/common/views.py

@@ -1,17 +1,32 @@
 from dateutil.relativedelta import relativedelta
+
+from django.contrib import messages
+from django.contrib.auth.decorators import login_required
 from django.db.models import Count
 from django.db.models.functions import ExtractYear, ExtractMonth
+from django.http import HttpResponse
 from django.shortcuts import render
 from django.urls import reverse
 from django.utils import timezone
+from django.views.decorators.http import require_http_methods
+from django.utils.translation import gettext_lazy as _
 
+from cachalot.api import invalidate
+
+from apps.common.decorators.htmx import only_htmx
 from apps.transactions.models import Transaction
 
 
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
 def toasts(request):
     return render(request, "common/fragments/toasts.html")
 
 
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
 def month_year_picker(request):
     field = request.GET.get("field", "reference_date")
     for_ = request.GET.get("for", None)
@@ -84,3 +99,19 @@ def month_year_picker(request):
             "current_year": current_year,
         },
     )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def invalidate_cache(request):
+    invalidate()
+
+    messages.success(request, _("Cache cleared successfully"))
+
+    return HttpResponse(
+        status=204,
+        headers={
+            "HX-Trigger": "updated",
+        },
+    )

app/apps/common/widgets/datepicker.py

@@ -0,0 +1,229 @@
+import datetime
+
+from django.forms import widgets
+from django.utils import formats, translation, dates
+from django.utils.translation import gettext_lazy as _
+
+from apps.common.utils.django import (
+    django_to_python_datetime,
+    django_to_airdatepicker_datetime,
+    django_to_airdatepicker_datetime_separated,
+)
+from apps.common.functions.format import get_format
+
+
+class AirDatePickerInput(widgets.DateInput):
+    def __init__(
+        self,
+        attrs=None,
+        format=None,
+        clear_button=True,
+        auto_close=True,
+        *args,
+        **kwargs,
+    ):
+        attrs = attrs or {}
+        super().__init__(attrs=attrs, format=format, *args, **kwargs)
+        self.clear_button = clear_button
+        self.auto_close = auto_close
+
+    @staticmethod
+    def _get_current_language():
+        """Get current language code in format compatible with AirDatepicker"""
+        lang_code = translation.get_language()
+        # AirDatepicker uses simple language codes
+        return lang_code.split("-")[0]
+
+    def _get_format(self):
+        """Get the format string based on user settings or default"""
+        if self.format:
+            return self.format
+
+        return get_format("SHORT_DATE_FORMAT", use_l10n=True)
+
+    def build_attrs(self, base_attrs, extra_attrs=None):
+        attrs = super().build_attrs(base_attrs, extra_attrs)
+
+        attrs["data-now-button-txt"] = _("Today")
+        attrs["data-auto-close"] = str(self.auto_close).lower()
+        attrs["data-clear-button"] = str(self.clear_button).lower()
+        attrs["data-language"] = self._get_current_language()
+        attrs["data-date-format"] = django_to_airdatepicker_datetime(self._get_format())
+
+        return attrs
+
+    def format_value(self, value):
+        """Format the value for display in the widget."""
+        if value:
+            self.attrs["data-value"] = value
+
+        if value is None:
+            return ""
+        if isinstance(value, (datetime.date, datetime.datetime)):
+            return formats.date_format(value, format=self._get_format(), use_l10n=True)
+
+        return str(value)
+
+    def value_from_datadict(self, data, files, name):
+        """Parse the datetime string from the form data."""
+        value = super().value_from_datadict(data, files, name)
+        if value:
+            try:
+                # This does it's best to convert Django's PHP-Style date format to a datetime format and reformat the
+                # value to be read by Django. Probably could be improved
+                return datetime.datetime.strptime(
+                    value.strip(),
+                    django_to_python_datetime(self._get_format())
+                    or django_to_python_datetime(get_format("SHORT_DATETIME_FORMAT")),
+                ).strftime("%Y-%m-%d")
+            except (ValueError, TypeError) as e:
+                return value
+        return None
+
+
+class AirDateTimePickerInput(widgets.DateTimeInput):
+    def __init__(
+        self,
+        attrs=None,
+        format=None,
+        timepicker=True,
+        clear_button=True,
+        auto_close=True,
+        *args,
+        **kwargs,
+    ):
+        attrs = attrs or {}
+        super().__init__(attrs=attrs, format=format, *args, **kwargs)
+        self.timepicker = timepicker
+        self.clear_button = clear_button
+        self.auto_close = auto_close
+
+    @staticmethod
+    def _get_current_language():
+        """Get current language code in format compatible with AirDatepicker"""
+        lang_code = translation.get_language()
+        # AirDatepicker uses simple language codes
+        return lang_code.split("-")[0]
+
+    def _get_format(self):
+        """Get the format string based on user settings or default"""
+        if self.format:
+            return self.format
+
+        return get_format("SHORT_DATETIME_FORMAT", use_l10n=True)
+
+    def build_attrs(self, base_attrs, extra_attrs=None):
+        attrs = super().build_attrs(base_attrs, extra_attrs)
+
+        date_format, time_format = django_to_airdatepicker_datetime_separated(
+            self._get_format()
+        )
+
+        # Add data attributes for AirDatepicker configuration
+        attrs["data-now-button-txt"] = _("Now")
+        attrs["data-timepicker"] = str(self.timepicker).lower()
+        attrs["data-auto-close"] = str(self.auto_close).lower()
+        attrs["data-clear-button"] = str(self.clear_button).lower()
+        attrs["data-language"] = self._get_current_language()
+        attrs["data-date-format"] = date_format
+        attrs["data-time-format"] = time_format
+
+        return attrs
+
+    def format_value(self, value):
+        """Format the value for display in the widget."""
+        if value and isinstance(value, (datetime.date, datetime.datetime)):
+            self.attrs["data-value"] = datetime.datetime.strftime(
+                value, "%Y-%m-%dT%H:%M:00"
+            )
+        elif value and isinstance(value, str):
+            value = datetime.datetime.strptime(value, "%Y-%m-%d %H:%M:00")
+            self.attrs["data-value"] = datetime.datetime.strftime(
+                value, "%Y-%m-%dT%H:%M:00"
+            )
+
+        if value is None:
+            return ""
+        if isinstance(value, (datetime.date, datetime.datetime)):
+            return formats.date_format(value, format=self._get_format(), use_l10n=True)
+
+        return str(value)
+
+    def value_from_datadict(self, data, files, name):
+        """Parse the datetime string from the form data."""
+        value = super().value_from_datadict(data, files, name)
+        if value:
+            try:
+                # This does it's best to convert Django's PHP-Style date format to a datetime format and reformat the
+                # value to be read by Django. Probably could be improved
+                return datetime.datetime.strptime(
+                    value.strip(),
+                    django_to_python_datetime(self._get_format())
+                    or django_to_python_datetime(get_format("SHORT_DATETIME_FORMAT")),
+                ).strftime("%Y-%m-%d %H:%M:%S")
+            except (ValueError, TypeError) as e:
+                return value
+        return None
+
+
+class AirMonthYearPickerInput(AirDatePickerInput):
+    def __init__(self, attrs=None, format=None, *args, **kwargs):
+        super().__init__(attrs=attrs, format=format, *args, **kwargs)
+        # Store the display format for AirDatepicker
+        self.display_format = "MMMM yyyy"
+        # Store the Python format for internal use
+        self.python_format = "%B %Y"
+
+    @staticmethod
+    def _get_month_names():
+        """Get month names using Django's date translation"""
+        return {dates.MONTHS[i]: i for i in range(1, 13)}
+
+    def build_attrs(self, base_attrs, extra_attrs=None):
+        attrs = super().build_attrs(base_attrs, extra_attrs)
+
+        # Add data attributes for AirDatepicker configuration
+        attrs["data-now-button-txt"] = _("Today")
+        attrs["data-date-format"] = "MMMM yyyy"
+
+        return attrs
+
+    def format_value(self, value):
+        """Format the value for display in the widget."""
+        if value:
+            self.attrs["data-value"] = (
+                value  # We use this to dynamically select the initial date on AirDatePicker
+            )
+
+        if value is None:
+            return ""
+        if isinstance(value, str):
+            try:
+                value = datetime.datetime.strptime(value, "%Y-%m-%d").date()
+            except ValueError:
+                return value
+        if isinstance(value, (datetime.datetime, datetime.date)):
+            # Use Django's date translation
+            month_name = dates.MONTHS[value.month]
+            return f"{month_name} {value.year}"
+        return value
+
+    def value_from_datadict(self, data, files, name):
+        """Convert the value from the widget format back to a format Django can handle."""
+        value = super().value_from_datadict(data, files, name)
+        if value:
+            try:
+                # Split the value into month name and year
+                month_str, year_str = value.rsplit(" ", 1)
+                year = int(year_str)
+
+                # Get month number from translated month name
+                month_names = self._get_month_names()
+                month = month_names.get(month_str)
+
+                if month and year:
+                    # Return the first day of the month in Django's expected format
+                    return datetime.date(year, month, 1).strftime("%Y-%m-%d")
+            except (ValueError, KeyError):
+                return None
+        return None

app/apps/common/widgets/decimal.py

@@ -1,7 +1,9 @@
 from decimal import Decimal, InvalidOperation
 
 from django import forms
-from django.utils.formats import get_format, number_format
+from django.utils.formats import number_format
+
+from apps.common.functions.format import get_format
 
 
 def convert_to_decimal(value: str):

app/apps/currencies/forms.py

@@ -6,9 +6,10 @@ from django.forms import CharField
 from django.utils.translation import gettext_lazy as _
 
 from apps.common.widgets.crispy.submit import NoClassSubmit
+from apps.common.widgets.datepicker import AirDateTimePickerInput
 from apps.common.widgets.decimal import ArbitraryDecimalDisplayNumberInput
-from apps.currencies.models import Currency, ExchangeRate
 from apps.common.widgets.tom_select import TomSelect
+from apps.currencies.models import Currency, ExchangeRate
 
 
 class CurrencyForm(forms.ModelForm):
@@ -64,9 +65,7 @@ class CurrencyForm(forms.ModelForm):
 
 class ExchangeRateForm(forms.ModelForm):
     date = forms.DateTimeField(
-        widget=forms.DateTimeInput(
-            attrs={"type": "datetime-local"}, format="%Y-%m-%dT%H:%M"
-        )
+        label=_("Date"),
     )
 
     class Meta:
@@ -82,6 +81,7 @@ class ExchangeRateForm(forms.ModelForm):
         self.helper.layout = Layout("date", "from_currency", "to_currency", "rate")
 
         self.fields["rate"].widget = ArbitraryDecimalDisplayNumberInput()
+        self.fields["date"].widget = AirDateTimePickerInput(clear_button=False)
 
         if self.instance and self.instance.pk:
             self.helper.layout.append(

app/apps/currencies/models.py

@@ -72,7 +72,9 @@ class ExchangeRate(models.Model):
 
     def clean(self):
         super().clean()
-        if self.from_currency == self.to_currency:
-            raise ValidationError(
-                {"to_currency": _("From and To currencies cannot be the same.")}
-            )
+        # Check if the attributes exist before comparing them
+        if hasattr(self, "from_currency") and hasattr(self, "to_currency"):
+            if self.from_currency == self.to_currency:
+                raise ValidationError(
+                    {"to_currency": _("From and To currencies cannot be the same.")}
+                )

app/apps/currencies/views/currencies.py

@@ -2,9 +2,7 @@ from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse
 from django.shortcuts import render, get_object_or_404
-from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
-from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_http_methods
 
 from apps.common.decorators.htmx import only_htmx
@@ -89,7 +87,6 @@ def currency_edit(request, pk):
 
 @only_htmx
 @login_required
-@csrf_exempt
 @require_http_methods(["DELETE"])
 def currency_delete(request, pk):
     currency = get_object_or_404(Currency, id=pk)

app/apps/currencies/views/exchange_rates.py

@@ -1,12 +1,11 @@
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
-from django.db.models import F, CharField, Value
+from django.db.models import CharField, Value
 from django.db.models.functions import Concat
 from django.http import HttpResponse
 from django.shortcuts import render, get_object_or_404
 from django.utils.translation import gettext_lazy as _
-from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_http_methods
 
 from apps.common.decorators.htmx import only_htmx
@@ -135,7 +134,6 @@ def exchange_rate_edit(request, pk):
 
 @only_htmx
 @login_required
-@csrf_exempt
 @require_http_methods(["DELETE"])
 def exchange_rate_delete(request, pk):
     exchange_rate = get_object_or_404(ExchangeRate, id=pk)

app/apps/dca/forms.py

@@ -1,13 +1,14 @@
 from crispy_forms.bootstrap import FormActions
-from django import forms
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import Layout, Row, Column
+from django import forms
 from django.utils.translation import gettext_lazy as _
 
+from apps.common.widgets.crispy.submit import NoClassSubmit
+from apps.common.widgets.datepicker import AirDatePickerInput
+from apps.common.widgets.decimal import ArbitraryDecimalDisplayNumberInput
 from apps.common.widgets.tom_select import TomSelect
 from apps.dca.models import DCAStrategy, DCAEntry
-from apps.common.widgets.decimal import ArbitraryDecimalDisplayNumberInput
-from apps.common.widgets.crispy.submit import NoClassSubmit
 
 
 class DCAStrategyForm(forms.ModelForm):
@@ -61,7 +62,6 @@ class DCAEntryForm(forms.ModelForm):
             "notes",
         ]
         widgets = {
-            "date": forms.DateInput(attrs={"type": "date"}, format="%Y-%m-%d"),
             "notes": forms.Textarea(attrs={"rows": 3}),
         }
 
@@ -106,3 +106,4 @@ class DCAEntryForm(forms.ModelForm):
 
         self.fields["amount_paid"].widget = ArbitraryDecimalDisplayNumberInput()
         self.fields["amount_received"].widget = ArbitraryDecimalDisplayNumberInput()
+        self.fields["date"].widget = AirDatePickerInput(clear_button=False)

app/apps/dca/views.py

@@ -6,12 +6,11 @@ from django.db.models.functions import TruncMonth
 from django.http import HttpResponse
 from django.shortcuts import render, get_object_or_404
 from django.utils.translation import gettext_lazy as _
-from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_http_methods
 
 from apps.common.decorators.htmx import only_htmx
-from apps.dca.models import DCAStrategy, DCAEntry
 from apps.dca.forms import DCAEntryForm, DCAStrategyForm
+from apps.dca.models import DCAStrategy, DCAEntry
 
 
 @login_required
@@ -82,7 +81,6 @@ def strategy_edit(request, strategy_id):
 
 @only_htmx
 @login_required
-@csrf_exempt
 @require_http_methods(["DELETE"])
 def strategy_delete(request, strategy_id):
     dca_strategy = get_object_or_404(DCAStrategy, id=strategy_id)
@@ -209,7 +207,6 @@ def strategy_entry_edit(request, strategy_id, entry_id):
 
 @only_htmx
 @login_required
-@csrf_exempt
 @require_http_methods(["DELETE"])
 def strategy_entry_delete(request, entry_id, strategy_id):
     dca_entry = get_object_or_404(DCAEntry, id=entry_id, strategy__id=strategy_id)

app/apps/import_app/admin.py

@@ -0,0 +1,6 @@
+from django.contrib import admin
+from apps.import_app import models
+
+# Register your models here.
+admin.site.register(models.ImportRun)
+admin.site.register(models.ImportProfile)

app/apps/import_app/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class ImportConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "apps.import_app"

app/apps/import_app/forms.py

@@ -0,0 +1,64 @@
+from crispy_forms.bootstrap import FormActions
+from crispy_forms.helper import FormHelper
+from crispy_forms.layout import (
+    Layout,
+)
+from django import forms
+from django.utils.translation import gettext_lazy as _
+
+from apps.import_app.models import ImportProfile
+from apps.common.widgets.crispy.submit import NoClassSubmit
+
+
+class ImportProfileForm(forms.ModelForm):
+    class Meta:
+        model = ImportProfile
+        fields = [
+            "name",
+            "version",
+            "yaml_config",
+        ]
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.helper = FormHelper()
+        self.helper.form_tag = False
+        self.helper.form_method = "post"
+        self.helper.layout = Layout("name", "version", "yaml_config")
+
+        if self.instance and self.instance.pk:
+            self.helper.layout.append(
+                FormActions(
+                    NoClassSubmit(
+                        "submit", _("Update"), css_class="btn btn-outline-primary w-100"
+                    ),
+                ),
+            )
+        else:
+            self.helper.layout.append(
+                FormActions(
+                    NoClassSubmit(
+                        "submit", _("Add"), css_class="btn btn-outline-primary w-100"
+                    ),
+                ),
+            )
+
+
+class ImportRunFileUploadForm(forms.Form):
+    file = forms.FileField(label=_("Select a file"))
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.helper = FormHelper()
+        self.helper.form_tag = False
+        self.helper.form_method = "post"
+        self.helper.layout = Layout(
+            "file",
+            FormActions(
+                NoClassSubmit(
+                    "submit", _("Import"), css_class="btn btn-outline-primary w-100"
+                ),
+            ),
+        )

app/apps/import_app/migrations/0001_initial.py

@@ -0,0 +1,51 @@
+# Generated by Django 5.1.5 on 2025-01-19 00:44
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('currencies', '0006_currency_exchange_currency'),
+        ('transactions', '0028_transaction_internal_note'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ImportProfile',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100)),
+                ('yaml_config', models.TextField(help_text='YAML configuration')),
+                ('version', models.IntegerField(choices=[(1, 'Version 1')], default=1, verbose_name='Version')),
+            ],
+            options={
+                'ordering': ['name'],
+            },
+        ),
+        migrations.CreateModel(
+            name='ImportRun',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('status', models.CharField(choices=[('QUEUED', 'Queued'), ('PROCESSING', 'Processing'), ('FAILED', 'Failed'), ('FINISHED', 'Finished')], default='QUEUED', max_length=10, verbose_name='Status')),
+                ('file_name', models.CharField(help_text='File name', max_length=10000)),
+                ('logs', models.TextField(blank=True)),
+                ('processed_rows', models.IntegerField(default=0)),
+                ('total_rows', models.IntegerField(default=0)),
+                ('successful_rows', models.IntegerField(default=0)),
+                ('skipped_rows', models.IntegerField(default=0)),
+                ('failed_rows', models.IntegerField(default=0)),
+                ('started_at', models.DateTimeField(null=True)),
+                ('finished_at', models.DateTimeField(null=True)),
+                ('categories', models.ManyToManyField(related_name='import_runs', to='transactions.transactioncategory')),
+                ('currencies', models.ManyToManyField(related_name='import_runs', to='currencies.currency')),
+                ('entities', models.ManyToManyField(related_name='import_runs', to='transactions.transactionentity')),
+                ('profile', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='import_app.importprofile')),
+                ('tags', models.ManyToManyField(related_name='import_runs', to='transactions.transactiontag')),
+                ('transactions', models.ManyToManyField(related_name='import_runs', to='transactions.transaction')),
+            ],
+        ),
+    ]

app/apps/import_app/migrations/0002_alter_importprofile_name_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.1.5 on 2025-01-23 03:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('import_app', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='importprofile',
+            name='name',
+            field=models.CharField(max_length=100, unique=True, verbose_name='Name'),
+        ),
+        migrations.AlterField(
+            model_name='importprofile',
+            name='yaml_config',
+            field=models.TextField(verbose_name='YAML Configuration'),
+        ),
+    ]

app/apps/import_app/models.py

@@ -0,0 +1,87 @@
+import yaml
+
+from django.core.exceptions import ValidationError
+from django.db import models
+from django.utils.translation import gettext_lazy as _
+
+from apps.import_app.schemas import version_1
+
+
+class ImportProfile(models.Model):
+    class Versions(models.IntegerChoices):
+        VERSION_1 = 1, "Version 1"
+
+    name = models.CharField(max_length=100, verbose_name=_("Name"), unique=True)
+    yaml_config = models.TextField(verbose_name=_("YAML Configuration"))
+    version = models.IntegerField(
+        choices=Versions,
+        default=Versions.VERSION_1,
+        verbose_name=_("Version"),
+    )
+
+    def __str__(self):
+        return self.name
+
+    class Meta:
+        ordering = ["name"]
+
+    def get_version_display(self):
+        version_number = self.Versions(self.version).name.split("_")[1]
+        return _("Version {number}").format(number=version_number)
+
+    def clean(self):
+        if self.version and self.version == self.Versions.VERSION_1:
+            try:
+                yaml_data = yaml.safe_load(self.yaml_config)
+                version_1.ImportProfileSchema(**yaml_data)
+            except Exception as e:
+                raise ValidationError(
+                    {"yaml_config": _("Invalid YAML Configuration: ") + str(e)}
+                )
+
+
+class ImportRun(models.Model):
+    class Status(models.TextChoices):
+        QUEUED = "QUEUED", _("Queued")
+        PROCESSING = "PROCESSING", _("Processing")
+        FAILED = "FAILED", _("Failed")
+        FINISHED = "FINISHED", _("Finished")
+
+    status = models.CharField(
+        max_length=10,
+        choices=Status,
+        default=Status.QUEUED,
+        verbose_name=_("Status"),
+    )
+    profile = models.ForeignKey(
+        ImportProfile,
+        on_delete=models.CASCADE,
+    )
+    file_name = models.CharField(
+        max_length=10000,
+        help_text=_("File name"),
+    )
+    transactions = models.ManyToManyField(
+        "transactions.Transaction", related_name="import_runs"
+    )
+    tags = models.ManyToManyField(
+        "transactions.TransactionTag", related_name="import_runs"
+    )
+    categories = models.ManyToManyField(
+        "transactions.TransactionCategory", related_name="import_runs"
+    )
+    entities = models.ManyToManyField(
+        "transactions.TransactionEntity", related_name="import_runs"
+    )
+    currencies = models.ManyToManyField(
+        "currencies.Currency", related_name="import_runs"
+    )
+
+    logs = models.TextField(blank=True)
+    processed_rows = models.IntegerField(default=0)
+    total_rows = models.IntegerField(default=0)
+    successful_rows = models.IntegerField(default=0)
+    skipped_rows = models.IntegerField(default=0)
+    failed_rows = models.IntegerField(default=0)
+    started_at = models.DateTimeField(null=True)
+    finished_at = models.DateTimeField(null=True)

app/apps/import_app/schemas/__init__.py

@@ -0,0 +1 @@
+import apps.import_app.schemas.v1 as version_1

app/apps/import_app/schemas/v1.py

@@ -0,0 +1,400 @@
+from typing import Dict, List, Optional, Literal
+from pydantic import BaseModel, Field, model_validator, field_validator
+
+
+class CompareDeduplicationRule(BaseModel):
+    type: Literal["compare"]
+    fields: list[str] = Field(..., description="Compare fields for deduplication")
+    match_type: Literal["lax", "strict"] = "lax"
+
+
+class ReplaceTransformationRule(BaseModel):
+    type: Literal["replace", "regex"] = Field(
+        ..., description="Type of transformation: replace or regex"
+    )
+    pattern: str = Field(..., description="Pattern to match")
+    replacement: str = Field(..., description="Value to replace with")
+    exclusive: bool = Field(
+        default=False,
+        description="If it should match against the last transformation or the original value",
+    )
+
+
+class DateFormatTransformationRule(BaseModel):
+    type: Literal["date_format"] = Field(
+        ..., description="Type of transformation: date_format"
+    )
+    original_format: str = Field(..., description="Original date format")
+    new_format: str = Field(..., description="New date format to use")
+
+
+class HashTransformationRule(BaseModel):
+    fields: List[str]
+    type: Literal["hash"]
+
+
+class MergeTransformationRule(BaseModel):
+    fields: List[str]
+    type: Literal["merge"]
+    separator: str = Field(default=" ", description="Separator to use when merging")
+
+
+class SplitTransformationRule(BaseModel):
+    type: Literal["split"]
+    separator: str = Field(default=",", description="Separator to use when splitting")
+    index: int | None = Field(
+        default=0, description="Index to return as value. Empty to return all."
+    )
+
+
+class CSVImportSettings(BaseModel):
+    skip_errors: bool = Field(
+        default=False,
+        description="If True, errors during import will be logged and skipped",
+    )
+    file_type: Literal["csv"] = "csv"
+    delimiter: str = Field(default=",", description="CSV delimiter character")
+    encoding: str = Field(default="utf-8", description="File encoding")
+    skip_lines: int = Field(
+        default=0, description="Number of rows to skip at the beginning of the file"
+    )
+    trigger_transaction_rules: bool = True
+    importing: Literal[
+        "transactions", "accounts", "currencies", "categories", "tags", "entities"
+    ]
+
+
+class ColumnMapping(BaseModel):
+    source: Optional[str] | Optional[list[str]] = Field(
+        default=None,
+        description="CSV column header. If None, the field will be generated from transformations",
+    )
+    default: Optional[str] = None
+    required: bool = False
+    transformations: Optional[
+        List[
+            ReplaceTransformationRule
+            | DateFormatTransformationRule
+            | HashTransformationRule
+            | MergeTransformationRule
+            | SplitTransformationRule
+        ]
+    ] = Field(default_factory=list)
+
+
+class TransactionAccountMapping(ColumnMapping):
+    target: Literal["account"] = Field(..., description="Transaction field to map to")
+    type: Literal["id", "name"] = "name"
+    coerce_to: Literal["str|int"] = Field("str|int", frozen=True)
+    required: bool = Field(True, frozen=True)
+
+
+class TransactionTypeMapping(ColumnMapping):
+    target: Literal["type"] = Field(..., description="Transaction field to map to")
+    detection_method: Literal["sign", "always_income", "always_expense"] = "sign"
+    coerce_to: Literal["transaction_type"] = Field("transaction_type", frozen=True)
+
+
+class TransactionIsPaidMapping(ColumnMapping):
+    target: Literal["is_paid"] = Field(..., description="Transaction field to map to")
+    detection_method: Literal["boolean", "always_paid", "always_unpaid"]
+    coerce_to: Literal["is_paid"] = Field("is_paid", frozen=True)
+
+
+class TransactionDateMapping(ColumnMapping):
+    target: Literal["date"] = Field(..., description="Transaction field to map to")
+    format: List[str] | str
+    coerce_to: Literal["date"] = Field("date", frozen=True)
+    required: bool = Field(True, frozen=True)
+
+
+class TransactionReferenceDateMapping(ColumnMapping):
+    target: Literal["reference_date"] = Field(
+        ..., description="Transaction field to map to"
+    )
+    format: List[str] | str
+    coerce_to: Literal["date"] = Field("date", frozen=True)
+
+
+class TransactionAmountMapping(ColumnMapping):
+    target: Literal["amount"] = Field(..., description="Transaction field to map to")
+    coerce_to: Literal["positive_decimal"] = Field("positive_decimal", frozen=True)
+    required: bool = Field(True, frozen=True)
+
+
+class TransactionDescriptionMapping(ColumnMapping):
+    target: Literal["description"] = Field(
+        ..., description="Transaction field to map to"
+    )
+    coerce_to: Literal["str"] = Field("str", frozen=True)
+
+
+class TransactionNotesMapping(ColumnMapping):
+    target: Literal["notes"] = Field(..., description="Transaction field to map to")
+    coerce_to: Literal["str"] = Field("str", frozen=True)
+
+
+class TransactionTagsMapping(ColumnMapping):
+    target: Literal["tags"] = Field(..., description="Transaction field to map to")
+    type: Literal["id", "name"] = "name"
+    create: bool = Field(
+        default=True, description="Create new tags if they doesn't exist"
+    )
+    coerce_to: Literal["list"] = Field("list", frozen=True)
+
+
+class TransactionEntitiesMapping(ColumnMapping):
+    target: Literal["entities"] = Field(..., description="Transaction field to map to")
+    type: Literal["id", "name"] = "name"
+    create: bool = Field(
+        default=True, description="Create new entities if they doesn't exist"
+    )
+    coerce_to: Literal["list"] = Field("list", frozen=True)
+
+
+class TransactionCategoryMapping(ColumnMapping):
+    target: Literal["category"] = Field(..., description="Transaction field to map to")
+    create: bool = Field(
+        default=True, description="Create category if it doesn't exist"
+    )
+    type: Literal["id", "name"] = "name"
+    coerce_to: Literal["str|int"] = Field("str|int", frozen=True)
+
+
+class TransactionInternalNoteMapping(ColumnMapping):
+    target: Literal["internal_note"] = Field(
+        ..., description="Transaction field to map to"
+    )
+    coerce_to: Literal["str"] = Field("str", frozen=True)
+
+
+class TransactionInternalIDMapping(ColumnMapping):
+    target: Literal["internal_id"] = Field(
+        ..., description="Transaction field to map to"
+    )
+    coerce_to: Literal["str"] = Field("str", frozen=True)
+
+
+class CategoryNameMapping(ColumnMapping):
+    target: Literal["category_name"] = Field(
+        ..., description="Category field to map to"
+    )
+    coerce_to: Literal["str"] = Field("str", frozen=True)
+
+
+class CategoryMuteMapping(ColumnMapping):
+    target: Literal["category_mute"] = Field(
+        ..., description="Category field to map to"
+    )
+    coerce_to: Literal["bool"] = Field("bool", frozen=True)
+
+
+class CategoryActiveMapping(ColumnMapping):
+    target: Literal["category_active"] = Field(
+        ..., description="Category field to map to"
+    )
+    coerce_to: Literal["bool"] = Field("bool", frozen=True)
+
+
+class TagNameMapping(ColumnMapping):
+    target: Literal["tag_name"] = Field(..., description="Tag field to map to")
+    coerce_to: Literal["str"] = Field("str", frozen=True)
+
+
+class TagActiveMapping(ColumnMapping):
+    target: Literal["tag_active"] = Field(..., description="Tag field to map to")
+    coerce_to: Literal["bool"] = Field("bool", frozen=True)
+
+
+class EntityNameMapping(ColumnMapping):
+    target: Literal["entity_name"] = Field(..., description="Entity field to map to")
+    coerce_to: Literal["str"] = Field("str", frozen=True)
+
+
+class EntityActiveMapping(ColumnMapping):
+    target: Literal["entity_active"] = Field(..., description="Entity field to map to")
+    coerce_to: Literal["bool"] = Field("bool", frozen=True)
+
+
+class AccountNameMapping(ColumnMapping):
+    target: Literal["account_name"] = Field(..., description="Account field to map to")
+    coerce_to: Literal["str"] = Field("str", frozen=True)
+
+
+class AccountGroupMapping(ColumnMapping):
+    target: Literal["account_group"] = Field(..., description="Account field to map to")
+    type: Literal["id", "name"]
+    coerce_to: Literal["str|int"] = Field("str|int", frozen=True)
+
+
+class AccountCurrencyMapping(ColumnMapping):
+    target: Literal["account_currency"] = Field(
+        ..., description="Account field to map to"
+    )
+    type: Literal["id", "name", "code"]
+    coerce_to: Literal["str|int"] = Field("str|int", frozen=True)
+
+
+class AccountExchangeCurrencyMapping(ColumnMapping):
+    target: Literal["account_exchange_currency"] = Field(
+        ..., description="Account field to map to"
+    )
+    type: Literal["id", "name", "code"]
+    coerce_to: Literal["str|int"] = Field("str|int", frozen=True)
+
+
+class AccountIsAssetMapping(ColumnMapping):
+    target: Literal["account_is_asset"] = Field(
+        ..., description="Account field to map to"
+    )
+    coerce_to: Literal["bool"] = Field("bool", frozen=True)
+
+
+class AccountIsArchivedMapping(ColumnMapping):
+    target: Literal["account_is_archived"] = Field(
+        ..., description="Account field to map to"
+    )
+    coerce_to: Literal["bool"] = Field("bool", frozen=True)
+
+
+class CurrencyCodeMapping(ColumnMapping):
+    target: Literal["currency_code"] = Field(
+        ..., description="Currency field to map to"
+    )
+    coerce_to: Literal["str"] = Field("str", frozen=True)
+
+
+class CurrencyNameMapping(ColumnMapping):
+    target: Literal["currency_name"] = Field(
+        ..., description="Currency field to map to"
+    )
+    coerce_to: Literal["str"] = Field("str", frozen=True)
+
+
+class CurrencyDecimalPlacesMapping(ColumnMapping):
+    target: Literal["currency_decimal_places"] = Field(
+        ..., description="Currency field to map to"
+    )
+    coerce_to: Literal["int"] = Field("int", frozen=True)
+
+
+class CurrencyPrefixMapping(ColumnMapping):
+    target: Literal["currency_prefix"] = Field(
+        ..., description="Currency field to map to"
+    )
+    coerce_to: Literal["str"] = Field("str", frozen=True)
+
+
+class CurrencySuffixMapping(ColumnMapping):
+    target: Literal["currency_suffix"] = Field(
+        ..., description="Currency field to map to"
+    )
+    coerce_to: Literal["str"] = Field("str", frozen=True)
+
+
+class CurrencyExchangeMapping(ColumnMapping):
+    target: Literal["currency_exchange"] = Field(
+        ..., description="Currency field to map to"
+    )
+    type: Literal["id", "name", "code"]
+    coerce_to: Literal["str|int"] = Field("str|int", frozen=True)
+
+
+class ImportProfileSchema(BaseModel):
+    settings: CSVImportSettings
+    mapping: Dict[
+        str,
+        TransactionAccountMapping
+        | TransactionTypeMapping
+        | TransactionIsPaidMapping
+        | TransactionDateMapping
+        | TransactionReferenceDateMapping
+        | TransactionAmountMapping
+        | TransactionDescriptionMapping
+        | TransactionNotesMapping
+        | TransactionTagsMapping
+        | TransactionEntitiesMapping
+        | TransactionCategoryMapping
+        | TransactionInternalNoteMapping
+        | TransactionInternalIDMapping
+        | CategoryNameMapping
+        | CategoryMuteMapping
+        | CategoryActiveMapping
+        | TagNameMapping
+        | TagActiveMapping
+        | EntityNameMapping
+        | EntityActiveMapping
+        | AccountNameMapping
+        | AccountGroupMapping
+        | AccountCurrencyMapping
+        | AccountExchangeCurrencyMapping
+        | AccountIsAssetMapping
+        | AccountIsArchivedMapping
+        | CurrencyCodeMapping
+        | CurrencyNameMapping
+        | CurrencyDecimalPlacesMapping
+        | CurrencyPrefixMapping
+        | CurrencySuffixMapping
+        | CurrencyExchangeMapping,
+    ]
+    deduplication: List[CompareDeduplicationRule] = Field(
+        default_factory=list,
+        description="Rules for deduplicating records during import",
+    )
+
+    @model_validator(mode="after")
+    def validate_mappings(self) -> "ImportProfileSchema":
+        import_type = self.settings.importing
+
+        # Define allowed mapping types for each import type
+        allowed_mappings = {
+            "transactions": (
+                TransactionAccountMapping,
+                TransactionTypeMapping,
+                TransactionIsPaidMapping,
+                TransactionDateMapping,
+                TransactionReferenceDateMapping,
+                TransactionAmountMapping,
+                TransactionDescriptionMapping,
+                TransactionNotesMapping,
+                TransactionTagsMapping,
+                TransactionEntitiesMapping,
+                TransactionCategoryMapping,
+                TransactionInternalNoteMapping,
+                TransactionInternalIDMapping,
+            ),
+            "accounts": (
+                AccountNameMapping,
+                AccountGroupMapping,
+                AccountCurrencyMapping,
+                AccountExchangeCurrencyMapping,
+                AccountIsAssetMapping,
+                AccountIsArchivedMapping,
+            ),
+            "currencies": (
+                CurrencyCodeMapping,
+                CurrencyNameMapping,
+                CurrencyDecimalPlacesMapping,
+                CurrencyPrefixMapping,
+                CurrencySuffixMapping,
+                CurrencyExchangeMapping,
+            ),
+            "categories": (
+                CategoryNameMapping,
+                CategoryMuteMapping,
+                CategoryActiveMapping,
+            ),
+            "tags": (TagNameMapping, TagActiveMapping),
+            "entities": (EntityNameMapping, EntityActiveMapping),
+        }
+
+        allowed_types = allowed_mappings[import_type]
+
+        for field_name, mapping in self.mapping.items():
+            if not isinstance(mapping, allowed_types):
+                raise ValueError(
+                    f"Mapping type '{type(mapping).__name__}' is not allowed when importing {import_type}. "
+                    f"Allowed types are: {', '.join(t.__name__ for t in allowed_types)}"
+                )
+
+        return self

app/apps/import_app/services/__init__.py

@@ -0,0 +1,3 @@
+from apps.import_app.services.v1 import ImportService as ImportServiceV1
+
+from apps.import_app.services.presets import PresetService

app/apps/import_app/services/presets.py

@@ -0,0 +1,45 @@
+import json
+from pathlib import Path
+
+from apps.import_app.models import ImportProfile
+
+
+class PresetService:
+    PRESET_PATH = "/usr/src/app/import_presets"
+
+    @classmethod
+    def get_all_presets(cls):
+        presets = []
+
+        for folder in Path(cls.PRESET_PATH).iterdir():
+            if folder.is_dir():
+                manifest_path = folder / "manifest.json"
+                config_path = folder / "config.yml"
+
+                if manifest_path.exists() and config_path.exists():
+                    with open(manifest_path) as f:
+                        manifest = json.load(f)
+
+                    with open(config_path) as f:
+                        config = json.dumps(f.read())
+
+                    try:
+                        preset = {
+                            "name": manifest.get("name", folder.name),
+                            "description": manifest.get("description", ""),
+                            "message": json.dumps(manifest.get("message", "")),
+                            "authors": manifest.get("author", "").split(","),
+                            "schema_version": (int(manifest.get("schema_version", 1))),
+                            "folder_name": folder.name,
+                            "config": config,
+                        }
+
+                        ImportProfile.Versions(
+                            preset["schema_version"]
+                        )  # Check if schema version is valid
+                    except Exception as e:
+                        pass
+                    else:
+                        presets.append(preset)
+
+        return presets

app/apps/import_app/services/v1.py

@@ -0,0 +1,642 @@
+import csv
+import hashlib
+import logging
+import os
+import re
+from datetime import datetime
+from decimal import Decimal
+from typing import Dict, Any, Literal, Union
+
+import cachalot.api
+import yaml
+from cachalot.api import cachalot_disabled
+from django.utils import timezone
+
+from apps.accounts.models import Account, AccountGroup
+from apps.currencies.models import Currency
+from apps.import_app.models import ImportRun, ImportProfile
+from apps.import_app.schemas import version_1
+from apps.transactions.models import (
+    Transaction,
+    TransactionCategory,
+    TransactionTag,
+    TransactionEntity,
+)
+from apps.rules.signals import transaction_created
+from apps.import_app.schemas.v1 import (
+    TransactionCategoryMapping,
+    TransactionAccountMapping,
+    TransactionTagsMapping,
+    TransactionEntitiesMapping,
+)
+
+logger = logging.getLogger(__name__)
+
+
+class ImportService:
+    TEMP_DIR = "/usr/src/app/temp"
+
+    def __init__(self, import_run: ImportRun):
+        self.import_run: ImportRun = import_run
+        self.profile: ImportProfile = import_run.profile
+        self.config: version_1.ImportProfileSchema = self._load_config()
+        self.settings: version_1.CSVImportSettings = self.config.settings
+        self.deduplication: list[version_1.CompareDeduplicationRule] = (
+            self.config.deduplication
+        )
+        self.mapping: Dict[str, version_1.ColumnMapping] = self.config.mapping
+
+        # Ensure temp directory exists
+        os.makedirs(self.TEMP_DIR, exist_ok=True)
+
+    def _load_config(self) -> version_1.ImportProfileSchema:
+        yaml_data = yaml.safe_load(self.profile.yaml_config)
+        try:
+            config = version_1.ImportProfileSchema(**yaml_data)
+        except Exception as e:
+            self._log("error", f"Fatal error processing YAML config: {str(e)}")
+            self._update_status("FAILED")
+            raise e
+        else:
+            return config
+
+    def _log(self, level: str, message: str, **kwargs) -> None:
+        """Add a log entry to the import run logs"""
+        timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+
+        # Format additional context if present
+        context = ""
+        if kwargs:
+            context = " - " + ", ".join(f"{k}={v}" for k, v in kwargs.items())
+
+        log_line = f"[{timestamp}] {level.upper()}: {message}{context}\n"
+
+        # Append to existing logs
+        self.import_run.logs += log_line
+        self.import_run.save(update_fields=["logs"])
+
+    def _update_totals(
+        self,
+        field: Literal["total", "processed", "successful", "skipped", "failed"],
+        value: int,
+    ) -> None:
+        if field == "total":
+            self.import_run.total_rows = value
+            self.import_run.save(update_fields=["total_rows"])
+        elif field == "processed":
+            self.import_run.processed_rows = value
+            self.import_run.save(update_fields=["processed_rows"])
+        elif field == "successful":
+            self.import_run.successful_rows = value
+            self.import_run.save(update_fields=["successful_rows"])
+        elif field == "skipped":
+            self.import_run.skipped_rows = value
+            self.import_run.save(update_fields=["skipped_rows"])
+        elif field == "failed":
+            self.import_run.failed_rows = value
+            self.import_run.save(update_fields=["failed_rows"])
+
+    def _increment_totals(
+        self,
+        field: Literal["total", "processed", "successful", "skipped", "failed"],
+        value: int,
+    ) -> None:
+        if field == "total":
+            self.import_run.total_rows = self.import_run.total_rows + value
+            self.import_run.save(update_fields=["total_rows"])
+        elif field == "processed":
+            self.import_run.processed_rows = self.import_run.processed_rows + value
+            self.import_run.save(update_fields=["processed_rows"])
+        elif field == "successful":
+            self.import_run.successful_rows = self.import_run.successful_rows + value
+            self.import_run.save(update_fields=["successful_rows"])
+        elif field == "skipped":
+            self.import_run.skipped_rows = self.import_run.skipped_rows + value
+            self.import_run.save(update_fields=["skipped_rows"])
+        elif field == "failed":
+            self.import_run.failed_rows = self.import_run.failed_rows + value
+            self.import_run.save(update_fields=["failed_rows"])
+
+    def _update_status(
+        self, new_status: Literal["PROCESSING", "FAILED", "FINISHED"]
+    ) -> None:
+        if new_status == "PROCESSING":
+            self.import_run.status = ImportRun.Status.PROCESSING
+        elif new_status == "FAILED":
+            self.import_run.status = ImportRun.Status.FAILED
+        elif new_status == "FINISHED":
+            self.import_run.status = ImportRun.Status.FINISHED
+
+        self.import_run.save(update_fields=["status"])
+
+    @staticmethod
+    def _transform_value(
+        value: str, mapping: version_1.ColumnMapping, row: Dict[str, str] = None
+    ) -> Any:
+        transformed = value
+
+        for transform in mapping.transformations:
+            if transform.type == "hash":
+                # Collect all values to be hashed
+                values_to_hash = []
+                for field in transform.fields:
+                    if field in row:
+                        values_to_hash.append(str(row[field]))
+
+                # Create hash from concatenated values
+                if values_to_hash:
+                    concatenated = "|".join(values_to_hash)
+                    transformed = hashlib.sha256(concatenated.encode()).hexdigest()
+
+            elif transform.type == "replace":
+                if transform.exclusive:
+                    transformed = value.replace(
+                        transform.pattern, transform.replacement
+                    )
+                else:
+                    transformed = transformed.replace(
+                        transform.pattern, transform.replacement
+                    )
+            elif transform.type == "regex":
+                if transform.exclusive:
+                    transformed = re.sub(
+                        transform.pattern, transform.replacement, value
+                    )
+                else:
+                    transformed = re.sub(
+                        transform.pattern, transform.replacement, transformed
+                    )
+            elif transform.type == "date_format":
+                transformed = datetime.strptime(
+                    transformed, transform.original_format
+                ).strftime(transform.new_format)
+            elif transform.type == "merge":
+                values_to_merge = []
+                for field in transform.fields:
+                    if field in row:
+                        values_to_merge.append(str(row[field]))
+                transformed = transform.separator.join(values_to_merge)
+            elif transform.type == "split":
+                parts = transformed.split(transform.separator)
+                if transform.index is not None:
+                    transformed = parts[transform.index] if parts else ""
+                else:
+                    transformed = parts
+
+        return transformed
+
+    def _create_transaction(self, data: Dict[str, Any]) -> Transaction:
+        tags = []
+        entities = []
+        # Handle related objects first
+        if "category" in data:
+            if "category" in data:
+                category_name = data.pop("category")
+                category_mapping = next(
+                    (
+                        m
+                        for m in self.mapping.values()
+                        if isinstance(m, TransactionCategoryMapping)
+                        and m.target == "category"
+                    ),
+                    None,
+                )
+
+                try:
+                    if category_mapping:
+                        if category_mapping.type == "id":
+                            category = TransactionCategory.objects.get(id=category_name)
+                        else:  # name
+                            if getattr(category_mapping, "create", False):
+                                category, _ = TransactionCategory.objects.get_or_create(
+                                    name=category_name
+                                )
+                            else:
+                                category = TransactionCategory.objects.filter(
+                                    name=category_name
+                                ).first()
+
+                        if category:
+                            data["category"] = category
+                            self.import_run.categories.add(category)
+                except (TransactionCategory.DoesNotExist, ValueError):
+                    # Ignore if category doesn't exist and create is False or not set
+                    data["category"] = None
+
+        if "account" in data:
+            account_id = data.pop("account")
+            account_mapping = next(
+                (
+                    m
+                    for m in self.mapping.values()
+                    if isinstance(m, TransactionAccountMapping)
+                    and m.target == "account"
+                ),
+                None,
+            )
+
+            try:
+                if account_mapping and account_mapping.type == "id":
+                    account = Account.objects.filter(id=account_id).first()
+                else:  # name
+                    account = Account.objects.filter(name=account_id).first()
+
+                if account:
+                    data["account"] = account
+            except ValueError:
+                # Ignore if account doesn't exist
+                pass
+
+        if "tags" in data:
+            tag_names = data.pop("tags")
+            tags_mapping = next(
+                (
+                    m
+                    for m in self.mapping.values()
+                    if isinstance(m, TransactionTagsMapping) and m.target == "tags"
+                ),
+                None,
+            )
+
+            for tag_name in tag_names:
+                try:
+                    if tags_mapping:
+                        if tags_mapping.type == "id":
+                            tag = TransactionTag.objects.filter(id=tag_name).first()
+                        else:  # name
+                            if getattr(tags_mapping, "create", False):
+                                tag, _ = TransactionTag.objects.get_or_create(
+                                    name=tag_name.strip()
+                                )
+                            else:
+                                tag = TransactionTag.objects.filter(
+                                    name=tag_name.strip()
+                                ).first()
+
+                        if tag:
+                            tags.append(tag)
+                            self.import_run.tags.add(tag)
+                except ValueError:
+                    # Ignore if tag doesn't exist and create is False or not set
+                    continue
+
+        if "entities" in data:
+            entity_names = data.pop("entities")
+            entities_mapping = next(
+                (
+                    m
+                    for m in self.mapping.values()
+                    if isinstance(m, TransactionEntitiesMapping)
+                    and m.target == "entities"
+                ),
+                None,
+            )
+
+            for entity_name in entity_names:
+                try:
+                    if entities_mapping:
+                        if entities_mapping.type == "id":
+                            entity = TransactionTag.objects.filter(
+                                id=entity_name
+                            ).first()
+                        else:  # name
+                            if getattr(entities_mapping, "create", False):
+                                entity, _ = TransactionEntity.objects.get_or_create(
+                                    name=entity_name.strip()
+                                )
+                            else:
+                                entity = TransactionEntity.objects.filter(
+                                    name=entity_name.strip()
+                                ).first()
+
+                        if entity:
+                            entities.append(entity)
+                            self.import_run.entities.add(entity)
+                except ValueError:
+                    # Ignore if entity doesn't exist and create is False or not set
+                    continue
+
+        # Create the transaction
+        new_transaction = Transaction.objects.create(**data)
+        self.import_run.transactions.add(new_transaction)
+
+        # Add many-to-many relationships
+        if tags:
+            new_transaction.tags.set(tags)
+        if entities:
+            new_transaction.entities.set(entities)
+
+        if self.settings.trigger_transaction_rules:
+            transaction_created.send(sender=new_transaction)
+
+        return new_transaction
+
+    def _create_account(self, data: Dict[str, Any]) -> Account:
+        if "group" in data:
+            group_name = data.pop("group")
+            group, _ = AccountGroup.objects.get_or_create(name=group_name)
+            data["group"] = group
+
+        # Handle currency references
+        if "currency" in data:
+            currency = Currency.objects.get(code=data["currency"])
+            data["currency"] = currency
+            self.import_run.currencies.add(currency)
+
+        if "exchange_currency" in data:
+            exchange_currency = Currency.objects.get(code=data["exchange_currency"])
+            data["exchange_currency"] = exchange_currency
+            self.import_run.currencies.add(exchange_currency)
+
+        return Account.objects.create(**data)
+
+    def _create_currency(self, data: Dict[str, Any]) -> Currency:
+        # Handle exchange currency reference
+        if "exchange_currency" in data:
+            exchange_currency = Currency.objects.get(code=data["exchange_currency"])
+            data["exchange_currency"] = exchange_currency
+            self.import_run.currencies.add(exchange_currency)
+
+        currency = Currency.objects.create(**data)
+        self.import_run.currencies.add(currency)
+        return currency
+
+    def _create_category(self, data: Dict[str, Any]) -> TransactionCategory:
+        category = TransactionCategory.objects.create(**data)
+        self.import_run.categories.add(category)
+        return category
+
+    def _create_tag(self, data: Dict[str, Any]) -> TransactionTag:
+        tag = TransactionTag.objects.create(**data)
+        self.import_run.tags.add(tag)
+        return tag
+
+    def _create_entity(self, data: Dict[str, Any]) -> TransactionEntity:
+        entity = TransactionEntity.objects.create(**data)
+        self.import_run.entities.add(entity)
+        return entity
+
+    def _check_duplicate_transaction(self, transaction_data: Dict[str, Any]) -> bool:
+        for rule in self.deduplication:
+            if rule.type == "compare":
+                query = Transaction.all_objects.all().values("id")
+
+                # Build query conditions for each field in the rule
+                for field in rule.fields:
+                    if field in transaction_data:
+                        if rule.match_type == "strict":
+                            query = query.filter(**{field: transaction_data[field]})
+                        else:  # lax matching
+                            query = query.filter(
+                                **{f"{field}__iexact": transaction_data[field]}
+                            )
+
+                # If we found any matching transaction, it's a duplicate
+                if query.exists():
+                    return True
+
+        return False
+
+    def _coerce_type(
+        self, value: str, mapping: version_1.ColumnMapping
+    ) -> Union[str, int, bool, Decimal, datetime, list]:
+        if not value:
+            return None
+
+        coerce_to = mapping.coerce_to
+
+        return self._coerce_single_type(value, coerce_to, mapping)
+
+    @staticmethod
+    def _coerce_single_type(
+        value: str, coerce_to: str, mapping: version_1.ColumnMapping
+    ) -> Union[str, int, bool, Decimal, datetime.date, list]:
+        if coerce_to == "str":
+            return str(value)
+        elif coerce_to == "int":
+            return int(value)
+        elif coerce_to == "str|int":
+            if hasattr(mapping, "type") and mapping.type == "id":
+                return int(value)
+            elif hasattr(mapping, "type") and mapping.type in ["name", "code"]:
+                return str(value)
+            else:
+                return str(value)
+        elif coerce_to == "bool":
+            return value.lower() in ["true", "1", "yes", "y", "on"]
+        elif coerce_to == "positive_decimal":
+            return abs(Decimal(value))
+        elif coerce_to == "date":
+            if isinstance(
+                mapping,
+                (
+                    version_1.TransactionDateMapping,
+                    version_1.TransactionReferenceDateMapping,
+                ),
+            ):
+                formats = (
+                    mapping.format
+                    if isinstance(mapping.format, list)
+                    else [mapping.format]
+                )
+                for fmt in formats:
+                    try:
+                        return datetime.strptime(value, fmt).date()
+                    except ValueError:
+                        continue
+                raise ValueError(
+                    f"Could not parse date '{value}' with any of the provided formats"
+                )
+            else:
+                raise ValueError(
+                    "Date coercion is only supported for TransactionDateMapping and TransactionReferenceDateMapping"
+                )
+        elif coerce_to == "list":
+            return (
+                value
+                if isinstance(value, list)
+                else [item.strip() for item in value.split(",") if item.strip()]
+            )
+        elif coerce_to == "transaction_type":
+            if isinstance(mapping, version_1.TransactionTypeMapping):
+                if mapping.detection_method == "sign":
+                    return (
+                        Transaction.Type.EXPENSE
+                        if value.startswith("-")
+                        else Transaction.Type.INCOME
+                    )
+                elif mapping.detection_method == "always_income":
+                    return Transaction.Type.INCOME
+                elif mapping.detection_method == "always_expense":
+                    return Transaction.Type.EXPENSE
+            raise ValueError("Invalid transaction type detection method")
+        elif coerce_to == "is_paid":
+            if isinstance(mapping, version_1.TransactionIsPaidMapping):
+                if mapping.detection_method == "boolean":
+                    return value.lower() in ["true", "1", "yes", "y", "on"]
+                elif mapping.detection_method == "always_paid":
+                    return True
+                elif mapping.detection_method == "always_unpaid":
+                    return False
+            raise ValueError("Invalid is_paid detection method")
+        else:
+            raise ValueError(f"Unsupported coercion type: {coerce_to}")
+
+    def _map_row(self, row: Dict[str, str]) -> Dict[str, Any]:
+        mapped_data = {}
+
+        for field, mapping in self.mapping.items():
+            value = None
+
+            if isinstance(mapping.source, str):
+                value = row.get(mapping.source, None)
+            elif isinstance(mapping.source, list):
+                for source in mapping.source:
+                    value = row.get(source, None)
+                    if value:
+                        break
+            else:
+                # If source is None, use None as the initial value
+                value = None
+
+            # Use default_value if value is None
+            if not value:
+                value = mapping.default
+
+            # Apply transformations
+            if mapping.transformations:
+                value = self._transform_value(value, mapping, row)
+
+            value = self._coerce_type(value, mapping)
+
+            if mapping.required and value is None:
+                raise ValueError(f"Required field {field} is missing")
+
+            if value is not None:
+                # Remove the prefix from the target field
+                target = mapping.target
+                if self.settings.importing == "transactions":
+                    mapped_data[target] = value
+                else:
+                    # Remove the model prefix (e.g., "account_" from "account_name")
+                    field_name = target.split("_", 1)[1]
+                    mapped_data[field_name] = value
+
+        return mapped_data
+
+    def _process_row(self, row: Dict[str, str], row_number: int) -> None:
+        try:
+            mapped_data = self._map_row(row)
+
+            if mapped_data:
+                # Handle different import types
+                if self.settings.importing == "transactions":
+                    if self.deduplication and self._check_duplicate_transaction(
+                        mapped_data
+                    ):
+                        self._increment_totals("skipped", 1)
+                        self._log("info", f"Skipped duplicate row {row_number}")
+                        return
+                    self._create_transaction(mapped_data)
+                elif self.settings.importing == "accounts":
+                    self._create_account(mapped_data)
+                elif self.settings.importing == "currencies":
+                    self._create_currency(mapped_data)
+                elif self.settings.importing == "categories":
+                    self._create_category(mapped_data)
+                elif self.settings.importing == "tags":
+                    self._create_tag(mapped_data)
+                elif self.settings.importing == "entities":
+                    self._create_entity(mapped_data)
+
+                self._increment_totals("successful", value=1)
+                self._log("info", f"Successfully processed row {row_number}")
+
+            self._increment_totals("processed", value=1)
+
+        except Exception as e:
+            if not self.settings.skip_errors:
+                self._log("error", f"Fatal error processing row {row_number}: {str(e)}")
+                self._update_status("FAILED")
+                raise
+            else:
+                self._log("warning", f"Error processing row {row_number}: {str(e)}")
+                self._increment_totals("failed", value=1)
+
+            logger.error(f"Fatal error processing row {row_number}", exc_info=e)
+
+    def _process_csv(self, file_path):
+        # First pass: count rows
+        with open(file_path, "r", encoding=self.settings.encoding) as csv_file:
+            # Skip specified number of rows
+            for _ in range(self.settings.skip_lines):
+                next(csv_file)
+
+            reader = csv.DictReader(csv_file, delimiter=self.settings.delimiter)
+            self._update_totals("total", value=sum(1 for _ in reader))
+
+        with open(file_path, "r", encoding=self.settings.encoding) as csv_file:
+            # Skip specified number of rows
+            for _ in range(self.settings.skip_lines):
+                next(csv_file)
+            if self.settings.skip_lines:
+                self._log("info", f"Skipped {self.settings.skip_lines} initial lines")
+
+            reader = csv.DictReader(csv_file, delimiter=self.settings.delimiter)
+
+            self._log("info", f"Starting import with {self.import_run.total_rows} rows")
+
+            for row_number, row in enumerate(reader, start=1):
+                self._process_row(row, row_number)
+
+    def _validate_file_path(self, file_path: str) -> str:
+        """
+        Validates that the file path is within the allowed temporary directory.
+        Returns the absolute path.
+        """
+        abs_path = os.path.abspath(file_path)
+        if not abs_path.startswith(self.TEMP_DIR):
+            raise ValueError(f"Invalid file path. File must be in {self.TEMP_DIR}")
+        return abs_path
+
+    def process_file(self, file_path: str):
+        with cachalot_disabled():
+            # Validate and get absolute path
+            file_path = self._validate_file_path(file_path)
+
+            self._update_status("PROCESSING")
+            self.import_run.started_at = timezone.now()
+            self.import_run.save(update_fields=["started_at"])
+
+            self._log("info", "Starting import process")
+
+            try:
+                if self.settings.file_type == "csv":
+                    self._process_csv(file_path)
+
+                self._update_status("FINISHED")
+                self._log(
+                    "info",
+                    f"Import completed successfully. "
+                    f"Successful: {self.import_run.successful_rows}, "
+                    f"Failed: {self.import_run.failed_rows}, "
+                    f"Skipped: {self.import_run.skipped_rows}",
+                )
+
+            except Exception as e:
+                self._update_status("FAILED")
+                self._log("error", f"Import failed: {str(e)}")
+                raise Exception("Import failed")
+
+            finally:
+                self._log("info", "Cleaning up temporary files")
+                try:
+                    if os.path.exists(file_path):
+                        os.remove(file_path)
+                        self._log("info", f"Deleted temporary file: {file_path}")
+                except OSError as e:
+                    self._log("warning", f"Failed to delete temporary file: {str(e)}")
+
+                self.import_run.finished_at = timezone.now()
+                self.import_run.save(update_fields=["finished_at"])
+        cachalot.api.invalidate()

app/apps/import_app/tasks.py

@@ -0,0 +1,21 @@
+import logging
+
+import cachalot.api
+from procrastinate.contrib.django import app
+
+from apps.import_app.models import ImportRun
+from apps.import_app.services import ImportServiceV1
+
+logger = logging.getLogger(__name__)
+
+
+@app.task
+def process_import(import_run_id: int, file_path: str):
+    try:
+        import_run = ImportRun.objects.get(id=import_run_id)
+        import_service = ImportServiceV1(import_run)
+        import_service.process_file(file_path)
+        cachalot.api.invalidate()
+    except ImportRun.DoesNotExist:
+        cachalot.api.invalidate()
+        raise ValueError(f"ImportRun with id {import_run_id} not found")

app/apps/import_app/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

app/apps/import_app/urls.py

@@ -0,0 +1,56 @@
+from django.urls import path
+import apps.import_app.views as views
+
+urlpatterns = [
+    path("import/", views.import_view, name="import"),
+    path(
+        "import/presets/",
+        views.import_presets_list,
+        name="import_presets_list",
+    ),
+    path(
+        "import/profiles/",
+        views.import_profile_index,
+        name="import_profiles_index",
+    ),
+    path(
+        "import/profiles/list/",
+        views.import_profile_list,
+        name="import_profiles_list",
+    ),
+    path(
+        "import/profiles/<int:profile_id>/delete/",
+        views.import_profile_delete,
+        name="import_profile_delete",
+    ),
+    path(
+        "import/profiles/add/",
+        views.import_profile_add,
+        name="import_profiles_add",
+    ),
+    path(
+        "import/profiles/<int:profile_id>/edit/",
+        views.import_profile_edit,
+        name="import_profile_edit",
+    ),
+    path(
+        "import/profiles/<int:profile_id>/runs/list/",
+        views.import_runs_list,
+        name="import_profile_runs_list",
+    ),
+    path(
+        "import/profiles/<int:profile_id>/runs/<int:run_id>/log/",
+        views.import_run_log,
+        name="import_run_log",
+    ),
+    path(
+        "import/profiles/<int:profile_id>/runs/<int:run_id>/delete/",
+        views.import_run_delete,
+        name="import_run_delete",
+    ),
+    path(
+        "import/profiles/<int:profile_id>/runs/add/",
+        views.import_run_add,
+        name="import_run_add",
+    ),
+]

app/apps/import_app/views.py

@@ -0,0 +1,227 @@
+import shutil
+
+from django.contrib import messages
+from django.contrib.auth.decorators import login_required
+from django.core.files.storage import FileSystemStorage
+from django.http import HttpResponse
+from django.shortcuts import render, get_object_or_404
+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.import_app.forms import ImportRunFileUploadForm, ImportProfileForm
+from apps.import_app.models import ImportRun, ImportProfile
+from apps.import_app.services import PresetService
+from apps.import_app.tasks import process_import
+
+
+def import_view(request):
+    import_profile = ImportProfile.objects.get(id=2)
+    shutil.copyfile(
+        "/usr/src/app/apps/import_app/teste2.csv", "/usr/src/app/temp/teste2.csv"
+    )
+    ir = ImportRun.objects.create(profile=import_profile, file_name="teste.csv")
+    process_import.defer(
+        import_run_id=ir.id,
+        file_path="/usr/src/app/temp/teste2.csv",
+    )
+    return HttpResponse("Hello, world. You're at the polls page.")
+
+
+@login_required
+@require_http_methods(["GET"])
+def import_presets_list(request):
+    presets = PresetService.get_all_presets()
+    return render(
+        request,
+        "import_app/fragments/profiles/list_presets.html",
+        {"presets": presets},
+    )
+
+
+@login_required
+@require_http_methods(["GET", "POST"])
+def import_profile_index(request):
+    return render(
+        request,
+        "import_app/pages/profiles_index.html",
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET", "POST"])
+def import_profile_list(request):
+    profiles = ImportProfile.objects.all()
+
+    return render(
+        request,
+        "import_app/fragments/profiles/list.html",
+        {"profiles": profiles},
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET", "POST"])
+def import_profile_add(request):
+    message = request.POST.get("message", None)
+
+    if request.method == "POST" and request.POST.get("submit"):
+        form = ImportProfileForm(request.POST)
+
+        if form.is_valid():
+            form.save()
+            messages.success(request, _("Import Profile added successfully"))
+
+            return HttpResponse(
+                status=204,
+                headers={
+                    "HX-Trigger": "updated, hide_offcanvas",
+                },
+            )
+    else:
+        form = ImportProfileForm(
+            initial={
+                "name": request.POST.get("name"),
+                "version": int(request.POST.get("version", 1)),
+                "yaml_config": request.POST.get("yaml_config"),
+            }
+        )
+
+    return render(
+        request,
+        "import_app/fragments/profiles/add.html",
+        {"form": form, "message": message},
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET", "POST"])
+def import_profile_edit(request, profile_id):
+    profile = get_object_or_404(ImportProfile, id=profile_id)
+
+    if request.method == "POST":
+        form = ImportProfileForm(request.POST, instance=profile)
+
+        if form.is_valid():
+            form.save()
+            messages.success(request, _("Import Profile update successfully"))
+
+            return HttpResponse(
+                status=204,
+                headers={
+                    "HX-Trigger": "updated, hide_offcanvas",
+                },
+            )
+    else:
+        form = ImportProfileForm(instance=profile)
+
+    return render(
+        request,
+        "import_app/fragments/profiles/edit.html",
+        {"form": form, "profile": profile},
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["DELETE"])
+def import_profile_delete(request, profile_id):
+    profile = ImportProfile.objects.get(id=profile_id)
+
+    profile.delete()
+
+    messages.success(request, _("Import Profile deleted successfully"))
+
+    return HttpResponse(
+        status=204,
+        headers={
+            "HX-Trigger": "updated",
+        },
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET", "POST"])
+def import_runs_list(request, profile_id):
+    profile = ImportProfile.objects.get(id=profile_id)
+
+    runs = ImportRun.objects.filter(profile=profile).order_by("-id")
+
+    return render(
+        request,
+        "import_app/fragments/runs/list.html",
+        {"profile": profile, "runs": runs},
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET", "POST"])
+def import_run_log(request, profile_id, run_id):
+    run = ImportRun.objects.get(profile__id=profile_id, id=run_id)
+
+    return render(
+        request,
+        "import_app/fragments/runs/log.html",
+        {"run": run},
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET", "POST"])
+def import_run_add(request, profile_id):
+    profile = ImportProfile.objects.get(id=profile_id)
+
+    if request.method == "POST":
+        form = ImportRunFileUploadForm(request.POST, request.FILES)
+
+        if form.is_valid():
+            uploaded_file = request.FILES["file"]
+            fs = FileSystemStorage(location="/usr/src/app/temp")
+            filename = fs.save(uploaded_file.name, uploaded_file)
+            file_path = fs.path(filename)
+
+            import_run = ImportRun.objects.create(profile=profile, file_name=filename)
+
+            # Defer the procrastinate task
+            process_import.defer(import_run_id=import_run.id, file_path=file_path)
+
+            messages.success(request, _("Import Run queued successfully"))
+
+            return HttpResponse(
+                status=204,
+                headers={
+                    "HX-Trigger": "updated, hide_offcanvas",
+                },
+            )
+    else:
+        form = ImportRunFileUploadForm()
+
+    return render(
+        request,
+        "import_app/fragments/runs/add.html",
+        {"form": form, "profile": profile},
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["DELETE"])
+def import_run_delete(request, profile_id, run_id):
+    run = ImportRun.objects.get(profile__id=profile_id, id=run_id)
+
+    run.delete()
+
+    messages.success(request, _("Run deleted successfully"))
+
+    return HttpResponse(
+        status=204,
+        headers={
+            "HX-Trigger": "updated",
+        },
+    )

app/apps/monthly_overview/urls.py

@@ -19,4 +19,19 @@ urlpatterns = [
         views.monthly_summary,
         name="monthly_summary",
     ),
+    path(
+        "monthly/<int:month>/<int:year>/summary/accounts/",
+        views.monthly_account_summary,
+        name="monthly_account_summary",
+    ),
+    path(
+        "monthly/<int:month>/<int:year>/summary/currencies/",
+        views.monthly_currency_summary,
+        name="monthly_currency_summary",
+    ),
+    path(
+        "monthly/summary/select/<str:selected>/",
+        views.monthly_summary_select,
+        name="monthly_summary_select",
+    ),
 ]

app/apps/monthly_overview/views.py

@@ -2,6 +2,7 @@ from django.contrib.auth.decorators import login_required
 from django.db.models import (
     Q,
 )
+from django.http import HttpResponse
 from django.shortcuts import render, redirect
 from django.utils import timezone
 from django.views.decorators.http import require_http_methods
@@ -16,6 +17,7 @@ from apps.transactions.models import Transaction
 from apps.transactions.utils.calculations import (
     calculate_currency_totals,
     calculate_percentage_distribution,
+    calculate_account_totals,
 )
 from apps.transactions.utils.default_ordering import default_order
 
@@ -30,6 +32,9 @@ def index(request):
 @login_required
 @require_http_methods(["GET"])
 def monthly_overview(request, month: int, year: int):
+    order = request.session.get("monthly_transactions_order", "default")
+    summary_tab = request.session.get("monthly_summary_tab", "summary")
+
     if month < 1 or month > 12:
         from django.http import Http404
 
@@ -54,6 +59,8 @@ def monthly_overview(request, month: int, year: int):
             "previous_month": previous_month,
             "previous_year": previous_year,
             "filter": f,
+            "order": order,
+            "summary_tab": summary_tab,
         },
     )
 
@@ -62,7 +69,12 @@ def monthly_overview(request, month: int, year: int):
 @login_required
 @require_http_methods(["GET"])
 def transactions_list(request, month: int, year: int):
-    order = request.GET.get("order")
+    order = request.session.get("monthly_transactions_order", "default")
+
+    if "order" in request.GET:
+        order = request.GET["order"]
+        if order != request.session.get("monthly_transactions_order", "default"):
+            request.session["monthly_transactions_order"] = order
 
     f = TransactionsFilter(request.GET)
     transactions_filtered = (
@@ -79,6 +91,7 @@ def transactions_list(request, month: int, year: int):
             "account__exchange_currency",
             "account__currency",
             "installment_plan",
+            "entities",
         )
     )
 
@@ -122,3 +135,61 @@ def monthly_summary(request, month: int, year: int):
         "monthly_overview/fragments/monthly_summary.html",
         context=context,
     )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def monthly_account_summary(request, month: int, year: int):
+    # Base queryset with all required filters
+    base_queryset = Transaction.objects.filter(
+        reference_date__year=year,
+        reference_date__month=month,
+    ).exclude(Q(category__mute=True) & ~Q(category=None))
+
+    account_data = calculate_account_totals(transactions_queryset=base_queryset.all())
+    account_percentages = calculate_percentage_distribution(account_data)
+
+    context = {
+        "account_data": account_data,
+        "account_percentages": account_percentages,
+    }
+
+    return render(
+        request,
+        "monthly_overview/fragments/monthly_account_summary.html",
+        context=context,
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def monthly_currency_summary(request, month: int, year: int):
+    # Base queryset with all required filters
+    base_queryset = Transaction.objects.filter(
+        reference_date__year=year,
+        reference_date__month=month,
+    ).exclude(Q(category__mute=True) & ~Q(category=None))
+
+    currency_data = calculate_currency_totals(base_queryset.all(), ignore_empty=True)
+    currency_percentages = calculate_percentage_distribution(currency_data)
+
+    context = {
+        "currency_data": currency_data,
+        "currency_percentages": currency_percentages,
+    }
+
+    return render(
+        request, "monthly_overview/fragments/monthly_currency_summary.html", context
+    )
+
+
+@login_required
+@require_http_methods(["GET"])
+def monthly_summary_select(request, selected):
+    request.session["monthly_summary_tab"] = selected
+
+    return HttpResponse(
+        status=204,
+    )

app/apps/rules/urls.py

@@ -52,19 +52,4 @@ urlpatterns = [
         views.transaction_rule_action_delete,
         name="transaction_rule_action_delete",
     ),
-    # path(
-    #     "rules/<int:installment_plan_id>/transactions/",
-    #     views.installment_plan_transactions,
-    #     name="rule_view",
-    # ),
-    # path(
-    #     "rules/<int:installment_plan_id>/edit/",
-    #     views.installment_plan_edit,
-    #     name="rule_edit",
-    # ),
-    # path(
-    #     "rules/<int:installment_plan_id>/delete/",
-    #     views.installment_plan_delete,
-    #     name="rule_delete",
-    # ),
 ]

app/apps/rules/views.py

@@ -3,7 +3,6 @@ from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse
 from django.shortcuts import render, get_object_or_404, redirect
 from django.utils.translation import gettext_lazy as _
-from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_http_methods
 
 from apps.common.decorators.htmx import only_htmx
@@ -118,7 +117,6 @@ def transaction_rule_view(request, transaction_rule_id):
 
 @only_htmx
 @login_required
-@csrf_exempt
 @require_http_methods(["DELETE"])
 def transaction_rule_delete(request, transaction_rule_id):
     transaction_rule = get_object_or_404(TransactionRule, id=transaction_rule_id)
@@ -201,7 +199,6 @@ def transaction_rule_action_edit(request, transaction_rule_action_id):
 
 @only_htmx
 @login_required
-@csrf_exempt
 @require_http_methods(["DELETE"])
 def transaction_rule_action_delete(request, transaction_rule_action_id):
     transaction_rule_action = get_object_or_404(

app/apps/transactions/admin.py

@@ -12,15 +12,34 @@ from apps.transactions.models import (
 
 @admin.register(Transaction)
 class TransactionModelAdmin(admin.ModelAdmin):
+    def get_queryset(self, request):
+        # Use the all_objects manager to show all transactions, including deleted ones
+        return self.model.all_objects.all()
+
+    list_filter = ["deleted", "type", "is_paid", "date", "account"]
+
     list_display = [
+        "date",
         "description",
         "type",
         "account__name",
         "amount",
         "account__currency__code",
-        "date",
         "reference_date",
+        "deleted",
     ]
+    readonly_fields = ["deleted_at"]
+
+    actions = ["hard_delete_selected"]
+
+    def hard_delete_selected(self, request, queryset):
+        for obj in queryset:
+            obj.hard_delete()
+        self.message_user(
+            request, f"Successfully hard deleted {queryset.count()} transactions."
+        )
+
+    hard_delete_selected.short_description = "Hard delete selected transactions"
 
 
 class TransactionInline(admin.TabularInline):

app/apps/transactions/filters.py

@@ -8,6 +8,7 @@ from django_filters import Filter
 
 from apps.accounts.models import Account
 from apps.common.fields.month_year import MonthYearFormField
+from apps.common.widgets.datepicker import AirDatePickerInput
 from apps.common.widgets.decimal import ArbitraryDecimalDisplayNumberInput
 from apps.common.widgets.tom_select import TomSelectMultiple
 from apps.currencies.models import Currency
@@ -87,13 +88,11 @@ class TransactionsFilter(django_filters.FilterSet):
     date_start = django_filters.DateFilter(
         field_name="date",
         lookup_expr="gte",
-        widget=forms.DateInput(attrs={"type": "date"}, format="%Y-%m-%d"),
         label=_("Date from"),
     )
     date_end = django_filters.DateFilter(
         field_name="date",
         lookup_expr="lte",
-        widget=forms.DateInput(attrs={"type": "date"}, format="%Y-%m-%d"),
         label=_("Until"),
     )
     reference_date_start = MonthYearFilter(
@@ -183,3 +182,5 @@ class TransactionsFilter(django_filters.FilterSet):
 
         self.form.fields["to_amount"].widget = ArbitraryDecimalDisplayNumberInput()
         self.form.fields["from_amount"].widget = ArbitraryDecimalDisplayNumberInput()
+        self.form.fields["date_start"].widget = AirDatePickerInput()
+        self.form.fields["date_end"].widget = AirDatePickerInput()

app/apps/transactions/forms.py

@@ -1,5 +1,5 @@
-from crispy_bootstrap5.bootstrap5 import Switch
-from crispy_forms.bootstrap import FormActions
+from crispy_bootstrap5.bootstrap5 import Switch, BS5Accordion
+from crispy_forms.bootstrap import FormActions, AccordionGroup
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import (
     Layout,
@@ -16,10 +16,11 @@ from apps.common.fields.forms.dynamic_select import (
     DynamicModelChoiceField,
     DynamicModelMultipleChoiceField,
 )
-from apps.common.fields.month_year import MonthYearFormField
 from apps.common.widgets.crispy.submit import NoClassSubmit
+from apps.common.widgets.datepicker import AirDatePickerInput, AirMonthYearPickerInput
 from apps.common.widgets.decimal import ArbitraryDecimalDisplayNumberInput
 from apps.common.widgets.tom_select import TomSelect
+from apps.rules.signals import transaction_created, transaction_updated
 from apps.transactions.models import (
     Transaction,
     TransactionCategory,
@@ -28,7 +29,6 @@ from apps.transactions.models import (
     RecurringTransaction,
     TransactionEntity,
 )
-from apps.rules.signals import transaction_created, transaction_updated
 
 
 class TransactionForm(forms.ModelForm):
@@ -59,7 +59,12 @@ class TransactionForm(forms.ModelForm):
         label=_("Account"),
         widget=TomSelect(clear_button=False, group_by="group"),
     )
-    reference_date = MonthYearFormField(label=_("Reference Date"), required=False)
+
+    date = forms.DateField(label=_("Date"))
+
+    reference_date = forms.DateField(
+        widget=AirMonthYearPickerInput(), label=_("Reference Date"), required=False
+    )
 
     class Meta:
         model = Transaction
@@ -77,7 +82,6 @@ class TransactionForm(forms.ModelForm):
             "entities",
         ]
         widgets = {
-            "date": forms.DateInput(attrs={"type": "date"}, format="%Y-%m-%d"),
             "notes": forms.Textarea(attrs={"rows": 3}),
             "account": TomSelect(clear_button=False, group_by="group"),
         }
@@ -111,15 +115,15 @@ class TransactionForm(forms.ModelForm):
                 "type",
                 template="transactions/widgets/income_expense_toggle_buttons.html",
             ),
-            Switch("is_paid"),
+            Field("is_paid", template="transactions/widgets/paid_toggle_button.html"),
             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("date", css_class="form-group col-md-6 mb-0"),
-                Column("reference_date", css_class="form-group col-md-6 mb-0"),
+                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",
@@ -132,7 +136,48 @@ class TransactionForm(forms.ModelForm):
             "notes",
         )
 
+        self.helper_simple = FormHelper()
+        self.helper_simple.form_tag = False
+        self.helper_simple.form_method = "post"
+        self.helper_simple.layout = Layout(
+            Field(
+                "type",
+                template="transactions/widgets/income_expense_toggle_buttons.html",
+            ),
+            Field("is_paid", template="transactions/widgets/paid_toggle_button.html"),
+            "account",
+            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"),
+            BS5Accordion(
+                AccordionGroup(
+                    _("More"),
+                    "entities",
+                    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",
+                    active=False,
+                ),
+                flush=False,
+                always_open=False,
+                css_class="mb-3",
+            ),
+            FormActions(
+                NoClassSubmit(
+                    "submit", _("Add"), css_class="btn btn-outline-primary w-100"
+                ),
+            ),
+        )
+
         self.fields["reference_date"].required = False
+        self.fields["date"].widget = AirDatePickerInput(clear_button=False)
 
         if self.instance and self.instance.pk:
             decimal_places = self.instance.account.currency.decimal_places
@@ -178,6 +223,43 @@ class TransactionForm(forms.ModelForm):
         return instance
 
 
+class BulkEditTransactionForm(TransactionForm):
+    is_paid = forms.NullBooleanField(required=False)
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        # Make all fields optional
+        for field_name, field in self.fields.items():
+            field.required = False
+
+        del self.helper.layout[-1]  # Remove button
+        del self.helper.layout[0:2]  # Remove type, is_paid field
+
+        self.helper.layout.insert(
+            0,
+            Field(
+                "type",
+                template="transactions/widgets/unselectable_income_expense_toggle_buttons.html",
+            ),
+        )
+
+        self.helper.layout.insert(
+            1,
+            Field(
+                "is_paid",
+                template="transactions/widgets/unselectable_paid_toggle_button.html",
+            ),
+        )
+
+        self.helper.layout.append(
+            FormActions(
+                NoClassSubmit(
+                    "submit", _("Update"), css_class="btn btn-outline-primary w-100"
+                ),
+            ),
+        )
+
+
 class TransferForm(forms.Form):
     from_account = forms.ModelChoiceField(
         queryset=Account.objects.filter(is_archived=False),
@@ -234,11 +316,12 @@ class TransferForm(forms.Form):
         queryset=TransactionTag.objects.filter(active=True),
     )
 
-    date = forms.DateField(
-        label=_("Date"),
-        widget=forms.DateInput(attrs={"type": "date"}, format="%Y-%m-%d"),
+    date = forms.DateField(label=_("Date"))
+
+    reference_date = forms.DateField(
+        widget=AirMonthYearPickerInput(), label=_("Reference Date"), required=False
     )
-    reference_date = MonthYearFormField(label=_("Reference Date"), required=False)
+
     description = forms.CharField(max_length=500, label=_("Description"))
     notes = forms.CharField(
         required=False,
@@ -318,8 +401,8 @@ class TransferForm(forms.Form):
         )
 
         self.fields["from_amount"].widget = ArbitraryDecimalDisplayNumberInput()
-
         self.fields["to_amount"].widget = ArbitraryDecimalDisplayNumberInput()
+        self.fields["date"].widget = AirDatePickerInput(clear_button=False)
 
     def clean(self):
         cleaned_data = super().clean()
@@ -404,7 +487,10 @@ class InstallmentPlanForm(forms.ModelForm):
         queryset=TransactionEntity.objects.filter(active=True),
     )
     type = forms.ChoiceField(choices=Transaction.Type.choices)
-    reference_date = MonthYearFormField(label=_("Reference Date"), required=False)
+
+    reference_date = forms.DateField(
+        widget=AirMonthYearPickerInput(), label=_("Reference Date"), required=False
+    )
 
     class Meta:
         model = InstallmentPlan
@@ -424,7 +510,6 @@ class InstallmentPlanForm(forms.ModelForm):
             "entities",
         ]
         widgets = {
-            "start_date": forms.DateInput(attrs={"type": "date"}, format="%Y-%m-%d"),
             "account": TomSelect(),
             "recurrence": TomSelect(clear_button=False),
             "notes": forms.Textarea(attrs={"rows": 3}),
@@ -487,6 +572,7 @@ class InstallmentPlanForm(forms.ModelForm):
         )
 
         self.fields["installment_amount"].widget = ArbitraryDecimalDisplayNumberInput()
+        self.fields["start_date"].widget = AirDatePickerInput(clear_button=False)
 
         if self.instance and self.instance.pk:
             self.helper.layout.append(
@@ -646,7 +732,6 @@ class RecurringTransactionForm(forms.ModelForm):
         queryset=TransactionEntity.objects.filter(active=True),
     )
     type = forms.ChoiceField(choices=Transaction.Type.choices)
-    reference_date = MonthYearFormField(label=_("Reference Date"), required=False)
 
     class Meta:
         model = RecurringTransaction
@@ -666,8 +751,7 @@ class RecurringTransactionForm(forms.ModelForm):
             "entities",
         ]
         widgets = {
-            "start_date": forms.DateInput(attrs={"type": "date"}, format="%Y-%m-%d"),
-            "end_date": forms.DateInput(attrs={"type": "date"}, format="%Y-%m-%d"),
+            "reference_date": AirMonthYearPickerInput(),
             "recurrence_type": TomSelect(clear_button=False),
             "notes": forms.Textarea(
                 attrs={
@@ -733,6 +817,8 @@ class RecurringTransactionForm(forms.ModelForm):
         )
 
         self.fields["amount"].widget = ArbitraryDecimalDisplayNumberInput()
+        self.fields["start_date"].widget = AirDatePickerInput(clear_button=False)
+        self.fields["end_date"].widget = AirDatePickerInput()
 
         if self.instance and self.instance.pk:
             self.helper.layout.append(
@@ -767,5 +853,7 @@ class RecurringTransactionForm(forms.ModelForm):
         instance = super().save(**kwargs)
         if is_new:
             instance.create_upcoming_transactions()
+        else:
+            instance.update_unpaid_transactions()
 
         return instance

app/apps/transactions/migrations/0027_alter_transaction_description.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.4 on 2025-01-14 12:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('transactions', '0026_transactionentity_active'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='transaction',
+            name='description',
+            field=models.CharField(blank=True, max_length=500, verbose_name='Description'),
+        ),
+    ]

app/apps/transactions/migrations/0028_transaction_internal_note.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.5 on 2025-01-19 00:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('transactions', '0027_alter_transaction_description'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='transaction',
+            name='internal_note',
+            field=models.TextField(blank=True, verbose_name='Internal Note'),
+        ),
+    ]

app/apps/transactions/migrations/0029_alter_transaction_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.1.5 on 2025-01-19 14:59
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('transactions', '0028_transaction_internal_note'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='transaction',
+            options={'default_manager_name': 'objects', 'verbose_name': 'Transaction', 'verbose_name_plural': 'Transactions'},
+        ),
+    ]

app/apps/transactions/migrations/0030_transaction_deleted_transaction_deleted_at.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.1.5 on 2025-01-19 14:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('transactions', '0029_alter_transaction_options'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='transaction',
+            name='deleted',
+            field=models.BooleanField(default=False, verbose_name='Deleted'),
+        ),
+        migrations.AddField(
+            model_name='transaction',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+    ]

app/apps/transactions/migrations/0031_alter_transaction_deleted.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.5 on 2025-01-19 15:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('transactions', '0030_transaction_deleted_transaction_deleted_at'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='transaction',
+            name='deleted',
+            field=models.BooleanField(db_index=True, default=False, verbose_name='Deleted'),
+        ),
+    ]

app/apps/transactions/migrations/0032_transaction_created_at_transaction_updated_at.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.1.5 on 2025-01-19 16:48
+
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('transactions', '0031_alter_transaction_deleted'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='transaction',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='transaction',
+            name='updated_at',
+            field=models.DateTimeField(auto_now=True),
+        ),
+    ]

app/apps/transactions/migrations/0033_transaction_internal_id.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.1.5 on 2025-01-21 01:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("transactions", "0032_transaction_created_at_transaction_updated_at"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="transaction",
+            name="internal_id",
+            field=models.TextField(
+                blank=True, null=True, unique=True, verbose_name="Internal ID"
+            ),
+        ),
+    ]

app/apps/transactions/models.py

@@ -6,6 +6,7 @@ from django.db import models, transaction
 from django.db.models import Q
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
+from django.conf import settings
 
 from apps.common.fields.month_year import MonthYearModelField
 from apps.common.functions.decimals import truncate_decimal
@@ -15,6 +16,53 @@ from apps.transactions.validators import validate_decimal_places, validate_non_n
 logger = logging.getLogger()
 
 
+class SoftDeleteQuerySet(models.QuerySet):
+    def delete(self):
+        if not settings.ENABLE_SOFT_DELETE:
+            # If soft deletion is disabled, perform a normal delete
+            return super().delete()
+
+        # Separate the queryset into already deleted and not deleted objects
+        already_deleted = self.filter(deleted=True)
+        not_deleted = self.filter(deleted=False)
+
+        # Use a transaction to ensure atomicity
+        with transaction.atomic():
+            # Perform hard delete on already deleted objects
+            hard_deleted_count = already_deleted._raw_delete(already_deleted.db)
+
+            # Perform soft delete on not deleted objects
+            soft_deleted_count = not_deleted.update(
+                deleted=True, deleted_at=timezone.now()
+            )
+
+        # Return a tuple of counts as expected by Django's delete method
+        return (
+            hard_deleted_count + soft_deleted_count,
+            {"Transaction": hard_deleted_count + soft_deleted_count},
+        )
+
+    def hard_delete(self):
+        return super().delete()
+
+
+class SoftDeleteManager(models.Manager):
+    def get_queryset(self):
+        qs = SoftDeleteQuerySet(self.model, using=self._db)
+        return qs.filter(deleted=False)
+
+
+class AllObjectsManager(models.Manager):
+    def get_queryset(self):
+        return SoftDeleteQuerySet(self.model, using=self._db)
+
+
+class DeletedObjectsManager(models.Manager):
+    def get_queryset(self):
+        qs = SoftDeleteQuerySet(self.model, using=self._db)
+        return qs.filter(deleted=True)
+
+
 class TransactionCategory(models.Model):
     name = models.CharField(max_length=255, verbose_name=_("Name"), unique=True)
     mute = models.BooleanField(default=False, verbose_name=_("Mute"))
@@ -101,7 +149,9 @@ class Transaction(models.Model):
         validators=[validate_non_negative, validate_decimal_places],
     )
 
-    description = models.CharField(max_length=500, verbose_name=_("Description"))
+    description = models.CharField(
+        max_length=500, verbose_name=_("Description"), blank=True
+    )
     notes = models.TextField(blank=True, verbose_name=_("Notes"))
     category = models.ForeignKey(
         TransactionCategory,
@@ -139,11 +189,29 @@ class Transaction(models.Model):
         related_name="transactions",
         verbose_name=_("Recurring Transaction"),
     )
+    internal_note = models.TextField(blank=True, verbose_name=_("Internal Note"))
+    internal_id = models.TextField(
+        blank=True, null=True, unique=True, verbose_name=_("Internal ID")
+    )
+
+    deleted = models.BooleanField(
+        default=False, verbose_name=_("Deleted"), db_index=True
+    )
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+    deleted_at = models.DateTimeField(
+        null=True, blank=True, verbose_name=_("Deleted At")
+    )
+
+    objects = SoftDeleteManager.from_queryset(SoftDeleteQuerySet)()
+    all_objects = AllObjectsManager.from_queryset(SoftDeleteQuerySet)()
+    deleted_objects = DeletedObjectsManager.from_queryset(SoftDeleteQuerySet)()
 
     class Meta:
         verbose_name = _("Transaction")
         verbose_name_plural = _("Transactions")
         db_table = "transactions"
+        default_manager_name = "objects"
 
     def save(self, *args, **kwargs):
         self.amount = truncate_decimal(
@@ -158,6 +226,20 @@ class Transaction(models.Model):
         self.full_clean()
         super().save(*args, **kwargs)
 
+    def delete(self, *args, **kwargs):
+        if settings.ENABLE_SOFT_DELETE:
+            if not self.deleted:
+                self.deleted = True
+                self.deleted_at = timezone.now()
+                self.save()
+            else:
+                super().delete(*args, **kwargs)
+        else:
+            super().delete(*args, **kwargs)
+
+    def hard_delete(self, *args, **kwargs):
+        super().delete(*args, **kwargs)
+
     def exchanged_amount(self):
         if self.account.exchange_currency:
             converted_amount, prefix, suffix, decimal_places = convert(
@@ -176,6 +258,10 @@ class Transaction(models.Model):
 
         return None
 
+    def __str__(self):
+        type_display = self.get_type_display()
+        return f"{self.description} - {type_display} - {self.account} - {self.date}"
+
 
 class InstallmentPlan(models.Model):
     class Recurrence(models.TextChoices):
@@ -334,10 +420,15 @@ class InstallmentPlan(models.Model):
                 existing_transaction.type = self.type
                 existing_transaction.date = transaction_date
                 existing_transaction.reference_date = transaction_reference_date
-                existing_transaction.amount = self.installment_amount
                 existing_transaction.description = self.description
                 existing_transaction.category = self.category
                 existing_transaction.notes = self.notes
+
+                if (
+                    not existing_transaction.is_paid
+                ):  # Don't update value for paid transactions
+                    existing_transaction.amount = self.installment_amount
+
                 existing_transaction.save()
 
                 # Update tags
@@ -540,3 +631,33 @@ class RecurringTransaction(models.Model):
             recurring_transaction.save(
                 update_fields=["last_generated_date", "last_generated_reference_date"]
             )
+
+    def update_unpaid_transactions(self):
+        """
+        Updates all unpaid transactions associated with this RecurringTransaction.
+
+        Only unpaid transactions (`is_paid=False`) are modified. Updates fields like
+        amount, description, category, notes, and many-to-many relationships (tags, entities).
+        """
+        unpaid_transactions = self.transactions.filter(is_paid=False)
+
+        for existing_transaction in unpaid_transactions:
+            # Update fields based on RecurringTransaction
+            existing_transaction.amount = self.amount
+            existing_transaction.description = self.description
+            existing_transaction.category = self.category
+            existing_transaction.notes = self.notes
+
+            # Update many-to-many relationships
+            existing_transaction.tags.set(self.tags.all())
+            existing_transaction.entities.set(self.entities.all())
+
+            # Save updated transaction
+            existing_transaction.save()
+
+    def delete_unpaid_transactions(self):
+        """
+        Deletes all unpaid transactions associated with this RecurringTransaction.
+        """
+        today = timezone.localdate(timezone.now())
+        self.transactions.filter(is_paid=False, date__gt=today).delete()

app/apps/transactions/tasks.py

@@ -1,9 +1,13 @@
 import logging
+from datetime import timedelta
+
+from cachalot.api import cachalot_disabled, invalidate
+from django.utils import timezone
+from django.conf import settings
 
 from procrastinate.contrib.django import app
 
-from apps.transactions.models import RecurringTransaction
-
+from apps.transactions.models import RecurringTransaction, Transaction
 
 logger = logging.getLogger(__name__)
 
@@ -19,3 +23,31 @@ def generate_recurring_transactions(timestamp=None):
             exc_info=True,
         )
         raise e
+
+
+@app.periodic(cron="10 1 * * *")
+@app.task
+def cleanup_deleted_transactions(timestamp=None):
+    with cachalot_disabled():
+        if settings.ENABLE_SOFT_DELETE and settings.KEEP_DELETED_TRANSACTIONS_FOR == 0:
+            return "KEEP_DELETED_TRANSACTIONS_FOR is 0, no cleanup performed."
+
+        if not settings.ENABLE_SOFT_DELETE:
+            # Hard delete all soft-deleted transactions
+            deleted_count, _ = Transaction.deleted_objects.all().hard_delete()
+            return (
+                f"Hard deleted {deleted_count} transactions (soft deletion disabled)."
+            )
+
+        # Calculate the cutoff date
+        cutoff_date = timezone.now() - timedelta(
+            days=settings.KEEP_DELETED_TRANSACTIONS_FOR
+        )
+
+    invalidate()
+
+    # Hard delete soft-deleted transactions older than the cutoff date
+    old_transactions = Transaction.deleted_objects.filter(deleted_at__lt=cutoff_date)
+    deleted_count, _ = old_transactions.hard_delete()
+
+    return f"Hard deleted {deleted_count} objects older than {settings.KEEP_DELETED_TRANSACTIONS_FOR} days."

app/apps/transactions/urls.py

@@ -6,13 +6,38 @@ urlpatterns = [
     path(
         "transactions/list/", views.transaction_all_list, name="transactions_all_list"
     ),
+    path(
+        "transactions/trash/",
+        views.transactions_trash_can_index,
+        name="transactions_trash_index",
+    ),
+    path(
+        "transactions/trash/list/",
+        views.transactions_trash_can_list,
+        name="transactions_trash_list",
+    ),
     path(
         "transactions/summary/",
         views.transaction_all_summary,
         name="transactions_all_summary",
     ),
     path(
-        "transactions/actions/pay",
+        "transactions/summary/account/",
+        views.transaction_all_account_summary,
+        name="transaction_all_account_summary",
+    ),
+    path(
+        "transactions/summary/currency/",
+        views.transaction_all_currency_summary,
+        name="transaction_all_currency_summary",
+    ),
+    path(
+        "transactions/summary/select/<str:selected>/",
+        views.transaction_all_summary_select,
+        name="transaction_all_summary_select",
+    ),
+    path(
+        "transactions/actions/pay/",
         views.bulk_pay_transactions,
         name="transactions_bulk_pay",
     ),
@@ -27,27 +52,57 @@ urlpatterns = [
         name="transactions_bulk_delete",
     ),
     path(
-        "transaction/<int:transaction_id>/pay",
+        "transactions/actions/undelete/",
+        views.bulk_undelete_transactions,
+        name="transactions_bulk_undelete",
+    ),
+    path(
+        "transactions/actions/duplicate/",
+        views.bulk_clone_transactions,
+        name="transactions_bulk_clone",
+    ),
+    path(
+        "transaction/<int:transaction_id>/pay/",
         views.transaction_pay,
         name="transaction_pay",
     ),
     path(
-        "transaction/<int:transaction_id>/delete",
+        "transaction/<int:transaction_id>/delete/",
         views.transaction_delete,
         name="transaction_delete",
     ),
     path(
-        "transaction/<int:transaction_id>/edit",
+        "transaction/<int:transaction_id>/undelete/",
+        views.transaction_undelete,
+        name="transaction_undelete",
+    ),
+    path(
+        "transaction/<int:transaction_id>/edit/",
         views.transaction_edit,
         name="transaction_edit",
     ),
     path(
-        "transaction/add",
+        "transactions/bulk-edit/",
+        views.transactions_bulk_edit,
+        name="transactions_bulk_edit",
+    ),
+    path(
+        "transaction/<int:transaction_id>/clone/",
+        views.transaction_clone,
+        name="transaction_clone",
+    ),
+    path(
+        "transaction/add/",
         views.transaction_add,
         name="transaction_add",
     ),
     path(
-        "transactions/transfer",
+        "add/",
+        views.transaction_simple_add,
+        name="transaction_simple_add",
+    ),
+    path(
+        "transactions/transfer/",
         views.transactions_transfer,
         name="transactions_transfer",
     ),

app/apps/transactions/utils/calculations.py

@@ -72,8 +72,12 @@ def calculate_currency_totals(transactions_queryset, ignore_empty=False):
         .order_by()
     )
 
-    # Process the results and calculate additional totals
+    # First pass: Process basic totals and store all currency data
     result = {}
+    currencies_using_exchange = (
+        {}
+    )  # Track which currencies use which exchange currencies
+
     for total in currency_totals:
         # Skip empty currencies if ignore_empty is True
         if ignore_empty and all(
@@ -91,7 +95,6 @@ def calculate_currency_totals(transactions_queryset, ignore_empty=False):
         total_current = total["income_current"] - total["expense_current"]
         total_projected = total["income_projected"] - total["expense_projected"]
         total_final = total_current + total_projected
-
         currency_id = total["account__currency"]
         from_currency = Currency.objects.get(id=currency_id)
         exchange_currency = (
@@ -120,8 +123,6 @@ def calculate_currency_totals(transactions_queryset, ignore_empty=False):
         # Add exchanged values if exchange_currency exists
         if exchange_currency:
             exchanged = {}
-
-            # Convert each value
             for field in [
                 "expense_current",
                 "expense_projected",
@@ -136,7 +137,6 @@ def calculate_currency_totals(transactions_queryset, ignore_empty=False):
                     from_currency=from_currency,
                     to_currency=exchange_currency,
                 )
-
                 if amount is not None:
                     exchanged[field] = amount
                     if "currency" not in exchanged:
@@ -148,12 +148,48 @@ def calculate_currency_totals(transactions_queryset, ignore_empty=False):
                             "name": exchange_currency.name,
                         }
 
-            # Only add exchanged data if at least one conversion was successful
             if exchanged:
                 currency_data["exchanged"] = exchanged
+                # Track which currencies are using which exchange currencies
+                if exchange_currency.id not in currencies_using_exchange:
+                    currencies_using_exchange[exchange_currency.id] = []
+                currencies_using_exchange[exchange_currency.id].append(
+                    {"currency_id": currency_id, "exchanged": exchanged}
+                )
 
         result[currency_id] = currency_data
 
+    # Second pass: Add consolidated totals for currencies that are used as exchange currencies
+    for currency_id, currency_data in result.items():
+        if currency_id in currencies_using_exchange:
+            consolidated = {
+                "currency": currency_data["currency"].copy(),
+                "expense_current": currency_data["expense_current"],
+                "expense_projected": currency_data["expense_projected"],
+                "income_current": currency_data["income_current"],
+                "income_projected": currency_data["income_projected"],
+                "total_current": currency_data["total_current"],
+                "total_projected": currency_data["total_projected"],
+                "total_final": currency_data["total_final"],
+            }
+
+            # Add exchanged values from all currencies using this as exchange currency
+            for using_currency in currencies_using_exchange[currency_id]:
+                exchanged = using_currency["exchanged"]
+                for field in [
+                    "expense_current",
+                    "expense_projected",
+                    "income_current",
+                    "income_projected",
+                    "total_current",
+                    "total_projected",
+                    "total_final",
+                ]:
+                    if field in exchanged:
+                        consolidated[field] += exchanged[field]
+
+            result[currency_id]["consolidated"] = consolidated
+
     return result
 
 

app/apps/transactions/views/actions.py

@@ -1,5 +1,9 @@
+from copy import deepcopy
+
+from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse
+from django.utils.translation import gettext_lazy as _, ngettext_lazy
 
 from apps.common.decorators.htmx import only_htmx
 from apps.transactions.models import Transaction
@@ -9,7 +13,19 @@ from apps.transactions.models import Transaction
 @login_required
 def bulk_pay_transactions(request):
     selected_transactions = request.GET.getlist("transactions", [])
-    Transaction.objects.filter(id__in=selected_transactions).update(is_paid=True)
+    transactions = Transaction.objects.filter(id__in=selected_transactions)
+    count = transactions.count()
+    transactions.update(is_paid=True)
+
+    messages.success(
+        request,
+        ngettext_lazy(
+            "%(count)s transaction marked as paid",
+            "%(count)s transactions marked as paid",
+            count,
+        )
+        % {"count": count},
+    )
 
     return HttpResponse(
         status=204,
@@ -21,7 +37,19 @@ def bulk_pay_transactions(request):
 @login_required
 def bulk_unpay_transactions(request):
     selected_transactions = request.GET.getlist("transactions", [])
-    Transaction.objects.filter(id__in=selected_transactions).update(is_paid=False)
+    transactions = Transaction.objects.filter(id__in=selected_transactions)
+    count = transactions.count()
+    transactions.update(is_paid=False)
+
+    messages.success(
+        request,
+        ngettext_lazy(
+            "%(count)s transaction marked as not paid",
+            "%(count)s transactions marked as not paid",
+            count,
+        )
+        % {"count": count},
+    )
 
     return HttpResponse(
         status=204,
@@ -33,7 +61,78 @@ def bulk_unpay_transactions(request):
 @login_required
 def bulk_delete_transactions(request):
     selected_transactions = request.GET.getlist("transactions", [])
-    Transaction.objects.filter(id__in=selected_transactions).delete()
+    transactions = Transaction.all_objects.filter(id__in=selected_transactions)
+    count = transactions.count()
+    transactions.delete()
+
+    messages.success(
+        request,
+        ngettext_lazy(
+            "%(count)s transaction deleted successfully",
+            "%(count)s transactions deleted successfully",
+            count,
+        )
+        % {"count": count},
+    )
+
+    return HttpResponse(
+        status=204,
+        headers={"HX-Trigger": "updated"},
+    )
+
+
+@only_htmx
+@login_required
+def bulk_undelete_transactions(request):
+    selected_transactions = request.GET.getlist("transactions", [])
+    transactions = Transaction.deleted_objects.filter(id__in=selected_transactions)
+    count = transactions.count()
+    transactions.update(deleted=False, deleted_at=None)
+
+    messages.success(
+        request,
+        ngettext_lazy(
+            "%(count)s transaction restored successfully",
+            "%(count)s transactions restored successfully",
+            count,
+        )
+        % {"count": count},
+    )
+
+    return HttpResponse(
+        status=204,
+        headers={"HX-Trigger": "updated"},
+    )
+
+
+@only_htmx
+@login_required
+def bulk_clone_transactions(request):
+    selected_transactions = request.GET.getlist("transactions", [])
+    transactions = Transaction.objects.filter(id__in=selected_transactions)
+    count = transactions.count()
+
+    for transaction in transactions:
+        new_transaction = deepcopy(transaction)
+        new_transaction.pk = None
+        new_transaction.installment_plan = None
+        new_transaction.installment_id = None
+        new_transaction.recurring_transaction = None
+        new_transaction.internal_id = None
+        new_transaction.save()
+
+        new_transaction.tags.add(*transaction.tags.all())
+        new_transaction.entities.add(*transaction.entities.all())
+
+    messages.success(
+        request,
+        ngettext_lazy(
+            "%(count)s transaction duplicated successfully",
+            "%(count)s transactions duplicated successfully",
+            count,
+        )
+        % {"count": count},
+    )
 
     return HttpResponse(
         status=204,

app/apps/transactions/views/categories.py

@@ -2,9 +2,7 @@ from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse
 from django.shortcuts import render, get_object_or_404
-from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
-from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_http_methods
 
 from apps.common.decorators.htmx import only_htmx
@@ -111,7 +109,6 @@ def category_edit(request, category_id):
 
 @only_htmx
 @login_required
-@csrf_exempt
 @require_http_methods(["DELETE"])
 def category_delete(request, category_id):
     category = get_object_or_404(TransactionCategory, id=category_id)

app/apps/transactions/views/entities.py

@@ -3,7 +3,6 @@ from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse
 from django.shortcuts import render, get_object_or_404
 from django.utils.translation import gettext_lazy as _
-from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_http_methods
 
 from apps.common.decorators.htmx import only_htmx
@@ -110,7 +109,6 @@ def entity_edit(request, entity_id):
 
 @only_htmx
 @login_required
-@csrf_exempt
 @require_http_methods(["DELETE"])
 def entity_delete(request, entity_id):
     entity = get_object_or_404(TransactionEntity, id=entity_id)

app/apps/transactions/views/installment_plans.py

@@ -4,7 +4,6 @@ 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.csrf import csrf_exempt
 from django.views.decorators.http import require_http_methods
 
 from apps.common.decorators.htmx import only_htmx
@@ -150,7 +149,6 @@ def installment_plan_refresh(request, installment_plan_id):
 
 @only_htmx
 @login_required
-@csrf_exempt
 @require_http_methods(["DELETE"])
 def installment_plan_delete(request, installment_plan_id):
     installment_plan = get_object_or_404(InstallmentPlan, id=installment_plan_id)

app/apps/transactions/views/recurring_transactions.py

@@ -1,5 +1,4 @@
 from dateutil.relativedelta import relativedelta
-
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.db.models import Q
@@ -7,7 +6,6 @@ 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.csrf import csrf_exempt
 from django.views.decorators.http import require_http_methods
 
 from apps.common.decorators.htmx import only_htmx
@@ -168,12 +166,26 @@ def recurring_transaction_toggle_pause(request, recurring_transaction_id):
     )
     current_paused = recurring_transaction.is_paused
     recurring_transaction.is_paused = not current_paused
-    recurring_transaction.save(update_fields=["is_paused"])
 
     if current_paused:
-        messages.success(request, _("Recurring transaction unpaused successfully"))
+        today = timezone.localdate(timezone.now())
+        recurring_transaction.last_generated_date = max(
+            recurring_transaction.last_generated_date, today
+        )
+        recurring_transaction.last_generated_reference_date = max(
+            recurring_transaction.last_generated_reference_date, today
+        )
+        recurring_transaction.save(
+            update_fields=[
+                "last_generated_date",
+                "last_generated_reference_date",
+                "is_paused",
+            ]
+        )
         generate_recurring_transactions.defer()
+        messages.success(request, _("Recurring transaction unpaused successfully"))
     else:
+        recurring_transaction.save(update_fields=["is_paused"])
         messages.success(request, _("Recurring transaction paused successfully"))
 
     return HttpResponse(
@@ -188,7 +200,7 @@ def recurring_transaction_toggle_pause(request, recurring_transaction_id):
 @login_required
 @require_http_methods(["GET"])
 def recurring_transaction_finish(request, recurring_transaction_id):
-    recurring_transaction = get_object_or_404(
+    recurring_transaction: RecurringTransaction = get_object_or_404(
         RecurringTransaction, id=recurring_transaction_id
     )
     today = timezone.localdate(timezone.now()) - relativedelta(days=1)
@@ -197,6 +209,9 @@ def recurring_transaction_finish(request, recurring_transaction_id):
     recurring_transaction.is_paused = True
     recurring_transaction.save(update_fields=["end_date", "is_paused"])
 
+    # Delete all unpaid transactions associated with this RecurringTransaction
+    recurring_transaction.delete_unpaid_transactions()
+
     messages.success(request, _("Recurring transaction finished successfully"))
 
     return HttpResponse(
@@ -209,7 +224,6 @@ def recurring_transaction_finish(request, recurring_transaction_id):
 
 @only_htmx
 @login_required
-@csrf_exempt
 @require_http_methods(["DELETE"])
 def recurring_transaction_delete(request, recurring_transaction_id):
     recurring_transaction = get_object_or_404(

app/apps/transactions/views/tags.py

@@ -3,7 +3,6 @@ from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse
 from django.shortcuts import render, get_object_or_404
 from django.utils.translation import gettext_lazy as _
-from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_http_methods
 
 from apps.common.decorators.htmx import only_htmx
@@ -110,7 +109,6 @@ def tag_edit(request, tag_id):
 
 @only_htmx
 @login_required
-@csrf_exempt
 @require_http_methods(["DELETE"])
 def tag_delete(request, tag_id):
     tag = get_object_or_404(TransactionTag, id=tag_id)

app/apps/transactions/views/transactions.py

@@ -1,4 +1,5 @@
 import datetime
+from copy import deepcopy
 
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
@@ -6,14 +7,18 @@ from django.core.paginator import Paginator
 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.csrf import csrf_exempt
+from django.utils.translation import gettext_lazy as _, ngettext_lazy
 from django.views.decorators.http import require_http_methods
 
 from apps.common.decorators.htmx import only_htmx
 from apps.common.utils.dicts import remove_falsey_entries
+from apps.rules.signals import transaction_created, transaction_updated
 from apps.transactions.filters import TransactionsFilter
-from apps.transactions.forms import TransactionForm, TransferForm
+from apps.transactions.forms import (
+    TransactionForm,
+    TransferForm,
+    BulkEditTransactionForm,
+)
 from apps.transactions.models import Transaction
 from apps.transactions.utils.calculations import (
     calculate_currency_totals,
@@ -53,7 +58,7 @@ def transaction_add(request):
             initial={
                 "date": expected_date,
                 "type": transaction_type,
-            }
+            },
         )
 
     return render(
@@ -63,6 +68,48 @@ def transaction_add(request):
     )
 
 
+@login_required
+@require_http_methods(["GET", "POST"])
+def transaction_simple_add(request):
+    month = int(request.GET.get("month", timezone.localdate(timezone.now()).month))
+    year = int(request.GET.get("year", timezone.localdate(timezone.now()).year))
+    transaction_type = Transaction.Type(request.GET.get("type", "IN"))
+
+    now = timezone.localdate(timezone.now())
+    expected_date = datetime.datetime(
+        day=now.day if month == now.month and year == now.year else 1,
+        month=month,
+        year=year,
+    ).date()
+
+    if request.method == "POST":
+        form = TransactionForm(request.POST)
+        if form.is_valid():
+            form.save()
+            messages.success(request, _("Transaction added successfully"))
+
+        form = TransactionForm(
+            initial={
+                "date": expected_date,
+                "type": transaction_type,
+            },
+        )
+
+    else:
+        form = TransactionForm(
+            initial={
+                "date": expected_date,
+                "type": transaction_type,
+            },
+        )
+
+    return render(
+        request,
+        "transactions/pages/add.html",
+        {"form": form},
+    )
+
+
 @only_htmx
 @login_required
 @require_http_methods(["GET", "POST"])
@@ -91,10 +138,113 @@ def transaction_edit(request, transaction_id, **kwargs):
 
 @only_htmx
 @login_required
-@csrf_exempt
+@require_http_methods(["GET", "POST"])
+def transactions_bulk_edit(request):
+    # Get selected transaction IDs from the URL parameter
+    transaction_ids = request.GET.getlist("transactions") or request.POST.getlist(
+        "transactions"
+    )
+    # Load the selected transactions
+    transactions = Transaction.objects.filter(id__in=transaction_ids)
+    count = transactions.count()
+
+    if request.method == "POST":
+        form = BulkEditTransactionForm(request.POST)
+        if form.is_valid():
+            # Apply changes from the form to all selected transactions
+            for transaction in transactions:
+                for field_name, value in form.cleaned_data.items():
+                    if value or isinstance(
+                        value, bool
+                    ):  # Only update fields that have been filled in the form
+                        if field_name == "tags":
+                            transaction.tags.set(value)
+                        elif field_name == "entities":
+                            transaction.entities.set(value)
+                        else:
+                            setattr(transaction, field_name, value)
+
+                transaction.save()
+                transaction_updated.send(sender=transaction)
+
+            messages.success(
+                request,
+                ngettext_lazy(
+                    "%(count)s transaction updated successfully",
+                    "%(count)s transactions updated successfully",
+                    count,
+                )
+                % {"count": count},
+            )
+            return HttpResponse(
+                status=204,
+                headers={"HX-Trigger": "updated, hide_offcanvas"},
+            )
+    else:
+        form = BulkEditTransactionForm(initial={"is_paid": None, "type": None})
+
+    context = {
+        "form": form,
+        "transactions": transactions,
+    }
+    return render(request, "transactions/fragments/bulk_edit.html", context)
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET", "POST"])
+def transaction_clone(request, transaction_id, **kwargs):
+    transaction = get_object_or_404(Transaction, id=transaction_id)
+    new_transaction = deepcopy(transaction)
+    new_transaction.pk = None
+    new_transaction.installment_plan = None
+    new_transaction.installment_id = None
+    new_transaction.recurring_transaction = None
+    new_transaction.internal_id = None
+    new_transaction.save()
+
+    new_transaction.tags.add(*transaction.tags.all())
+    new_transaction.entities.add(*transaction.entities.all())
+
+    messages.success(request, _("Transaction duplicated successfully"))
+
+    transaction_created.send(sender=transaction)
+
+    # THIS HAS BEEN DISABLE DUE TO HTMX INCOMPATIBILITY
+    # SEE https://github.com/bigskysoftware/htmx/issues/3115 and https://github.com/bigskysoftware/htmx/issues/2706
+
+    # if request.GET.get("edit") == "true":
+    #     return HttpResponse(
+    #         status=200,
+    #         headers={
+    #             "HX-Trigger": "updated",
+    #             "HX-Push-Url": "false",
+    #             "HX-Location": json.dumps(
+    #                 {
+    #                     "path": reverse(
+    #                         "transaction_edit",
+    #                         kwargs={"transaction_id": new_transaction.id},
+    #                     ),
+    #                     "target": "#generic-offcanvas",
+    #                     "swap": "innerHTML",
+    #                 }
+    #             ),
+    #         },
+    #     )
+    # else:
+    #     transaction_created.send(sender=transaction)
+
+    return HttpResponse(
+        status=204,
+        headers={"HX-Trigger": "updated"},
+    )
+
+
+@only_htmx
+@login_required
 @require_http_methods(["DELETE"])
 def transaction_delete(request, transaction_id, **kwargs):
-    transaction = get_object_or_404(Transaction, id=transaction_id)
+    transaction = get_object_or_404(Transaction.all_objects, id=transaction_id)
 
     transaction.delete()
 
@@ -106,6 +256,24 @@ def transaction_delete(request, transaction_id, **kwargs):
     )
 
 
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def transaction_undelete(request, transaction_id, **kwargs):
+    transaction = get_object_or_404(Transaction.deleted_objects, id=transaction_id)
+
+    transaction.deleted = False
+    transaction.deleted_at = None
+    transaction.save()
+
+    messages.success(request, _("Transaction restored successfully"))
+
+    return HttpResponse(
+        status=204,
+        headers={"HX-Trigger": "updated"},
+    )
+
+
 @only_htmx
 @login_required
 @require_http_methods(["GET", "POST"])
@@ -134,7 +302,7 @@ def transactions_transfer(request):
             initial={
                 "reference_date": expected_date,
                 "date": expected_date,
-            }
+            },
         )
 
     return render(request, "transactions/fragments/transfer.html", {"form": form})
@@ -163,15 +331,27 @@ def transaction_pay(request, transaction_id):
 @login_required
 @require_http_methods(["GET"])
 def transaction_all_index(request):
+    order = request.session.get("all_transactions_order", "default")
+    summary_tab = request.session.get("transaction_all_summary_tab", "currency")
+
     f = TransactionsFilter(request.GET)
-    return render(request, "transactions/pages/transactions.html", {"filter": f})
+    return render(
+        request,
+        "transactions/pages/transactions.html",
+        {"filter": f, "order": order, "summary_tab": summary_tab},
+    )
 
 
 @only_htmx
 @login_required
 @require_http_methods(["GET"])
 def transaction_all_list(request):
-    order = request.GET.get("order")
+    order = request.session.get("all_transactions_order", "default")
+
+    if "order" in request.GET:
+        order = request.GET["order"]
+        if order != request.session.get("all_transactions_order", "default"):
+            request.session["all_transactions_order"] = order
 
     transactions = Transaction.objects.prefetch_related(
         "account",
@@ -181,6 +361,7 @@ def transaction_all_list(request):
         "account__exchange_currency",
         "account__currency",
         "installment_plan",
+        "entities",
     ).all()
 
     transactions = default_order(transactions, order=order)
@@ -223,16 +404,98 @@ def transaction_all_summary(request):
     account_percentages = calculate_percentage_distribution(account_data)
 
     context = {
-        "income_current": remove_falsey_entries(currency_data, "income_current"),
-        "income_projected": remove_falsey_entries(currency_data, "income_projected"),
-        "expense_current": remove_falsey_entries(currency_data, "expense_current"),
-        "expense_projected": remove_falsey_entries(currency_data, "expense_projected"),
-        "total_current": remove_falsey_entries(currency_data, "total_current"),
-        "total_final": remove_falsey_entries(currency_data, "total_final"),
-        "total_projected": remove_falsey_entries(currency_data, "total_projected"),
+        "currency_data": currency_data,
         "currency_percentages": currency_percentages,
         "account_data": account_data,
         "account_percentages": account_percentages,
     }
 
     return render(request, "transactions/fragments/summary.html", context)
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def transaction_all_account_summary(request):
+    transactions = Transaction.objects.prefetch_related(
+        "account",
+        "account__group",
+        "category",
+        "tags",
+        "account__exchange_currency",
+        "account__currency",
+        "installment_plan",
+    ).all()
+
+    f = TransactionsFilter(request.GET, queryset=transactions)
+
+    account_data = calculate_account_totals(transactions_queryset=f.qs.all())
+    account_percentages = calculate_percentage_distribution(account_data)
+
+    context = {
+        "account_data": account_data,
+        "account_percentages": account_percentages,
+    }
+
+    return render(request, "transactions/fragments/all_account_summary.html", context)
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def transaction_all_currency_summary(request):
+    transactions = Transaction.objects.prefetch_related(
+        "account",
+        "account__group",
+        "category",
+        "tags",
+        "account__exchange_currency",
+        "account__currency",
+        "installment_plan",
+    ).all()
+
+    f = TransactionsFilter(request.GET, queryset=transactions)
+
+    currency_data = calculate_currency_totals(f.qs.all(), ignore_empty=True)
+    currency_percentages = calculate_percentage_distribution(currency_data)
+
+    context = {
+        "currency_data": currency_data,
+        "currency_percentages": currency_percentages,
+    }
+
+    return render(request, "transactions/fragments/all_currency_summary.html", context)
+
+
+@login_required
+@require_http_methods(["GET"])
+def transaction_all_summary_select(request, selected):
+    request.session["transaction_all_summary_tab"] = selected
+
+    return HttpResponse(
+        status=204,
+    )
+
+
+@login_required
+@require_http_methods(["GET"])
+def transactions_trash_can_index(request):
+    return render(request, "transactions/pages/trash.html")
+
+
+def transactions_trash_can_list(request):
+    transactions = Transaction.deleted_objects.prefetch_related(
+        "account",
+        "account__group",
+        "category",
+        "tags",
+        "account__exchange_currency",
+        "account__currency",
+        "installment_plan",
+    ).all()
+
+    return render(
+        request,
+        "transactions/fragments/trash_list.html",
+        {"transactions": transactions},
+    )

app/apps/users/forms.py

@@ -46,9 +46,72 @@ class LoginForm(AuthenticationForm):
 
 
 class UserSettingsForm(forms.ModelForm):
+    DATE_FORMAT_CHOICES = [
+        ("SHORT_DATE_FORMAT", _("Default")),
+        ("d-m-Y", "20-01-2025"),
+        ("m-d-Y", "01-20-2025"),
+        ("Y-m-d", "2025-01-20"),
+        ("d/m/Y", "20/01/2025"),
+        ("m/d/Y", "01/20/2025"),
+        ("Y/m/d", "2025/01/20"),
+        ("d.m.Y", "20.01.2025"),
+        ("m.d.Y", "01.20.2025"),
+        ("Y.m.d", "2025.01.20"),
+    ]
+
+    DATETIME_FORMAT_CHOICES = [
+        ("SHORT_DATETIME_FORMAT", _("Default")),
+        ("d-m-Y H:i", "20-01-2025 15:30"),
+        ("m-d-Y H:i", "01-20-2025 15:30"),
+        ("Y-m-d H:i", "2025-01-20 15:30"),
+        ("d-m-Y h:i A", "20-01-2025 03:30 PM"),
+        ("m-d-Y h:i A", "01-20-2025 03:30 PM"),
+        ("Y-m-d h:i A", "2025-01-20 03:30 PM"),
+        ("d/m/Y H:i", "20/01/2025 15:30"),
+        ("m/d/Y H:i", "01/20/2025 15:30"),
+        ("Y/m/d H:i", "2025/01/20 15:30"),
+        ("d/m/Y h:i A", "20/01/2025 03:30 PM"),
+        ("m/d/Y h:i A", "01/20/2025 03:30 PM"),
+        ("Y/m/d h:i A", "2025/01/20 03:30 PM"),
+        ("d.m.Y H:i", "20.01.2025 15:30"),
+        ("m.d.Y H:i", "01.20.2025 15:30"),
+        ("Y.m.d H:i", "2025.01.20 15:30"),
+        ("d.m.Y h:i A", "20.01.2025 03:30 PM"),
+        ("m.d.Y h:i A", "01.20.2025 03:30 PM"),
+        ("Y.m.d h:i A", "2025.01.20 03:30 PM"),
+    ]
+
+    NUMBER_FORMAT_CHOICES = [
+        ("AA", _("Default")),
+        ("DC", "1.234,50"),
+        ("CD", "1,234.50"),
+    ]
+
+    date_format = forms.ChoiceField(
+        choices=DATE_FORMAT_CHOICES, initial="SHORT_DATE_FORMAT", label=_("Date Format")
+    )
+    datetime_format = forms.ChoiceField(
+        choices=DATETIME_FORMAT_CHOICES,
+        initial="SHORT_DATETIME_FORMAT",
+        label=_("Datetime Format"),
+    )
+
+    number_format = forms.ChoiceField(
+        choices=NUMBER_FORMAT_CHOICES,
+        initial="AA",
+        label=_("Number Format"),
+    )
+
     class Meta:
         model = UserSettings
-        fields = ["language", "timezone", "start_page"]
+        fields = [
+            "language",
+            "timezone",
+            "start_page",
+            "date_format",
+            "datetime_format",
+            "number_format",
+        ]
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -59,6 +122,9 @@ class UserSettingsForm(forms.ModelForm):
         self.helper.layout = Layout(
             "language",
             "timezone",
+            "date_format",
+            "datetime_format",
+            "number_format",
             "start_page",
             FormActions(
                 NoClassSubmit(

app/apps/users/migrations/0013_usersettings_date_format_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.1.5 on 2025-01-20 17:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0012_alter_usersettings_start_page'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='usersettings',
+            name='date_format',
+            field=models.CharField(default='SHORT_DATE_FORMAT', max_length=100),
+        ),
+        migrations.AddField(
+            model_name='usersettings',
+            name='datetime_format',
+            field=models.CharField(default='SHORT_DATETIME_FORMAT', max_length=100),
+        ),
+    ]

app/apps/users/migrations/0014_alter_usersettings_date_format_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.1.5 on 2025-01-23 03:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0013_usersettings_date_format_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='usersettings',
+            name='date_format',
+            field=models.CharField(default='SHORT_DATE_FORMAT', max_length=100, verbose_name='Date Format'),
+        ),
+        migrations.AlterField(
+            model_name='usersettings',
+            name='datetime_format',
+            field=models.CharField(default='SHORT_DATETIME_FORMAT', max_length=100, verbose_name='Datetime Format'),
+        ),
+        migrations.AlterField(
+            model_name='usersettings',
+            name='language',
+            field=models.CharField(choices=[('auto', 'Auto'), ('en', 'English'), ('nl', 'Nederlands'), ('pt-br', 'Português (Brasil)')], default='auto', max_length=10, verbose_name='Language'),
+        ),
+    ]

app/apps/users/migrations/0015_alter_usersettings_language.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.5 on 2025-01-24 19:29
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0014_alter_usersettings_date_format_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='usersettings',
+            name='language',
+            field=models.CharField(choices=[('auto', 'Auto'), ('en', 'English'), ('pt-br', 'Português (Brasil)')], default='auto', max_length=10, verbose_name='Language'),
+        ),
+    ]

app/apps/users/migrations/0016_alter_usersettings_language.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.5 on 2025-01-25 18:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0015_alter_usersettings_language'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='usersettings',
+            name='language',
+            field=models.CharField(choices=[('auto', 'Auto'), ('en', 'English'), ('nl', 'Nederlands'), ('pt-br', 'Português (Brasil)')], default='auto', max_length=10, verbose_name='Language'),
+        ),
+    ]

app/apps/users/migrations/0017_usersettings_number_format.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.5 on 2025-01-27 12:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0016_alter_usersettings_language'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='usersettings',
+            name='number_format',
+            field=models.CharField(default='AA', max_length=2, verbose_name='Number Format'),
+        ),
+    ]

app/apps/users/migrations/0018_alter_usersettings_start_page.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.5 on 2025-02-02 02:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0017_usersettings_number_format'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='usersettings',
+            name='start_page',
+            field=models.CharField(choices=[('MONTHLY_OVERVIEW', 'Monthly'), ('YEARLY_OVERVIEW_CURRENCY', 'Yearly by currency'), ('YEARLY_OVERVIEW_ACCOUNT', 'Yearly by account'), ('NETWORTH_CURRENT', 'Current Net Worth'), ('NETWORTH_PROJECTED', 'Projected Net Worth'), ('ALL_TRANSACTIONS', 'All Transactions'), ('CALENDAR', 'Calendar')], default='MONTHLY_OVERVIEW', max_length=255, verbose_name='Start page'),
+        ),
+    ]

app/apps/users/models.py

@@ -1,8 +1,8 @@
 import pytz
 from django.conf import settings
 from django.contrib.auth import get_user_model
-from django.db import models
 from django.contrib.auth.models import AbstractUser, Group
+from django.db import models
 from django.utils.translation import gettext_lazy as _
 
 from apps.users.managers import UserManager
@@ -26,7 +26,8 @@ class UserSettings(models.Model):
         MONTHLY = "MONTHLY_OVERVIEW", _("Monthly")
         YEARLY_CURRENCY = "YEARLY_OVERVIEW_CURRENCY", _("Yearly by currency")
         YEARLY_ACCOUNT = "YEARLY_OVERVIEW_ACCOUNT", _("Yearly by account")
-        NETWORTH = "NETWORTH", _("Net Worth")
+        NETWORTH_CURRENT = "NETWORTH_CURRENT", _("Current Net Worth")
+        NETWORTH_PROJECTED = "NETWORTH_PROJECTED", _("Projected Net Worth")
         ALL_TRANSACTIONS = "ALL_TRANSACTIONS", _("All Transactions")
         CALENDAR = "CALENDAR", _("Calendar")
 
@@ -36,6 +37,18 @@ class UserSettings(models.Model):
     hide_amounts = models.BooleanField(default=False)
     mute_sounds = models.BooleanField(default=False)
 
+    date_format = models.CharField(
+        max_length=100, default="SHORT_DATE_FORMAT", verbose_name=_("Date Format")
+    )
+    datetime_format = models.CharField(
+        max_length=100,
+        default="SHORT_DATETIME_FORMAT",
+        verbose_name=_("Datetime Format"),
+    )
+    number_format = models.CharField(
+        max_length=2, default="AA", verbose_name=_("Number Format")
+    )
+
     language = models.CharField(
         max_length=10,
         choices=(("auto", _("Auto")),) + settings.LANGUAGES,
@@ -57,3 +70,6 @@ class UserSettings(models.Model):
 
     def __str__(self):
         return f"{self.user.email}'s settings"
+
+    def clean(self):
+        super().clean()

app/apps/users/views.py

@@ -26,10 +26,14 @@ def logout_view(request):
 def index(request):
     if request.user.settings.start_page == UserSettings.StartPage.MONTHLY:
         return redirect(reverse("monthly_index"))
-    elif request.user.settings.start_page == UserSettings.StartPage.YEARLY:
-        return redirect(reverse("yearly_index"))
-    elif request.user.settings.start_page == UserSettings.StartPage.NETWORTH:
-        return redirect(reverse("net_worth"))
+    elif request.user.settings.start_page == UserSettings.StartPage.YEARLY_ACCOUNT:
+        return redirect(reverse("yearly_index_account"))
+    elif request.user.settings.start_page == UserSettings.StartPage.YEARLY_CURRENCY:
+        return redirect(reverse("yearly_index_currency"))
+    elif request.user.settings.start_page == UserSettings.StartPage.NETWORTH_CURRENT:
+        return redirect(reverse("net_worth_current"))
+    elif request.user.settings.start_page == UserSettings.StartPage.NETWORTH_PROJECTED:
+        return redirect(reverse("net_worth_projected"))
     elif request.user.settings.start_page == UserSettings.StartPage.ALL_TRANSACTIONS:
         return redirect(reverse("transactions_all_index"))
     elif request.user.settings.start_page == UserSettings.StartPage.CALENDAR:

app/apps/yearly_overview/views.py

@@ -89,7 +89,6 @@ def yearly_overview_by_currency(request, year: int):
             "year": year,
             "totals": data,
             "percentages": percentages,
-            "single": True if currency else False,
         },
     )
 
@@ -159,6 +158,5 @@ def yearly_overview_by_account(request, year: int):
             "year": year,
             "totals": data,
             "percentages": percentages,
-            "single": True if account else False,
         },
     )

app/import_presets/nuconta/config.yml

@@ -0,0 +1,54 @@
+settings:
+  file_type: csv
+  delimiter: ","
+  encoding: utf-8
+  skip_lines: 0
+  importing: transactions
+  trigger_transaction_rules: true
+  skip_errors: true
+
+mapping:
+  account:
+    target: account
+    default: <NOME DA SUA CONTA>
+    type: name
+
+  date:
+    target: date
+    source: Data
+    format: "%d/%m/%Y"
+
+  amount:
+    target: amount
+    source: Valor
+
+  description:
+    target: description
+    source: Descrição
+    transformations:
+      - type: split
+        separator: " - "
+        index: 0
+
+  type:
+    source: "Valor"
+    target: "type"
+    detection_method: sign
+
+  notes:
+    target: notes
+    source: Notes
+
+  internal_id:
+    target: internal_id
+    source: Identificador
+
+  is_paid:
+    target: is_paid
+    detection_method: always_paid
+
+deduplicate:
+  - type: compare
+    fields:
+      - internal_id
+    match_type: lax

app/import_presets/nuconta/manifest.json

@@ -0,0 +1,7 @@
+{
+  "author": "eitchtee",
+  "description": "Importe suas transações da conta corrente do Nubank",
+  "schema_version": 1,
+  "name": "Nubank - Conta Corrente",
+  "message": "Mude '<NOME DA SUA CONTA>' para o nome da sua Nuconta dentro do WYGIWYH"
+}

app/static/img/favicon/manifest.json

@@ -1,41 +0,0 @@
-{
- "name": "WYGIWYH",
- "icons": [
-  {
-   "src": "\/static\/img\/favicon\/android-icon-36x36.png",
-   "sizes": "36x36",
-   "type": "image\/png",
-   "density": "0.75"
-  },
-  {
-   "src": "\/static\/img\/favicon\/android-icon-48x48.png",
-   "sizes": "48x48",
-   "type": "image\/png",
-   "density": "1.0"
-  },
-  {
-   "src": "\/static\/img\/favicon\/android-icon-72x72.png",
-   "sizes": "72x72",
-   "type": "image\/png",
-   "density": "1.5"
-  },
-  {
-   "src": "\/static\/img\/favicon\/android-icon-96x96.png",
-   "sizes": "96x96",
-   "type": "image\/png",
-   "density": "2.0"
-  },
-  {
-   "src": "\/static\/img\/favicon\/android-icon-144x144.png",
-   "sizes": "144x144",
-   "type": "image\/png",
-   "density": "3.0"
-  },
-  {
-   "src": "\/static\/img\/favicon\/android-icon-192x192.png",
-   "sizes": "192x192",
-   "type": "image\/png",
-   "density": "4.0"
-  }
- ]
-}

app/templates/calendar_view/fragments/list.html

@@ -39,23 +39,23 @@
           {% 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="{{ transaction.description }}"></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="{{ transaction.description }}"></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="{{ transaction.description }}"></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="{{ transaction.description }}"></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="{{ transaction.description }}"></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="{{ transaction.description }}"></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="{{ transaction.description }}"></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-green-300" data-bs-toggle="tooltip" data-bs-title="{{ transaction.description }}"></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 %}

app/templates/calendar_view/fragments/list_transactions.html

@@ -5,14 +5,14 @@
 {% block title %}{% translate 'Transactions on' %} {{ date|date:"SHORT_DATE_FORMAT" }}{% endblock %}
 
 {% block body %}
-<div hx-get="{% url 'calendar_transactions_list' day=date.day month=date.month year=date.year %}" hx-trigger="updated from:window" hx-vals='{"disable_selection": true}'  hx-target="closest .offcanvas" class="show-loading">
-{% for transaction in transactions %}
-  <c-transaction.item
-    :transaction="transaction"
-    :disable-selection="True"></c-transaction.item>
-{% empty %}
-  <c-msg.empty
-      title="{% translate 'No transactions on this date' %}"></c-msg.empty>
-{% endfor %}
+<div hx-get="{% url 'calendar_transactions_list' day=date.day month=date.month year=date.year %}" hx-trigger="updated from:window" hx-vals='{"disable_selection": true}'  hx-target="closest .offcanvas" class="show-loading" id="transactions-list">
+  {% for transaction in transactions %}
+    <c-transaction.item :transaction="transaction"></c-transaction.item>
+  {% empty %}
+    <c-msg.empty
+        title="{% translate 'No transactions on this date' %}"></c-msg.empty>
+  {% endfor %}
+  {# Floating bar #}
+  <c-ui.transactions-action-bar></c-ui.transactions-action-bar>
 </div>
 {% endblock %}