Merge pull request #156 from eitchtee/dev

fix(transactions): paying transaction doesn't trigger update rules
fix(transactions): bulk (un)paying transactions doesn't trigger update rules
2026-02-26 01:14:50 +01:00 · 2025-02-09 23:38:58 -03:00 · 2025-02-09 23:38:22 -03:00 · 2025-02-09 23:33:57 -03:00 · 2025-02-09 19:50:09 -03:00 · 2025-02-09 19:49:47 -03:00
14 changed files with 1455 additions and 519 deletions
--- a/README.md
+++ b/README.md
@@ -80,7 +80,7 @@ $ docker compose exec -it web python manage.py createsuperuser
 ```

 > [!NOTE]
-> If you're using Unraid, you don't need to follow these steps, use the app on the store. Make sure to read the [Unraid section](#unraid) and [Enviroment Variables](#enviroment-variables) for an explanation of all available variables
+> If you're using Unraid, you don't need to follow these steps, use the app on the store. Make sure to read the [Unraid section](#unraid) and [Environment Variables](#environment-variables) for an explanation of all available variables

 ## Running locally

@@ -110,7 +110,7 @@ WYGIWYH is available on the Unraid Store. You'll need to provision your own post

 To create the first user, open the container's console using Unraid's UI, by clicking on WYGIWYH icon on the Docker page and selecting `Console`, then type `python manage.py createsuperuser`, you'll them be prompted to input your e-mail and password.

-## Enviroment Variables
+## Environment Variables

 | variable                      | type        | default                           | explanation                                                                                                                                                                                                                              |
 |-------------------------------|-------------|-----------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
@@ -122,7 +122,7 @@ To create the first user, open the container's console using Unraid's UI, by cli
 | 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_HOST                      | string      | localhost                         | The address 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.                                                                             |
--- a/app/apps/rules/migrations/0010_alter_updateorcreatetransactionruleaction_search_account_and_more.py
+++ b/app/apps/rules/migrations/0010_alter_updateorcreatetransactionruleaction_search_account_and_more.py
@@ -0,0 +1,138 @@
+# Generated by Django 5.1.6 on 2025-02-09 20:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rules', '0009_alter_transactionrule_options_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='updateorcreatetransactionruleaction',
+            name='search_account',
+            field=models.TextField(blank=True, verbose_name='Search Account'),
+        ),
+        migrations.AlterField(
+            model_name='updateorcreatetransactionruleaction',
+            name='search_amount',
+            field=models.TextField(blank=True, verbose_name='Search Amount'),
+        ),
+        migrations.AlterField(
+            model_name='updateorcreatetransactionruleaction',
+            name='search_category',
+            field=models.TextField(blank=True, verbose_name='Search Category'),
+        ),
+        migrations.AlterField(
+            model_name='updateorcreatetransactionruleaction',
+            name='search_description',
+            field=models.TextField(blank=True, verbose_name='Search Description'),
+        ),
+        migrations.AlterField(
+            model_name='updateorcreatetransactionruleaction',
+            name='search_entities',
+            field=models.TextField(blank=True, verbose_name='Search Entities'),
+        ),
+        migrations.AlterField(
+            model_name='updateorcreatetransactionruleaction',
+            name='search_internal_id',
+            field=models.TextField(blank=True, verbose_name='Search Internal ID'),
+        ),
+        migrations.AlterField(
+            model_name='updateorcreatetransactionruleaction',
+            name='search_internal_note',
+            field=models.TextField(blank=True, verbose_name='Search Internal Note'),
+        ),
+        migrations.AlterField(
+            model_name='updateorcreatetransactionruleaction',
+            name='search_is_paid',
+            field=models.TextField(blank=True, verbose_name='Search Is Paid'),
+        ),
+        migrations.AlterField(
+            model_name='updateorcreatetransactionruleaction',
+            name='search_notes',
+            field=models.TextField(blank=True, verbose_name='Search Notes'),
+        ),
+        migrations.AlterField(
+            model_name='updateorcreatetransactionruleaction',
+            name='search_reference_date',
+            field=models.TextField(blank=True, verbose_name='Search Reference Date'),
+        ),
+        migrations.AlterField(
+            model_name='updateorcreatetransactionruleaction',
+            name='search_tags',
+            field=models.TextField(blank=True, verbose_name='Search Tags'),
+        ),
+        migrations.AlterField(
+            model_name='updateorcreatetransactionruleaction',
+            name='search_type',
+            field=models.TextField(blank=True, verbose_name='Search Type'),
+        ),
+        migrations.AlterField(
+            model_name='updateorcreatetransactionruleaction',
+            name='set_account',
+            field=models.TextField(blank=True, verbose_name='Account'),
+        ),
+        migrations.AlterField(
+            model_name='updateorcreatetransactionruleaction',
+            name='set_amount',
+            field=models.TextField(blank=True, verbose_name='Amount'),
+        ),
+        migrations.AlterField(
+            model_name='updateorcreatetransactionruleaction',
+            name='set_category',
+            field=models.TextField(blank=True, verbose_name='Category'),
+        ),
+        migrations.AlterField(
+            model_name='updateorcreatetransactionruleaction',
+            name='set_date',
+            field=models.TextField(blank=True, verbose_name='Date'),
+        ),
+        migrations.AlterField(
+            model_name='updateorcreatetransactionruleaction',
+            name='set_description',
+            field=models.TextField(blank=True, verbose_name='Description'),
+        ),
+        migrations.AlterField(
+            model_name='updateorcreatetransactionruleaction',
+            name='set_entities',
+            field=models.TextField(blank=True, verbose_name='Entities'),
+        ),
+        migrations.AlterField(
+            model_name='updateorcreatetransactionruleaction',
+            name='set_internal_id',
+            field=models.TextField(blank=True, verbose_name='Internal ID'),
+        ),
+        migrations.AlterField(
+            model_name='updateorcreatetransactionruleaction',
+            name='set_internal_note',
+            field=models.TextField(blank=True, verbose_name='Internal Note'),
+        ),
+        migrations.AlterField(
+            model_name='updateorcreatetransactionruleaction',
+            name='set_is_paid',
+            field=models.TextField(blank=True, verbose_name='Is Paid'),
+        ),
+        migrations.AlterField(
+            model_name='updateorcreatetransactionruleaction',
+            name='set_notes',
+            field=models.TextField(blank=True, verbose_name='Notes'),
+        ),
+        migrations.AlterField(
+            model_name='updateorcreatetransactionruleaction',
+            name='set_reference_date',
+            field=models.TextField(blank=True, verbose_name='Reference Date'),
+        ),
+        migrations.AlterField(
+            model_name='updateorcreatetransactionruleaction',
+            name='set_tags',
+            field=models.TextField(blank=True, verbose_name='Tags'),
+        ),
+        migrations.AlterField(
+            model_name='updateorcreatetransactionruleaction',
+            name='set_type',
+            field=models.TextField(blank=True, verbose_name='Type'),
+        ),
+    ]
--- a/app/apps/rules/migrations/0011_alter_updateorcreatetransactionruleaction_set_is_paid.py
+++ b/app/apps/rules/migrations/0011_alter_updateorcreatetransactionruleaction_set_is_paid.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.1.6 on 2025-02-09 20:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rules', '0010_alter_updateorcreatetransactionruleaction_search_account_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='updateorcreatetransactionruleaction',
+            name='set_is_paid',
+            field=models.TextField(blank=True, verbose_name='Paid'),
+        ),
+    ]
--- a/app/apps/rules/models.py
+++ b/app/apps/rules/models.py
@@ -88,226 +88,201 @@ class UpdateOrCreateTransactionRuleAction(models.Model):

    # Search fields with operators
    search_account = models.TextField(
-        verbose_name=_("Search Account"),
+        verbose_name="Search Account",
        blank=True,
-        help_text=_("Expression to match transaction account (ID or name)"),
    )
    search_account_operator = models.CharField(
        max_length=10,
        choices=SearchOperator.choices,
        default=SearchOperator.EXACT,
-        verbose_name=_("Account Operator"),
+        verbose_name="Account Operator",
    )

    search_type = models.TextField(
-        verbose_name=_("Search Type"),
+        verbose_name="Search Type",
        blank=True,
-        help_text=_("Expression to match transaction type ('IN' or 'EX')"),
    )
    search_type_operator = models.CharField(
        max_length=10,
        choices=SearchOperator.choices,
        default=SearchOperator.EXACT,
-        verbose_name=_("Type Operator"),
+        verbose_name="Type Operator",
    )

    search_is_paid = models.TextField(
-        verbose_name=_("Search Is Paid"),
+        verbose_name="Search Is Paid",
        blank=True,
-        help_text=_("Expression to match transaction paid status"),
    )
    search_is_paid_operator = models.CharField(
        max_length=10,
        choices=SearchOperator.choices,
        default=SearchOperator.EXACT,
-        verbose_name=_("Is Paid Operator"),
+        verbose_name="Is Paid Operator",
    )

    search_date = models.TextField(
-        verbose_name=_("Search Date"),
+        verbose_name="Search Date",
        blank=True,
-        help_text=_("Expression to match transaction date"),
+        help_text="Expression to match transaction date",
    )
    search_date_operator = models.CharField(
        max_length=10,
        choices=SearchOperator.choices,
        default=SearchOperator.EXACT,
-        verbose_name=_("Date Operator"),
+        verbose_name="Date Operator",
    )

    search_reference_date = models.TextField(
-        verbose_name=_("Search Reference Date"),
+        verbose_name="Search Reference Date",
        blank=True,
-        help_text=_("Expression to match transaction reference date"),
    )
    search_reference_date_operator = models.CharField(
        max_length=10,
        choices=SearchOperator.choices,
        default=SearchOperator.EXACT,
-        verbose_name=_("Reference Date Operator"),
+        verbose_name="Reference Date Operator",
    )

    search_amount = models.TextField(
-        verbose_name=_("Search Amount"),
+        verbose_name="Search Amount",
        blank=True,
-        help_text=_("Expression to match transaction amount"),
    )
    search_amount_operator = models.CharField(
        max_length=10,
        choices=SearchOperator.choices,
        default=SearchOperator.EXACT,
-        verbose_name=_("Amount Operator"),
+        verbose_name="Amount Operator",
    )

    search_description = models.TextField(
-        verbose_name=_("Search Description"),
+        verbose_name="Search Description",
        blank=True,
-        help_text=_("Expression to match transaction description"),
    )
    search_description_operator = models.CharField(
        max_length=10,
        choices=SearchOperator.choices,
        default=SearchOperator.CONTAINS,
-        verbose_name=_("Description Operator"),
+        verbose_name="Description Operator",
    )

    search_notes = models.TextField(
-        verbose_name=_("Search Notes"),
+        verbose_name="Search Notes",
        blank=True,
-        help_text=_("Expression to match transaction notes"),
    )
    search_notes_operator = models.CharField(
        max_length=10,
        choices=SearchOperator.choices,
        default=SearchOperator.CONTAINS,
-        verbose_name=_("Notes Operator"),
+        verbose_name="Notes Operator",
    )

    search_category = models.TextField(
-        verbose_name=_("Search Category"),
+        verbose_name="Search Category",
        blank=True,
-        help_text=_("Expression to match transaction category (ID or name)"),
    )
    search_category_operator = models.CharField(
        max_length=10,
        choices=SearchOperator.choices,
        default=SearchOperator.EXACT,
-        verbose_name=_("Category Operator"),
+        verbose_name="Category Operator",
    )

    search_tags = models.TextField(
-        verbose_name=_("Search Tags"),
+        verbose_name="Search Tags",
        blank=True,
-        help_text=_("Expression to match transaction tags (list of IDs or names)"),
    )
    search_tags_operator = models.CharField(
        max_length=10,
        choices=SearchOperator.choices,
        default=SearchOperator.CONTAINS,
-        verbose_name=_("Tags Operator"),
+        verbose_name="Tags Operator",
    )

    search_entities = models.TextField(
-        verbose_name=_("Search Entities"),
+        verbose_name="Search Entities",
        blank=True,
-        help_text=_("Expression to match transaction entities (list of IDs or names)"),
    )
    search_entities_operator = models.CharField(
        max_length=10,
        choices=SearchOperator.choices,
        default=SearchOperator.CONTAINS,
-        verbose_name=_("Entities Operator"),
+        verbose_name="Entities Operator",
    )

    search_internal_note = models.TextField(
-        verbose_name=_("Search Internal Note"),
+        verbose_name="Search Internal Note",
        blank=True,
-        help_text=_("Expression to match transaction internal note"),
    )
    search_internal_note_operator = models.CharField(
        max_length=10,
        choices=SearchOperator.choices,
        default=SearchOperator.EXACT,
-        verbose_name=_("Internal Note Operator"),
+        verbose_name="Internal Note Operator",
    )

    search_internal_id = models.TextField(
-        verbose_name=_("Search Internal ID"),
+        verbose_name="Search Internal ID",
        blank=True,
-        help_text=_("Expression to match transaction internal ID"),
    )
    search_internal_id_operator = models.CharField(
        max_length=10,
        choices=SearchOperator.choices,
        default=SearchOperator.EXACT,
-        verbose_name=_("Internal ID Operator"),
+        verbose_name="Internal ID Operator",
    )

    # Set fields
    set_account = models.TextField(
-        verbose_name=_("Set Account"),
+        verbose_name=_("Account"),
        blank=True,
-        help_text=_("Expression for account to set (ID or name)"),
    )
    set_type = models.TextField(
-        verbose_name=_("Set Type"),
+        verbose_name=_("Type"),
        blank=True,
-        help_text=_("Expression for type to set ('IN' or 'EX')"),
    )
    set_is_paid = models.TextField(
-        verbose_name=_("Set Is Paid"),
+        verbose_name=_("Paid"),
        blank=True,
-        help_text=_("Expression for paid status to set"),
    )
    set_date = models.TextField(
-        verbose_name=_("Set Date"),
+        verbose_name=_("Date"),
        blank=True,
-        help_text=_("Expression for date to set"),
    )
    set_reference_date = models.TextField(
-        verbose_name=_("Set Reference Date"),
+        verbose_name=_("Reference Date"),
        blank=True,
-        help_text=_("Expression for reference date to set"),
    )
    set_amount = models.TextField(
-        verbose_name=_("Set Amount"),
+        verbose_name=_("Amount"),
        blank=True,
-        help_text=_("Expression for amount to set"),
    )
    set_description = models.TextField(
-        verbose_name=_("Set Description"),
+        verbose_name=_("Description"),
        blank=True,
-        help_text=_("Expression for description to set"),
    )
    set_notes = models.TextField(
-        verbose_name=_("Set Notes"),
+        verbose_name=_("Notes"),
        blank=True,
-        help_text=_("Expression for notes to set"),
    )
    set_internal_note = models.TextField(
-        verbose_name=_("Set Internal Note"),
+        verbose_name=_("Internal Note"),
        blank=True,
-        help_text=_("Expression for internal note to set"),
    )
    set_internal_id = models.TextField(
-        verbose_name=_("Set Internal ID"),
+        verbose_name=_("Internal ID"),
        blank=True,
-        help_text=_("Expression for internal ID to set"),
    )
    set_entities = models.TextField(
-        verbose_name=_("Set Entities"),
+        verbose_name=_("Entities"),
        blank=True,
-        help_text=_("Expression for entities to set (list of IDs or names)"),
    )
    set_category = models.TextField(
-        verbose_name=_("Set Category"),
+        verbose_name=_("Category"),
        blank=True,
-        help_text=_("Expression for category to set (ID or name)"),
    )
    set_tags = models.TextField(
-        verbose_name=_("Set Tags"),
+        verbose_name=_("Tags"),
        blank=True,
-        help_text=_("Expression for tags to set (list of IDs or names)"),
    )

    class Meta:
--- a/app/apps/transactions/views/actions.py
+++ b/app/apps/transactions/views/actions.py
@@ -7,6 +7,7 @@ from django.utils.translation import gettext_lazy as _, ngettext_lazy

 from apps.common.decorators.htmx import only_htmx
 from apps.transactions.models import Transaction
+from apps.rules.signals import transaction_updated


@only_htmx
@@ -17,6 +18,9 @@ def bulk_pay_transactions(request):
    count = transactions.count()
    transactions.update(is_paid=True)

+    for transaction in transactions:
+        transaction_updated.send(sender=transaction)
+
    messages.success(
        request,
        ngettext_lazy(
@@ -41,6 +45,9 @@ def bulk_unpay_transactions(request):
    count = transactions.count()
    transactions.update(is_paid=False)

+    for transaction in transactions:
+        transaction_updated.send(sender=transaction)
+
    messages.success(
        request,
        ngettext_lazy(
--- a/app/apps/transactions/views/transactions.py
+++ b/app/apps/transactions/views/transactions.py
@@ -316,6 +316,7 @@ def transaction_pay(request, transaction_id):
    new_is_paid = False if transaction.is_paid else True
    transaction.is_paid = new_is_paid
    transaction.save()
+    transaction_updated.send(sender=transaction)

    response = render(
        request,
--- a/app/locale/de/LC_MESSAGES/django.po
+++ b/app/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-07 11:45-0300\n"
+"POT-Creation-Date: 2025-02-09 17:27-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,10 +26,10 @@ msgstr ""
 #: apps/currencies/forms.py:53 apps/currencies/forms.py:91
 #: apps/currencies/forms.py:142 apps/dca/forms.py:41 apps/dca/forms.py:93
 #: apps/import_app/forms.py:34 apps/rules/forms.py:45 apps/rules/forms.py:87
-#: apps/transactions/forms.py:190 apps/transactions/forms.py:257
-#: apps/transactions/forms.py:581 apps/transactions/forms.py:624
-#: apps/transactions/forms.py:656 apps/transactions/forms.py:691
-#: apps/transactions/forms.py:827
+#: apps/rules/forms.py:359 apps/transactions/forms.py:190
+#: apps/transactions/forms.py:257 apps/transactions/forms.py:581
+#: apps/transactions/forms.py:624 apps/transactions/forms.py:656
+#: apps/transactions/forms.py:691 apps/transactions/forms.py:827
 msgid "Update"
 msgstr ""

@@ -37,10 +37,11 @@ msgstr ""
 #: apps/common/widgets/tom_select.py:12 apps/currencies/forms.py:61
 #: apps/currencies/forms.py:99 apps/currencies/forms.py:150
 #: apps/dca/forms.py:49 apps/dca/forms.py:102 apps/import_app/forms.py:42
-#: apps/rules/forms.py:53 apps/rules/forms.py:95 apps/transactions/forms.py:174
-#: apps/transactions/forms.py:199 apps/transactions/forms.py:589
-#: apps/transactions/forms.py:632 apps/transactions/forms.py:664
-#: apps/transactions/forms.py:699 apps/transactions/forms.py:835
+#: apps/rules/forms.py:53 apps/rules/forms.py:95 apps/rules/forms.py:367
+#: apps/transactions/forms.py:174 apps/transactions/forms.py:199
+#: apps/transactions/forms.py:589 apps/transactions/forms.py:632
+#: apps/transactions/forms.py:664 apps/transactions/forms.py:699
+#: apps/transactions/forms.py:835
 #: templates/account_groups/fragments/list.html:9
 #: templates/accounts/fragments/list.html:9
 #: templates/categories/fragments/list.html:9
@@ -67,7 +68,8 @@ msgstr ""
 msgid "New balance"
 msgstr ""

-#: apps/accounts/forms.py:119 apps/rules/models.py:27
+#: apps/accounts/forms.py:119 apps/rules/forms.py:168 apps/rules/forms.py:183
+#: apps/rules/models.py:32 apps/rules/models.py:280
 #: apps/transactions/forms.py:39 apps/transactions/forms.py:291
 #: apps/transactions/forms.py:298 apps/transactions/forms.py:478
 #: apps/transactions/forms.py:723 apps/transactions/models.py:159
@@ -75,7 +77,8 @@ msgstr ""
 msgid "Category"
 msgstr ""

-#: apps/accounts/forms.py:126 apps/rules/models.py:28
+#: apps/accounts/forms.py:126 apps/rules/forms.py:171 apps/rules/forms.py:180
+#: apps/rules/models.py:33 apps/rules/models.py:284
 #: apps/transactions/filters.py:74 apps/transactions/forms.py:47
 #: apps/transactions/forms.py:307 apps/transactions/forms.py:315
 #: apps/transactions/forms.py:471 apps/transactions/forms.py:716
@@ -86,7 +89,7 @@ msgid "Tags"
 msgstr ""

 #: apps/accounts/models.py:9 apps/accounts/models.py:21 apps/dca/models.py:14
-#: apps/import_app/models.py:14 apps/rules/models.py:9
+#: apps/import_app/models.py:14 apps/rules/models.py:10
 #: apps/transactions/models.py:67 apps/transactions/models.py:87
 #: apps/transactions/models.py:106
 #: templates/account_groups/fragments/list.html:25
@@ -147,7 +150,8 @@ msgstr ""
 msgid "Archived accounts don't show up nor count towards your net worth"
 msgstr ""

-#: apps/accounts/models.py:59 apps/rules/models.py:19
+#: apps/accounts/models.py:59 apps/rules/forms.py:160 apps/rules/forms.py:173
+#: apps/rules/models.py:24 apps/rules/models.py:236
 #: apps/transactions/forms.py:59 apps/transactions/forms.py:463
 #: apps/transactions/forms.py:708 apps/transactions/models.py:132
 #: apps/transactions/models.py:288 apps/transactions/models.py:490
@@ -356,7 +360,8 @@ msgstr ""
 msgid "Suffix"
 msgstr ""

-#: apps/currencies/forms.py:69 apps/dca/models.py:156 apps/rules/models.py:22
+#: apps/currencies/forms.py:69 apps/dca/models.py:156 apps/rules/forms.py:163
+#: apps/rules/forms.py:176 apps/rules/models.py:27 apps/rules/models.py:248
 #: apps/transactions/forms.py:63 apps/transactions/forms.py:319
 #: apps/transactions/models.py:142
 #: templates/dca/fragments/strategy/details.html:52
@@ -562,7 +567,8 @@ msgstr ""
 msgid "Payment Currency"
 msgstr ""

-#: apps/dca/models.py:27 apps/dca/models.py:179 apps/rules/models.py:26
+#: apps/dca/models.py:27 apps/dca/models.py:179 apps/rules/forms.py:167
+#: apps/rules/forms.py:182 apps/rules/models.py:31 apps/rules/models.py:264
 #: apps/transactions/forms.py:333 apps/transactions/models.py:155
 #: apps/transactions/models.py:337 apps/transactions/models.py:518
 msgid "Notes"
@@ -726,42 +732,62 @@ msgstr ""
 msgid "A value for this field already exists in the rule."
 msgstr ""

-#: apps/rules/models.py:10 apps/rules/models.py:25
-#: apps/transactions/forms.py:325 apps/transactions/models.py:153
-#: apps/transactions/models.py:295 apps/transactions/models.py:504
-msgid "Description"
+#: apps/rules/forms.py:147 apps/rules/forms.py:148 apps/rules/forms.py:149
+#: apps/rules/forms.py:150 apps/rules/forms.py:151 apps/rules/forms.py:152
+#: apps/rules/forms.py:153 apps/rules/forms.py:154 apps/rules/forms.py:155
+#: apps/rules/forms.py:156 apps/rules/forms.py:157 apps/rules/forms.py:158
+#: apps/rules/forms.py:159
+msgid "Operator"
 msgstr ""

-#: apps/rules/models.py:11
-msgid "Trigger"
-msgstr ""
-
-#: apps/rules/models.py:20 apps/transactions/models.py:139
+#: apps/rules/forms.py:161 apps/rules/forms.py:174 apps/rules/models.py:25
+#: apps/rules/models.py:240 apps/transactions/models.py:139
 #: apps/transactions/models.py:293 apps/transactions/models.py:496
 msgid "Type"
 msgstr ""

-#: apps/rules/models.py:21 apps/transactions/filters.py:23
-#: apps/transactions/models.py:141 templates/cotton/transaction/item.html:20
-#: templates/cotton/transaction/item.html:30
+#: apps/rules/forms.py:162 apps/rules/forms.py:175 apps/rules/models.py:26
+#: apps/rules/models.py:244 apps/transactions/filters.py:23
+#: apps/transactions/models.py:141 templates/cotton/transaction/item.html:21
+#: templates/cotton/transaction/item.html:31
 #: templates/transactions/widgets/paid_toggle_button.html:12
 #: templates/transactions/widgets/unselectable_paid_toggle_button.html:16
 msgid "Paid"
 msgstr ""

-#: apps/rules/models.py:23 apps/transactions/forms.py:66
+#: apps/rules/forms.py:164 apps/rules/forms.py:177 apps/rules/models.py:28
+#: apps/rules/models.py:252 apps/transactions/forms.py:66
 #: apps/transactions/forms.py:322 apps/transactions/forms.py:492
 #: apps/transactions/models.py:143 apps/transactions/models.py:311
 #: apps/transactions/models.py:520
 msgid "Reference Date"
 msgstr ""

-#: apps/rules/models.py:24 apps/transactions/models.py:148
+#: apps/rules/forms.py:165 apps/rules/forms.py:178 apps/rules/models.py:29
+#: apps/rules/models.py:256 apps/transactions/models.py:148
 #: apps/transactions/models.py:501
 msgid "Amount"
 msgstr ""

-#: apps/rules/models.py:29 apps/transactions/filters.py:81
+#: apps/rules/forms.py:166 apps/rules/forms.py:179 apps/rules/models.py:11
+#: apps/rules/models.py:30 apps/rules/models.py:260
+#: apps/transactions/forms.py:325 apps/transactions/models.py:153
+#: apps/transactions/models.py:295 apps/transactions/models.py:504
+msgid "Description"
+msgstr ""
+
+#: apps/rules/forms.py:169 apps/rules/forms.py:184 apps/rules/models.py:268
+#: apps/transactions/models.py:192
+msgid "Internal Note"
+msgstr ""
+
+#: apps/rules/forms.py:170 apps/rules/forms.py:185 apps/rules/models.py:272
+#: apps/transactions/models.py:194
+msgid "Internal ID"
+msgstr ""
+
+#: apps/rules/forms.py:172 apps/rules/forms.py:181 apps/rules/models.py:34
+#: apps/rules/models.py:276 apps/transactions/filters.py:81
 #: apps/transactions/forms.py:55 apps/transactions/forms.py:486
 #: apps/transactions/forms.py:731 apps/transactions/models.py:117
 #: apps/transactions/models.py:170 apps/transactions/models.py:333
@@ -770,48 +796,142 @@ msgstr ""
 msgid "Entities"
 msgstr ""

-#: apps/rules/models.py:35
+#: apps/rules/forms.py:199
+msgid "Search Criteria"
+msgstr ""
+
+#: apps/rules/forms.py:334
+msgid "Set Values"
+msgstr ""
+
+#: apps/rules/models.py:12
+msgid "Trigger"
+msgstr ""
+
+#: apps/rules/models.py:15
+msgid "Transaction rule"
+msgstr ""
+
+#: apps/rules/models.py:16
+msgid "Transaction rules"
+msgstr ""
+
+#: apps/rules/models.py:40 apps/rules/models.py:78
 msgid "Rule"
 msgstr ""

-#: apps/rules/models.py:40
+#: apps/rules/models.py:45
 msgid "Field"
 msgstr ""

-#: apps/rules/models.py:42
+#: apps/rules/models.py:47
 msgid "Value"
 msgstr ""

-#: apps/rules/views.py:44
+#: apps/rules/models.py:53
+msgid "Edit transaction action"
+msgstr ""
+
+#: apps/rules/models.py:54
+msgid "Edit transaction actions"
+msgstr ""
+
+#: apps/rules/models.py:64
+msgid "is exactly"
+msgstr ""
+
+#: apps/rules/models.py:65
+msgid "contains"
+msgstr ""
+
+#: apps/rules/models.py:66
+msgid "starts with"
+msgstr ""
+
+#: apps/rules/models.py:67
+msgid "ends with"
+msgstr ""
+
+#: apps/rules/models.py:68
+msgid "equals"
+msgstr ""
+
+#: apps/rules/models.py:69
+msgid "greater than"
+msgstr ""
+
+#: apps/rules/models.py:70
+msgid "less than"
+msgstr ""
+
+#: apps/rules/models.py:71
+msgid "greater than or equal"
+msgstr ""
+
+#: apps/rules/models.py:72
+msgid "less than or equal"
+msgstr ""
+
+#: apps/rules/models.py:82 templates/transactions/pages/transactions.html:15
+msgid "Filter"
+msgstr ""
+
+#: apps/rules/models.py:85
+msgid ""
+"Generic expression to enable or disable execution. Should evaluate to True "
+"or False"
+msgstr ""
+
+#: apps/rules/models.py:289
+msgid "Update or create transaction action"
+msgstr ""
+
+#: apps/rules/models.py:290
+msgid "Update or create transaction actions"
+msgstr ""
+
+#: apps/rules/views.py:52
 msgid "Rule deactivated successfully"
 msgstr ""

-#: apps/rules/views.py:46
+#: apps/rules/views.py:54
 msgid "Rule activated successfully"
 msgstr ""

-#: apps/rules/views.py:64
+#: apps/rules/views.py:72
 msgid "Rule added successfully"
 msgstr ""

-#: apps/rules/views.py:87
+#: apps/rules/views.py:100
 msgid "Rule updated successfully"
 msgstr ""

-#: apps/rules/views.py:126
+#: apps/rules/views.py:139
 msgid "Rule deleted successfully"
 msgstr ""

-#: apps/rules/views.py:180
+#: apps/rules/views.py:193
 msgid "Action updated successfully"
 msgstr ""

-#: apps/rules/views.py:210
+#: apps/rules/views.py:223
 msgid "Action deleted successfully"
 msgstr ""

-#: apps/transactions/filters.py:24 templates/cotton/transaction/item.html:20
-#: templates/cotton/transaction/item.html:30 templates/includes/navbar.html:46
+#: apps/rules/views.py:246
+msgid "Update or Create Transaction action added successfully"
+msgstr ""
+
+#: apps/rules/views.py:278
+msgid "Update or Create Transaction action updated successfully"
+msgstr ""
+
+#: apps/rules/views.py:307
+msgid "Update or Create Transaction action deleted successfully"
+msgstr ""
+
+#: apps/transactions/filters.py:24 templates/cotton/transaction/item.html:21
+#: templates/cotton/transaction/item.html:31 templates/includes/navbar.html:46
 #: templates/transactions/widgets/paid_toggle_button.html:8
 #: templates/transactions/widgets/unselectable_paid_toggle_button.html:12
 msgid "Projected"
@@ -963,14 +1083,6 @@ msgstr ""
 msgid "Recurring Transaction"
 msgstr ""

-#: apps/transactions/models.py:192
-msgid "Internal Note"
-msgstr ""
-
-#: apps/transactions/models.py:194
-msgid "Internal ID"
-msgstr ""
-
 #: apps/transactions/models.py:198
 msgid "Deleted"
 msgstr ""
@@ -1384,7 +1496,7 @@ msgstr ""
 #: templates/account_groups/fragments/list.html:36
 #: templates/accounts/fragments/list.html:41
 #: templates/categories/fragments/table.html:29
-#: templates/cotton/transaction/item.html:126
+#: templates/cotton/transaction/item.html:127
 #: templates/cotton/ui/transactions_action_bar.html:49
 #: templates/currencies/fragments/list.html:37
 #: templates/dca/fragments/strategy/details.html:67
@@ -1396,8 +1508,9 @@ msgstr ""
 #: templates/import_app/fragments/profiles/list.html:48
 #: templates/installment_plans/fragments/table.html:27
 #: templates/recurring_transactions/fragments/table.html:29
-#: templates/rules/fragments/transaction_rule/view.html:22
-#: templates/rules/fragments/transaction_rule/view.html:48
+#: templates/rules/fragments/transaction_rule/view.html:23
+#: templates/rules/fragments/transaction_rule/view.html:47
+#: templates/rules/fragments/transaction_rule/view.html:80
 #: templates/tags/fragments/table.html:28
 msgid "Edit"
 msgstr ""
@@ -1405,8 +1518,8 @@ msgstr ""
 #: templates/account_groups/fragments/list.html:43
 #: templates/accounts/fragments/list.html:48
 #: templates/categories/fragments/table.html:36
-#: templates/cotton/transaction/item.html:141
-#: templates/cotton/transaction/item.html:160
+#: templates/cotton/transaction/item.html:142
+#: templates/cotton/transaction/item.html:161
 #: templates/cotton/ui/deleted_transactions_action_bar.html:55
 #: templates/cotton/ui/transactions_action_bar.html:86
 #: templates/currencies/fragments/list.html:44
@@ -1422,7 +1535,8 @@ msgstr ""
 #: templates/mini_tools/unit_price_calculator.html:18
 #: templates/recurring_transactions/fragments/table.html:91
 #: templates/rules/fragments/list.html:44
-#: templates/rules/fragments/transaction_rule/view.html:56
+#: templates/rules/fragments/transaction_rule/view.html:55
+#: templates/rules/fragments/transaction_rule/view.html:88
 #: templates/tags/fragments/table.html:36
 msgid "Delete"
 msgstr ""
@@ -1430,8 +1544,8 @@ msgstr ""
 #: templates/account_groups/fragments/list.html:47
 #: templates/accounts/fragments/list.html:52
 #: templates/categories/fragments/table.html:41
-#: templates/cotton/transaction/item.html:145
-#: templates/cotton/transaction/item.html:164
+#: templates/cotton/transaction/item.html:146
+#: templates/cotton/transaction/item.html:165
 #: templates/cotton/ui/deleted_transactions_action_bar.html:57
 #: templates/cotton/ui/transactions_action_bar.html:88
 #: templates/currencies/fragments/list.html:48
@@ -1450,7 +1564,8 @@ msgstr ""
 #: templates/recurring_transactions/fragments/table.html:82
 #: templates/recurring_transactions/fragments/table.html:96
 #: templates/rules/fragments/list.html:48
-#: templates/rules/fragments/transaction_rule/view.html:60
+#: templates/rules/fragments/transaction_rule/view.html:59
+#: templates/rules/fragments/transaction_rule/view.html:92
 #: templates/tags/fragments/table.html:40
 msgid "Are you sure?"
 msgstr ""
@@ -1458,8 +1573,8 @@ msgstr ""
 #: templates/account_groups/fragments/list.html:48
 #: templates/accounts/fragments/list.html:53
 #: templates/categories/fragments/table.html:42
-#: templates/cotton/transaction/item.html:146
-#: templates/cotton/transaction/item.html:165
+#: templates/cotton/transaction/item.html:147
+#: templates/cotton/transaction/item.html:166
 #: templates/cotton/ui/deleted_transactions_action_bar.html:58
 #: templates/cotton/ui/transactions_action_bar.html:89
 #: templates/currencies/fragments/list.html:49
@@ -1471,7 +1586,8 @@ msgstr ""
 #: templates/exchange_rates_services/fragments/table.html:37
 #: templates/import_app/fragments/profiles/list.html:74
 #: templates/rules/fragments/list.html:49
-#: templates/rules/fragments/transaction_rule/view.html:61
+#: templates/rules/fragments/transaction_rule/view.html:60
+#: templates/rules/fragments/transaction_rule/view.html:93
 #: templates/tags/fragments/table.html:41
 msgid "You won't be able to revert this!"
 msgstr ""
@@ -1479,8 +1595,8 @@ msgstr ""
 #: templates/account_groups/fragments/list.html:49
 #: templates/accounts/fragments/list.html:54
 #: templates/categories/fragments/table.html:43
-#: templates/cotton/transaction/item.html:147
-#: templates/cotton/transaction/item.html:166
+#: templates/cotton/transaction/item.html:148
+#: templates/cotton/transaction/item.html:167
 #: templates/currencies/fragments/list.html:50
 #: templates/dca/fragments/strategy/details.html:82
 #: templates/dca/fragments/strategy/list.html:48
@@ -1493,7 +1609,8 @@ msgstr ""
 #: templates/installment_plans/fragments/table.html:62
 #: templates/recurring_transactions/fragments/table.html:98
 #: templates/rules/fragments/list.html:50
-#: templates/rules/fragments/transaction_rule/view.html:62
+#: templates/rules/fragments/transaction_rule/view.html:61
+#: templates/rules/fragments/transaction_rule/view.html:94
 #: templates/tags/fragments/table.html:42
 msgid "Yes, delete it!"
 msgstr ""
@@ -1604,16 +1721,16 @@ msgstr ""
 msgid "Search"
 msgstr ""

-#: templates/cotton/transaction/item.html:7
+#: templates/cotton/transaction/item.html:8
 msgid "Select"
 msgstr ""

-#: templates/cotton/transaction/item.html:133
+#: templates/cotton/transaction/item.html:134
 #: templates/cotton/ui/transactions_action_bar.html:78
 msgid "Duplicate"
 msgstr ""

-#: templates/cotton/transaction/item.html:154
+#: templates/cotton/transaction/item.html:155
 #: templates/cotton/ui/deleted_transactions_action_bar.html:47
 msgid "Restore"
 msgstr ""
@@ -1623,33 +1740,33 @@ msgstr ""
 msgid "projected income"
 msgstr ""

-#: templates/cotton/ui/account_card.html:37
-#: templates/cotton/ui/currency_card.html:32
+#: templates/cotton/ui/account_card.html:41
+#: templates/cotton/ui/currency_card.html:36
 msgid "projected expenses"
 msgstr ""

-#: templates/cotton/ui/account_card.html:61
-#: templates/cotton/ui/currency_card.html:56
+#: templates/cotton/ui/account_card.html:69
+#: templates/cotton/ui/currency_card.html:64
 msgid "projected total"
 msgstr ""

-#: templates/cotton/ui/account_card.html:86
-#: templates/cotton/ui/currency_card.html:81
+#: templates/cotton/ui/account_card.html:94
+#: templates/cotton/ui/currency_card.html:88
 msgid "current income"
 msgstr ""

-#: templates/cotton/ui/account_card.html:108
-#: templates/cotton/ui/currency_card.html:103
+#: templates/cotton/ui/account_card.html:120
+#: templates/cotton/ui/currency_card.html:114
 msgid "current expenses"
 msgstr ""

-#: templates/cotton/ui/account_card.html:130
-#: templates/cotton/ui/currency_card.html:125
+#: templates/cotton/ui/account_card.html:146
+#: templates/cotton/ui/currency_card.html:140
 msgid "current total"
 msgstr ""

-#: templates/cotton/ui/account_card.html:156
-#: templates/cotton/ui/currency_card.html:151
+#: templates/cotton/ui/account_card.html:171
+#: templates/cotton/ui/currency_card.html:165
 msgid "final total"
 msgstr ""

@@ -1810,7 +1927,7 @@ msgid "No entries for this DCA"
 msgstr ""

 #: templates/dca/fragments/strategy/details.html:125
-#: templates/monthly_overview/fragments/list.html:41
+#: templates/monthly_overview/fragments/list.html:47
 #: templates/transactions/fragments/list_all.html:40
 msgid "Try adding one"
 msgstr ""
@@ -2220,7 +2337,7 @@ msgstr ""
 msgid "Item"
 msgstr ""

-#: templates/monthly_overview/fragments/list.html:40
+#: templates/monthly_overview/fragments/list.html:46
 msgid "No transactions this month"
 msgstr ""

@@ -2391,10 +2508,12 @@ msgid "Edit transaction rule"
 msgstr ""

 #: templates/rules/fragments/transaction_rule/transaction_rule_action/add.html:5
+#: templates/rules/fragments/transaction_rule/update_or_create_transaction_rule_action/add.html:5
 msgid "Add action to transaction rule"
 msgstr ""

 #: templates/rules/fragments/transaction_rule/transaction_rule_action/edit.html:5
+#: templates/rules/fragments/transaction_rule/update_or_create_transaction_rule_action/edit.html:5
 msgid "Edit transaction rule action"
 msgstr ""

@@ -2402,15 +2521,21 @@ msgstr ""
 msgid "Transaction Rule"
 msgstr ""

-#: templates/rules/fragments/transaction_rule/view.html:13
+#: templates/rules/fragments/transaction_rule/view.html:14
 msgid "If transaction..."
 msgstr ""

-#: templates/rules/fragments/transaction_rule/view.html:31
+#: templates/rules/fragments/transaction_rule/view.html:32
 msgid "Then..."
 msgstr ""

 #: templates/rules/fragments/transaction_rule/view.html:36
+#: templates/transactions/fragments/edit.html:5
+#: templates/transactions/fragments/edit_installment_plan.html:5
+msgid "Edit transaction"
+msgstr ""
+
+#: templates/rules/fragments/transaction_rule/view.html:39
 msgid "Set"
 msgstr ""

@@ -2419,13 +2544,29 @@ msgid "to"
 msgstr ""

 #: templates/rules/fragments/transaction_rule/view.html:71
+msgid "Update or create transaction"
+msgstr ""
+
+#: templates/rules/fragments/transaction_rule/view.html:74
+msgid "Edit to view"
+msgstr ""
+
+#: templates/rules/fragments/transaction_rule/view.html:104
 msgid "This rule has no actions"
 msgstr ""

-#: templates/rules/fragments/transaction_rule/view.html:80
+#: templates/rules/fragments/transaction_rule/view.html:112
 msgid "Add new"
 msgstr ""

+#: templates/rules/fragments/transaction_rule/view.html:117
+msgid "Edit Transaction"
+msgstr ""
+
+#: templates/rules/fragments/transaction_rule/view.html:120
+msgid "Update or Create Transaction"
+msgstr ""
+
 #: templates/tags/fragments/add.html:5
 msgid "Add tag"
 msgstr ""
@@ -2459,11 +2600,6 @@ msgstr ""
 msgid "transactions"
 msgstr ""

-#: templates/transactions/fragments/edit.html:5
-#: templates/transactions/fragments/edit_installment_plan.html:5
-msgid "Edit transaction"
-msgstr ""
-
 #: templates/transactions/fragments/list_all.html:39
 msgid "No transactions found"
 msgstr ""
@@ -2476,10 +2612,6 @@ msgstr ""
 msgid "No deleted transactions to show"
 msgstr ""

-#: templates/transactions/pages/transactions.html:15
-msgid "Filter"
-msgstr ""
-
 #: templates/transactions/pages/trash.html:4
 #: templates/transactions/pages/trash.html:9
 msgid "Deleted transactions"
--- a/app/locale/nl/LC_MESSAGES/django.po
+++ b/app/locale/nl/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-07 11:45-0300\n"
+"POT-Creation-Date: 2025-02-09 17:27-0300\n"
 "PO-Revision-Date: 2025-01-29 06:12+0100\n"
 "Last-Translator: Dimitri Decrock <dimitri@fam-decrock.eu>\n"
 "Language-Team: \n"
@@ -27,10 +27,10 @@ msgstr "Groepsnaam"
 #: apps/currencies/forms.py:53 apps/currencies/forms.py:91
 #: apps/currencies/forms.py:142 apps/dca/forms.py:41 apps/dca/forms.py:93
 #: apps/import_app/forms.py:34 apps/rules/forms.py:45 apps/rules/forms.py:87
-#: apps/transactions/forms.py:190 apps/transactions/forms.py:257
-#: apps/transactions/forms.py:581 apps/transactions/forms.py:624
-#: apps/transactions/forms.py:656 apps/transactions/forms.py:691
-#: apps/transactions/forms.py:827
+#: apps/rules/forms.py:359 apps/transactions/forms.py:190
+#: apps/transactions/forms.py:257 apps/transactions/forms.py:581
+#: apps/transactions/forms.py:624 apps/transactions/forms.py:656
+#: apps/transactions/forms.py:691 apps/transactions/forms.py:827
 msgid "Update"
 msgstr "Bijwerken"

@@ -38,10 +38,11 @@ msgstr "Bijwerken"
 #: apps/common/widgets/tom_select.py:12 apps/currencies/forms.py:61
 #: apps/currencies/forms.py:99 apps/currencies/forms.py:150
 #: apps/dca/forms.py:49 apps/dca/forms.py:102 apps/import_app/forms.py:42
-#: apps/rules/forms.py:53 apps/rules/forms.py:95 apps/transactions/forms.py:174
-#: apps/transactions/forms.py:199 apps/transactions/forms.py:589
-#: apps/transactions/forms.py:632 apps/transactions/forms.py:664
-#: apps/transactions/forms.py:699 apps/transactions/forms.py:835
+#: apps/rules/forms.py:53 apps/rules/forms.py:95 apps/rules/forms.py:367
+#: apps/transactions/forms.py:174 apps/transactions/forms.py:199
+#: apps/transactions/forms.py:589 apps/transactions/forms.py:632
+#: apps/transactions/forms.py:664 apps/transactions/forms.py:699
+#: apps/transactions/forms.py:835
 #: templates/account_groups/fragments/list.html:9
 #: templates/accounts/fragments/list.html:9
 #: templates/categories/fragments/list.html:9
@@ -68,7 +69,8 @@ msgstr "Groep"
 msgid "New balance"
 msgstr "Nieuw saldo"

-#: apps/accounts/forms.py:119 apps/rules/models.py:27
+#: apps/accounts/forms.py:119 apps/rules/forms.py:168 apps/rules/forms.py:183
+#: apps/rules/models.py:32 apps/rules/models.py:280
 #: apps/transactions/forms.py:39 apps/transactions/forms.py:291
 #: apps/transactions/forms.py:298 apps/transactions/forms.py:478
 #: apps/transactions/forms.py:723 apps/transactions/models.py:159
@@ -76,7 +78,8 @@ msgstr "Nieuw saldo"
 msgid "Category"
 msgstr "Categorie"

-#: apps/accounts/forms.py:126 apps/rules/models.py:28
+#: apps/accounts/forms.py:126 apps/rules/forms.py:171 apps/rules/forms.py:180
+#: apps/rules/models.py:33 apps/rules/models.py:284
 #: apps/transactions/filters.py:74 apps/transactions/forms.py:47
 #: apps/transactions/forms.py:307 apps/transactions/forms.py:315
 #: apps/transactions/forms.py:471 apps/transactions/forms.py:716
@@ -87,7 +90,7 @@ msgid "Tags"
 msgstr "Labels"

 #: apps/accounts/models.py:9 apps/accounts/models.py:21 apps/dca/models.py:14
-#: apps/import_app/models.py:14 apps/rules/models.py:9
+#: apps/import_app/models.py:14 apps/rules/models.py:10
 #: apps/transactions/models.py:67 apps/transactions/models.py:87
 #: apps/transactions/models.py:106
 #: templates/account_groups/fragments/list.html:25
@@ -152,7 +155,8 @@ msgstr ""
 "Gearchiveerde rekeningen worden niet weergegeven en tellen niet mee voor je "
 "\"Netto Waarde\"."

-#: apps/accounts/models.py:59 apps/rules/models.py:19
+#: apps/accounts/models.py:59 apps/rules/forms.py:160 apps/rules/forms.py:173
+#: apps/rules/models.py:24 apps/rules/models.py:236
 #: apps/transactions/forms.py:59 apps/transactions/forms.py:463
 #: apps/transactions/forms.py:708 apps/transactions/models.py:132
 #: apps/transactions/models.py:288 apps/transactions/models.py:490
@@ -362,7 +366,8 @@ msgstr "Voorvoegsel"
 msgid "Suffix"
 msgstr "Achtervoegsel"

-#: apps/currencies/forms.py:69 apps/dca/models.py:156 apps/rules/models.py:22
+#: apps/currencies/forms.py:69 apps/dca/models.py:156 apps/rules/forms.py:163
+#: apps/rules/forms.py:176 apps/rules/models.py:27 apps/rules/models.py:248
 #: apps/transactions/forms.py:63 apps/transactions/forms.py:319
 #: apps/transactions/models.py:142
 #: templates/dca/fragments/strategy/details.html:52
@@ -592,7 +597,8 @@ msgstr "Doel Munteenheid"
 msgid "Payment Currency"
 msgstr "Betaal Munteenheid"

-#: apps/dca/models.py:27 apps/dca/models.py:179 apps/rules/models.py:26
+#: apps/dca/models.py:27 apps/dca/models.py:179 apps/rules/forms.py:167
+#: apps/rules/forms.py:182 apps/rules/models.py:31 apps/rules/models.py:264
 #: apps/transactions/forms.py:333 apps/transactions/models.py:155
 #: apps/transactions/models.py:337 apps/transactions/models.py:518
 msgid "Notes"
@@ -756,42 +762,62 @@ msgstr "Naar"
 msgid "A value for this field already exists in the rule."
 msgstr "Een waarde voor dit veld bestaat al in de regel."

-#: apps/rules/models.py:10 apps/rules/models.py:25
-#: apps/transactions/forms.py:325 apps/transactions/models.py:153
-#: apps/transactions/models.py:295 apps/transactions/models.py:504
-msgid "Description"
-msgstr "Beschrijving"
+#: apps/rules/forms.py:147 apps/rules/forms.py:148 apps/rules/forms.py:149
+#: apps/rules/forms.py:150 apps/rules/forms.py:151 apps/rules/forms.py:152
+#: apps/rules/forms.py:153 apps/rules/forms.py:154 apps/rules/forms.py:155
+#: apps/rules/forms.py:156 apps/rules/forms.py:157 apps/rules/forms.py:158
+#: apps/rules/forms.py:159
+msgid "Operator"
+msgstr ""

-#: apps/rules/models.py:11
-msgid "Trigger"
-msgstr "Trigger"
-
-#: apps/rules/models.py:20 apps/transactions/models.py:139
+#: apps/rules/forms.py:161 apps/rules/forms.py:174 apps/rules/models.py:25
+#: apps/rules/models.py:240 apps/transactions/models.py:139
 #: apps/transactions/models.py:293 apps/transactions/models.py:496
 msgid "Type"
 msgstr "Soort"

-#: apps/rules/models.py:21 apps/transactions/filters.py:23
-#: apps/transactions/models.py:141 templates/cotton/transaction/item.html:20
-#: templates/cotton/transaction/item.html:30
+#: apps/rules/forms.py:162 apps/rules/forms.py:175 apps/rules/models.py:26
+#: apps/rules/models.py:244 apps/transactions/filters.py:23
+#: apps/transactions/models.py:141 templates/cotton/transaction/item.html:21
+#: templates/cotton/transaction/item.html:31
 #: templates/transactions/widgets/paid_toggle_button.html:12
 #: templates/transactions/widgets/unselectable_paid_toggle_button.html:16
 msgid "Paid"
 msgstr "Betaald"

-#: apps/rules/models.py:23 apps/transactions/forms.py:66
+#: apps/rules/forms.py:164 apps/rules/forms.py:177 apps/rules/models.py:28
+#: apps/rules/models.py:252 apps/transactions/forms.py:66
 #: apps/transactions/forms.py:322 apps/transactions/forms.py:492
 #: apps/transactions/models.py:143 apps/transactions/models.py:311
 #: apps/transactions/models.py:520
 msgid "Reference Date"
 msgstr "Referentiedatum"

-#: apps/rules/models.py:24 apps/transactions/models.py:148
+#: apps/rules/forms.py:165 apps/rules/forms.py:178 apps/rules/models.py:29
+#: apps/rules/models.py:256 apps/transactions/models.py:148
 #: apps/transactions/models.py:501
 msgid "Amount"
 msgstr "Bedrag"

-#: apps/rules/models.py:29 apps/transactions/filters.py:81
+#: apps/rules/forms.py:166 apps/rules/forms.py:179 apps/rules/models.py:11
+#: apps/rules/models.py:30 apps/rules/models.py:260
+#: apps/transactions/forms.py:325 apps/transactions/models.py:153
+#: apps/transactions/models.py:295 apps/transactions/models.py:504
+msgid "Description"
+msgstr "Beschrijving"
+
+#: apps/rules/forms.py:169 apps/rules/forms.py:184 apps/rules/models.py:268
+#: apps/transactions/models.py:192
+msgid "Internal Note"
+msgstr "Interne opmerking"
+
+#: apps/rules/forms.py:170 apps/rules/forms.py:185 apps/rules/models.py:272
+#: apps/transactions/models.py:194
+msgid "Internal ID"
+msgstr "Interne ID"
+
+#: apps/rules/forms.py:172 apps/rules/forms.py:181 apps/rules/models.py:34
+#: apps/rules/models.py:276 apps/transactions/filters.py:81
 #: apps/transactions/forms.py:55 apps/transactions/forms.py:486
 #: apps/transactions/forms.py:731 apps/transactions/models.py:117
 #: apps/transactions/models.py:170 apps/transactions/models.py:333
@@ -800,48 +826,162 @@ msgstr "Bedrag"
 msgid "Entities"
 msgstr "Bedrijven"

-#: apps/rules/models.py:35
+#: apps/rules/forms.py:199
+msgid "Search Criteria"
+msgstr ""
+
+#: apps/rules/forms.py:334
+#, fuzzy
+#| msgid "Current Value"
+msgid "Set Values"
+msgstr "Actuele waarde"
+
+#: apps/rules/models.py:12
+msgid "Trigger"
+msgstr "Trigger"
+
+#: apps/rules/models.py:15
+#, fuzzy
+#| msgid "Transaction Rule"
+msgid "Transaction rule"
+msgstr "Verrichtingsregel"
+
+#: apps/rules/models.py:16
+#, fuzzy
+#| msgid "Transaction Rule"
+msgid "Transaction rules"
+msgstr "Verrichtingsregel"
+
+#: apps/rules/models.py:40 apps/rules/models.py:78
 msgid "Rule"
 msgstr "Regel"

-#: apps/rules/models.py:40
+#: apps/rules/models.py:45
 msgid "Field"
 msgstr "Veld"

-#: apps/rules/models.py:42
+#: apps/rules/models.py:47
 msgid "Value"
 msgstr "Waarde"

-#: apps/rules/views.py:44
+#: apps/rules/models.py:53
+#, fuzzy
+#| msgid "Edit transaction rule action"
+msgid "Edit transaction action"
+msgstr "Bewerk verrichtingsregel actie"
+
+#: apps/rules/models.py:54
+#, fuzzy
+#| msgid "Edit transaction rule action"
+msgid "Edit transaction actions"
+msgstr "Bewerk verrichtingsregel actie"
+
+#: apps/rules/models.py:64
+msgid "is exactly"
+msgstr ""
+
+#: apps/rules/models.py:65
+msgid "contains"
+msgstr ""
+
+#: apps/rules/models.py:66
+msgid "starts with"
+msgstr ""
+
+#: apps/rules/models.py:67
+msgid "ends with"
+msgstr ""
+
+#: apps/rules/models.py:68
+msgid "equals"
+msgstr ""
+
+#: apps/rules/models.py:69
+msgid "greater than"
+msgstr ""
+
+#: apps/rules/models.py:70
+msgid "less than"
+msgstr ""
+
+#: apps/rules/models.py:71
+msgid "greater than or equal"
+msgstr ""
+
+#: apps/rules/models.py:72
+msgid "less than or equal"
+msgstr ""
+
+#: apps/rules/models.py:82 templates/transactions/pages/transactions.html:15
+msgid "Filter"
+msgstr "Filter"
+
+#: apps/rules/models.py:85
+msgid ""
+"Generic expression to enable or disable execution. Should evaluate to True "
+"or False"
+msgstr ""
+
+#: apps/rules/models.py:289
+#, fuzzy
+#| msgid "Edit transaction rule action"
+msgid "Update or create transaction action"
+msgstr "Bewerk verrichtingsregel actie"
+
+#: apps/rules/models.py:290
+#, fuzzy
+#| msgid "Edit transaction rule action"
+msgid "Update or create transaction actions"
+msgstr "Bewerk verrichtingsregel actie"
+
+#: apps/rules/views.py:52
 msgid "Rule deactivated successfully"
 msgstr "Regel succesvol uitgeschakeld"

-#: apps/rules/views.py:46
+#: apps/rules/views.py:54
 msgid "Rule activated successfully"
 msgstr "Regel succesvol ingeschakeld"

-#: apps/rules/views.py:64
+#: apps/rules/views.py:72
 msgid "Rule added successfully"
 msgstr "Regel succesvol toegevoegd"

-#: apps/rules/views.py:87
+#: apps/rules/views.py:100
 msgid "Rule updated successfully"
 msgstr "Regel succesvol bijgewerkt"

-#: apps/rules/views.py:126
+#: apps/rules/views.py:139
 msgid "Rule deleted successfully"
 msgstr "Regel succesvol verwijderd"

-#: apps/rules/views.py:180
+#: apps/rules/views.py:193
 msgid "Action updated successfully"
 msgstr "Actie succesvol bijgewerkt"

-#: apps/rules/views.py:210
+#: apps/rules/views.py:223
 msgid "Action deleted successfully"
 msgstr "Actie succesvol verwijderd"

-#: apps/transactions/filters.py:24 templates/cotton/transaction/item.html:20
-#: templates/cotton/transaction/item.html:30 templates/includes/navbar.html:46
+#: apps/rules/views.py:246
+#, fuzzy
+#| msgid "Recurring Transaction added successfully"
+msgid "Update or Create Transaction action added successfully"
+msgstr "Terugkerende Verrichting succesvol toegevoegd"
+
+#: apps/rules/views.py:278
+#, fuzzy
+#| msgid "Recurring Transaction updated successfully"
+msgid "Update or Create Transaction action updated successfully"
+msgstr "Terugkerende Verrichting succesvol bijgewerkt"
+
+#: apps/rules/views.py:307
+#, fuzzy
+#| msgid "Recurring Transaction deleted successfully"
+msgid "Update or Create Transaction action deleted successfully"
+msgstr "Terugkerende Verrichting succesvol verwijderd"
+
+#: apps/transactions/filters.py:24 templates/cotton/transaction/item.html:21
+#: templates/cotton/transaction/item.html:31 templates/includes/navbar.html:46
 #: templates/transactions/widgets/paid_toggle_button.html:8
 #: templates/transactions/widgets/unselectable_paid_toggle_button.html:12
 msgid "Projected"
@@ -999,14 +1139,6 @@ msgstr "Afbetalingsplan"
 msgid "Recurring Transaction"
 msgstr "Terugkerende verrichting"

-#: apps/transactions/models.py:192
-msgid "Internal Note"
-msgstr "Interne opmerking"
-
-#: apps/transactions/models.py:194
-msgid "Internal ID"
-msgstr "Interne ID"
-
 #: apps/transactions/models.py:198
 msgid "Deleted"
 msgstr "Verwijderd"
@@ -1424,7 +1556,7 @@ msgstr "Acties"
 #: templates/account_groups/fragments/list.html:36
 #: templates/accounts/fragments/list.html:41
 #: templates/categories/fragments/table.html:29
-#: templates/cotton/transaction/item.html:126
+#: templates/cotton/transaction/item.html:127
 #: templates/cotton/ui/transactions_action_bar.html:49
 #: templates/currencies/fragments/list.html:37
 #: templates/dca/fragments/strategy/details.html:67
@@ -1436,8 +1568,9 @@ msgstr "Acties"
 #: templates/import_app/fragments/profiles/list.html:48
 #: templates/installment_plans/fragments/table.html:27
 #: templates/recurring_transactions/fragments/table.html:29
-#: templates/rules/fragments/transaction_rule/view.html:22
-#: templates/rules/fragments/transaction_rule/view.html:48
+#: templates/rules/fragments/transaction_rule/view.html:23
+#: templates/rules/fragments/transaction_rule/view.html:47
+#: templates/rules/fragments/transaction_rule/view.html:80
 #: templates/tags/fragments/table.html:28
 msgid "Edit"
 msgstr "Bijwerken"
@@ -1445,8 +1578,8 @@ msgstr "Bijwerken"
 #: templates/account_groups/fragments/list.html:43
 #: templates/accounts/fragments/list.html:48
 #: templates/categories/fragments/table.html:36
-#: templates/cotton/transaction/item.html:141
-#: templates/cotton/transaction/item.html:160
+#: templates/cotton/transaction/item.html:142
+#: templates/cotton/transaction/item.html:161
 #: templates/cotton/ui/deleted_transactions_action_bar.html:55
 #: templates/cotton/ui/transactions_action_bar.html:86
 #: templates/currencies/fragments/list.html:44
@@ -1462,7 +1595,8 @@ msgstr "Bijwerken"
 #: templates/mini_tools/unit_price_calculator.html:18
 #: templates/recurring_transactions/fragments/table.html:91
 #: templates/rules/fragments/list.html:44
-#: templates/rules/fragments/transaction_rule/view.html:56
+#: templates/rules/fragments/transaction_rule/view.html:55
+#: templates/rules/fragments/transaction_rule/view.html:88
 #: templates/tags/fragments/table.html:36
 msgid "Delete"
 msgstr "Verwijderen"
@@ -1470,8 +1604,8 @@ msgstr "Verwijderen"
 #: templates/account_groups/fragments/list.html:47
 #: templates/accounts/fragments/list.html:52
 #: templates/categories/fragments/table.html:41
-#: templates/cotton/transaction/item.html:145
-#: templates/cotton/transaction/item.html:164
+#: templates/cotton/transaction/item.html:146
+#: templates/cotton/transaction/item.html:165
 #: templates/cotton/ui/deleted_transactions_action_bar.html:57
 #: templates/cotton/ui/transactions_action_bar.html:88
 #: templates/currencies/fragments/list.html:48
@@ -1490,7 +1624,8 @@ msgstr "Verwijderen"
 #: templates/recurring_transactions/fragments/table.html:82
 #: templates/recurring_transactions/fragments/table.html:96
 #: templates/rules/fragments/list.html:48
-#: templates/rules/fragments/transaction_rule/view.html:60
+#: templates/rules/fragments/transaction_rule/view.html:59
+#: templates/rules/fragments/transaction_rule/view.html:92
 #: templates/tags/fragments/table.html:40
 msgid "Are you sure?"
 msgstr "Weet je het zeker?"
@@ -1498,8 +1633,8 @@ msgstr "Weet je het zeker?"
 #: templates/account_groups/fragments/list.html:48
 #: templates/accounts/fragments/list.html:53
 #: templates/categories/fragments/table.html:42
-#: templates/cotton/transaction/item.html:146
-#: templates/cotton/transaction/item.html:165
+#: templates/cotton/transaction/item.html:147
+#: templates/cotton/transaction/item.html:166
 #: templates/cotton/ui/deleted_transactions_action_bar.html:58
 #: templates/cotton/ui/transactions_action_bar.html:89
 #: templates/currencies/fragments/list.html:49
@@ -1511,7 +1646,8 @@ msgstr "Weet je het zeker?"
 #: templates/exchange_rates_services/fragments/table.html:37
 #: templates/import_app/fragments/profiles/list.html:74
 #: templates/rules/fragments/list.html:49
-#: templates/rules/fragments/transaction_rule/view.html:61
+#: templates/rules/fragments/transaction_rule/view.html:60
+#: templates/rules/fragments/transaction_rule/view.html:93
 #: templates/tags/fragments/table.html:41
 msgid "You won't be able to revert this!"
 msgstr "Je kunt dit niet meer terugdraaien!"
@@ -1519,8 +1655,8 @@ msgstr "Je kunt dit niet meer terugdraaien!"
 #: templates/account_groups/fragments/list.html:49
 #: templates/accounts/fragments/list.html:54
 #: templates/categories/fragments/table.html:43
-#: templates/cotton/transaction/item.html:147
-#: templates/cotton/transaction/item.html:166
+#: templates/cotton/transaction/item.html:148
+#: templates/cotton/transaction/item.html:167
 #: templates/currencies/fragments/list.html:50
 #: templates/dca/fragments/strategy/details.html:82
 #: templates/dca/fragments/strategy/list.html:48
@@ -1533,7 +1669,8 @@ msgstr "Je kunt dit niet meer terugdraaien!"
 #: templates/installment_plans/fragments/table.html:62
 #: templates/recurring_transactions/fragments/table.html:98
 #: templates/rules/fragments/list.html:50
-#: templates/rules/fragments/transaction_rule/view.html:62
+#: templates/rules/fragments/transaction_rule/view.html:61
+#: templates/rules/fragments/transaction_rule/view.html:94
 #: templates/tags/fragments/table.html:42
 msgid "Yes, delete it!"
 msgstr "Ja, verwijder het!"
@@ -1644,16 +1781,16 @@ msgstr "Sluiten"
 msgid "Search"
 msgstr "Zoeken"

-#: templates/cotton/transaction/item.html:7
+#: templates/cotton/transaction/item.html:8
 msgid "Select"
 msgstr "Selecteer"

-#: templates/cotton/transaction/item.html:133
+#: templates/cotton/transaction/item.html:134
 #: templates/cotton/ui/transactions_action_bar.html:78
 msgid "Duplicate"
 msgstr "Dupliceren"

-#: templates/cotton/transaction/item.html:154
+#: templates/cotton/transaction/item.html:155
 #: templates/cotton/ui/deleted_transactions_action_bar.html:47
 msgid "Restore"
 msgstr ""
@@ -1663,33 +1800,33 @@ msgstr ""
 msgid "projected income"
 msgstr "verwachte inkomsten"

-#: templates/cotton/ui/account_card.html:37
-#: templates/cotton/ui/currency_card.html:32
+#: templates/cotton/ui/account_card.html:41
+#: templates/cotton/ui/currency_card.html:36
 msgid "projected expenses"
 msgstr "verwachte uitgaven"

-#: templates/cotton/ui/account_card.html:61
-#: templates/cotton/ui/currency_card.html:56
+#: templates/cotton/ui/account_card.html:69
+#: templates/cotton/ui/currency_card.html:64
 msgid "projected total"
 msgstr "verwachte totaal"

-#: templates/cotton/ui/account_card.html:86
-#: templates/cotton/ui/currency_card.html:81
+#: templates/cotton/ui/account_card.html:94
+#: templates/cotton/ui/currency_card.html:88
 msgid "current income"
 msgstr "huidige inkomsten"

-#: templates/cotton/ui/account_card.html:108
-#: templates/cotton/ui/currency_card.html:103
+#: templates/cotton/ui/account_card.html:120
+#: templates/cotton/ui/currency_card.html:114
 msgid "current expenses"
 msgstr "huidige uitgaven"

-#: templates/cotton/ui/account_card.html:130
-#: templates/cotton/ui/currency_card.html:125
+#: templates/cotton/ui/account_card.html:146
+#: templates/cotton/ui/currency_card.html:140
 msgid "current total"
 msgstr "huidige totaal"

-#: templates/cotton/ui/account_card.html:156
-#: templates/cotton/ui/currency_card.html:151
+#: templates/cotton/ui/account_card.html:171
+#: templates/cotton/ui/currency_card.html:165
 msgid "final total"
 msgstr "eindtotaal"

@@ -1850,7 +1987,7 @@ msgid "No entries for this DCA"
 msgstr "Geen idems in deze DCA"

 #: templates/dca/fragments/strategy/details.html:125
-#: templates/monthly_overview/fragments/list.html:41
+#: templates/monthly_overview/fragments/list.html:47
 #: templates/transactions/fragments/list_all.html:40
 msgid "Try adding one"
 msgstr "Probeer er een toe te voegen"
@@ -2273,7 +2410,7 @@ msgstr "Eenheidsprijs"
 msgid "Item"
 msgstr "Artikel"

-#: templates/monthly_overview/fragments/list.html:40
+#: templates/monthly_overview/fragments/list.html:46
 msgid "No transactions this month"
 msgstr "Geen verrichtingen deze maand"

@@ -2450,10 +2587,12 @@ msgid "Edit transaction rule"
 msgstr "Verrichtingsregel bewerken"

 #: templates/rules/fragments/transaction_rule/transaction_rule_action/add.html:5
+#: templates/rules/fragments/transaction_rule/update_or_create_transaction_rule_action/add.html:5
 msgid "Add action to transaction rule"
 msgstr "Actie toevoegen aan verrichtingsregel"

 #: templates/rules/fragments/transaction_rule/transaction_rule_action/edit.html:5
+#: templates/rules/fragments/transaction_rule/update_or_create_transaction_rule_action/edit.html:5
 msgid "Edit transaction rule action"
 msgstr "Bewerk verrichtingsregel actie"

@@ -2461,15 +2600,21 @@ msgstr "Bewerk verrichtingsregel actie"
 msgid "Transaction Rule"
 msgstr "Verrichtingsregel"

-#: templates/rules/fragments/transaction_rule/view.html:13
+#: templates/rules/fragments/transaction_rule/view.html:14
 msgid "If transaction..."
 msgstr "Als verrichting..."

-#: templates/rules/fragments/transaction_rule/view.html:31
+#: templates/rules/fragments/transaction_rule/view.html:32
 msgid "Then..."
 msgstr "Dan..."

 #: templates/rules/fragments/transaction_rule/view.html:36
+#: templates/transactions/fragments/edit.html:5
+#: templates/transactions/fragments/edit_installment_plan.html:5
+msgid "Edit transaction"
+msgstr "Bewerk verrichting"
+
+#: templates/rules/fragments/transaction_rule/view.html:39
 msgid "Set"
 msgstr "Stel"

@@ -2478,13 +2623,37 @@ msgid "to"
 msgstr "naar"

 #: templates/rules/fragments/transaction_rule/view.html:71
+#, fuzzy
+#| msgid "Edit recurring transaction"
+msgid "Update or create transaction"
+msgstr "Bewerk terugkerende verrichtingen"
+
+#: templates/rules/fragments/transaction_rule/view.html:74
+#, fuzzy
+#| msgid "Edit entity"
+msgid "Edit to view"
+msgstr "Bewerk bedrijf"
+
+#: templates/rules/fragments/transaction_rule/view.html:104
 msgid "This rule has no actions"
 msgstr "Deze regel heeft geen acties"

-#: templates/rules/fragments/transaction_rule/view.html:80
+#: templates/rules/fragments/transaction_rule/view.html:112
 msgid "Add new"
 msgstr "Nieuwe toevoegen"

+#: templates/rules/fragments/transaction_rule/view.html:117
+#, fuzzy
+#| msgid "Edit transaction"
+msgid "Edit Transaction"
+msgstr "Bewerk verrichting"
+
+#: templates/rules/fragments/transaction_rule/view.html:120
+#, fuzzy
+#| msgid "Expense Transaction"
+msgid "Update or Create Transaction"
+msgstr "Uitgave Transactie"
+
 #: templates/tags/fragments/add.html:5
 msgid "Add tag"
 msgstr "Label toevoegen"
@@ -2518,11 +2687,6 @@ msgstr "Bewerking"
 msgid "transactions"
 msgstr "verrichtingen"

-#: templates/transactions/fragments/edit.html:5
-#: templates/transactions/fragments/edit_installment_plan.html:5
-msgid "Edit transaction"
-msgstr "Bewerk verrichting"
-
 #: templates/transactions/fragments/list_all.html:39
 msgid "No transactions found"
 msgstr "Geen Verrichtingen gevonden"
@@ -2537,10 +2701,6 @@ msgstr "Nieuwe overschrijving"
 msgid "No deleted transactions to show"
 msgstr "Geen verrichtingen deze maand"

-#: templates/transactions/pages/transactions.html:15
-msgid "Filter"
-msgstr "Filter"
-
 #: templates/transactions/pages/trash.html:4
 #: templates/transactions/pages/trash.html:9
 #, fuzzy
@@ -2579,6 +2739,191 @@ msgstr "Jaaroverzicht"
 msgid "Year"
 msgstr "Jaar"

+#, fuzzy
+#~| msgid "Start Date"
+#~ msgid "Search Date"
+#~ msgstr "Startdatum"
+
+#, fuzzy
+#~| msgid "Internal Note"
+#~ msgid "Search Internal Note"
+#~ msgstr "Interne opmerking"
+
+#, fuzzy
+#~| msgid "Set field"
+#~ msgid "Is Paid"
+#~ msgstr "Veld instellen"
+
+#, fuzzy
+#~| msgid "From Account"
+#~ msgid "Search Account"
+#~ msgstr "Van rekening"
+
+#, fuzzy
+#~| msgid "Account Group"
+#~ msgid "Account Operator"
+#~ msgstr "Accountgroep"
+
+#, fuzzy
+#~| msgid "Recurrence Type"
+#~ msgid "Search Type"
+#~ msgstr "Type Terugkeerpatroon"
+
+#, fuzzy
+#~| msgid "Search"
+#~ msgid "Search Is Paid"
+#~ msgstr "Zoeken"
+
+#, fuzzy
+#~| msgid "Add action to transaction rule"
+#~ msgid "Expression to match transaction date"
+#~ msgstr "Actie toevoegen aan verrichtingsregel"
+
+#, fuzzy
+#~| msgid "Date Format"
+#~ msgid "Date Operator"
+#~ msgstr "Datumnotatie"
+
+#, fuzzy
+#~| msgid "Reference Date"
+#~ msgid "Search Reference Date"
+#~ msgstr "Referentiedatum"
+
+#, fuzzy
+#~| msgid "Reference date from"
+#~ msgid "Reference Date Operator"
+#~ msgstr "Referentiedatum vanaf"
+
+#, fuzzy
+#~| msgid "From Amount"
+#~ msgid "Search Amount"
+#~ msgstr "Van Bedrag"
+
+#, fuzzy
+#~| msgid "Amount max"
+#~ msgid "Amount Operator"
+#~ msgstr "Maximaal bedrag"
+
+#, fuzzy
+#~| msgid "Description"
+#~ msgid "Search Description"
+#~ msgstr "Beschrijving"
+
+#, fuzzy
+#~| msgid "Edit transaction rule action"
+#~ msgid "Expression to match transaction description"
+#~ msgstr "Bewerk verrichtingsregel actie"
+
+#, fuzzy
+#~| msgid "Description"
+#~ msgid "Description Operator"
+#~ msgstr "Beschrijving"
+
+#, fuzzy
+#~| msgid "Search"
+#~ msgid "Search Notes"
+#~ msgstr "Zoeken"
+
+#, fuzzy
+#~| msgid "Category"
+#~ msgid "Search Category"
+#~ msgstr "Categorie"
+
+#, fuzzy
+#~| msgid "Category name"
+#~ msgid "Category Operator"
+#~ msgstr "Naam van categorie"
+
+#, fuzzy
+#~| msgid "Search"
+#~ msgid "Search Tags"
+#~ msgstr "Zoeken"
+
+#, fuzzy
+#~| msgid "Entities"
+#~ msgid "Search Entities"
+#~ msgstr "Bedrijven"
+
+#, fuzzy
+#~| msgid "Entities"
+#~ msgid "Entities Operator"
+#~ msgstr "Bedrijven"
+
+#, fuzzy
+#~| msgid "Internal Note"
+#~ msgid "Internal Note Operator"
+#~ msgstr "Interne opmerking"
+
+#, fuzzy
+#~| msgid "Internal ID"
+#~ msgid "Search Internal ID"
+#~ msgstr "Interne ID"
+
+#, fuzzy
+#~| msgid "Internal ID"
+#~ msgid "Internal ID Operator"
+#~ msgstr "Interne ID"
+
+#, fuzzy
+#~| msgid "Account"
+#~ msgid "Set Account"
+#~ msgstr "Rekening"
+
+#, fuzzy
+#~| msgid "Recurrence Type"
+#~ msgid "Set Type"
+#~ msgstr "Type Terugkeerpatroon"
+
+#, fuzzy
+#~| msgid "Start Date"
+#~ msgid "Set Date"
+#~ msgstr "Startdatum"
+
+#, fuzzy
+#~| msgid "Reference Date"
+#~ msgid "Set Reference Date"
+#~ msgstr "Referentiedatum"
+
+#, fuzzy
+#~| msgid "Amount"
+#~ msgid "Set Amount"
+#~ msgstr "Bedrag"
+
+#, fuzzy
+#~| msgid "Description"
+#~ msgid "Set Description"
+#~ msgstr "Beschrijving"
+
+#, fuzzy
+#~| msgid "Notes"
+#~ msgid "Set Notes"
+#~ msgstr "Opmerkingen"
+
+#, fuzzy
+#~| msgid "Internal Note"
+#~ msgid "Set Internal Note"
+#~ msgstr "Interne opmerking"
+
+#, fuzzy
+#~| msgid "Internal ID"
+#~ msgid "Set Internal ID"
+#~ msgstr "Interne ID"
+
+#, fuzzy
+#~| msgid "Entities"
+#~ msgid "Set Entities"
+#~ msgstr "Bedrijven"
+
+#, fuzzy
+#~| msgid "Category"
+#~ msgid "Set Category"
+#~ msgstr "Categorie"
+
+#, fuzzy
+#~| msgid "Tags"
+#~ msgid "Set Tags"
+#~ msgstr "Labels"
+
 #, fuzzy
 #~| msgid "Exchange rate deleted successfully"
 #~ msgid "Exchange rates queued to be fetched successfully"
--- a/app/locale/pt_BR/LC_MESSAGES/django.po
+++ b/app/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-07 11:45-0300\n"
-"PO-Revision-Date: 2025-02-07 11:46-0300\n"
+"POT-Creation-Date: 2025-02-09 17:27-0300\n"
+"PO-Revision-Date: 2025-02-09 17:30-0300\n"
 "Last-Translator: Herculino Trotta\n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -27,10 +27,10 @@ msgstr "Nome do grupo"
 #: apps/currencies/forms.py:53 apps/currencies/forms.py:91
 #: apps/currencies/forms.py:142 apps/dca/forms.py:41 apps/dca/forms.py:93
 #: apps/import_app/forms.py:34 apps/rules/forms.py:45 apps/rules/forms.py:87
-#: apps/transactions/forms.py:190 apps/transactions/forms.py:257
-#: apps/transactions/forms.py:581 apps/transactions/forms.py:624
-#: apps/transactions/forms.py:656 apps/transactions/forms.py:691
-#: apps/transactions/forms.py:827
+#: apps/rules/forms.py:359 apps/transactions/forms.py:190
+#: apps/transactions/forms.py:257 apps/transactions/forms.py:581
+#: apps/transactions/forms.py:624 apps/transactions/forms.py:656
+#: apps/transactions/forms.py:691 apps/transactions/forms.py:827
 msgid "Update"
 msgstr "Atualizar"

@@ -38,10 +38,11 @@ msgstr "Atualizar"
 #: apps/common/widgets/tom_select.py:12 apps/currencies/forms.py:61
 #: apps/currencies/forms.py:99 apps/currencies/forms.py:150
 #: apps/dca/forms.py:49 apps/dca/forms.py:102 apps/import_app/forms.py:42
-#: apps/rules/forms.py:53 apps/rules/forms.py:95 apps/transactions/forms.py:174
-#: apps/transactions/forms.py:199 apps/transactions/forms.py:589
-#: apps/transactions/forms.py:632 apps/transactions/forms.py:664
-#: apps/transactions/forms.py:699 apps/transactions/forms.py:835
+#: apps/rules/forms.py:53 apps/rules/forms.py:95 apps/rules/forms.py:367
+#: apps/transactions/forms.py:174 apps/transactions/forms.py:199
+#: apps/transactions/forms.py:589 apps/transactions/forms.py:632
+#: apps/transactions/forms.py:664 apps/transactions/forms.py:699
+#: apps/transactions/forms.py:835
 #: templates/account_groups/fragments/list.html:9
 #: templates/accounts/fragments/list.html:9
 #: templates/categories/fragments/list.html:9
@@ -68,7 +69,8 @@ msgstr "Grupo da Conta"
 msgid "New balance"
 msgstr "Novo saldo"

-#: apps/accounts/forms.py:119 apps/rules/models.py:27
+#: apps/accounts/forms.py:119 apps/rules/forms.py:168 apps/rules/forms.py:183
+#: apps/rules/models.py:32 apps/rules/models.py:280
 #: apps/transactions/forms.py:39 apps/transactions/forms.py:291
 #: apps/transactions/forms.py:298 apps/transactions/forms.py:478
 #: apps/transactions/forms.py:723 apps/transactions/models.py:159
@@ -76,7 +78,8 @@ msgstr "Novo saldo"
 msgid "Category"
 msgstr "Categoria"

-#: apps/accounts/forms.py:126 apps/rules/models.py:28
+#: apps/accounts/forms.py:126 apps/rules/forms.py:171 apps/rules/forms.py:180
+#: apps/rules/models.py:33 apps/rules/models.py:284
 #: apps/transactions/filters.py:74 apps/transactions/forms.py:47
 #: apps/transactions/forms.py:307 apps/transactions/forms.py:315
 #: apps/transactions/forms.py:471 apps/transactions/forms.py:716
@@ -87,7 +90,7 @@ msgid "Tags"
 msgstr "Tags"

 #: apps/accounts/models.py:9 apps/accounts/models.py:21 apps/dca/models.py:14
-#: apps/import_app/models.py:14 apps/rules/models.py:9
+#: apps/import_app/models.py:14 apps/rules/models.py:10
 #: apps/transactions/models.py:67 apps/transactions/models.py:87
 #: apps/transactions/models.py:106
 #: templates/account_groups/fragments/list.html:25
@@ -151,7 +154,8 @@ msgid "Archived accounts don't show up nor count towards your net worth"
 msgstr ""
 "Contas arquivadas não aparecem nem contam para o seu patrimônio líquido"

-#: apps/accounts/models.py:59 apps/rules/models.py:19
+#: apps/accounts/models.py:59 apps/rules/forms.py:160 apps/rules/forms.py:173
+#: apps/rules/models.py:24 apps/rules/models.py:236
 #: apps/transactions/forms.py:59 apps/transactions/forms.py:463
 #: apps/transactions/forms.py:708 apps/transactions/models.py:132
 #: apps/transactions/models.py:288 apps/transactions/models.py:490
@@ -360,7 +364,8 @@ msgstr "Prefixo"
 msgid "Suffix"
 msgstr "Sufixo"

-#: apps/currencies/forms.py:69 apps/dca/models.py:156 apps/rules/models.py:22
+#: apps/currencies/forms.py:69 apps/dca/models.py:156 apps/rules/forms.py:163
+#: apps/rules/forms.py:176 apps/rules/models.py:27 apps/rules/models.py:248
 #: apps/transactions/forms.py:63 apps/transactions/forms.py:319
 #: apps/transactions/models.py:142
 #: templates/dca/fragments/strategy/details.html:52
@@ -576,7 +581,8 @@ msgstr "Moeda de destino"
 msgid "Payment Currency"
 msgstr "Moeda de pagamento"

-#: apps/dca/models.py:27 apps/dca/models.py:179 apps/rules/models.py:26
+#: apps/dca/models.py:27 apps/dca/models.py:179 apps/rules/forms.py:167
+#: apps/rules/forms.py:182 apps/rules/models.py:31 apps/rules/models.py:264
 #: apps/transactions/forms.py:333 apps/transactions/models.py:155
 #: apps/transactions/models.py:337 apps/transactions/models.py:518
 msgid "Notes"
@@ -740,42 +746,62 @@ msgstr "Para"
 msgid "A value for this field already exists in the rule."
 msgstr "Já existe um valor para esse campo na regra."

-#: apps/rules/models.py:10 apps/rules/models.py:25
-#: apps/transactions/forms.py:325 apps/transactions/models.py:153
-#: apps/transactions/models.py:295 apps/transactions/models.py:504
-msgid "Description"
-msgstr "Descrição"
+#: apps/rules/forms.py:147 apps/rules/forms.py:148 apps/rules/forms.py:149
+#: apps/rules/forms.py:150 apps/rules/forms.py:151 apps/rules/forms.py:152
+#: apps/rules/forms.py:153 apps/rules/forms.py:154 apps/rules/forms.py:155
+#: apps/rules/forms.py:156 apps/rules/forms.py:157 apps/rules/forms.py:158
+#: apps/rules/forms.py:159
+msgid "Operator"
+msgstr "Operador"

-#: apps/rules/models.py:11
-msgid "Trigger"
-msgstr "Gatilho"
-
-#: apps/rules/models.py:20 apps/transactions/models.py:139
+#: apps/rules/forms.py:161 apps/rules/forms.py:174 apps/rules/models.py:25
+#: apps/rules/models.py:240 apps/transactions/models.py:139
 #: apps/transactions/models.py:293 apps/transactions/models.py:496
 msgid "Type"
 msgstr "Tipo"

-#: apps/rules/models.py:21 apps/transactions/filters.py:23
-#: apps/transactions/models.py:141 templates/cotton/transaction/item.html:20
-#: templates/cotton/transaction/item.html:30
+#: apps/rules/forms.py:162 apps/rules/forms.py:175 apps/rules/models.py:26
+#: apps/rules/models.py:244 apps/transactions/filters.py:23
+#: apps/transactions/models.py:141 templates/cotton/transaction/item.html:21
+#: templates/cotton/transaction/item.html:31
 #: templates/transactions/widgets/paid_toggle_button.html:12
 #: templates/transactions/widgets/unselectable_paid_toggle_button.html:16
 msgid "Paid"
 msgstr "Pago"

-#: apps/rules/models.py:23 apps/transactions/forms.py:66
+#: apps/rules/forms.py:164 apps/rules/forms.py:177 apps/rules/models.py:28
+#: apps/rules/models.py:252 apps/transactions/forms.py:66
 #: apps/transactions/forms.py:322 apps/transactions/forms.py:492
 #: apps/transactions/models.py:143 apps/transactions/models.py:311
 #: apps/transactions/models.py:520
 msgid "Reference Date"
 msgstr "Data de Referência"

-#: apps/rules/models.py:24 apps/transactions/models.py:148
+#: apps/rules/forms.py:165 apps/rules/forms.py:178 apps/rules/models.py:29
+#: apps/rules/models.py:256 apps/transactions/models.py:148
 #: apps/transactions/models.py:501
 msgid "Amount"
 msgstr "Quantia"

-#: apps/rules/models.py:29 apps/transactions/filters.py:81
+#: apps/rules/forms.py:166 apps/rules/forms.py:179 apps/rules/models.py:11
+#: apps/rules/models.py:30 apps/rules/models.py:260
+#: apps/transactions/forms.py:325 apps/transactions/models.py:153
+#: apps/transactions/models.py:295 apps/transactions/models.py:504
+msgid "Description"
+msgstr "Descrição"
+
+#: apps/rules/forms.py:169 apps/rules/forms.py:184 apps/rules/models.py:268
+#: apps/transactions/models.py:192
+msgid "Internal Note"
+msgstr "Nota Interna"
+
+#: apps/rules/forms.py:170 apps/rules/forms.py:185 apps/rules/models.py:272
+#: apps/transactions/models.py:194
+msgid "Internal ID"
+msgstr "ID Interna"
+
+#: apps/rules/forms.py:172 apps/rules/forms.py:181 apps/rules/models.py:34
+#: apps/rules/models.py:276 apps/transactions/filters.py:81
 #: apps/transactions/forms.py:55 apps/transactions/forms.py:486
 #: apps/transactions/forms.py:731 apps/transactions/models.py:117
 #: apps/transactions/models.py:170 apps/transactions/models.py:333
@@ -784,48 +810,144 @@ msgstr "Quantia"
 msgid "Entities"
 msgstr "Entidades"

-#: apps/rules/models.py:35
+#: apps/rules/forms.py:199
+msgid "Search Criteria"
+msgstr "Critério de Busca"
+
+#: apps/rules/forms.py:334
+msgid "Set Values"
+msgstr "Definir valores"
+
+#: apps/rules/models.py:12
+msgid "Trigger"
+msgstr "Gatilho"
+
+#: apps/rules/models.py:15
+msgid "Transaction rule"
+msgstr "Regra da transação"
+
+#: apps/rules/models.py:16
+msgid "Transaction rules"
+msgstr "Regra da transação"
+
+#: apps/rules/models.py:40 apps/rules/models.py:78
 msgid "Rule"
 msgstr "Regra"

-#: apps/rules/models.py:40
+#: apps/rules/models.py:45
 msgid "Field"
 msgstr "Campo"

-#: apps/rules/models.py:42
+#: apps/rules/models.py:47
 msgid "Value"
 msgstr "Valor"

-#: apps/rules/views.py:44
+#: apps/rules/models.py:53
+msgid "Edit transaction action"
+msgstr "Editar ação de transação"
+
+#: apps/rules/models.py:54
+msgid "Edit transaction actions"
+msgstr "Editar ações de transação"
+
+#: apps/rules/models.py:64
+msgid "is exactly"
+msgstr "é exatamete"
+
+#: apps/rules/models.py:65
+msgid "contains"
+msgstr "contém"
+
+#: apps/rules/models.py:66
+msgid "starts with"
+msgstr "começa com"
+
+#: apps/rules/models.py:67
+msgid "ends with"
+msgstr "termina em"
+
+#: apps/rules/models.py:68
+msgid "equals"
+msgstr "igual"
+
+#: apps/rules/models.py:69
+msgid "greater than"
+msgstr "maior que"
+
+#: apps/rules/models.py:70
+msgid "less than"
+msgstr "menos de"
+
+#: apps/rules/models.py:71
+msgid "greater than or equal"
+msgstr "maior ou igual"
+
+#: apps/rules/models.py:72
+msgid "less than or equal"
+msgstr "menor ou igual"
+
+#: apps/rules/models.py:82 templates/transactions/pages/transactions.html:15
+msgid "Filter"
+msgstr "Filtro"
+
+#: apps/rules/models.py:85
+msgid ""
+"Generic expression to enable or disable execution. Should evaluate to True "
+"or False"
+msgstr ""
+"Expressão genérica para ativar ou desativar a execução. Deve retornar True "
+"ou False"
+
+#: apps/rules/models.py:289
+msgid "Update or create transaction action"
+msgstr "Atualizar ou criar transação ação"
+
+#: apps/rules/models.py:290
+msgid "Update or create transaction actions"
+msgstr "Atualizar ou criar transação ações"
+
+#: apps/rules/views.py:52
 msgid "Rule deactivated successfully"
 msgstr "Regra desativada com sucesso"

-#: apps/rules/views.py:46
+#: apps/rules/views.py:54
 msgid "Rule activated successfully"
 msgstr "Regra ativada com sucesso"

-#: apps/rules/views.py:64
+#: apps/rules/views.py:72
 msgid "Rule added successfully"
 msgstr "Regra adicionada com sucesso"

-#: apps/rules/views.py:87
+#: apps/rules/views.py:100
 msgid "Rule updated successfully"
 msgstr "Regra atualizada com sucesso"

-#: apps/rules/views.py:126
+#: apps/rules/views.py:139
 msgid "Rule deleted successfully"
 msgstr "Regra apagada com sucesso"

-#: apps/rules/views.py:180
+#: apps/rules/views.py:193
 msgid "Action updated successfully"
 msgstr "Ação atualizada com sucesso"

-#: apps/rules/views.py:210
+#: apps/rules/views.py:223
 msgid "Action deleted successfully"
 msgstr "Ação apagada com sucesso"

-#: apps/transactions/filters.py:24 templates/cotton/transaction/item.html:20
-#: templates/cotton/transaction/item.html:30 templates/includes/navbar.html:46
+#: apps/rules/views.py:246
+msgid "Update or Create Transaction action added successfully"
+msgstr "Ação Atualizar ou Criar Transação adicionada com sucesso"
+
+#: apps/rules/views.py:278
+msgid "Update or Create Transaction action updated successfully"
+msgstr "Ação Atualizar ou Criar Transação atualizada com sucesso"
+
+#: apps/rules/views.py:307
+msgid "Update or Create Transaction action deleted successfully"
+msgstr "Ação Atualizar ou Criar Transação apagada com sucesso"
+
+#: apps/transactions/filters.py:24 templates/cotton/transaction/item.html:21
+#: templates/cotton/transaction/item.html:31 templates/includes/navbar.html:46
 #: templates/transactions/widgets/paid_toggle_button.html:8
 #: templates/transactions/widgets/unselectable_paid_toggle_button.html:12
 msgid "Projected"
@@ -982,14 +1104,6 @@ msgstr "Parcelamento"
 msgid "Recurring Transaction"
 msgstr "Transação Recorrente"

-#: apps/transactions/models.py:192
-msgid "Internal Note"
-msgstr "Nota Interna"
-
-#: apps/transactions/models.py:194
-msgid "Internal ID"
-msgstr "ID Interna"
-
 #: apps/transactions/models.py:198
 msgid "Deleted"
 msgstr "Apagado"
@@ -1403,7 +1517,7 @@ msgstr "Ações"
 #: templates/account_groups/fragments/list.html:36
 #: templates/accounts/fragments/list.html:41
 #: templates/categories/fragments/table.html:29
-#: templates/cotton/transaction/item.html:126
+#: templates/cotton/transaction/item.html:127
 #: templates/cotton/ui/transactions_action_bar.html:49
 #: templates/currencies/fragments/list.html:37
 #: templates/dca/fragments/strategy/details.html:67
@@ -1415,8 +1529,9 @@ msgstr "Ações"
 #: templates/import_app/fragments/profiles/list.html:48
 #: templates/installment_plans/fragments/table.html:27
 #: templates/recurring_transactions/fragments/table.html:29
-#: templates/rules/fragments/transaction_rule/view.html:22
-#: templates/rules/fragments/transaction_rule/view.html:48
+#: templates/rules/fragments/transaction_rule/view.html:23
+#: templates/rules/fragments/transaction_rule/view.html:47
+#: templates/rules/fragments/transaction_rule/view.html:80
 #: templates/tags/fragments/table.html:28
 msgid "Edit"
 msgstr "Editar"
@@ -1424,8 +1539,8 @@ msgstr "Editar"
 #: templates/account_groups/fragments/list.html:43
 #: templates/accounts/fragments/list.html:48
 #: templates/categories/fragments/table.html:36
-#: templates/cotton/transaction/item.html:141
-#: templates/cotton/transaction/item.html:160
+#: templates/cotton/transaction/item.html:142
+#: templates/cotton/transaction/item.html:161
 #: templates/cotton/ui/deleted_transactions_action_bar.html:55
 #: templates/cotton/ui/transactions_action_bar.html:86
 #: templates/currencies/fragments/list.html:44
@@ -1441,7 +1556,8 @@ msgstr "Editar"
 #: templates/mini_tools/unit_price_calculator.html:18
 #: templates/recurring_transactions/fragments/table.html:91
 #: templates/rules/fragments/list.html:44
-#: templates/rules/fragments/transaction_rule/view.html:56
+#: templates/rules/fragments/transaction_rule/view.html:55
+#: templates/rules/fragments/transaction_rule/view.html:88
 #: templates/tags/fragments/table.html:36
 msgid "Delete"
 msgstr "Apagar"
@@ -1449,8 +1565,8 @@ msgstr "Apagar"
 #: templates/account_groups/fragments/list.html:47
 #: templates/accounts/fragments/list.html:52
 #: templates/categories/fragments/table.html:41
-#: templates/cotton/transaction/item.html:145
-#: templates/cotton/transaction/item.html:164
+#: templates/cotton/transaction/item.html:146
+#: templates/cotton/transaction/item.html:165
 #: templates/cotton/ui/deleted_transactions_action_bar.html:57
 #: templates/cotton/ui/transactions_action_bar.html:88
 #: templates/currencies/fragments/list.html:48
@@ -1469,7 +1585,8 @@ msgstr "Apagar"
 #: templates/recurring_transactions/fragments/table.html:82
 #: templates/recurring_transactions/fragments/table.html:96
 #: templates/rules/fragments/list.html:48
-#: templates/rules/fragments/transaction_rule/view.html:60
+#: templates/rules/fragments/transaction_rule/view.html:59
+#: templates/rules/fragments/transaction_rule/view.html:92
 #: templates/tags/fragments/table.html:40
 msgid "Are you sure?"
 msgstr "Tem certeza?"
@@ -1477,8 +1594,8 @@ msgstr "Tem certeza?"
 #: templates/account_groups/fragments/list.html:48
 #: templates/accounts/fragments/list.html:53
 #: templates/categories/fragments/table.html:42
-#: templates/cotton/transaction/item.html:146
-#: templates/cotton/transaction/item.html:165
+#: templates/cotton/transaction/item.html:147
+#: templates/cotton/transaction/item.html:166
 #: templates/cotton/ui/deleted_transactions_action_bar.html:58
 #: templates/cotton/ui/transactions_action_bar.html:89
 #: templates/currencies/fragments/list.html:49
@@ -1490,7 +1607,8 @@ msgstr "Tem certeza?"
 #: templates/exchange_rates_services/fragments/table.html:37
 #: templates/import_app/fragments/profiles/list.html:74
 #: templates/rules/fragments/list.html:49
-#: templates/rules/fragments/transaction_rule/view.html:61
+#: templates/rules/fragments/transaction_rule/view.html:60
+#: templates/rules/fragments/transaction_rule/view.html:93
 #: templates/tags/fragments/table.html:41
 msgid "You won't be able to revert this!"
 msgstr "Você não será capaz de reverter isso!"
@@ -1498,8 +1616,8 @@ msgstr "Você não será capaz de reverter isso!"
 #: templates/account_groups/fragments/list.html:49
 #: templates/accounts/fragments/list.html:54
 #: templates/categories/fragments/table.html:43
-#: templates/cotton/transaction/item.html:147
-#: templates/cotton/transaction/item.html:166
+#: templates/cotton/transaction/item.html:148
+#: templates/cotton/transaction/item.html:167
 #: templates/currencies/fragments/list.html:50
 #: templates/dca/fragments/strategy/details.html:82
 #: templates/dca/fragments/strategy/list.html:48
@@ -1512,7 +1630,8 @@ msgstr "Você não será capaz de reverter isso!"
 #: templates/installment_plans/fragments/table.html:62
 #: templates/recurring_transactions/fragments/table.html:98
 #: templates/rules/fragments/list.html:50
-#: templates/rules/fragments/transaction_rule/view.html:62
+#: templates/rules/fragments/transaction_rule/view.html:61
+#: templates/rules/fragments/transaction_rule/view.html:94
 #: templates/tags/fragments/table.html:42
 msgid "Yes, delete it!"
 msgstr "Sim, apague!"
@@ -1623,16 +1742,16 @@ msgstr "Fechar"
 msgid "Search"
 msgstr "Buscar"

-#: templates/cotton/transaction/item.html:7
+#: templates/cotton/transaction/item.html:8
 msgid "Select"
 msgstr "Selecionar"

-#: templates/cotton/transaction/item.html:133
+#: templates/cotton/transaction/item.html:134
 #: templates/cotton/ui/transactions_action_bar.html:78
 msgid "Duplicate"
 msgstr "Duplicar"

-#: templates/cotton/transaction/item.html:154
+#: templates/cotton/transaction/item.html:155
 #: templates/cotton/ui/deleted_transactions_action_bar.html:47
 msgid "Restore"
 msgstr "Restaurar"
@@ -1642,33 +1761,33 @@ msgstr "Restaurar"
 msgid "projected income"
 msgstr "renda prevista"

-#: templates/cotton/ui/account_card.html:37
-#: templates/cotton/ui/currency_card.html:32
+#: templates/cotton/ui/account_card.html:41
+#: templates/cotton/ui/currency_card.html:36
 msgid "projected expenses"
 msgstr "despesas previstas"

-#: templates/cotton/ui/account_card.html:61
-#: templates/cotton/ui/currency_card.html:56
+#: templates/cotton/ui/account_card.html:69
+#: templates/cotton/ui/currency_card.html:64
 msgid "projected total"
 msgstr "total previsto"

-#: templates/cotton/ui/account_card.html:86
-#: templates/cotton/ui/currency_card.html:81
+#: templates/cotton/ui/account_card.html:94
+#: templates/cotton/ui/currency_card.html:88
 msgid "current income"
 msgstr "renda atual"

-#: templates/cotton/ui/account_card.html:108
-#: templates/cotton/ui/currency_card.html:103
+#: templates/cotton/ui/account_card.html:120
+#: templates/cotton/ui/currency_card.html:114
 msgid "current expenses"
 msgstr "despesas atuais"

-#: templates/cotton/ui/account_card.html:130
-#: templates/cotton/ui/currency_card.html:125
+#: templates/cotton/ui/account_card.html:146
+#: templates/cotton/ui/currency_card.html:140
 msgid "current total"
 msgstr "total atual"

-#: templates/cotton/ui/account_card.html:156
-#: templates/cotton/ui/currency_card.html:151
+#: templates/cotton/ui/account_card.html:171
+#: templates/cotton/ui/currency_card.html:165
 msgid "final total"
 msgstr "total final"

@@ -1829,7 +1948,7 @@ msgid "No entries for this DCA"
 msgstr "Nenhuma entrada neste CMP"

 #: templates/dca/fragments/strategy/details.html:125
-#: templates/monthly_overview/fragments/list.html:41
+#: templates/monthly_overview/fragments/list.html:47
 #: templates/transactions/fragments/list_all.html:40
 msgid "Try adding one"
 msgstr "Tente adicionar uma"
@@ -2245,7 +2364,7 @@ msgstr "Preço unitário"
 msgid "Item"
 msgstr "Item"

-#: templates/monthly_overview/fragments/list.html:40
+#: templates/monthly_overview/fragments/list.html:46
 msgid "No transactions this month"
 msgstr "Nenhuma transação neste mês"

@@ -2419,10 +2538,12 @@ msgid "Edit transaction rule"
 msgstr "Editar regra de transação"

 #: templates/rules/fragments/transaction_rule/transaction_rule_action/add.html:5
+#: templates/rules/fragments/transaction_rule/update_or_create_transaction_rule_action/add.html:5
 msgid "Add action to transaction rule"
 msgstr "Adicionar ação à regra de transação"

 #: templates/rules/fragments/transaction_rule/transaction_rule_action/edit.html:5
+#: templates/rules/fragments/transaction_rule/update_or_create_transaction_rule_action/edit.html:5
 msgid "Edit transaction rule action"
 msgstr "Editar ação de regra de transação"

@@ -2430,15 +2551,21 @@ msgstr "Editar ação de regra de transação"
 msgid "Transaction Rule"
 msgstr "Regra de transação"

-#: templates/rules/fragments/transaction_rule/view.html:13
+#: templates/rules/fragments/transaction_rule/view.html:14
 msgid "If transaction..."
 msgstr "Se a transação..."

-#: templates/rules/fragments/transaction_rule/view.html:31
+#: templates/rules/fragments/transaction_rule/view.html:32
 msgid "Then..."
 msgstr "Então..."

 #: templates/rules/fragments/transaction_rule/view.html:36
+#: templates/transactions/fragments/edit.html:5
+#: templates/transactions/fragments/edit_installment_plan.html:5
+msgid "Edit transaction"
+msgstr "Editar transação"
+
+#: templates/rules/fragments/transaction_rule/view.html:39
 msgid "Set"
 msgstr "Definir"

@@ -2447,13 +2574,29 @@ msgid "to"
 msgstr "para"

 #: templates/rules/fragments/transaction_rule/view.html:71
+msgid "Update or create transaction"
+msgstr "Atualizar ou criar transação"
+
+#: templates/rules/fragments/transaction_rule/view.html:74
+msgid "Edit to view"
+msgstr "Edite para ver"
+
+#: templates/rules/fragments/transaction_rule/view.html:104
 msgid "This rule has no actions"
 msgstr "Essa regra não tem ações"

-#: templates/rules/fragments/transaction_rule/view.html:80
+#: templates/rules/fragments/transaction_rule/view.html:112
 msgid "Add new"
 msgstr "Adicionar novo"

+#: templates/rules/fragments/transaction_rule/view.html:117
+msgid "Edit Transaction"
+msgstr "Editar Transação"
+
+#: templates/rules/fragments/transaction_rule/view.html:120
+msgid "Update or Create Transaction"
+msgstr "Atualizar ou Criar Transação"
+
 #: templates/tags/fragments/add.html:5
 msgid "Add tag"
 msgstr "Adicionar tag"
@@ -2487,11 +2630,6 @@ msgstr "Editando"
 msgid "transactions"
 msgstr "transações"

-#: templates/transactions/fragments/edit.html:5
-#: templates/transactions/fragments/edit_installment_plan.html:5
-msgid "Edit transaction"
-msgstr "Editar transação"
-
 #: templates/transactions/fragments/list_all.html:39
 msgid "No transactions found"
 msgstr "Nenhuma transação encontrada"
@@ -2504,10 +2642,6 @@ msgstr "Nova transferência"
 msgid "No deleted transactions to show"
 msgstr "Nenhuma transação apaga para mostrar"

-#: templates/transactions/pages/transactions.html:15
-msgid "Filter"
-msgstr "Filtro"
-
 #: templates/transactions/pages/trash.html:4
 #: templates/transactions/pages/trash.html:9
 msgid "Deleted transactions"
@@ -2544,6 +2678,171 @@ msgstr "Visão Anual"
 msgid "Year"
 msgstr "Ano"

+#, fuzzy
+#~| msgid "Start Date"
+#~ msgid "Search Date"
+#~ msgstr "Data de Início"
+
+#, fuzzy
+#~| msgid "Internal Note"
+#~ msgid "Search Internal Note"
+#~ msgstr "Nota Interna"
+
+#, fuzzy
+#~| msgid "Set field"
+#~ msgid "Is Paid"
+#~ msgstr "Definir campo"
+
+#, fuzzy
+#~| msgid "From Account"
+#~ msgid "Search Account"
+#~ msgstr "Conta de origem"
+
+#, fuzzy
+#~| msgid "Account Group"
+#~ msgid "Account Operator"
+#~ msgstr "Grupo da Conta"
+
+#, fuzzy
+#~| msgid "Service Type"
+#~ msgid "Search Type"
+#~ msgstr "Tipo de Serviço"
+
+#, fuzzy
+#~| msgid "Search"
+#~ msgid "Search Is Paid"
+#~ msgstr "Buscar"
+
+#, fuzzy
+#~| msgid "Add action to transaction rule"
+#~ msgid "Expression to match transaction date"
+#~ msgstr "Adicionar ação à regra de transação"
+
+#, fuzzy
+#~| msgid "Date Format"
+#~ msgid "Date Operator"
+#~ msgstr "Formato de Data"
+
+#, fuzzy
+#~| msgid "Reference Date"
+#~ msgid "Search Reference Date"
+#~ msgstr "Data de Referência"
+
+#, fuzzy
+#~| msgid "Reference date from"
+#~ msgid "Reference Date Operator"
+#~ msgstr "Data de Referência de"
+
+#, fuzzy
+#~| msgid "From Amount"
+#~ msgid "Search Amount"
+#~ msgstr "Quantia de origem"
+
+#, fuzzy
+#~| msgid "Amount max"
+#~ msgid "Amount Operator"
+#~ msgstr "Quantia máxima"
+
+#, fuzzy
+#~| msgid "Description"
+#~ msgid "Search Description"
+#~ msgstr "Descrição"
+
+#, fuzzy
+#~| msgid "Edit transaction rule action"
+#~ msgid "Expression to match transaction description"
+#~ msgstr "Editar ação de regra de transação"
+
+#, fuzzy
+#~| msgid "Description"
+#~ msgid "Description Operator"
+#~ msgstr "Descrição"
+
+#, fuzzy
+#~| msgid "Search"
+#~ msgid "Search Notes"
+#~ msgstr "Buscar"
+
+#, fuzzy
+#~| msgid "Category"
+#~ msgid "Search Category"
+#~ msgstr "Categoria"
+
+#, fuzzy
+#~| msgid "Category name"
+#~ msgid "Category Operator"
+#~ msgstr "Nome da Categoria"
+
+#, fuzzy
+#~| msgid "Search"
+#~ msgid "Search Tags"
+#~ msgstr "Buscar"
+
+#, fuzzy
+#~| msgid "Entities"
+#~ msgid "Search Entities"
+#~ msgstr "Entidades"
+
+#, fuzzy
+#~| msgid "Entities"
+#~ msgid "Entities Operator"
+#~ msgstr "Entidades"
+
+#, fuzzy
+#~| msgid "Internal Note"
+#~ msgid "Internal Note Operator"
+#~ msgstr "Nota Interna"
+
+#, fuzzy
+#~| msgid "Internal ID"
+#~ msgid "Search Internal ID"
+#~ msgstr "ID Interna"
+
+#, fuzzy
+#~| msgid "Internal ID"
+#~ msgid "Internal ID Operator"
+#~ msgstr "ID Interna"
+
+#, fuzzy
+#~| msgid "Account"
+#~ msgid "Set Account"
+#~ msgstr "Conta"
+
+#, fuzzy
+#~| msgid "Service Type"
+#~ msgid "Set Type"
+#~ msgstr "Tipo de Serviço"
+
+#~ msgid "Set Date"
+#~ msgstr "Definir Data de Início"
+
+#~ msgid "Set Reference Date"
+#~ msgstr "Definir Data de Referência"
+
+#~ msgid "Set Amount"
+#~ msgstr "Definir Quantia"
+
+#~ msgid "Set Description"
+#~ msgstr "Definir Descrição"
+
+#~ msgid "Set Notes"
+#~ msgstr "Definir Notas"
+
+#~ msgid "Set Internal Note"
+#~ msgstr "Definir Nota Interna"
+
+#~ msgid "Set Internal ID"
+#~ msgstr "Definir ID Interna"
+
+#~ msgid "Set Entities"
+#~ msgstr "Definir Entidades"
+
+#~ msgid "Set Category"
+#~ msgstr "Definir Categoria"
+
+#~ msgid "Set Tags"
+#~ msgstr "Definir Tags"
+
 #~ msgid "Fetch Interval (hours)"
 #~ msgstr "Intervalo de busca (horas)"

--- a/app/templates/accounts/fragments/list.html
+++ b/app/templates/accounts/fragments/list.html
@@ -57,9 +57,8 @@
            </td>
            <td class="col">{{ account.name }}</td>
            <td class="col">{{ account.group.name }}</td>
-            <td class="col">{{ account.currency }} ({{ account.currency.code }})</td>
-            <td class="col">{% if account.exchange_currency %}{{ account.exchange_currency }} (
-              {{ account.exchange_currency.code }}){% else %}-{% endif %}</td>
+            <td class="col">{{ account.currency }}</td>
+            <td class="col">{% if account.exchange_currency %}{{ account.exchange_currency }}{% else %}-{% endif %}</td>
            <td class="col">{% if account.is_asset %}<i class="fa-solid fa-solid fa-check text-success"></i>{% endif %}</td>
            <td class="col">{% if account.is_archived %}<i class="fa-solid fa-solid fa-check text-success"></i>{% endif %}</td>
          </tr>
--- a/app/templates/cotton/transaction/item.html
+++ b/app/templates/cotton/transaction/item.html
@@ -1,172 +1,174 @@
 {% load markdown %}
 {% load i18n %}
-<div class="transaction d-flex my-1 {% if transaction.type == "EX" %}expense{% else %}income{% endif %}">
-  {% if not disable_selection %}
-    <label class="px-3 d-flex align-items-center justify-content-center">
-      <input class="form-check-input" type="checkbox" name="transactions" value="{{ transaction.id }}"
-             id="check-{{ transaction.id }}" aria-label="{% translate 'Select' %}" hx-preserve>
-    </label>
-  {% endif %}
-  <div class="tw-border-s-6 tw-border-e-0 tw-border-t-0 tw-border-b-0 border-bottom
+<div class="transaction">
+  <div class="d-flex my-1 {% if transaction.type == "EX" %}expense{% else %}income{% endif %}">
+    {% if not disable_selection %}
+      <label class="px-3 d-flex align-items-center justify-content-center">
+        <input class="form-check-input" type="checkbox" name="transactions" value="{{ transaction.id }}"
+               id="check-{{ transaction.id }}" aria-label="{% translate 'Select' %}" hx-preserve>
+      </label>
+    {% endif %}
+    <div class="tw-border-s-6 tw-border-e-0 tw-border-t-0 tw-border-b-0 border-bottom
  hover:tw-bg-zinc-900 p-2 {% if transaction.account.is_asset %}tw-border-dashed{% else %}tw-border-solid{% endif %}
  {% if transaction.type == "EX" %}tw-border-red-500{% else %}tw-border-green-500{% endif %} tw-relative
  w-100 transaction-item"
-       _="on mouseover remove .tw-invisible from the first .transaction-actions in me end
+         _="on mouseover remove .tw-invisible from the first .transaction-actions in me end
        on mouseout add .tw-invisible to the first .transaction-actions in me end">
-    <div class="row font-monospace tw-text-sm align-items-center">
-      <div class="col-lg-1 col-12 d-flex align-items-center tw-text-2xl lg:tw-text-xl text-lg-center text-center">
-        {% if not transaction.deleted %}
-        <a class="text-decoration-none my-lg-3 mx-lg-3 mx-2 my-2 tw-text-gray-500"
-           title="{% if transaction.is_paid %}{% trans 'Paid' %}{% else %}{% trans 'Projected' %}{% endif %}"
-           role="button"
-           hx-get="{% url 'transaction_pay' transaction_id=transaction.id %}"
-           hx-target="closest .transaction"
-           hx-swap="outerHTML">
-          {% if transaction.is_paid %}<i class="fa-regular fa-circle-check"></i>{% else %}<i
-              class="fa-regular fa-circle"></i>{% endif %}
-        </a>
-        {% else %}
-          <div class="text-decoration-none my-lg-3 mx-lg-3 mx-2 my-2 tw-text-gray-500"
-               title="{% if transaction.is_paid %}{% trans 'Paid' %}{% else %}{% trans 'Projected' %}{% endif %}">
-          {% if transaction.is_paid %}<i class="fa-regular fa-circle-check"></i>{% else %}<i
-              class="fa-regular fa-circle"></i>{% endif %}
+      <div class="row font-monospace tw-text-sm align-items-center">
+        <div class="col-lg-1 col-12 d-flex align-items-center tw-text-2xl lg:tw-text-xl text-lg-center text-center">
+          {% if not transaction.deleted %}
+            <a class="text-decoration-none my-lg-3 mx-lg-3 mx-2 my-2 tw-text-gray-500"
+               title="{% if transaction.is_paid %}{% trans 'Paid' %}{% else %}{% trans 'Projected' %}{% endif %}"
+               role="button"
+               hx-get="{% url 'transaction_pay' transaction_id=transaction.id %}"
+               hx-target="closest .transaction"
+               hx-swap="outerHTML">
+              {% if transaction.is_paid %}<i class="fa-regular fa-circle-check"></i>{% else %}<i
+                  class="fa-regular fa-circle"></i>{% endif %}
+            </a>
+          {% else %}
+            <div class="text-decoration-none my-lg-3 mx-lg-3 mx-2 my-2 tw-text-gray-500"
+                 title="{% if transaction.is_paid %}{% trans 'Paid' %}{% else %}{% trans 'Projected' %}{% endif %}">
+              {% if transaction.is_paid %}<i class="fa-regular fa-circle-check"></i>{% else %}<i
+                  class="fa-regular fa-circle"></i>{% endif %}
+            </div>
+          {% endif %}
+        </div>
+        <div class="col-lg-8 col-12">
+          {#      Date#}
+          <div class="row mb-2 mb-lg-1 tw-text-gray-400">
+            <div class="col-auto pe-1"><i class="fa-solid fa-calendar fa-fw me-1 fa-xs"></i></div>
+            <div
+                class="col ps-0">{{ transaction.date|date:"SHORT_DATE_FORMAT" }} • {{ transaction.reference_date|date:"b/Y" }}</div>
          </div>
-        {% endif %}
-      </div>
-      <div class="col-lg-8 col-12">
-        {#      Date#}
-        <div class="row mb-2 mb-lg-1 tw-text-gray-400">
-          <div class="col-auto pe-1"><i class="fa-solid fa-calendar fa-fw me-1 fa-xs"></i></div>
-          <div
-              class="col ps-0">{{ transaction.date|date:"SHORT_DATE_FORMAT" }} • {{ transaction.reference_date|date:"b/Y" }}</div>
-        </div>
-        {#      Description#}
-        <div class="mb-2 mb-lg-1 text-white tw-text-base">
-          {% spaceless %}
-            <span>{{ transaction.description }}</span>
-            {% if transaction.installment_plan and transaction.installment_id %}
-              <span
-                  class="badge text-bg-secondary ms-2">{{ transaction.installment_id }}/{{ transaction.installment_plan.installment_total_number }}</span>
-            {% endif %}
-            {% if transaction.recurring_transaction %}
-              <span class="text-primary tw-text-xs ms-2"><i class="fa-solid fa-arrows-rotate fa-fw"></i></span>
-            {% endif %}
-          {% endspaceless %}
-        </div>
-        <div class="tw-text-gray-400 tw-text-sm">
-          {#        Entities #}
-          {% with transaction.entities.all as entities %}
-            {% if entities %}
+          {#      Description#}
+          <div class="mb-2 mb-lg-1 text-white tw-text-base">
+            {% spaceless %}
+              <span>{{ transaction.description }}</span>
+              {% if transaction.installment_plan and transaction.installment_id %}
+                <span
+                    class="badge text-bg-secondary ms-2">{{ transaction.installment_id }}/{{ transaction.installment_plan.installment_total_number }}</span>
+              {% endif %}
+              {% if transaction.recurring_transaction %}
+                <span class="text-primary tw-text-xs ms-2"><i class="fa-solid fa-arrows-rotate fa-fw"></i></span>
+              {% endif %}
+            {% endspaceless %}
+          </div>
+          <div class="tw-text-gray-400 tw-text-sm">
+            {#        Entities #}
+            {% with transaction.entities.all as entities %}
+              {% if entities %}
+                <div class="row mb-2 mb-lg-1 tw-text-gray-400">
+                  <div class="col-auto pe-1"><i class="fa-solid fa-user-group fa-fw me-1 fa-xs"></i></div>
+                  <div class="col ps-0">{{ entities|join:", " }}</div>
+                </div>
+              {% endif %}
+            {% endwith %}
+            {#        Notes#}
+            {% if transaction.notes %}
              <div class="row mb-2 mb-lg-1 tw-text-gray-400">
-                <div class="col-auto pe-1"><i class="fa-solid fa-user-group fa-fw me-1 fa-xs"></i></div>
-                <div class="col ps-0">{{ entities|join:", " }}</div>
-              </div>
-            {% endif %}
-          {% endwith %}
-          {#        Notes#}
-          {% if transaction.notes %}
-            <div class="row mb-2 mb-lg-1 tw-text-gray-400">
-              <div class="col-auto pe-1"><i class="fa-solid fa-align-left fa-fw me-1 fa-xs"></i></div>
-              <div class="col ps-0">{{ transaction.notes | limited_markdown | linebreaksbr }}</div>
-            </div>
-          {% endif %}
-          {#        Category#}
-          {% if transaction.category %}
-            <div class="row mb-2 mb-lg-1 tw-text-gray-400">
-              <div class="col-auto pe-1"><i class="fa-solid fa-icons fa-fw me-1 fa-xs"></i></div>
-              <div class="col ps-0">{{ transaction.category.name }}</div>
-            </div>
-          {% endif %}
-          {#        Tags#}
-          {% with transaction.tags.all as tags %}
-            {% if tags %}
-              <div class="row mb-2 mb-lg-1 tw-text-gray-400">
-                <div class="col-auto pe-1"><i class="fa-solid fa-hashtag fa-fw me-1 fa-xs"></i></div>
-                <div class="col ps-0">{{ tags|join:", " }}</div>
+                <div class="col-auto pe-1"><i class="fa-solid fa-align-left fa-fw me-1 fa-xs"></i></div>
+                <div class="col ps-0">{{ transaction.notes | limited_markdown | linebreaksbr }}</div>
+              </div>
+            {% endif %}
+            {#        Category#}
+            {% if transaction.category %}
+              <div class="row mb-2 mb-lg-1 tw-text-gray-400">
+                <div class="col-auto pe-1"><i class="fa-solid fa-icons fa-fw me-1 fa-xs"></i></div>
+                <div class="col ps-0">{{ transaction.category.name }}</div>
+              </div>
+            {% endif %}
+            {#        Tags#}
+            {% with transaction.tags.all as tags %}
+              {% if tags %}
+                <div class="row mb-2 mb-lg-1 tw-text-gray-400">
+                  <div class="col-auto pe-1"><i class="fa-solid fa-hashtag fa-fw me-1 fa-xs"></i></div>
+                  <div class="col ps-0">{{ tags|join:", " }}</div>
+                </div>
+              {% endif %}
+            {% endwith %}
+          </div>
+        </div>
+        <div class="col-lg-3 col-12 text-lg-end align-self-end">
+          <div class="main-amount mb-2 mb-lg-0">
+            <c-amount.display
+                :amount="transaction.amount"
+                :prefix="transaction.account.currency.prefix"
+                :suffix="transaction.account.currency.suffix"
+                :decimal_places="transaction.account.currency.decimal_places"
+                color="{% if transaction.type == "EX" %}red{% else %}green{% endif %}"></c-amount.display>
+          </div>
+          {#    Exchange Rate#}
+          {% with exchanged=transaction.exchanged_amount %}
+            {% if exchanged %}
+              <div class="exchanged-amount mb-2 mb-lg-0">
+                <c-amount.display
+                    :amount="exchanged.amount"
+                    :prefix="exchanged.prefix"
+                    :suffix="exchanged.suffix"
+                    :decimal_places="exchanged.decimal_places"
+                    color="grey"></c-amount.display>
              </div>
            {% endif %}
          {% endwith %}
+          <div>
+            {% if transaction.account.group %}{{ transaction.account.group.name }} • {% endif %}{{ transaction.account.name }}
+          </div>
        </div>
-      </div>
-      <div class="col-lg-3 col-12 text-lg-end align-self-end">
-        <div class="main-amount mb-2 mb-lg-0">
-          <c-amount.display
-              :amount="transaction.amount"
-              :prefix="transaction.account.currency.prefix"
-              :suffix="transaction.account.currency.suffix"
-              :decimal_places="transaction.account.currency.decimal_places"
-              color="{% if transaction.type == "EX" %}red{% else %}green{% endif %}"></c-amount.display>
-        </div>
-        {#    Exchange Rate#}
-        {% with exchanged=transaction.exchanged_amount %}
-          {% if exchanged %}
-            <div class="exchanged-amount mb-2 mb-lg-0">
-              <c-amount.display
-                  :amount="exchanged.amount"
-                  :prefix="exchanged.prefix"
-                  :suffix="exchanged.suffix"
-                  :decimal_places="exchanged.decimal_places"
-                  color="grey"></c-amount.display>
-            </div>
-          {% endif %}
-        {% endwith %}
        <div>
-          {% if transaction.account.group %}{{ transaction.account.group.name }} • {% endif %}{{ transaction.account.name }}
-        </div>
-      </div>
-      <div>
-        {#      Item actions#}
-        <div
-            class="transaction-actions !tw-absolute tw-left-1/2 tw-top-0 tw--translate-x-1/2 tw--translate-y-1/2 tw-invisible d-flex flex-row card">
-          <div class="card-body p-1 shadow-lg">
-            {% if not transaction.deleted %}
-              <a class="btn btn-secondary btn-sm transaction-action"
-                 role="button"
-                 data-bs-toggle="tooltip"
-                 data-bs-title="{% translate "Edit" %}"
-                 hx-get="{% url 'transaction_edit' transaction_id=transaction.id %}"
-                 hx-target="#generic-offcanvas" hx-swap="innerHTML">
-                <i class="fa-solid fa-pencil fa-fw"></i></a>
-              <a class="btn btn-secondary btn-sm transaction-action"
-                 role="button"
-                 data-bs-toggle="tooltip"
-                 data-bs-title="{% translate "Duplicate" %}"
-                 hx-get="{% url 'transaction_clone' transaction_id=transaction.id %}"
-                 _="on click if event.ctrlKey set @hx-get to `{% url 'transaction_clone' transaction_id=transaction.id %}?edit=true` then call htmx.process(me) end then trigger ready"
-                 hx-trigger="ready">
-                <i class="fa-solid fa-clone fa-fw"></i></a>
-              <a class="btn btn-secondary btn-sm transaction-action"
-                 role="button"
-                 data-bs-toggle="tooltip"
-                 data-bs-title="{% translate "Delete" %}"
-                 hx-delete="{% url 'transaction_delete' transaction_id=transaction.id %}"
-                 hx-trigger='confirmed'
-                 data-bypass-on-ctrl="true"
-                 data-title="{% translate "Are you sure?" %}"
-                 data-text="{% translate "You won't be able to revert this!" %}"
-                 data-confirm-text="{% translate "Yes, delete it!" %}"
-                 _="install prompt_swal"><i class="fa-solid fa-trash fa-fw text-danger"></i>
-              </a>
-            {% else %}
-              <a class="btn btn-secondary btn-sm transaction-action"
-                 role="button"
-                 data-bs-toggle="tooltip"
-                 data-bs-title="{% translate "Restore" %}"
-                 hx-get="{% url 'transaction_undelete' transaction_id=transaction.id %}"><i
-                  class="fa-solid fa-trash-arrow-up"></i></a>
-              <a class="btn btn-secondary btn-sm transaction-action"
-                 role="button"
-                 data-bs-toggle="tooltip"
-                 data-bs-title="{% translate "Delete" %}"
-                 hx-delete="{% url 'transaction_delete' transaction_id=transaction.id %}"
-                 hx-trigger='confirmed'
-                 data-bypass-on-ctrl="true"
-                 data-title="{% translate "Are you sure?" %}"
-                 data-text="{% translate "You won't be able to revert this!" %}"
-                 data-confirm-text="{% translate "Yes, delete it!" %}"
-                 _="install prompt_swal"><i class="fa-solid fa-trash fa-fw text-danger"></i>
-              </a>
-            {% endif %}
+          {#      Item actions#}
+          <div
+              class="transaction-actions !tw-absolute tw-left-1/2 tw-top-0 tw--translate-x-1/2 tw--translate-y-1/2 tw-invisible d-flex flex-row card">
+            <div class="card-body p-1 shadow-lg">
+              {% if not transaction.deleted %}
+                <a class="btn btn-secondary btn-sm transaction-action"
+                   role="button"
+                   data-bs-toggle="tooltip"
+                   data-bs-title="{% translate "Edit" %}"
+                   hx-get="{% url 'transaction_edit' transaction_id=transaction.id %}"
+                   hx-target="#generic-offcanvas" hx-swap="innerHTML">
+                  <i class="fa-solid fa-pencil fa-fw"></i></a>
+                <a class="btn btn-secondary btn-sm transaction-action"
+                   role="button"
+                   data-bs-toggle="tooltip"
+                   data-bs-title="{% translate "Duplicate" %}"
+                   hx-get="{% url 'transaction_clone' transaction_id=transaction.id %}"
+                   _="on click if event.ctrlKey set @hx-get to `{% url 'transaction_clone' transaction_id=transaction.id %}?edit=true` then call htmx.process(me) end then trigger ready"
+                   hx-trigger="ready">
+                  <i class="fa-solid fa-clone fa-fw"></i></a>
+                <a class="btn btn-secondary btn-sm transaction-action"
+                   role="button"
+                   data-bs-toggle="tooltip"
+                   data-bs-title="{% translate "Delete" %}"
+                   hx-delete="{% url 'transaction_delete' transaction_id=transaction.id %}"
+                   hx-trigger='confirmed'
+                   data-bypass-on-ctrl="true"
+                   data-title="{% translate "Are you sure?" %}"
+                   data-text="{% translate "You won't be able to revert this!" %}"
+                   data-confirm-text="{% translate "Yes, delete it!" %}"
+                   _="install prompt_swal"><i class="fa-solid fa-trash fa-fw text-danger"></i>
+                </a>
+              {% else %}
+                <a class="btn btn-secondary btn-sm transaction-action"
+                   role="button"
+                   data-bs-toggle="tooltip"
+                   data-bs-title="{% translate "Restore" %}"
+                   hx-get="{% url 'transaction_undelete' transaction_id=transaction.id %}"><i
+                    class="fa-solid fa-trash-arrow-up"></i></a>
+                <a class="btn btn-secondary btn-sm transaction-action"
+                   role="button"
+                   data-bs-toggle="tooltip"
+                   data-bs-title="{% translate "Delete" %}"
+                   hx-delete="{% url 'transaction_delete' transaction_id=transaction.id %}"
+                   hx-trigger='confirmed'
+                   data-bypass-on-ctrl="true"
+                   data-title="{% translate "Are you sure?" %}"
+                   data-text="{% translate "You won't be able to revert this!" %}"
+                   data-confirm-text="{% translate "Yes, delete it!" %}"
+                   _="install prompt_swal"><i class="fa-solid fa-trash fa-fw text-danger"></i>
+                </a>
+              {% endif %}
+            </div>
          </div>
        </div>
      </div>
--- a/app/templates/monthly_overview/fragments/list.html
+++ b/app/templates/monthly_overview/fragments/list.html
@@ -4,9 +4,9 @@

 <div id="transactions-list">
  {% for x in transactions_by_date %}
-    <div id="{{ x.grouper|slugify }}"
-         _="on htmx:afterSettle from #transactions if sessionStorage.getItem(my id) is null then sessionStorage.setItem(my id, 'true')">
-      <div class="mt-3 mb-1 w-100 tw-text-base border-bottom bg-body">
+    <div id="{{ x.grouper|slugify }}" class="transactions-divider"
+         _="on htmx:afterSwap from #transactions if sessionStorage.getItem(my id) is null then sessionStorage.setItem(my id, 'true')">
+      <div class="mt-3 mb-1 w-100 tw-text-base border-bottom bg-body transactions-divider-title">
        <a class="text-decoration-none d-inline-block w-100"
           role="button"
           data-bs-toggle="collapse"
@@ -17,15 +17,21 @@
        {{ x.grouper }}
        </a>
      </div>
-      <div class="collapse" id="c-{{ x.grouper|slugify }}-collapse"
+      <div class="collapse transactions-divider-collapse" id="c-{{ x.grouper|slugify }}-collapse"
           _="on shown.bs.collapse sessionStorage.setItem(the closest parent @id, 'true')
              on hidden.bs.collapse sessionStorage.setItem(the closest parent @id, 'false')
-              on htmx:afterSettle from #transactions
+              on htmx:afterSettle from #transactions or toggle
                set state to sessionStorage.getItem(the closest parent @id)
                if state is 'true' or state is null
                  add .show to me
                  set @aria-expanded of #c-{{ x.grouper|slugify }}-collapsible to true
-                end">
+                else
+                  remove .show from me
+                  set @aria-expanded of #c-{{ x.grouper|slugify }}-collapsible to false
+                end
+              on show
+                add .show to me
+                set @aria-expanded of #c-{{ x.grouper|slugify }}-collapsible to true">
        <div class="d-flex flex-column">
        {% for transaction in x.list %}
          <c-transaction.item
--- a/app/templates/monthly_overview/fragments/monthly_summary.html
+++ b/app/templates/monthly_overview/fragments/monthly_summary.html
@@ -256,7 +256,7 @@
  <div class="col">
    <c-ui.info-card color="yellow" icon="fa-solid fa-percent" title="{% trans 'Distribution' %}">
      {% for p in percentages.values %}
-        <p class="tw-text-gray-400 mb-2 {% if not forloop.first %}mt-3{% endif %}">{{ p.currency.name }} ({{ p.currency.code }})</p>
+        <p class="tw-text-gray-400 mb-2 {% if not forloop.first %}mt-3{% endif %}">{{ p.currency.name }}</p>
        <c-ui.percentage-distribution :percentage="p"></c-ui.percentage-distribution>
      {% endfor %}
    </c-ui.info-card>
--- a/app/templates/monthly_overview/pages/overview.html
+++ b/app/templates/monthly_overview/pages/overview.html
@@ -172,6 +172,20 @@
                    _="on click call #filter.reset() then trigger change on #filter">{% translate 'Clear' %}</button>
          </div>
        </div>
+        <div id="search" class="my-3">
+          <label class="w-100">
+          <input type="search" class="form-control" placeholder="Buscar" hx-preserve id="quick-search"
+                 _="on input or search or htmx:afterSwap from window
+                      if my value is empty
+                        trigger toggle on <.transactions-divider-collapse/>
+                      else
+                        trigger show on <.transactions-divider-collapse/>
+                      end
+                      show <.transactions-divider-title/> when my value is empty
+                      show <.transaction/> in <#transactions-list/>
+                      when its textContent.toLowerCase() contains my value.toLowerCase()">
+          </label>
+        </div>
        {#      Transactions list#}
        <div id="transactions"
             class="show-loading"
Author	SHA1	Message	Date
Herculino Trotta	851b34f07a	Merge pull request #156 from eitchtee/dev fix(transactions): paying transaction doesn't trigger update rules	2025-02-09 23:38:58 -03:00
Herculino Trotta	546ed5c6af	fix(transactions): bulk (un)paying transactions doesn't trigger update rules	2025-02-09 23:38:22 -03:00
Herculino Trotta	04ae7337f5	fix(transactions): paying transaction doesn't trigger update rules	2025-02-09 23:33:57 -03:00
Herculino Trotta	63069f0ec9	Merge pull request #155 from eitchtee/dev refactor: don't display currency code	2025-02-09 19:50:09 -03:00
Herculino Trotta	32b522dad2	refactor: don't display currency code	2025-02-09 19:49:47 -03:00
Herculino Trotta	0c20a079e3	Merge pull request #154 from eitchtee/dev locale: update locales	2025-02-09 17:31:03 -03:00
Herculino Trotta	7c9697f683	locale: update locales	2025-02-09 17:30:39 -03:00
Herculino Trotta	15d04230ae	Merge pull request #153 feat(monthly): add quick-search field	2025-02-09 17:14:44 -03:00
Herculino Trotta	ecc09ca6a6	feat(monthly): add quick-search field	2025-02-09 17:14:25 -03:00
Herculino Trotta	cd753c5dd5	Merge pull request #152 from luzpaz/readme-typos fix: typos in README	2025-02-09 10:55:54 -03:00
luzpaz	a3b9952f80	fix: typos in README Found via `codespell -q 3 -S "*.po" -L bu,nome,vew`	2025-02-09 09:47:03 +00:00