From 7028672b9351a8ba6b2f33bb7c1d8d9882ec2649 Mon Sep 17 00:00:00 2001
From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de>
Date: Wed, 2 Feb 2022 09:32:34 +0100
Subject: [PATCH 01/12] # 86 Viewport jump Intervention

* adds direct jump of viewport on related-data action (create/delete)
---
 compensation/views/eco_account.py             |  3 +-
 compensation/views/payment.py                 |  5 ++-
 intervention/models/revocation.py             |  4 ++
 .../templates/intervention/detail/view.html   | 40 ++++++++++---------
 intervention/views.py                         | 11 +++--
 5 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/compensation/views/eco_account.py b/compensation/views/eco_account.py
index 59b82a7b..988b0c50 100644
--- a/compensation/views/eco_account.py
+++ b/compensation/views/eco_account.py
@@ -533,7 +533,8 @@ def new_deduction_view(request: HttpRequest, id: str):
     form = NewDeductionModalForm(request.POST or None, instance=acc, request=request)
     return form.process_request(
         request,
-        msg_success=_("Deduction added")
+        msg_success=_("Deduction added"),
+        redirect_url=reverse("compensation:detail", args=(id,)) + "#related_data"
     )
 
 
diff --git a/compensation/views/payment.py b/compensation/views/payment.py
index 99d6d3ee..7caf847e 100644
--- a/compensation/views/payment.py
+++ b/compensation/views/payment.py
@@ -5,6 +5,7 @@ Contact: michel.peltriaux@sgdnord.rlp.de
 Created on: 09.08.21
 
 """
+from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from django.contrib.auth.decorators import login_required
 from django.http import HttpRequest
@@ -33,7 +34,8 @@ def new_payment_view(request: HttpRequest, intervention_id: str):
     form = NewPaymentForm(request.POST or None, instance=intervention, request=request)
     return form.process_request(
         request,
-        msg_success=_("Payment added")
+        msg_success=_("Payment added"),
+        redirect_url=reverse("intervention:detail", args=(intervention_id,)) + "#related_data"
     )
 
 
@@ -54,5 +56,6 @@ def payment_remove_view(request: HttpRequest, id: str):
     return form.process_request(
         request=request,
         msg_success=_("Payment removed"),
+        redirect_url=reverse("intervention:detail", args=(payment.intervention_id,)) + "#related_data"
     )
 
diff --git a/intervention/models/revocation.py b/intervention/models/revocation.py
index 5eb70e5e..e996f564 100644
--- a/intervention/models/revocation.py
+++ b/intervention/models/revocation.py
@@ -26,6 +26,10 @@ class Revocation(BaseResource):
             self.document.delete(*args, **kwargs)
         super().delete()
 
+    @property
+    def intervention(self):
+        return self.legal.intervention
+
 
 class RevocationDocument(AbstractDocument):
     """
diff --git a/intervention/templates/intervention/detail/view.html b/intervention/templates/intervention/detail/view.html
index e51f3ecd..86220949 100644
--- a/intervention/templates/intervention/detail/view.html
+++ b/intervention/templates/intervention/detail/view.html
@@ -136,27 +136,29 @@
     </div>
     <hr>
 
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'intervention/detail/includes/compensations.html' %}
+    <div id="related_data">
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'intervention/detail/includes/compensations.html' %}
+            </div>
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'intervention/detail/includes/payments.html' %}
+            </div>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'intervention/detail/includes/payments.html' %}
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'intervention/detail/includes/deductions.html' %}
+            </div>
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'intervention/detail/includes/revocation.html' %}
+            </div>
         </div>
-    </div>
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'intervention/detail/includes/deductions.html' %}
-        </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'intervention/detail/includes/revocation.html' %}
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'intervention/detail/includes/documents.html' %}
-        </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'intervention/detail/includes/documents.html' %}
+            </div>
+            <div class="col-sm-12 col-md-12 col-lg-6">
+            </div>
         </div>
     </div>
 
diff --git a/intervention/views.py b/intervention/views.py
index 3d65b7df..71fd0989 100644
--- a/intervention/views.py
+++ b/intervention/views.py
@@ -129,7 +129,8 @@ def new_document_view(request: HttpRequest, id: str):
     form = NewInterventionDocumentForm(request.POST or None, request.FILES or None, instance=intervention, request=request)
     return form.process_request(
         request,
-        msg_success=_("Document added")
+        msg_success=_("Document added"),
+        redirect_url=reverse("intervention:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -348,10 +349,12 @@ def remove_revocation_view(request: HttpRequest, id: str):
 
     """
     obj = Revocation.objects.get(id=id)
+
     form = RemoveModalForm(request.POST or None, instance=obj, request=request)
     return form.process_request(
         request,
         _("Revocation removed"),
+        redirect_url=reverse("intervention:detail", args=(obj.intervention.id,)) + "#related_data"
     )
 
 
@@ -455,7 +458,8 @@ def new_revocation_view(request: HttpRequest, id: str):
     form = NewRevocationModalForm(request.POST or None, request.FILES or None, instance=intervention, request=request)
     return form.process_request(
         request,
-        msg_success=_("Revocation added")
+        msg_success=_("Revocation added"),
+        redirect_url=reverse("intervention:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -502,7 +506,8 @@ def new_deduction_view(request: HttpRequest, id: str):
     form = NewDeductionModalForm(request.POST or None, instance=intervention, request=request)
     return form.process_request(
         request,
-        msg_success=_("Deduction added")
+        msg_success=_("Deduction added"),
+        redirect_url=reverse("intervention:detail", args=(id,)) + "#related_data",
     )
 
 

From 299923ef45e88632f12394d50fb2e17b37acbac9 Mon Sep 17 00:00:00 2001
From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de>
Date: Wed, 2 Feb 2022 10:17:59 +0100
Subject: [PATCH 02/12] # 86 Viewport jump Compensation

* adds direct jump of viewport on related-data action (create/delete)
* adds comment field to log.html as 'details'
---
 .../compensation/includes/deadlines.html      |  2 +-
 .../detail/compensation/view.html             | 37 ++++++++--------
 compensation/urls/compensation.py             |  1 +
 compensation/views/compensation.py            | 42 ++++++++++++++++---
 templates/log.html                            |  8 +++-
 5 files changed, 64 insertions(+), 26 deletions(-)

diff --git a/compensation/templates/compensation/detail/compensation/includes/deadlines.html b/compensation/templates/compensation/detail/compensation/includes/deadlines.html
index 4ca109f7..8897483e 100644
--- a/compensation/templates/compensation/detail/compensation/includes/deadlines.html
+++ b/compensation/templates/compensation/detail/compensation/includes/deadlines.html
@@ -50,7 +50,7 @@
                 <td class="align-middle">{{ deadline.comment }}</td>
                 <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'deadline-remove' deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
+                    <button data-form-url="{% url 'compensation:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/compensation/view.html b/compensation/templates/compensation/detail/compensation/view.html
index c210986a..7b167658 100644
--- a/compensation/templates/compensation/detail/compensation/view.html
+++ b/compensation/templates/compensation/detail/compensation/view.html
@@ -118,26 +118,27 @@
         </div>
     </div>
     <hr>
-
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/compensation/includes/states-before.html' %}
+    <div id="related_data">
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'compensation/detail/compensation/includes/states-before.html' %}
+            </div>
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'compensation/detail/compensation/includes/states-after.html' %}
+            </div>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/compensation/includes/states-after.html' %}
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'compensation/detail/compensation/includes/actions.html' %}
+            </div>
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'compensation/detail/compensation/includes/deadlines.html' %}
+            </div>
         </div>
-    </div>
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/compensation/includes/actions.html' %}
-        </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/compensation/includes/deadlines.html' %}
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/compensation/includes/documents.html' %}
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'compensation/detail/compensation/includes/documents.html' %}
+            </div>
         </div>
     </div>
 
diff --git a/compensation/urls/compensation.py b/compensation/urls/compensation.py
index f169bb9e..9c23117b 100644
--- a/compensation/urls/compensation.py
+++ b/compensation/urls/compensation.py
@@ -23,6 +23,7 @@ urlpatterns = [
     path('<id>/state/<state_id>/remove', state_remove_view, name='state-remove'),
     path('<id>/action/<action_id>/remove', action_remove_view, name='action-remove'),
     path('<id>/deadline/new', deadline_new_view, name="new-deadline"),
+    path('<id>/deadline/<deadline_id>/remove', deadline_remove_view, name='deadline-remove'),
     path('<id>/report', report_view, name='report'),
 
     # Documents
diff --git a/compensation/views/compensation.py b/compensation/views/compensation.py
index 009eaf82..43bdf8ce 100644
--- a/compensation/views/compensation.py
+++ b/compensation/views/compensation.py
@@ -13,6 +13,7 @@ from intervention.models import Intervention
 from konova.contexts import BaseContext
 from konova.decorators import *
 from konova.forms import RemoveModalForm, SimpleGeomForm
+from konova.models import Deadline
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.documents import get_document, remove_document
 from konova.utils.generators import generate_qr_code
@@ -276,7 +277,8 @@ def new_document_view(request: HttpRequest, id: str):
     form = NewCompensationDocumentForm(request.POST or None, request.FILES or None, instance=comp, request=request)
     return form.process_request(
         request,
-        msg_success=_("Document added")
+        msg_success=_("Document added"),
+        redirect_url=reverse("compensation:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -345,7 +347,8 @@ def state_new_view(request: HttpRequest, id: str):
     form = NewStateModalForm(request.POST or None, instance=comp, request=request)
     return form.process_request(
         request,
-        msg_success=_("State added")
+        msg_success=_("State added"),
+        redirect_url=reverse("compensation:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -366,7 +369,8 @@ def action_new_view(request: HttpRequest, id: str):
     form = NewActionModalForm(request.POST or None, instance=comp, request=request)
     return form.process_request(
         request,
-        msg_success=_("Action added")
+        msg_success=_("Action added"),
+        redirect_url=reverse("compensation:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -387,7 +391,31 @@ def deadline_new_view(request: HttpRequest, id: str):
     form = NewDeadlineModalForm(request.POST or None, instance=comp, request=request)
     return form.process_request(
         request,
-        msg_success=_("Deadline added")
+        msg_success=_("Deadline added"),
+        redirect_url=reverse("compensation:detail", args=(id,)) + "#related_data"
+    )
+
+
+@login_required
+@default_group_required
+@shared_access_required(Compensation, "id")
+def deadline_remove_view(request: HttpRequest, id: str, deadline_id: str):
+    """ Renders a form for removing deadlines from a compensation
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The compensation's id
+        deadline_id (str): The deadline's id
+
+    Returns:
+
+    """
+    deadline = get_object_or_404(Deadline, id=deadline_id)
+    form = RemoveModalForm(request.POST or None, instance=deadline, request=request)
+    return form.process_request(
+        request,
+        msg_success=_("Deadline removed"),
+        redirect_url=reverse("compensation:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -409,7 +437,8 @@ def state_remove_view(request: HttpRequest, id: str, state_id: str):
     form = RemoveModalForm(request.POST or None, instance=state, request=request)
     return form.process_request(
         request,
-        msg_success=_("State removed")
+        msg_success=_("State removed"),
+        redirect_url=reverse("compensation:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -431,7 +460,8 @@ def action_remove_view(request: HttpRequest, id: str, action_id: str):
     form = RemoveModalForm(request.POST or None, instance=action, request=request)
     return form.process_request(
         request,
-        msg_success=_("Action removed")
+        msg_success=_("Action removed"),
+        redirect_url=reverse("compensation:detail", args=(id,)) + "#related_data"
     )
 
 
diff --git a/templates/log.html b/templates/log.html
index acc2ee67..a5195870 100644
--- a/templates/log.html
+++ b/templates/log.html
@@ -3,12 +3,15 @@
     <table class="table table-hover">
         <thead>
             <tr>
-                <th scope="col">
+                <th scope="col" class="w-25">
                     {% trans 'Timestamp' %}
                 </th>
                 <th scope="col">
                     {% trans 'Action' %}
                 </th>
+                <th scope="col">
+                    {% trans 'Details' %}
+                </th>
                 <th scope="col">
                     {% trans 'User' %}
                 </th>
@@ -23,6 +26,9 @@
                 <td>
                     {{ entry.action_humanize}}
                 </td>
+                <td>
+                    {{ entry.comment|default_if_none:"-" }}
+                </td>
                 <td>
                     {{entry.user}}
                 </td>

From d5e23b420e766a0608eeeaab54aae6042c5fdd0b Mon Sep 17 00:00:00 2001
From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de>
Date: Wed, 2 Feb 2022 11:26:02 +0100
Subject: [PATCH 03/12] # 86 Viewport jump EcoAccount/EMA

* adds direct jump of viewport on related-data action (create/delete)
---
 compensation/forms/forms.py                   | 10 ++--
 compensation/models/eco_account.py            | 10 ++++
 compensation/tables.py                        |  4 +-
 .../detail/eco_account/includes/actions.html  |  4 +-
 .../detail/eco_account/includes/controls.html | 14 ++---
 .../eco_account/includes/deadlines.html       |  4 +-
 .../eco_account/includes/deductions.html      |  4 +-
 .../eco_account/includes/documents.html       |  6 +-
 .../eco_account/includes/states-after.html    |  4 +-
 .../eco_account/includes/states-before.html   |  4 +-
 .../compensation/detail/eco_account/view.html | 42 ++++++-------
 compensation/tests/test_views.py              | 28 ++++-----
 compensation/tests/test_workflow.py           |  2 +-
 compensation/urls/eco_account.py              | 40 +++++++------
 compensation/urls/payment.py                  |  5 +-
 compensation/urls/urls.py                     |  4 +-
 compensation/views/eco_account.py             | 59 ++++++++++++++-----
 ema/models/ema.py                             |  9 +++
 .../ema/detail/includes/deadlines.html        |  2 +-
 ema/templates/ema/detail/view.html            | 37 ++++++------
 ema/urls.py                                   |  2 +-
 ema/views.py                                  | 42 +++++++++++--
 intervention/forms/modalForms.py              |  6 +-
 intervention/models/intervention.py           |  9 +++
 .../detail/includes/deductions.html           |  6 +-
 .../detail/includes/payments.html             |  4 +-
 .../templates/intervention/report/report.html |  2 +-
 intervention/tests/test_workflow.py           |  8 +--
 intervention/urls.py                          |  2 +-
 konova/models/object.py                       |  9 +++
 .../includes/quickstart/ecoaccounts.html      |  6 +-
 konova/urls.py                                |  5 +-
 konova/views.py                               | 19 ------
 templates/navbars/navbar.html                 |  2 +-
 34 files changed, 247 insertions(+), 167 deletions(-)

diff --git a/compensation/forms/forms.py b/compensation/forms/forms.py
index 0970daad..7ac7f601 100644
--- a/compensation/forms/forms.py
+++ b/compensation/forms/forms.py
@@ -339,13 +339,13 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix
         super().__init__(*args, **kwargs)
         self.form_title = _("New Eco-Account")
 
-        self.action_url = reverse("compensation:acc-new")
-        self.cancel_redirect = reverse("compensation:acc-index")
+        self.action_url = reverse("compensation:acc:new")
+        self.cancel_redirect = reverse("compensation:acc:index")
 
         tmp = EcoAccount()
         identifier = tmp.generate_new_identifier()
         self.initialize_form_field("identifier", identifier)
-        self.fields["identifier"].widget.attrs["url"] = reverse_lazy("compensation:acc-new-id")
+        self.fields["identifier"].widget.attrs["url"] = reverse_lazy("compensation:acc:new-id")
         self.fields["title"].widget.attrs["placeholder"] = _("Eco-Account XY; Location ABC")
 
     def save(self, user: User, geom_form: SimpleGeomForm):
@@ -402,8 +402,8 @@ class EditEcoAccountForm(NewEcoAccountForm):
         super().__init__(*args, **kwargs)
         self.form_title = _("Edit Eco-Account")
 
-        self.action_url = reverse("compensation:acc-edit", args=(self.instance.id,))
-        self.cancel_redirect = reverse("compensation:acc-detail", args=(self.instance.id,))
+        self.action_url = reverse("compensation:acc:edit", args=(self.instance.id,))
+        self.cancel_redirect = reverse("compensation:acc:detail", args=(self.instance.id,))
 
         # Initialize form data
         reg_date = self.instance.legal.registration_date
diff --git a/compensation/models/eco_account.py b/compensation/models/eco_account.py
index afe556f9..8e4d32e1 100644
--- a/compensation/models/eco_account.py
+++ b/compensation/models/eco_account.py
@@ -7,6 +7,8 @@ Created on: 16.11.21
 """
 import shutil
 
+from django.urls import reverse
+
 from user.models import User
 from django.core.exceptions import ValidationError
 from django.core.validators import MinValueValidator
@@ -203,6 +205,14 @@ class EcoAccount(AbstractCompensation, ShareableObjectMixin, RecordableObjectMix
         is_ready = is_recorded
         return is_ready
 
+    def get_share_link(self):
+        """ Returns the share url for the object
+
+        Returns:
+
+        """
+        return reverse("compensation:acc:share", args=(self.id, self.access_token))
+
 
 class EcoAccountDocument(AbstractDocument):
     """
diff --git a/compensation/tables.py b/compensation/tables.py
index 9daf2b23..b78b5aa9 100644
--- a/compensation/tables.py
+++ b/compensation/tables.py
@@ -201,7 +201,7 @@ class EcoAccountTable(BaseTable, TableRenderMixin):
 
     def __init__(self,  request: HttpRequest, *args, **kwargs):
         self.title = _("Eco Accounts")
-        self.add_new_url = reverse("compensation:acc-new")
+        self.add_new_url = reverse("compensation:acc:new")
         qs = kwargs.get("queryset", None)
         self.filter = EcoAccountTableFilter(
             user=request.user,
@@ -224,7 +224,7 @@ class EcoAccountTable(BaseTable, TableRenderMixin):
         html = ""
         html += self.render_link(
             tooltip=_("Open {}").format(_("Eco-account")),
-            href=reverse("compensation:acc-detail", args=(record.id,)),
+            href=reverse("compensation:acc:detail", args=(record.id,)),
             txt=value,
             new_tab=False,
         )
diff --git a/compensation/templates/compensation/detail/eco_account/includes/actions.html b/compensation/templates/compensation/detail/eco_account/includes/actions.html
index c5b9c1c1..67dd2bbf 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/actions.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/actions.html
@@ -11,7 +11,7 @@
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
                     {% if is_default_member and has_access  %}
-                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc-new-action' obj.id %}" title="{% trans 'Add new action' %}">
+                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc:new-action' obj.id %}" title="{% trans 'Add new action' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'seedling' %}
                     </button>
@@ -58,7 +58,7 @@
                 <td class="align-middle">{{ action.comment|default_if_none:"" }}</td>
                 <td class="align-middle">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc-action-remove' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove action' %}">
+                    <button data-form-url="{% url 'compensation:acc:action-remove' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove action' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/eco_account/includes/controls.html b/compensation/templates/compensation/detail/eco_account/includes/controls.html
index f43ddebe..fcc70dc2 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/controls.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/controls.html
@@ -6,36 +6,36 @@
             LANIS
         </button>
     </a>
-    <a href="{% url 'compensation:acc-report' obj.id %}" target="_blank" class="mr-2">
+    <a href="{% url 'compensation:acc:report' obj.id %}" target="_blank" class="mr-2">
         <button class="btn btn-default" title="{% trans 'Public report' %}">
             {% fa5_icon 'file-alt' %}
         </button>
     </a>
     {% if has_access %}
-        <button class="btn btn-default btn-modal mr-2" title="{% trans 'Share' %}" data-form-url="{% url 'compensation:share-create' obj.id %}">
+        <button class="btn btn-default btn-modal mr-2" title="{% trans 'Share' %}" data-form-url="{% url 'compensation:acc:share-create' obj.id %}">
             {% fa5_icon 'share-alt' %}
         </button>
         {% if is_ets_member %}
             {% if obj.recorded %}
-                <button class="btn btn-default btn-modal mr-2" title="{% trans 'Unrecord' %}" data-form-url="{% url 'compensation:acc-record' obj.id %}">
+                <button class="btn btn-default btn-modal mr-2" title="{% trans 'Unrecord' %}" data-form-url="{% url 'compensation:acc:record' obj.id %}">
                     {% fa5_icon 'bookmark' 'far' %}
                 </button>
             {% else %}
-                <button class="btn btn-default btn-modal mr-2" title="{% trans 'Record' %}" data-form-url="{% url 'compensation:acc-record' obj.id %}">
+                <button class="btn btn-default btn-modal mr-2" title="{% trans 'Record' %}" data-form-url="{% url 'compensation:acc:record' obj.id %}">
                     {% fa5_icon 'bookmark' %}
                 </button>
             {% endif %}
         {% endif %}
         {% if is_default_member %}
-        <a href="{% url 'compensation:acc-edit' obj.id %}" class="mr-2">
+        <a href="{% url 'compensation:acc:edit' obj.id %}" class="mr-2">
             <button class="btn btn-default" title="{% trans 'Edit' %}">
                 {% fa5_icon 'edit' %}
             </button>
         </a>
-        <button class="btn btn-default btn-modal mr-2" data-form-url="{% url 'compensation:acc-log' obj.id %}" title="{% trans 'Show log' %}">
+        <button class="btn btn-default btn-modal mr-2" data-form-url="{% url 'compensation:acc:log' obj.id %}" title="{% trans 'Show log' %}">
             {% fa5_icon 'history' %}
         </button>
-        <button class="btn btn-default btn-modal" data-form-url="{% url 'compensation:acc-remove' obj.id %}" title="{% trans 'Delete' %}">
+        <button class="btn btn-default btn-modal" data-form-url="{% url 'compensation:acc:remove' obj.id %}" title="{% trans 'Delete' %}">
             {% fa5_icon 'trash' %}
         </button>
         {% endif %}
diff --git a/compensation/templates/compensation/detail/eco_account/includes/deadlines.html b/compensation/templates/compensation/detail/eco_account/includes/deadlines.html
index 4bf26df6..a1764df8 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/deadlines.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/deadlines.html
@@ -11,7 +11,7 @@
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
                     {% if is_default_member and has_access  %}
-                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc-new-deadline' obj.id %}" title="{% trans 'Add new deadline' %}">
+                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc:new-deadline' obj.id %}" title="{% trans 'Add new deadline' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'calendar-check' %}
                     </button>
@@ -48,7 +48,7 @@
                 <td class="align-middle">{{ deadline.comment }}</td>
                 <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'deadline-remove' deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
+                    <button data-form-url="{% url 'compensation:acc:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/eco_account/includes/deductions.html b/compensation/templates/compensation/detail/eco_account/includes/deductions.html
index 16b9cb75..ca97f005 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/deductions.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/deductions.html
@@ -11,7 +11,7 @@
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
                     {% if is_default_member and has_access  %}
-                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc-new-deduction' obj.id %}" title="{% trans 'Add new deduction' %}">
+                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc:new-deduction' obj.id %}" title="{% trans 'Add new deduction' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'tree' %}
                     </button>
@@ -60,7 +60,7 @@
                 <td class="align-middle">{{ deduction.created.timestamp|default_if_none:""|naturalday}}</td>
                 <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc-remove-deduction' deduction.account.id deduction.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove Deduction' %}">
+                    <button data-form-url="{% url 'compensation:acc:remove-deduction' deduction.account.id deduction.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove Deduction' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/eco_account/includes/documents.html b/compensation/templates/compensation/detail/eco_account/includes/documents.html
index bd371df2..f6376f46 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/documents.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/documents.html
@@ -11,7 +11,7 @@
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
                     {% if is_default_member and has_access  %}
-                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc-new-doc' obj.id %}" title="{% trans 'Add new document' %}">
+                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc:new-doc' obj.id %}" title="{% trans 'Add new document' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'file' %}
                     </button>
@@ -39,14 +39,14 @@
             {% for doc in obj.documents.all %}
             <tr>
                 <td class="align-middle">
-                    <a href="{% url 'compensation:acc-get-doc' doc.id %}">
+                    <a href="{% url 'compensation:acc:get-doc' doc.id %}">
                         {{ doc.title }}
                     </a>
                 </td>
                 <td class="align-middle">{{ doc.comment }}</td>
                 <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc-remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
+                    <button data-form-url="{% url 'compensation:acc:remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/eco_account/includes/states-after.html b/compensation/templates/compensation/detail/eco_account/includes/states-after.html
index 70a36018..17e7d44a 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/states-after.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/states-after.html
@@ -11,7 +11,7 @@
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
                     {% if is_default_member and has_access  %}
-                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc-new-state' obj.id %}" title="{% trans 'Add new state after' %}">
+                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc:new-state' obj.id %}" title="{% trans 'Add new state after' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'layer-group' %}
                     </button>
@@ -61,7 +61,7 @@
                 <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
                 <td class="align-middle">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc-state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
+                    <button data-form-url="{% url 'compensation:acc:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/eco_account/includes/states-before.html b/compensation/templates/compensation/detail/eco_account/includes/states-before.html
index 5482674a..3a1136ca 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/states-before.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/states-before.html
@@ -11,7 +11,7 @@
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
                     {% if is_default_member and has_access  %}
-                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc-new-state' obj.id %}?before=true" title="{% trans 'Add new state before' %}">
+                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc:new-state' obj.id %}?before=true" title="{% trans 'Add new state before' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'layer-group' %}
                     </button>
@@ -61,7 +61,7 @@
                 <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
                 <td class="align-middle">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc-state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
+                    <button data-form-url="{% url 'compensation:acc:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/eco_account/view.html b/compensation/templates/compensation/detail/eco_account/view.html
index 493a9292..033eda33 100644
--- a/compensation/templates/compensation/detail/eco_account/view.html
+++ b/compensation/templates/compensation/detail/eco_account/view.html
@@ -102,28 +102,30 @@
     </div>
     <hr>
 
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/eco_account/includes/states-before.html' %}
+    <div id="related_data">
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'compensation/detail/eco_account/includes/states-before.html' %}
+            </div>
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'compensation/detail/eco_account/includes/states-after.html' %}
+            </div>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/eco_account/includes/states-after.html' %}
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'compensation/detail/eco_account/includes/actions.html' %}
+            </div>
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'compensation/detail/eco_account/includes/deadlines.html' %}
+            </div>
         </div>
-    </div>
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/eco_account/includes/actions.html' %}
-        </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/eco_account/includes/deadlines.html' %}
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/eco_account/includes/documents.html' %}
-        </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/eco_account/includes/deductions.html' %}
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'compensation/detail/eco_account/includes/documents.html' %}
+            </div>
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'compensation/detail/eco_account/includes/deductions.html' %}
+            </div>
         </div>
     </div>
 
diff --git a/compensation/tests/test_views.py b/compensation/tests/test_views.py
index ff9bc728..8d668220 100644
--- a/compensation/tests/test_views.py
+++ b/compensation/tests/test_views.py
@@ -245,20 +245,20 @@ class EcoAccountViewTestCase(CompensationViewTestCase):
         cls.eco_account.actions.set([action])
 
         # Prepare urls
-        cls.index_url = reverse("compensation:acc-index", args=())
-        cls.new_url = reverse("compensation:acc-new", args=())
-        cls.new_id_url = reverse("compensation:acc-new-id", args=())
-        cls.detail_url = reverse("compensation:acc-detail", args=(cls.eco_account.id,))
-        cls.log_url = reverse("compensation:acc-log", args=(cls.eco_account.id,))
-        cls.edit_url = reverse("compensation:acc-edit", args=(cls.eco_account.id,))
-        cls.remove_url = reverse("compensation:acc-remove", args=(cls.eco_account.id,))
-        cls.report_url = reverse("compensation:acc-report", args=(cls.eco_account.id,))
-        cls.state_new_url = reverse("compensation:acc-new-state", args=(cls.eco_account.id,))
-        cls.action_new_url = reverse("compensation:acc-new-action", args=(cls.eco_account.id,))
-        cls.deadline_new_url = reverse("compensation:acc-new-deadline", args=(cls.eco_account.id,))
-        cls.new_doc_url = reverse("compensation:acc-new-doc", args=(cls.eco_account.id,))
-        cls.state_remove_url = reverse("compensation:acc-state-remove", args=(cls.eco_account.id, cls.comp_state.id,))
-        cls.action_remove_url = reverse("compensation:acc-action-remove", args=(cls.eco_account.id, cls.comp_action.id,))
+        cls.index_url = reverse("compensation:acc:index", args=())
+        cls.new_url = reverse("compensation:acc:new", args=())
+        cls.new_id_url = reverse("compensation:acc:new-id", args=())
+        cls.detail_url = reverse("compensation:acc:detail", args=(cls.eco_account.id,))
+        cls.log_url = reverse("compensation:acc:log", args=(cls.eco_account.id,))
+        cls.edit_url = reverse("compensation:acc:edit", args=(cls.eco_account.id,))
+        cls.remove_url = reverse("compensation:acc:remove", args=(cls.eco_account.id,))
+        cls.report_url = reverse("compensation:acc:report", args=(cls.eco_account.id,))
+        cls.state_new_url = reverse("compensation:acc:new-state", args=(cls.eco_account.id,))
+        cls.action_new_url = reverse("compensation:acc:new-action", args=(cls.eco_account.id,))
+        cls.deadline_new_url = reverse("compensation:acc:new-deadline", args=(cls.eco_account.id,))
+        cls.new_doc_url = reverse("compensation:acc:new-doc", args=(cls.eco_account.id,))
+        cls.state_remove_url = reverse("compensation:acc:state-remove", args=(cls.eco_account.id, cls.comp_state.id,))
+        cls.action_remove_url = reverse("compensation:acc:action-remove", args=(cls.eco_account.id, cls.comp_action.id,))
 
     def test_logged_in_no_groups_shared(self):
         """ Check correct status code for all requests
diff --git a/compensation/tests/test_workflow.py b/compensation/tests/test_workflow.py
index adf5b197..7f4864d6 100644
--- a/compensation/tests/test_workflow.py
+++ b/compensation/tests/test_workflow.py
@@ -258,7 +258,7 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
         self.intervention.share_with(self.superuser)
 
         # Prepare data for deduction creation
-        deduct_url = reverse("compensation:acc-new-deduction", args=(self.eco_account.id,))
+        deduct_url = reverse("compensation:acc:new-deduction", args=(self.eco_account.id,))
         test_surface = 10.00
         post_data = {
             "surface": test_surface,
diff --git a/compensation/urls/eco_account.py b/compensation/urls/eco_account.py
index 9bdecf2c..7deb48f7 100644
--- a/compensation/urls/eco_account.py
+++ b/compensation/urls/eco_account.py
@@ -8,31 +8,33 @@ Created on: 24.08.21
 from django.urls import path
 from compensation.views.eco_account import *
 
+app_name = "acc"
 urlpatterns = [
-    path("", index_view, name="acc-index"),
-    path('new/', new_view, name='acc-new'),
-    path('new/id', new_id_view, name='acc-new-id'),
-    path('<id>', detail_view, name='acc-detail'),
-    path('<id>/log', log_view, name='acc-log'),
-    path('<id>/record', record_view, name='acc-record'),
-    path('<id>/report', report_view, name='acc-report'),
-    path('<id>/edit', edit_view, name='acc-edit'),
-    path('<id>/remove', remove_view, name='acc-remove'),
-    path('<id>/state/new', state_new_view, name='acc-new-state'),
-    path('<id>/action/new', action_new_view, name='acc-new-action'),
-    path('<id>/state/<state_id>/remove', state_remove_view, name='acc-state-remove'),
-    path('<id>/action/<action_id>/remove', action_remove_view, name='acc-action-remove'),
-    path('<id>/deadline/new', deadline_new_view, name="acc-new-deadline"),
+    path("", index_view, name="index"),
+    path('new/', new_view, name='new'),
+    path('new/id', new_id_view, name='new-id'),
+    path('<id>', detail_view, name='detail'),
+    path('<id>/log', log_view, name='log'),
+    path('<id>/record', record_view, name='record'),
+    path('<id>/report', report_view, name='report'),
+    path('<id>/edit', edit_view, name='edit'),
+    path('<id>/remove', remove_view, name='remove'),
+    path('<id>/state/new', state_new_view, name='new-state'),
+    path('<id>/action/new', action_new_view, name='new-action'),
+    path('<id>/state/<state_id>/remove', state_remove_view, name='state-remove'),
+    path('<id>/action/<action_id>/remove', action_remove_view, name='action-remove'),
+    path('<id>/deadline/<deadline_id>/remove', deadline_remove_view, name='deadline-remove'),
+    path('<id>/deadline/new', deadline_new_view, name="new-deadline"),
     path('<id>/share/<token>', share_view, name='share'),
     path('<id>/share', create_share_view, name='share-create'),
 
     # Documents
-    path('<id>/document/new/', new_document_view, name='acc-new-doc'),
-    path('document/<doc_id>', get_document_view, name='acc-get-doc'),
-    path('document/<doc_id>/remove/', remove_document_view, name='acc-remove-doc'),
+    path('<id>/document/new/', new_document_view, name='new-doc'),
+    path('document/<doc_id>', get_document_view, name='get-doc'),
+    path('document/<doc_id>/remove/', remove_document_view, name='remove-doc'),
 
     # Eco-account deductions
-    path('<id>/remove/<deduction_id>', deduction_remove_view, name='acc-remove-deduction'),
-    path('<id>/deduct/new', new_deduction_view, name='acc-new-deduction'),
+    path('<id>/remove/<deduction_id>', deduction_remove_view, name='remove-deduction'),
+    path('<id>/deduct/new', new_deduction_view, name='new-deduction'),
 
 ]
\ No newline at end of file
diff --git a/compensation/urls/payment.py b/compensation/urls/payment.py
index 0bb80938..2c8e5d4b 100644
--- a/compensation/urls/payment.py
+++ b/compensation/urls/payment.py
@@ -8,7 +8,8 @@ Created on: 24.08.21
 from django.urls import path
 from compensation.views.payment import *
 
+app_name = "pay"
 urlpatterns = [
-    path('<intervention_id>/new', new_payment_view, name='pay-new'),
-    path('<id>/remove', payment_remove_view, name='pay-remove'),
+    path('<intervention_id>/new', new_payment_view, name='new'),
+    path('<id>/remove', payment_remove_view, name='remove'),
 ]
diff --git a/compensation/urls/urls.py b/compensation/urls/urls.py
index 58765bcb..870d290d 100644
--- a/compensation/urls/urls.py
+++ b/compensation/urls/urls.py
@@ -10,6 +10,6 @@ from django.urls import path, include
 app_name = "compensation"
 urlpatterns = [
     path("", include("compensation.urls.compensation")),
-    path("acc/", include("compensation.urls.eco_account")),
-    path("pay/", include("compensation.urls.payment")),
+    path("acc/", include("compensation.urls.eco_account", namespace="acc")),
+    path("pay/", include("compensation.urls.payment", namespace="pay")),
 ]
\ No newline at end of file
diff --git a/compensation/views/eco_account.py b/compensation/views/eco_account.py
index 988b0c50..d1d6ddbf 100644
--- a/compensation/views/eco_account.py
+++ b/compensation/views/eco_account.py
@@ -24,6 +24,7 @@ from konova.contexts import BaseContext
 from konova.decorators import any_group_check, default_group_required, conservation_office_group_required, \
     shared_access_required
 from konova.forms import RemoveModalForm, SimpleGeomForm, NewDocumentForm, RecordModalForm
+from konova.models import Deadline
 from konova.settings import DEFAULT_GROUP, ZB_GROUP, ETS_GROUP
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.documents import get_document, remove_document
@@ -89,7 +90,7 @@ def new_view(request: HttpRequest):
                     )
                 )
             messages.success(request, _("Eco-Account {} added").format(acc.identifier))
-            return redirect("compensation:acc-detail", id=acc.id)
+            return redirect("compensation:acc:detail", id=acc.id)
         else:
             messages.error(request, FORM_INVALID, extra_tags="danger",)
     else:
@@ -147,7 +148,7 @@ def edit_view(request: HttpRequest, id: str):
             # The data form takes the geom form for processing, as well as the performing user
             acc = data_form.save(request.user, geom_form)
             messages.success(request, _("Eco-Account {} edited").format(acc.identifier))
-            return redirect("compensation:acc-detail", id=acc.id)
+            return redirect("compensation:acc:detail", id=acc.id)
         else:
             messages.error(request, FORM_INVALID, extra_tags="danger",)
     else:
@@ -254,13 +255,13 @@ def remove_view(request: HttpRequest, id: str):
         user = request.user
         if not in_group(user, ETS_GROUP):
             messages.info(request, CANCEL_ACC_RECORDED_OR_DEDUCTED)
-            return redirect("compensation:acc-detail", id=id)
+            return redirect("compensation:acc:detail", id=id)
 
     form = RemoveModalForm(request.POST or None, instance=acc, request=request)
     return form.process_request(
         request=request,
         msg_success=_("Eco-account removed"),
-        redirect_url=reverse("compensation:acc-index"),
+        redirect_url=reverse("compensation:acc:index"),
     )
 
 
@@ -287,7 +288,8 @@ def deduction_remove_view(request: HttpRequest, id: str, deduction_id: str):
     form = RemoveModalForm(request.POST or None, instance=eco_deduction, request=request)
     return form.process_request(
         request=request,
-        msg_success=_("Deduction removed")
+        msg_success=_("Deduction removed"),
+        redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -357,7 +359,8 @@ def state_new_view(request: HttpRequest, id: str):
     form = NewStateModalForm(request.POST or None, instance=acc, request=request)
     return form.process_request(
         request,
-        msg_success=_("State added")
+        msg_success=_("State added"),
+        redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -378,7 +381,8 @@ def action_new_view(request: HttpRequest, id: str):
     form = NewActionModalForm(request.POST or None, instance=acc, request=request)
     return form.process_request(
         request,
-        msg_success=_("Action added")
+        msg_success=_("Action added"),
+        redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -400,7 +404,8 @@ def state_remove_view(request: HttpRequest, id: str, state_id: str):
     form = RemoveModalForm(request.POST or None, instance=state, request=request)
     return form.process_request(
         request,
-        msg_success=_("State removed")
+        msg_success=_("State removed"),
+        redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -422,7 +427,31 @@ def action_remove_view(request: HttpRequest, id: str, action_id: str):
     form = RemoveModalForm(request.POST or None, instance=action, request=request)
     return form.process_request(
         request,
-        msg_success=_("Action removed")
+        msg_success=_("Action removed"),
+        redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
+    )
+
+
+@login_required
+@default_group_required
+@shared_access_required(EcoAccount, "id")
+def deadline_remove_view(request: HttpRequest, id: str, deadline_id: str):
+    """ Renders a form for removing deadlines from a compensation
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The compensation's id
+        deadline_id (str): The deadline's id
+
+    Returns:
+
+    """
+    deadline = get_object_or_404(Deadline, id=deadline_id)
+    form = RemoveModalForm(request.POST or None, instance=deadline, request=request)
+    return form.process_request(
+        request,
+        msg_success=_("Deadline removed"),
+        redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -443,7 +472,8 @@ def deadline_new_view(request: HttpRequest, id: str):
     form = NewDeadlineModalForm(request.POST or None, instance=acc, request=request)
     return form.process_request(
         request,
-        msg_success=_("Deadline added")
+        msg_success=_("Deadline added"),
+        redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -463,7 +493,8 @@ def new_document_view(request: HttpRequest, id: str):
     form = NewEcoAccountDocumentForm(request.POST or None, request.FILES or None, instance=acc, request=request)
     return form.process_request(
         request,
-        msg_success=_("Document added")
+        msg_success=_("Document added"),
+        redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data",
     )
 
 
@@ -490,7 +521,7 @@ def get_document_view(request: HttpRequest, doc_id: str):
             request,
             DATA_UNSHARED
         )
-        return redirect("compensation:acc-detail", id=instance.id)
+        return redirect("compensation:acc:detail", id=instance.id)
     return get_document(doc)
 
 
@@ -534,7 +565,7 @@ def new_deduction_view(request: HttpRequest, id: str):
     return form.process_request(
         request,
         msg_success=_("Deduction added"),
-        redirect_url=reverse("compensation:detail", args=(id,)) + "#related_data"
+        redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -633,7 +664,7 @@ def share_view(request: HttpRequest, id: str, token: str):
                 _("{} has been shared with you").format(obj.identifier)
             )
             obj.share_with(user)
-        return redirect("compensation:acc-detail", id=id)
+        return redirect("compensation:acc:detail", id=id)
     else:
         messages.error(
             request,
diff --git a/ema/models/ema.py b/ema/models/ema.py
index f0c4d234..de67ed8e 100644
--- a/ema/models/ema.py
+++ b/ema/models/ema.py
@@ -11,6 +11,7 @@ from django.contrib import messages
 from django.db import models
 from django.db.models import QuerySet
 from django.http import HttpRequest
+from django.urls import reverse
 
 from compensation.models import AbstractCompensation
 from ema.managers import EmaManager
@@ -119,6 +120,14 @@ class Ema(AbstractCompensation, ShareableObjectMixin, RecordableObjectMixin):
         is_ready = is_recorded
         return is_ready
 
+    def get_share_link(self):
+        """ Returns the share url for the object
+
+        Returns:
+
+        """
+        return reverse("ema:share", args=(self.id, self.access_token))
+
 
 class EmaDocument(AbstractDocument):
     """
diff --git a/ema/templates/ema/detail/includes/deadlines.html b/ema/templates/ema/detail/includes/deadlines.html
index 36bda6fd..cfce5095 100644
--- a/ema/templates/ema/detail/includes/deadlines.html
+++ b/ema/templates/ema/detail/includes/deadlines.html
@@ -48,7 +48,7 @@
                 <td class="align-middle">{{ deadline.comment }}</td>
                 <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'deadline-remove' deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
+                    <button data-form-url="{% url 'ema:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/ema/templates/ema/detail/view.html b/ema/templates/ema/detail/view.html
index 8ed7aa26..3e7f2d30 100644
--- a/ema/templates/ema/detail/view.html
+++ b/ema/templates/ema/detail/view.html
@@ -95,26 +95,27 @@
         </div>
     </div>
     <hr>
-
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'ema/detail/includes/states-before.html' %}
+    <div id="related_data">
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'ema/detail/includes/states-before.html' %}
+            </div>
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'ema/detail/includes/states-after.html' %}
+            </div>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'ema/detail/includes/states-after.html' %}
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'ema/detail/includes/actions.html' %}
+            </div>
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'ema/detail/includes/deadlines.html' %}
+            </div>
         </div>
-    </div>
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'ema/detail/includes/actions.html' %}
-        </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'ema/detail/includes/deadlines.html' %}
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'ema/detail/includes/documents.html' %}
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'ema/detail/includes/documents.html' %}
+            </div>
         </div>
     </div>
 
diff --git a/ema/urls.py b/ema/urls.py
index a732f327..1aa52780 100644
--- a/ema/urls.py
+++ b/ema/urls.py
@@ -23,12 +23,12 @@ urlpatterns = [
     path('<id>/action/new', action_new_view, name='new-action'),
     path('<id>/state/<state_id>/remove', state_remove_view, name='state-remove'),
     path('<id>/action/<action_id>/remove', action_remove_view, name='action-remove'),
+    path('<id>/deadline/<deadline_id>/remove', deadline_remove_view, name='deadline-remove'),
     path('<id>/deadline/new', deadline_new_view, name="new-deadline"),
     path('<id>/share/<token>', share_view, name='share'),
     path('<id>/share', create_share_view, name='share-create'),
 
     # Documents
-    # Document remove route can be found in konova/urls.py
     path('<id>/document/new/', document_new_view, name='new-doc'),
     path('document/<doc_id>', get_document_view, name='get-doc'),
     path('document/<doc_id>/remove/', remove_document_view, name='remove-doc'),
diff --git a/ema/views.py b/ema/views.py
index 8a3454e3..01d8ea24 100644
--- a/ema/views.py
+++ b/ema/views.py
@@ -15,6 +15,7 @@ from konova.contexts import BaseContext
 from konova.decorators import conservation_office_group_required, shared_access_required
 from ema.models import Ema, EmaDocument
 from konova.forms import RemoveModalForm, SimpleGeomForm, RecordModalForm
+from konova.models import Deadline
 from konova.settings import DEFAULT_GROUP, ZB_GROUP, ETS_GROUP
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.documents import get_document, remove_document
@@ -290,7 +291,8 @@ def state_new_view(request: HttpRequest, id: str):
     form = NewStateModalForm(request.POST or None, instance=ema, request=request)
     return form.process_request(
         request,
-        msg_success=_("State added")
+        msg_success=_("State added"),
+        redirect_url=reverse("ema:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -311,7 +313,8 @@ def action_new_view(request: HttpRequest, id: str):
     form = NewActionModalForm(request.POST or None, instance=ema, request=request)
     return form.process_request(
         request,
-        msg_success=_("Action added")
+        msg_success=_("Action added"),
+        redirect_url=reverse("ema:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -332,7 +335,8 @@ def deadline_new_view(request: HttpRequest, id: str):
     form = NewDeadlineModalForm(request.POST or None, instance=ema, request=request)
     return form.process_request(
         request,
-        msg_success=_("Deadline added")
+        msg_success=_("Deadline added"),
+        redirect_url=reverse("ema:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -352,7 +356,8 @@ def document_new_view(request: HttpRequest, id: str):
     form = NewEmaDocumentForm(request.POST or None, request.FILES or None, instance=ema, request=request)
     return form.process_request(
         request,
-        msg_success=_("Document added")
+        msg_success=_("Document added"),
+        redirect_url=reverse("ema:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -422,7 +427,8 @@ def state_remove_view(request: HttpRequest, id: str, state_id: str):
     form = RemoveModalForm(request.POST or None, instance=state, request=request)
     return form.process_request(
         request,
-        msg_success=_("State removed")
+        msg_success=_("State removed"),
+        redirect_url=reverse("ema:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -444,7 +450,8 @@ def action_remove_view(request: HttpRequest, id: str, action_id: str):
     form = RemoveModalForm(request.POST or None, instance=action, request=request)
     return form.process_request(
         request,
-        msg_success=_("Action removed")
+        msg_success=_("Action removed"),
+        redirect_url=reverse("ema:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -564,4 +571,27 @@ def create_share_view(request: HttpRequest, id: str):
     return form.process_request(
         request,
         msg_success=_("Share settings updated")
+    )
+
+
+@login_required
+@conservation_office_group_required
+@shared_access_required(Ema, "id")
+def deadline_remove_view(request: HttpRequest, id: str, deadline_id: str):
+    """ Renders a form for removing deadlines from a compensation
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The compensation's id
+        deadline_id (str): The deadline's id
+
+    Returns:
+
+    """
+    deadline = get_object_or_404(Deadline, id=deadline_id)
+    form = RemoveModalForm(request.POST or None, instance=deadline, request=request)
+    return form.process_request(
+        request,
+        msg_success=_("Deadline removed"),
+        redirect_url=reverse("ema:detail", args=(id,)) + "#related_data"
     )
\ No newline at end of file
diff --git a/intervention/forms/modalForms.py b/intervention/forms/modalForms.py
index 06997235..b7330aec 100644
--- a/intervention/forms/modalForms.py
+++ b/intervention/forms/modalForms.py
@@ -80,10 +80,8 @@ class ShareModalForm(BaseModalForm):
 
         """
         # Initialize share_link field
-        url_name = f"{self.instance._meta.app_label}:share"
-        self.share_link = self.request.build_absolute_uri(
-            reverse(url_name, args=(self.instance.id, self.instance.access_token,))
-        )
+        share_link = self.instance.get_share_link()
+        self.share_link = self.request.build_absolute_uri(share_link)
         self.initialize_form_field(
             "url",
             self.share_link
diff --git a/intervention/models/intervention.py b/intervention/models/intervention.py
index 47539206..24018fe7 100644
--- a/intervention/models/intervention.py
+++ b/intervention/models/intervention.py
@@ -8,6 +8,7 @@ Created on: 15.11.21
 import shutil
 
 from django.contrib import messages
+from django.urls import reverse
 from django.utils import timezone
 
 from user.models import User
@@ -299,6 +300,14 @@ class Intervention(BaseObject, ShareableObjectMixin, RecordableObjectMixin, Chec
                    and is_free_of_revocations
         return is_ready
 
+    def get_share_link(self):
+        """ Returns the share url for the object
+
+        Returns:
+
+        """
+        return reverse("intervention:share", args=(self.id, self.access_token))
+
 
 class InterventionDocument(AbstractDocument):
     """
diff --git a/intervention/templates/intervention/detail/includes/deductions.html b/intervention/templates/intervention/detail/includes/deductions.html
index 6bb602d6..3e320a1b 100644
--- a/intervention/templates/intervention/detail/includes/deductions.html
+++ b/intervention/templates/intervention/detail/includes/deductions.html
@@ -11,7 +11,7 @@
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
                     {% if is_default_member and has_access  %}
-                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'intervention:acc-new-deduction' obj.id %}" title="{% trans 'Add new deduction' %}">
+                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'intervention:new-deduction' obj.id %}" title="{% trans 'Add new deduction' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'tree' %}
                     </button>
@@ -44,7 +44,7 @@
             {% for deduction in obj.deductions.all %}
             <tr {% if deduction.account.deleted %}class="align-middle alert-danger" title="{% trans 'Eco-account deleted! Deduction invalid!' %}" {% elif not deduction.account.recorded %}class="align-middle alert-danger" title="{% trans 'Eco-account not recorded! Deduction invalid!' %}"  {% endif %}>
                 <td class="align-middle">
-                    <a href="{% url 'compensation:acc-detail' deduction.account.id %}">
+                    <a href="{% url 'compensation:acc:detail' deduction.account.id %}">
                         {% if deduction.account.deleted or not deduction.account.recorded %}
                         {% fa5_icon 'exclamation-triangle' %}
                         {% endif %}
@@ -55,7 +55,7 @@
                 <td class="align-middle">{{ deduction.created.timestamp|default_if_none:""|naturalday}}</td>
                 <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc-remove-deduction' deduction.account.id deduction.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove Deduction' %}">
+                    <button data-form-url="{% url 'compensation:acc:remove-deduction' deduction.account.id deduction.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove Deduction' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/intervention/templates/intervention/detail/includes/payments.html b/intervention/templates/intervention/detail/includes/payments.html
index c3ab7568..4277eb25 100644
--- a/intervention/templates/intervention/detail/includes/payments.html
+++ b/intervention/templates/intervention/detail/includes/payments.html
@@ -11,7 +11,7 @@
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
                     {% if is_default_member and has_access  %}
-                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:pay-new' obj.id %}" title="{% trans 'Add new payment' %}">
+                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:pay:new' obj.id %}" title="{% trans 'Add new payment' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'money-bill-wave' %}
                     </button>
@@ -50,7 +50,7 @@
                 <td class="align-middle">{{ pay.comment }}</td>
                 <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:pay-remove' pay.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove payment' %}">
+                    <button data-form-url="{% url 'compensation:pay:remove' pay.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove payment' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/intervention/templates/intervention/report/report.html b/intervention/templates/intervention/report/report.html
index ac6c29ea..ca5aa109 100644
--- a/intervention/templates/intervention/report/report.html
+++ b/intervention/templates/intervention/report/report.html
@@ -62,7 +62,7 @@
                         <th scope="row">{% trans 'Deductions of eco-accounts' %}</th>
                         <td class="align-middle">
                             {% for deduction in deductions %}
-                                <a href="{% url 'compensation:acc-report' deduction.account.id %}">
+                                <a href="{% url 'compensation:acc:report' deduction.account.id %}">
                                     {{deduction.account.identifier}} - {{deduction.account.title}}
                                 </a>
                                 <br>
diff --git a/intervention/tests/test_workflow.py b/intervention/tests/test_workflow.py
index 005c6f5f..fbc2f81f 100644
--- a/intervention/tests/test_workflow.py
+++ b/intervention/tests/test_workflow.py
@@ -210,7 +210,7 @@ class InterventionWorkflowTestCase(BaseWorkflowTestCase):
         # Attention: Despite the fact, this url refers to a compensation app route, we test it here for the interventions.
         # Reason: A payment is some kind of compensation for an intervention. Therefore it lives inside the compensation app.
         # BUT: Payments are added on the intervention detail page. Therefore it's part of a regular intervention workflow.
-        new_payment_url = reverse("compensation:pay-new", args=(self.intervention.id,))
+        new_payment_url = reverse("compensation:pay:new", args=(self.intervention.id,))
 
         # Make sure there are no payments on the intervention, yet
         self.assertEqual(0, self.intervention.payments.count())
@@ -251,7 +251,7 @@ class InterventionWorkflowTestCase(BaseWorkflowTestCase):
 
         """
         # Create removing url for the payment
-        remove_url = reverse("compensation:pay-remove", args=(payment.id,))
+        remove_url = reverse("compensation:pay:remove", args=(payment.id,))
         post_data = {
             "confirm": True,
         }
@@ -390,7 +390,7 @@ class InterventionWorkflowTestCase(BaseWorkflowTestCase):
 
         """
         # Create the url for creating a new deduction
-        new_url = reverse("compensation:acc-new-deduction", args=(self.eco_account.id,))
+        new_url = reverse("compensation:acc:new-deduction", args=(self.eco_account.id,))
 
         # Prepare the form data
         test_surface = 100.00
@@ -415,7 +415,7 @@ class InterventionWorkflowTestCase(BaseWorkflowTestCase):
 
         """
         # Prepare url for deleting of this deduction
-        delete_url = reverse("compensation:acc-remove-deduction", args=(self.eco_account.id, deduction.id,))
+        delete_url = reverse("compensation:acc:remove-deduction", args=(self.eco_account.id, deduction.id,))
         post_data = {
             "confirm": True
         }
diff --git a/intervention/urls.py b/intervention/urls.py
index df1e0d76..dc757da7 100644
--- a/intervention/urls.py
+++ b/intervention/urls.py
@@ -32,7 +32,7 @@ urlpatterns = [
     path('document/<doc_id>/remove/', remove_document_view, name='remove-doc'),
 
     # Deductions
-    path('<id>/deduction/new', new_deduction_view, name='acc-new-deduction'),
+    path('<id>/deduction/new', new_deduction_view, name='new-deduction'),
 
     # Revocation routes
     path('<id>/revocation/new', new_revocation_view, name='new-revocation'),
diff --git a/konova/models/object.py b/konova/models/object.py
index 723d0eb2..c5ad501d 100644
--- a/konova/models/object.py
+++ b/konova/models/object.py
@@ -479,6 +479,15 @@ class ShareableObjectMixin(models.Model):
         """
         return self.users.all()
 
+    @abstractmethod
+    def get_share_url(self):
+        """ Returns the share url for the object
+
+        Returns:
+
+        """
+        raise NotImplementedError("Must be implemented in subclasses!")
+
 
 class GeoReferencedMixin(models.Model):
     geometry = models.ForeignKey("konova.Geometry", null=True, blank=True, on_delete=models.SET_NULL)
diff --git a/konova/templates/konova/includes/quickstart/ecoaccounts.html b/konova/templates/konova/includes/quickstart/ecoaccounts.html
index aa5cc68a..13301506 100644
--- a/konova/templates/konova/includes/quickstart/ecoaccounts.html
+++ b/konova/templates/konova/includes/quickstart/ecoaccounts.html
@@ -4,7 +4,7 @@
     {% trans 'Eco-account' %}
 </h4>
 <div class="row">
-    <a class="text-decoration-none" href="{% url 'compensation:acc-index' %}">
+    <a class="text-decoration-none" href="{% url 'compensation:acc:index' %}">
         <div class="col-sm-5">
             <div class="qs-box d-flex justify-content-center align-items-center">
                 {% fa5_icon 'tree' %}
@@ -26,12 +26,12 @@
     <div class="col-sm-12 col-lg">
         <div class="col-sm">
             <div class="row my-1">
-                <a href="{% url 'compensation:acc-new' %}">
+                <a href="{% url 'compensation:acc:new' %}">
                     <button class="btn btn-default">{% fa5_icon 'plus' %} {% trans 'Create' %}</button>
                 </a>
             </div>
             <div class="row my-1">
-                <a href="{% url 'compensation:acc-index' %}">
+                <a href="{% url 'compensation:acc:index' %}">
                     <button class="btn btn-default">{% fa5_icon 'eye' %} {% trans 'Show' %}</button>
                 </a>
             </div>
diff --git a/konova/urls.py b/konova/urls.py
index 267b35c4..68256e7a 100644
--- a/konova/urls.py
+++ b/konova/urls.py
@@ -23,7 +23,7 @@ from konova.autocompletes import EcoAccountAutocomplete, \
     ShareUserAutocomplete, BiotopeExtraCodeAutocomplete, CompensationActionDetailCodeAutocomplete
 from konova.settings import SSO_SERVER, SSO_PUBLIC_KEY, SSO_PRIVATE_KEY, DEBUG
 from konova.sso.sso import KonovaSSOClient
-from konova.views import logout_view, home_view, remove_deadline_view
+from konova.views import logout_view, home_view
 
 sso_client = KonovaSSOClient(SSO_SERVER, SSO_PUBLIC_KEY, SSO_PRIVATE_KEY)
 urlpatterns = [
@@ -40,9 +40,6 @@ urlpatterns = [
     path('analysis/', include("analysis.urls")),
     path('api/', include("api.urls")),
 
-    # Generic deadline routes
-    path('deadline/<id>/remove', remove_deadline_view, name="deadline-remove"),
-
     # Autocomplete paths for all apps
     path("atcmplt/eco-accounts", EcoAccountAutocomplete.as_view(), name="accounts-autocomplete"),
     path("atcmplt/interventions", InterventionAutocomplete.as_view(), name="interventions-autocomplete"),
diff --git a/konova/views.py b/konova/views.py
index d46a0228..2a4c8ad5 100644
--- a/konova/views.py
+++ b/konova/views.py
@@ -99,25 +99,6 @@ def home_view(request: HttpRequest):
     return render(request, template, context)
 
 
-@login_required
-def remove_deadline_view(request: HttpRequest, id:str):
-    """ Renders a modal form for removing a deadline object
-
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): The deadline id
-
-    Returns:
-
-    """
-    deadline = get_object_or_404(Deadline, id=id)
-    form = RemoveModalForm(request.POST or None, instance=deadline, request=request)
-    return form.process_request(
-        request,
-        msg_success=_("Deadline removed")
-    )
-
-
 def get_404_view(request: HttpRequest, exception=None):
     """ Returns a 404 handling view
 
diff --git a/templates/navbars/navbar.html b/templates/navbars/navbar.html
index a5938e09..ffb27e8d 100644
--- a/templates/navbars/navbar.html
+++ b/templates/navbars/navbar.html
@@ -29,7 +29,7 @@
                 </a>
             </li>
             <li class=" menu-elem">
-                <a class="nav-btn nav-link" href="{% url 'compensation:acc-index' %}">
+                <a class="nav-btn nav-link" href="{% url 'compensation:acc:index' %}">
                     {% fa5_icon 'tree' %}
                     {% trans 'Eco-account' %}
                 </a>

From 77b59db56fd7a4017b117a4ba990d4dbee7100cd Mon Sep 17 00:00:00 2001
From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de>
Date: Wed, 2 Feb 2022 12:54:45 +0100
Subject: [PATCH 04/12] # 86 Comment field length

* removes comment field length limit
* adds improvements for rendering large comments
---
 compensation/forms/modalForms.py                 |  3 +--
 .../detail/compensation/includes/actions.html    |  9 +++++++--
 .../detail/compensation/includes/deadlines.html  |  6 +++++-
 .../detail/compensation/includes/documents.html  |  8 ++++++--
 .../detail/eco_account/includes/actions.html     | 10 +++++++---
 .../detail/eco_account/includes/deadlines.html   |  8 ++++++--
 .../detail/eco_account/includes/documents.html   |  8 ++++++--
 ema/templates/ema/detail/includes/actions.html   |  8 ++++++--
 ema/templates/ema/detail/includes/deadlines.html |  8 ++++++--
 ema/templates/ema/detail/includes/documents.html |  8 ++++++--
 .../intervention/detail/includes/documents.html  |  8 ++++++--
 .../intervention/detail/includes/payments.html   |  8 ++++++--
 .../intervention/detail/includes/revocation.html |  8 ++++++--
 konova/templatetags/ksp_filters.py               | 16 ++++++++++++++++
 templates/base.html                              |  2 +-
 15 files changed, 91 insertions(+), 27 deletions(-)

diff --git a/compensation/forms/modalForms.py b/compensation/forms/modalForms.py
index dd9f4c70..9e7419b6 100644
--- a/compensation/forms/modalForms.py
+++ b/compensation/forms/modalForms.py
@@ -346,10 +346,9 @@ class NewActionModalForm(BaseModalForm):
     )
     comment = forms.CharField(
         required=False,
-        max_length=200,
         label=_("Comment"),
         label_suffix=_(""),
-        help_text=_("Additional comment, maximum {} letters").format(200),
+        help_text=_("Additional comment"),
         widget=forms.Textarea(
             attrs={
                 "rows": 5,
diff --git a/compensation/templates/compensation/detail/compensation/includes/actions.html b/compensation/templates/compensation/detail/compensation/includes/actions.html
index 648e777a..129673ef 100644
--- a/compensation/templates/compensation/detail/compensation/includes/actions.html
+++ b/compensation/templates/compensation/detail/compensation/includes/actions.html
@@ -1,4 +1,5 @@
-{% load i18n l10n fontawesome_5 humanize %}
+{% load i18n l10n fontawesome_5 humanize ksp_filters %}
+
 <div id="actions" class="card">
     <div class="card-header rlp-r">
         <div class="row">
@@ -55,7 +56,11 @@
                     {% endfor %}
                 </td>
                 <td class="align-middle">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
-                <td class="align-middle">{{ action.comment|default_if_none:"" }}</td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ action.comment }}
+                    </div>
+                </td>
                 <td class="align-middle">
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:action-remove' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove action' %}">
diff --git a/compensation/templates/compensation/detail/compensation/includes/deadlines.html b/compensation/templates/compensation/detail/compensation/includes/deadlines.html
index 8897483e..dcf3894a 100644
--- a/compensation/templates/compensation/detail/compensation/includes/deadlines.html
+++ b/compensation/templates/compensation/detail/compensation/includes/deadlines.html
@@ -47,7 +47,11 @@
                     {% trans deadline.type_humanized %}
                 </td>
                 <td class="align-middle">{{ deadline.date|default_if_none:"---" }}</td>
-                <td class="align-middle">{{ deadline.comment }}</td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ deadline.comment }}
+                    </div>
+                </td>
                 <td>
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
diff --git a/compensation/templates/compensation/detail/compensation/includes/documents.html b/compensation/templates/compensation/detail/compensation/includes/documents.html
index 7e958f6d..108db76c 100644
--- a/compensation/templates/compensation/detail/compensation/includes/documents.html
+++ b/compensation/templates/compensation/detail/compensation/includes/documents.html
@@ -45,8 +45,12 @@
                         {{ doc.title }}
                     </a>
                 </td>
-                <td class="align-middle">{{ doc.comment }}</td>
-                <td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ doc.comment }}
+                    </div>
+                </td>
+                <td class="align-middle">
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
                         {% fa5_icon 'trash' %}
diff --git a/compensation/templates/compensation/detail/eco_account/includes/actions.html b/compensation/templates/compensation/detail/eco_account/includes/actions.html
index 67dd2bbf..b4701744 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/actions.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/actions.html
@@ -1,4 +1,4 @@
-{% load i18n l10n fontawesome_5 humanize %}
+{% load i18n l10n fontawesome_5 humanize ksp_filters %}
 <div id="actions" class="card">
     <div class="card-header rlp-r">
         <div class="row">
@@ -36,7 +36,7 @@
                 <th scope="col">
                     {% trans 'Comment' %}
                 </th>
-                {% if default_member and has_access %}
+                {% if is_default_member and has_access %}
                     <th scope="col">
                         {% trans 'Action' %}
                     </th>
@@ -55,7 +55,11 @@
                     {% endfor %}
                 </td>
                 <td class="align-middle">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
-                <td class="align-middle">{{ action.comment|default_if_none:"" }}</td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ action.comment }}
+                    </div>
+                </td>
                 <td class="align-middle">
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:acc:action-remove' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove action' %}">
diff --git a/compensation/templates/compensation/detail/eco_account/includes/deadlines.html b/compensation/templates/compensation/detail/eco_account/includes/deadlines.html
index a1764df8..b57c4ad0 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/deadlines.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/deadlines.html
@@ -45,8 +45,12 @@
                     {% trans deadline.type_humanized %}
                 </td>
                 <td class="align-middle">{{ deadline.date|default_if_none:"---" }}</td>
-                <td class="align-middle">{{ deadline.comment }}</td>
-                <td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ deadline.comment }}
+                    </div>
+                </td>
+                <td class="align-middle">
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:acc:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
                         {% fa5_icon 'trash' %}
diff --git a/compensation/templates/compensation/detail/eco_account/includes/documents.html b/compensation/templates/compensation/detail/eco_account/includes/documents.html
index f6376f46..3c8d89aa 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/documents.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/documents.html
@@ -43,8 +43,12 @@
                         {{ doc.title }}
                     </a>
                 </td>
-                <td class="align-middle">{{ doc.comment }}</td>
-                <td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ doc.comment }}
+                    </div>
+                </td>
+                <td class="align-middle">
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:acc:remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
                         {% fa5_icon 'trash' %}
diff --git a/ema/templates/ema/detail/includes/actions.html b/ema/templates/ema/detail/includes/actions.html
index fcd1d274..7425e3c3 100644
--- a/ema/templates/ema/detail/includes/actions.html
+++ b/ema/templates/ema/detail/includes/actions.html
@@ -1,4 +1,4 @@
-{% load i18n l10n fontawesome_5 humanize %}
+{% load i18n l10n fontawesome_5 humanize ksp_filters %}
 <div id="actions" class="card">
     <div class="card-header rlp-r">
         <div class="row">
@@ -53,7 +53,11 @@
                     {% endfor %}
                 </td>
                 <td class="align-middle">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
-                <td class="align-middle">{{ action.comment|default_if_none:"" }}</td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ action.comment }}
+                    </div>
+                </td>
                 <td class="align-middle">
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'ema:action-remove' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove action' %}">
diff --git a/ema/templates/ema/detail/includes/deadlines.html b/ema/templates/ema/detail/includes/deadlines.html
index cfce5095..83ba4067 100644
--- a/ema/templates/ema/detail/includes/deadlines.html
+++ b/ema/templates/ema/detail/includes/deadlines.html
@@ -45,8 +45,12 @@
                     {% trans deadline.type_humanized %}
                 </td>
                 <td class="align-middle">{{ deadline.date|default_if_none:"---" }}</td>
-                <td class="align-middle">{{ deadline.comment }}</td>
-                <td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ deadline.comment }}
+                    </div>
+                </td>
+                <td class="align-middle">
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'ema:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
                         {% fa5_icon 'trash' %}
diff --git a/ema/templates/ema/detail/includes/documents.html b/ema/templates/ema/detail/includes/documents.html
index 96a24a67..3218917c 100644
--- a/ema/templates/ema/detail/includes/documents.html
+++ b/ema/templates/ema/detail/includes/documents.html
@@ -43,8 +43,12 @@
                         {{ doc.title }}
                     </a>
                 </td>
-                <td class="align-middle">{{ doc.comment }}</td>
-                <td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ doc.comment }}
+                    </div>
+                </td>
+                <td class="align-middle">
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'ema:remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
                         {% fa5_icon 'trash' %}
diff --git a/intervention/templates/intervention/detail/includes/documents.html b/intervention/templates/intervention/detail/includes/documents.html
index cc0c9a17..b8e8ab39 100644
--- a/intervention/templates/intervention/detail/includes/documents.html
+++ b/intervention/templates/intervention/detail/includes/documents.html
@@ -45,8 +45,12 @@
                         {{ doc.title }}
                     </a>
                 </td>
-                <td class="align-middle">{{ doc.comment }}</td>
-                <td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ doc.comment }}
+                    </div>
+                </td>
+                <td class="align-middle">
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'intervention:remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
                         {% fa5_icon 'trash' %}
diff --git a/intervention/templates/intervention/detail/includes/payments.html b/intervention/templates/intervention/detail/includes/payments.html
index 4277eb25..641f2c2f 100644
--- a/intervention/templates/intervention/detail/includes/payments.html
+++ b/intervention/templates/intervention/detail/includes/payments.html
@@ -47,8 +47,12 @@
                     {{ pay.amount|floatformat:2 }} €
                 </td>
                 <td class="align-middle">{{ pay.due_on|default_if_none:"---" }}</td>
-                <td class="align-middle">{{ pay.comment }}</td>
-                <td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ pay.comment }}
+                    </div>
+                </td>
+                <td class="align-middle">
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:pay:remove' pay.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove payment' %}">
                         {% fa5_icon 'trash' %}
diff --git a/intervention/templates/intervention/detail/includes/revocation.html b/intervention/templates/intervention/detail/includes/revocation.html
index cc3e7b3e..66e89261 100644
--- a/intervention/templates/intervention/detail/includes/revocation.html
+++ b/intervention/templates/intervention/detail/includes/revocation.html
@@ -56,8 +56,12 @@
                             </a>
                         {% endif %}
                     </td>
-                    <td class="align-middle">{{ rev.comment }}</td>
-                    <td>
+                    <td class="align-middle">
+                        <div class="scroll-150">
+                            {{ rev.comment }}
+                        </div>
+                    </td>
+                    <td class="align-middle">
                         {% if is_default_member and has_access  %}
                         <button data-form-url="{% url 'intervention:remove-revocation' rev.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove revocation' %}">
                             {% fa5_icon 'trash' %}
diff --git a/konova/templatetags/ksp_filters.py b/konova/templatetags/ksp_filters.py
index f311a538..f7820933 100644
--- a/konova/templatetags/ksp_filters.py
+++ b/konova/templatetags/ksp_filters.py
@@ -52,3 +52,19 @@ def default_if_zero(val1, val2):
 
     """
     return val1 if val1 > 0 else val2
+
+
+@register.filter("shorten")
+def shorten(val, length):
+    """ Returns val shortened to the first number of length character
+
+    Args:
+        val (str): The value
+        length (int): The number of characters left
+
+    Returns:
+
+    """
+    if val is not None and len(val) > length:
+        val = f"{val[:length]}..."
+    return val
diff --git a/templates/base.html b/templates/base.html
index 2f5e5b24..ccbd8f9f 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -23,7 +23,7 @@
             {% include 'navbars/navbar.html' %}
         {% endblock %}
     </header>
-    <div class="container-fluid mt-3 px-5">
+    <div class="container-fluid mt-3">
         <div class="">
         {% for message in messages %}
             <div class="row alert alert-{{ message.tags }}">

From 874b26635228a67c1dc05d36e435c0bea9098c23 Mon Sep 17 00:00:00 2001
From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de>
Date: Wed, 2 Feb 2022 14:18:44 +0100
Subject: [PATCH 05/12] # 86 Visual improvements

* moves message rendering directly below navigation menu for a more closed look
* reworks message rendering on before_states and after_states for all compensation related datatypes
* reworks layout of action column on all related data card tables
* resizes certain attribute layouts on related data card tables
* reworks layout of details on CompensationState and CompensationAction rendering from own column into subgrouped placement of main type info
* drops align-middle placement for all related data card table contents
---
 .../detail/compensation/includes/actions.html | 36 ++++++++-------
 .../compensation/includes/deadlines.html      |  8 ++--
 .../compensation/includes/documents.html      |  8 ++--
 .../compensation/includes/states-after.html   | 46 +++++++++----------
 .../compensation/includes/states-before.html  | 46 +++++++++----------
 .../detail/eco_account/includes/actions.html  | 36 ++++++++-------
 .../eco_account/includes/deadlines.html       |  8 ++--
 .../eco_account/includes/deductions.html      |  8 ++--
 .../eco_account/includes/documents.html       |  8 ++--
 .../eco_account/includes/states-after.html    | 46 +++++++++----------
 .../eco_account/includes/states-before.html   | 46 +++++++++----------
 .../ema/detail/includes/actions.html          | 34 +++++++-------
 .../ema/detail/includes/deadlines.html        |  8 ++--
 .../ema/detail/includes/documents.html        |  8 ++--
 .../ema/detail/includes/states-after.html     | 46 +++++++++----------
 .../ema/detail/includes/states-before.html    | 46 +++++++++----------
 .../detail/includes/compensations.html        | 10 ++--
 .../detail/includes/deductions.html           | 10 ++--
 .../detail/includes/documents.html            | 16 ++++---
 .../detail/includes/payments.html             | 10 ++--
 .../detail/includes/revocation.html           |  8 ++--
 templates/base.html                           | 13 +++---
 22 files changed, 267 insertions(+), 238 deletions(-)

diff --git a/compensation/templates/compensation/detail/compensation/includes/actions.html b/compensation/templates/compensation/detail/compensation/includes/actions.html
index 129673ef..806d19ff 100644
--- a/compensation/templates/compensation/detail/compensation/includes/actions.html
+++ b/compensation/templates/compensation/detail/compensation/includes/actions.html
@@ -21,16 +21,13 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th class="w-25" scope="col">
+                <th class="" scope="col">
                     {% trans 'Action type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Action type details' %}
-                </th>
                 <th scope="col">
                     {% trans 'Amount' context 'Compensation' %}
                 </th>
@@ -39,7 +36,9 @@
                 </th>
                 {% if is_default_member and has_access %}
                 <th scope="col">
-                    {% trans 'Action' %}
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
                 {% endif %}
             </tr>
@@ -47,23 +46,26 @@
             <tbody>
             {% for action in actions %}
             <tr>
-                <td class="align-middle">
-                    {{ action.action_type }}
+                <td class="">
+                    <span>{{ action.action_type }}</span>
+                    {% if action.action_type_details.count > 0 %}
+                        <hr>
+                        <span>{% trans 'Action type details' %}:</span>
+                        {% for detail in action.action_type_details.all %}
+                            <br>
+                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                        {% endfor %}
+                    {% endif %}
                 </td>
-                <td class="align-middle">
-                    {% for detail in action.action_type_details.all %}
-                        <div class="mb-2" title="{{detail}}">{{detail.long_name}}</div>
-                    {% endfor %}
-                </td>
-                <td class="align-middle">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
-                <td class="align-middle">
+                <td class="">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
+                <td class="">
                     <div class="scroll-150">
                         {{ action.comment }}
                     </div>
                 </td>
-                <td class="align-middle">
+                <td class="">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:action-remove' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove action' %}">
+                    <button data-form-url="{% url 'compensation:action-remove' obj.id action.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove action' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/compensation/includes/deadlines.html b/compensation/templates/compensation/detail/compensation/includes/deadlines.html
index dcf3894a..da4e21d6 100644
--- a/compensation/templates/compensation/detail/compensation/includes/deadlines.html
+++ b/compensation/templates/compensation/detail/compensation/includes/deadlines.html
@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -35,7 +35,9 @@
                 </th>
                 {% if is_default_member and has_access %}
                     <th scope="col">
-                        {% trans 'Action' %}
+                        <span class="float-right">
+                            {% trans 'Action' %}
+                        </span>
                     </th>
                 {% endif %}
             </tr>
@@ -54,7 +56,7 @@
                 </td>
                 <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
+                    <button data-form-url="{% url 'compensation:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove deadline' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/compensation/includes/documents.html b/compensation/templates/compensation/detail/compensation/includes/documents.html
index 108db76c..0615d4be 100644
--- a/compensation/templates/compensation/detail/compensation/includes/documents.html
+++ b/compensation/templates/compensation/detail/compensation/includes/documents.html
@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -32,7 +32,9 @@
                 </th>
                 {% if is_default_member and has_access %}
                     <th scope="col">
-                        {% trans 'Action' %}
+                        <span class="float-right">
+                            {% trans 'Action' %}
+                        </span>
                     </th>
                 {% endif %}
             </tr>
@@ -52,7 +54,7 @@
                 </td>
                 <td class="align-middle">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
+                    <button data-form-url="{% url 'compensation:remove-doc' doc.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove document' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/compensation/includes/states-after.html b/compensation/templates/compensation/detail/compensation/includes/states-after.html
index 408689a7..026d0a51 100644
--- a/compensation/templates/compensation/detail/compensation/includes/states-after.html
+++ b/compensation/templates/compensation/detail/compensation/includes/states-after.html
@@ -20,27 +20,26 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
-        {% if sum_before_states > sum_after_states %}
-            <div class="row alert alert-danger">
-                {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
-            </div>
-        {% endif %}
+    {% if sum_before_states > sum_after_states %}
+    <div class="alert alert-danger mb-0">
+        {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
+    </div>
+    {% endif %}
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th class="w-25" scope="col">
+                <th class="w-50" scope="col">
                     {% trans 'Biotope type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Biotope additional type' %}
-                </th>
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
                 {% if is_default_member and has_access %}
                 <th scope="col">
-                    {% trans 'Action' %}
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
                 {% endif %}
             </tr>
@@ -48,20 +47,21 @@
             <tbody>
             {% for state in after_states %}
             <tr>
-                <td class="align-middle">
-                    {{ state.biotope_type }}
+                <td>
+                    <span>{{ state.biotope_type }}</span>
+                    {% if state.biotope_type_details.count > 0 %}
+                        <hr>
+                        <span>{% trans 'Biotope additional type' %}:</span>
+                        {% for detail in state.biotope_type_details.all %}
+                            <br>
+                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                        {% endfor %}
+                    {% endif %}
                 </td>
-                <td class="align-middle">
-                    {% for biotope_extra in state.biotope_type_details.all %}
-                    <div class="mb-2" title="{{ biotope_extra }}">
-                        {{ biotope_extra.long_name }}
-                    </div>
-                    {% endfor %}
-                </td>
-                <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
-                <td class="align-middle">
+                <td>{{ state.surface|floatformat:2 }} m²</td>
+                <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
+                    <button data-form-url="{% url 'compensation:state-remove' obj.id state.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove state' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/compensation/includes/states-before.html b/compensation/templates/compensation/detail/compensation/includes/states-before.html
index 991f6c23..b9eeb341 100644
--- a/compensation/templates/compensation/detail/compensation/includes/states-before.html
+++ b/compensation/templates/compensation/detail/compensation/includes/states-before.html
@@ -20,27 +20,26 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
-        {% if sum_before_states < sum_after_states %}
-            <div class="row alert alert-danger">
-                {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
-            </div>
-        {% endif %}
+    {% if sum_before_states < sum_after_states %}
+    <div class="alert alert-danger mb-0">
+        {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
+    </div>
+    {% endif %}
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th class="w-25" scope="col">
+                <th class="w-50" scope="col">
                     {% trans 'Biotope type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Biotope additional type' %}
-                </th>
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
                 {% if is_default_member and has_access %}
                 <th scope="col">
-                    {% trans 'Action' %}
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
                 {% endif %}
             </tr>
@@ -48,20 +47,21 @@
             <tbody>
             {% for state in before_states %}
             <tr>
-                <td class="align-middle">
-                    {{ state.biotope_type }}
+                <td>
+                    <span>{{ state.biotope_type }}</span>
+                    {% if state.biotope_type_details.count > 0 %}
+                        <hr>
+                        <span>{% trans 'Biotope additional type' %}:</span>
+                        {% for detail in state.biotope_type_details.all %}
+                            <br>
+                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                        {% endfor %}
+                    {% endif %}
                 </td>
-                <td class="align-middle">
-                    {% for biotope_extra in state.biotope_type_details.all %}
-                    <div class="mb-2" title="{{ biotope_extra }}">
-                        {{ biotope_extra.long_name }}
-                    </div>
-                    {% endfor %}
-                </td>
-                <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
-                <td class="align-middle">
+                <td>{{ state.surface|floatformat:2 }} m²</td>
+                <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
+                    <button data-form-url="{% url 'compensation:state-remove' obj.id state.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove state' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/eco_account/includes/actions.html b/compensation/templates/compensation/detail/eco_account/includes/actions.html
index b4701744..2acd2594 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/actions.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/actions.html
@@ -20,16 +20,13 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th class="w-25" scope="col">
+                <th class="" scope="col">
                     {% trans 'Action type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Action type details' %}
-                </th>
                 <th scope="col">
                     {% trans 'Amount' context 'Compensation' %}
                 </th>
@@ -38,7 +35,9 @@
                 </th>
                 {% if is_default_member and has_access %}
                     <th scope="col">
-                        {% trans 'Action' %}
+                        <span class="float-right">
+                            {% trans 'Action' %}
+                        </span>
                     </th>
                 {% endif %}
             </tr>
@@ -46,23 +45,26 @@
             <tbody>
             {% for action in actions %}
             <tr>
-                <td class="align-middle">
-                    {{ action.action_type }}
+                <td class="">
+                    <span>{{ action.action_type }}</span>
+                    {% if action.action_type_details.count > 0 %}
+                        <hr>
+                        <span>{% trans 'Action type details' %}:</span>
+                        {% for detail in action.action_type_details.all %}
+                            <br>
+                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                        {% endfor %}
+                    {% endif %}
                 </td>
-                <td class="align-middle">
-                    {% for detail in action.action_type_details.all %}
-                        <div class="mb-2" title="{{detail}}">{{detail.long_name}}</div>
-                    {% endfor %}
-                </td>
-                <td class="align-middle">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
-                <td class="align-middle">
+                <td class="">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
+                <td class="">
                     <div class="scroll-150">
                         {{ action.comment }}
                     </div>
                 </td>
-                <td class="align-middle">
+                <td class="">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc:action-remove' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove action' %}">
+                    <button data-form-url="{% url 'compensation:acc:action-remove' obj.id action.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove action' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/eco_account/includes/deadlines.html b/compensation/templates/compensation/detail/eco_account/includes/deadlines.html
index b57c4ad0..ff8a5291 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/deadlines.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/deadlines.html
@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -34,7 +34,9 @@
                     {% trans 'Comment' %}
                 </th>
                 <th scope="col">
-                    {% trans 'Action' %}
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
             </tr>
             </thead>
@@ -52,7 +54,7 @@
                 </td>
                 <td class="align-middle">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
+                    <button data-form-url="{% url 'compensation:acc:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove deadline' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/eco_account/includes/deductions.html b/compensation/templates/compensation/detail/eco_account/includes/deductions.html
index ca97f005..e72ab2ab 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/deductions.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/deductions.html
@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -37,7 +37,9 @@
                     {% trans 'Created' %}
                 </th>
                 <th scope="col">
-                    {% trans 'Action' %}
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
             </tr>
             </thead>
@@ -60,7 +62,7 @@
                 <td class="align-middle">{{ deduction.created.timestamp|default_if_none:""|naturalday}}</td>
                 <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc:remove-deduction' deduction.account.id deduction.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove Deduction' %}">
+                    <button data-form-url="{% url 'compensation:acc:remove-deduction' deduction.account.id deduction.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove Deduction' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/eco_account/includes/documents.html b/compensation/templates/compensation/detail/eco_account/includes/documents.html
index 3c8d89aa..b3895eac 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/documents.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/documents.html
@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -31,7 +31,9 @@
                     {% trans 'Comment' %}
                 </th>
                 <th scope="col">
-                    {% trans 'Action' %}
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
             </tr>
             </thead>
@@ -50,7 +52,7 @@
                 </td>
                 <td class="align-middle">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc:remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
+                    <button data-form-url="{% url 'compensation:acc:remove-doc' doc.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove document' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/eco_account/includes/states-after.html b/compensation/templates/compensation/detail/eco_account/includes/states-after.html
index 17e7d44a..0cec0144 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/states-after.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/states-after.html
@@ -20,27 +20,26 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
-        {% if sum_before_states > sum_after_states %}
-            <div class="row alert alert-danger">
-                {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
-            </div>
-        {% endif %}
+    {% if sum_before_states > sum_after_states %}
+    <div class="alert alert-danger mb-0">
+        {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
+    </div>
+    {% endif %}
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th class="w-25" scope="col">
+                <th class="w-50" scope="col">
                     {% trans 'Biotope type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Biotope additional type' %}
-                </th>
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
                 {% if is_default_member and has_access %}
                 <th scope="col">
-                    {% trans 'Action' %}
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
                 {% endif %}
             </tr>
@@ -48,20 +47,21 @@
             <tbody>
             {% for state in after_states %}
             <tr>
-                <td class="align-middle">
-                    {{ state.biotope_type }}
+                <td>
+                    <span>{{ state.biotope_type }}</span>
+                    {% if state.biotope_type_details.count > 0 %}
+                        <hr>
+                        <span>{% trans 'Biotope additional type' %}:</span>
+                        {% for detail in state.biotope_type_details.all %}
+                            <br>
+                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                        {% endfor %}
+                    {% endif %}
                 </td>
-                <td class="align-middle">
-                    {% for biotope_extra in state.biotope_type_details.all %}
-                    <div class="mb-2" title="{{ biotope_extra }}">
-                        {{ biotope_extra.long_name }}
-                    </div>
-                    {% endfor %}
-                </td>
-                <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
-                <td class="align-middle">
+                <td>{{ state.surface|floatformat:2 }} m²</td>
+                <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
+                    <button data-form-url="{% url 'compensation:acc:state-remove' obj.id state.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove state' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/eco_account/includes/states-before.html b/compensation/templates/compensation/detail/eco_account/includes/states-before.html
index 3a1136ca..8c4a094a 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/states-before.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/states-before.html
@@ -20,27 +20,26 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
-        {% if sum_before_states < sum_after_states %}
-            <div class="row alert alert-danger">
-                {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
-            </div>
-        {% endif %}
+    {% if sum_before_states < sum_after_states %}
+    <div class="alert alert-danger mb-0">
+        {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
+    </div>
+    {% endif %}
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th class="w-25" scope="col">
+                <th class="w-50" scope="col">
                     {% trans 'Biotope type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Biotope additional type' %}
-                </th>
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
                 {% if is_default_member and has_access %}
                 <th scope="col">
-                    {% trans 'Action' %}
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
                 {% endif %}
             </tr>
@@ -48,20 +47,21 @@
             <tbody>
             {% for state in before_states %}
             <tr>
-                <td class="align-middle">
-                    {{ state.biotope_type }}
+                <td>
+                    <span>{{ state.biotope_type }}</span>
+                    {% if state.biotope_type_details.count > 0 %}
+                        <hr>
+                        <span>{% trans 'Biotope additional type' %}:</span>
+                        {% for detail in state.biotope_type_details.all %}
+                            <br>
+                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                        {% endfor %}
+                    {% endif %}
                 </td>
-                <td class="align-middle">
-                    {% for biotope_extra in state.biotope_type_details.all %}
-                    <div class="mb-2" title="{{ biotope_extra }}">
-                        {{ biotope_extra.long_name }}
-                    </div>
-                    {% endfor %}
-                </td>
-                <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
-                <td class="align-middle">
+                <td>{{ state.surface|floatformat:2 }} m²</td>
+                <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
+                    <button data-form-url="{% url 'compensation:acc:state-remove' obj.id state.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove state' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/ema/templates/ema/detail/includes/actions.html b/ema/templates/ema/detail/includes/actions.html
index 7425e3c3..d5852197 100644
--- a/ema/templates/ema/detail/includes/actions.html
+++ b/ema/templates/ema/detail/includes/actions.html
@@ -20,16 +20,13 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
                 <th class="w-25" scope="col">
                     {% trans 'Action type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Action type details' %}
-                </th>
                 <th scope="col">
                     {% trans 'Amount' context 'Compensation' %}
                 </th>
@@ -37,30 +34,35 @@
                     {% trans 'Comment' %}
                 </th>
                 <th scope="col">
-                    {% trans 'Action' %}
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
             </tr>
             </thead>
             <tbody>
             {% for action in obj.actions.all %}
             <tr>
-                <td class="align-middle">
-                    {{ action.action_type }}
+                <td class="">
+                    <span>{{ action.action_type }}</span>
+                    {% if action.action_type_details.count > 0 %}
+                        <hr>
+                        <span>{% trans 'Action type details' %}:</span>
+                        {% for detail in action.action_type_details.all %}
+                            <br>
+                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                        {% endfor %}
+                    {% endif %}
                 </td>
-                <td class="align-middle">
-                    {% for detail in action.action_type_details.all %}
-                        <div class="mb-2" title="{{detail}}">{{detail.long_name}}</div>
-                    {% endfor %}
-                </td>
-                <td class="align-middle">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
-                <td class="align-middle">
+                <td class="">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
+                <td class="">
                     <div class="scroll-150">
                         {{ action.comment }}
                     </div>
                 </td>
-                <td class="align-middle">
+                <td class="">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'ema:action-remove' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove action' %}">
+                    <button data-form-url="{% url 'ema:action-remove' obj.id action.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove action' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/ema/templates/ema/detail/includes/deadlines.html b/ema/templates/ema/detail/includes/deadlines.html
index 83ba4067..02efaf8b 100644
--- a/ema/templates/ema/detail/includes/deadlines.html
+++ b/ema/templates/ema/detail/includes/deadlines.html
@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -34,7 +34,9 @@
                     {% trans 'Comment' %}
                 </th>
                 <th scope="col">
-                    {% trans 'Action' %}
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
             </tr>
             </thead>
@@ -52,7 +54,7 @@
                 </td>
                 <td class="align-middle">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'ema:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
+                    <button data-form-url="{% url 'ema:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove deadline' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/ema/templates/ema/detail/includes/documents.html b/ema/templates/ema/detail/includes/documents.html
index 3218917c..dbc8927b 100644
--- a/ema/templates/ema/detail/includes/documents.html
+++ b/ema/templates/ema/detail/includes/documents.html
@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -31,7 +31,9 @@
                     {% trans 'Comment' %}
                 </th>
                 <th scope="col">
-                    {% trans 'Action' %}
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
             </tr>
             </thead>
@@ -50,7 +52,7 @@
                 </td>
                 <td class="align-middle">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'ema:remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
+                    <button data-form-url="{% url 'ema:remove-doc' doc.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove document' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/ema/templates/ema/detail/includes/states-after.html b/ema/templates/ema/detail/includes/states-after.html
index db9e75b9..05876405 100644
--- a/ema/templates/ema/detail/includes/states-after.html
+++ b/ema/templates/ema/detail/includes/states-after.html
@@ -20,46 +20,46 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
-        {% if sum_before_states > sum_after_states %}
-            <div class="row alert alert-danger">
-                {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
-            </div>
-        {% endif %}
+    {% if sum_before_states > sum_after_states %}
+    <div class="alert alert-danger mb-0">
+        {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
+    </div>
+    {% endif %}
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th class="w-25" scope="col">
+                <th class="w-50" scope="col">
                     {% trans 'Biotope type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Biotope additional type' %}
-                </th>
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
                 <th scope="col">
-                    {% trans 'Action' %}
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
             </tr>
             </thead>
             <tbody>
             {% for state in after_states %}
             <tr>
-                <td class="align-middle">
-                    {{ state.biotope_type }}
+                <td>
+                    <span>{{ state.biotope_type }}</span>
+                    {% if state.biotope_type_details.count > 0 %}
+                        <hr>
+                        <span>{% trans 'Biotope additional type' %}:</span>
+                        {% for detail in state.biotope_type_details.all %}
+                            <br>
+                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                        {% endfor %}
+                    {% endif %}
                 </td>
-                <td class="align-middle">
-                    {% for biotope_extra in state.biotope_type_details.all %}
-                    <div class="mb-2" title="{{ biotope_extra }}">
-                        {{ biotope_extra.long_name }}
-                    </div>
-                    {% endfor %}
-                </td>
-                <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
-                <td class="align-middle">
+                <td>{{ state.surface|floatformat:2 }} m²</td>
+                <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'ema:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
+                    <button data-form-url="{% url 'ema:state-remove' obj.id state.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove state' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/ema/templates/ema/detail/includes/states-before.html b/ema/templates/ema/detail/includes/states-before.html
index a4da5538..1d142cef 100644
--- a/ema/templates/ema/detail/includes/states-before.html
+++ b/ema/templates/ema/detail/includes/states-before.html
@@ -20,46 +20,46 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
-        {% if sum_before_states < sum_after_states %}
-            <div class="row alert alert-danger">
-                {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
-            </div>
-        {% endif %}
+    {% if sum_before_states < sum_after_states %}
+    <div class="alert alert-danger mb-0">
+        {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
+    </div>
+    {% endif %}
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th class="w-25" scope="col">
+                <th class="w-50" scope="col">
                     {% trans 'Biotope type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Biotope additional type' %}
-                </th>
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
                 <th scope="col">
-                    {% trans 'Action' %}
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
             </tr>
             </thead>
             <tbody>
             {% for state in before_states %}
             <tr>
-                <td class="align-middle">
-                    {{ state.biotope_type }}
+                <td>
+                    <span>{{ state.biotope_type }}</span>
+                    {% if state.biotope_type_details.count > 0 %}
+                        <hr>
+                        <span>{% trans 'Biotope additional type' %}:</span>
+                        {% for detail in state.biotope_type_details.all %}
+                            <br>
+                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                        {% endfor %}
+                    {% endif %}
                 </td>
-                <td class="align-middle">
-                    {% for biotope_extra in state.biotope_type_details.all %}
-                    <div class="mb-2" title="{{ biotope_extra }}">
-                        {{ biotope_extra.long_name }}
-                    </div>
-                    {% endfor %}
-                </td>
-                <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
-                <td class="align-middle">
+                <td>{{ state.surface|floatformat:2 }} m²</td>
+                <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'ema:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
+                    <button data-form-url="{% url 'ema:state-remove' obj.id state.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove state' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/intervention/templates/intervention/detail/includes/compensations.html b/intervention/templates/intervention/detail/includes/compensations.html
index 79fcaa09..442d5d83 100644
--- a/intervention/templates/intervention/detail/includes/compensations.html
+++ b/intervention/templates/intervention/detail/includes/compensations.html
@@ -22,11 +22,11 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th scope="col">
+                <th class="w-25" scope="col">
                     {% trans 'Identifier' %}
                 </th>
                 <th scope="col">
@@ -34,7 +34,9 @@
                 </th>
                 {% if is_default_member and has_access %}
                     <th scope="col">
-                        {% trans 'Action' %}
+                        <span class="float-right">
+                            {% trans 'Action' %}
+                        </span>
                     </th>
                 {% endif %}
             </tr>
@@ -50,7 +52,7 @@
                 <td class="align-middle">{{ comp.title }}</td>
                 <td>
                 {% if is_default_member and has_access %}
-                    <button data-form-url="{% url 'compensation:remove' comp.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove compensation' %}">
+                    <button data-form-url="{% url 'compensation:remove' comp.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove compensation' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                 {% endif %}
diff --git a/intervention/templates/intervention/detail/includes/deductions.html b/intervention/templates/intervention/detail/includes/deductions.html
index 3e320a1b..bc169082 100644
--- a/intervention/templates/intervention/detail/includes/deductions.html
+++ b/intervention/templates/intervention/detail/includes/deductions.html
@@ -20,11 +20,11 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th scope="col">
+                <th class="w-25" scope="col">
                     {% trans 'Account Identifier' %}
                 </th>
                 <th scope="col">
@@ -35,7 +35,9 @@
                 </th>
                 {% if is_default_member and has_access %}
                     <th scope="col">
-                        {% trans 'Action' %}
+                        <span class="float-right">
+                            {% trans 'Action' %}
+                        </span>
                     </th>
                 {% endif %}
             </tr>
@@ -55,7 +57,7 @@
                 <td class="align-middle">{{ deduction.created.timestamp|default_if_none:""|naturalday}}</td>
                 <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc:remove-deduction' deduction.account.id deduction.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove Deduction' %}">
+                    <button data-form-url="{% url 'compensation:acc:remove-deduction' deduction.account.id deduction.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove Deduction' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/intervention/templates/intervention/detail/includes/documents.html b/intervention/templates/intervention/detail/includes/documents.html
index b8e8ab39..f536f154 100644
--- a/intervention/templates/intervention/detail/includes/documents.html
+++ b/intervention/templates/intervention/detail/includes/documents.html
@@ -20,19 +20,21 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
                 <th scope="col">
                     {% trans 'Title' %}
                 </th>
-                <th scope="col">
+                <th class="w-50" scope="col">
                     {% trans 'Comment' %}
                 </th>
                 {% if is_default_member and has_access %}
                     <th scope="col">
-                        {% trans 'Action' %}
+                        <span class="float-right">
+                            {% trans 'Action' %}
+                        </span>
                     </th>
                 {% endif %}
             </tr>
@@ -40,19 +42,19 @@
             <tbody>
             {% for doc in obj.documents.all %}
             <tr>
-                <td class="align-middle">
+                <td>
                     <a href="{% url 'intervention:get-doc' doc.id %}">
                         {{ doc.title }}
                     </a>
                 </td>
-                <td class="align-middle">
+                <td>
                     <div class="scroll-150">
                         {{ doc.comment }}
                     </div>
                 </td>
-                <td class="align-middle">
+                <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'intervention:remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
+                    <button data-form-url="{% url 'intervention:remove-doc' doc.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove document' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/intervention/templates/intervention/detail/includes/payments.html b/intervention/templates/intervention/detail/includes/payments.html
index 641f2c2f..53a17f8f 100644
--- a/intervention/templates/intervention/detail/includes/payments.html
+++ b/intervention/templates/intervention/detail/includes/payments.html
@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -30,12 +30,14 @@
                 <th scope="col">
                     {% trans 'Due on' %}
                 </th>
-                <th scope="col">
+                <th class="w-50" scope="col">
                     {% trans 'Comment' %}
                 </th>
                 {% if is_default_member and has_access %}
                     <th scope="col">
-                        {% trans 'Action' %}
+                        <span class="float-right">
+                            {% trans 'Action' %}
+                        </span>
                     </th>
                 {% endif %}
             </tr>
@@ -54,7 +56,7 @@
                 </td>
                 <td class="align-middle">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:pay:remove' pay.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove payment' %}">
+                    <button data-form-url="{% url 'compensation:pay:remove' pay.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove payment' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/intervention/templates/intervention/detail/includes/revocation.html b/intervention/templates/intervention/detail/includes/revocation.html
index 66e89261..9fb2989d 100644
--- a/intervention/templates/intervention/detail/includes/revocation.html
+++ b/intervention/templates/intervention/detail/includes/revocation.html
@@ -23,7 +23,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -38,7 +38,9 @@
                 </th>
                 {% if is_default_member and has_access %}
                     <th scope="col">
-                        {% trans 'Action' %}
+                        <span class="float-right">
+                            {% trans 'Action' %}
+                        </span>
                     </th>
                 {% endif %}
             </tr>
@@ -63,7 +65,7 @@
                     </td>
                     <td class="align-middle">
                         {% if is_default_member and has_access  %}
-                        <button data-form-url="{% url 'intervention:remove-revocation' rev.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove revocation' %}">
+                        <button data-form-url="{% url 'intervention:remove-revocation' rev.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove revocation' %}">
                             {% fa5_icon 'trash' %}
                         </button>
                         {% endif %}
diff --git a/templates/base.html b/templates/base.html
index ccbd8f9f..d0656ee3 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -23,15 +23,14 @@
             {% include 'navbars/navbar.html' %}
         {% endblock %}
     </header>
-    <div class="container-fluid mt-3">
-        <div class="">
+    <div class="col">
         {% for message in messages %}
-            <div class="row alert alert-{{ message.tags }}">
-                {{ message }}
-            </div>
-        {% endfor %}
+        <div class="row alert alert-{{ message.tags }}">
+            {{ message }}
         </div>
-
+        {% endfor %}
+    </div>
+    <div class="container-fluid mt-3">
         {% comment %}
             The modal wrapper, which can be used on every view can stay on the base.html template
         {% endcomment %}

From f224bbb5bd9936b20ccbeb93af0add6acb6570b5 Mon Sep 17 00:00:00 2001
From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de>
Date: Wed, 2 Feb 2022 14:26:39 +0100
Subject: [PATCH 06/12] # 86 HTML simplification

* simplifies rendering of detail attributes for CompensationState and CompensationAction -> takes up less space
---
 .../compensation/detail/compensation/includes/actions.html  | 6 ++----
 .../detail/compensation/includes/states-after.html          | 6 ++----
 .../detail/compensation/includes/states-before.html         | 6 ++----
 .../compensation/detail/eco_account/includes/actions.html   | 6 ++----
 .../detail/eco_account/includes/states-after.html           | 6 ++----
 .../detail/eco_account/includes/states-before.html          | 6 ++----
 ema/templates/ema/detail/includes/actions.html              | 6 ++----
 ema/templates/ema/detail/includes/states-after.html         | 6 ++----
 ema/templates/ema/detail/includes/states-before.html        | 6 ++----
 9 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/compensation/templates/compensation/detail/compensation/includes/actions.html b/compensation/templates/compensation/detail/compensation/includes/actions.html
index 806d19ff..d82d8c08 100644
--- a/compensation/templates/compensation/detail/compensation/includes/actions.html
+++ b/compensation/templates/compensation/detail/compensation/includes/actions.html
@@ -49,11 +49,9 @@
                 <td class="">
                     <span>{{ action.action_type }}</span>
                     {% if action.action_type_details.count > 0 %}
-                        <hr>
-                        <span>{% trans 'Action type details' %}:</span>
+                        <br>
                         {% for detail in action.action_type_details.all %}
-                            <br>
-                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                            <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
                         {% endfor %}
                     {% endif %}
                 </td>
diff --git a/compensation/templates/compensation/detail/compensation/includes/states-after.html b/compensation/templates/compensation/detail/compensation/includes/states-after.html
index 026d0a51..b3e86a26 100644
--- a/compensation/templates/compensation/detail/compensation/includes/states-after.html
+++ b/compensation/templates/compensation/detail/compensation/includes/states-after.html
@@ -50,11 +50,9 @@
                 <td>
                     <span>{{ state.biotope_type }}</span>
                     {% if state.biotope_type_details.count > 0 %}
-                        <hr>
-                        <span>{% trans 'Biotope additional type' %}:</span>
+                        <br>
                         {% for detail in state.biotope_type_details.all %}
-                            <br>
-                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                            <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
                         {% endfor %}
                     {% endif %}
                 </td>
diff --git a/compensation/templates/compensation/detail/compensation/includes/states-before.html b/compensation/templates/compensation/detail/compensation/includes/states-before.html
index b9eeb341..c3c7e0f1 100644
--- a/compensation/templates/compensation/detail/compensation/includes/states-before.html
+++ b/compensation/templates/compensation/detail/compensation/includes/states-before.html
@@ -50,11 +50,9 @@
                 <td>
                     <span>{{ state.biotope_type }}</span>
                     {% if state.biotope_type_details.count > 0 %}
-                        <hr>
-                        <span>{% trans 'Biotope additional type' %}:</span>
+                        <br>
                         {% for detail in state.biotope_type_details.all %}
-                            <br>
-                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                            <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
                         {% endfor %}
                     {% endif %}
                 </td>
diff --git a/compensation/templates/compensation/detail/eco_account/includes/actions.html b/compensation/templates/compensation/detail/eco_account/includes/actions.html
index 2acd2594..d1275c78 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/actions.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/actions.html
@@ -48,11 +48,9 @@
                 <td class="">
                     <span>{{ action.action_type }}</span>
                     {% if action.action_type_details.count > 0 %}
-                        <hr>
-                        <span>{% trans 'Action type details' %}:</span>
+                        <br>
                         {% for detail in action.action_type_details.all %}
-                            <br>
-                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                            <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
                         {% endfor %}
                     {% endif %}
                 </td>
diff --git a/compensation/templates/compensation/detail/eco_account/includes/states-after.html b/compensation/templates/compensation/detail/eco_account/includes/states-after.html
index 0cec0144..ea696b31 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/states-after.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/states-after.html
@@ -50,11 +50,9 @@
                 <td>
                     <span>{{ state.biotope_type }}</span>
                     {% if state.biotope_type_details.count > 0 %}
-                        <hr>
-                        <span>{% trans 'Biotope additional type' %}:</span>
+                        <br>
                         {% for detail in state.biotope_type_details.all %}
-                            <br>
-                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                            <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
                         {% endfor %}
                     {% endif %}
                 </td>
diff --git a/compensation/templates/compensation/detail/eco_account/includes/states-before.html b/compensation/templates/compensation/detail/eco_account/includes/states-before.html
index 8c4a094a..af3042ea 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/states-before.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/states-before.html
@@ -50,11 +50,9 @@
                 <td>
                     <span>{{ state.biotope_type }}</span>
                     {% if state.biotope_type_details.count > 0 %}
-                        <hr>
-                        <span>{% trans 'Biotope additional type' %}:</span>
+                        <br>
                         {% for detail in state.biotope_type_details.all %}
-                            <br>
-                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                            <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
                         {% endfor %}
                     {% endif %}
                 </td>
diff --git a/ema/templates/ema/detail/includes/actions.html b/ema/templates/ema/detail/includes/actions.html
index d5852197..74f0564a 100644
--- a/ema/templates/ema/detail/includes/actions.html
+++ b/ema/templates/ema/detail/includes/actions.html
@@ -46,11 +46,9 @@
                 <td class="">
                     <span>{{ action.action_type }}</span>
                     {% if action.action_type_details.count > 0 %}
-                        <hr>
-                        <span>{% trans 'Action type details' %}:</span>
+                        <br>
                         {% for detail in action.action_type_details.all %}
-                            <br>
-                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                            <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
                         {% endfor %}
                     {% endif %}
                 </td>
diff --git a/ema/templates/ema/detail/includes/states-after.html b/ema/templates/ema/detail/includes/states-after.html
index 05876405..f0d3dfc4 100644
--- a/ema/templates/ema/detail/includes/states-after.html
+++ b/ema/templates/ema/detail/includes/states-after.html
@@ -48,11 +48,9 @@
                 <td>
                     <span>{{ state.biotope_type }}</span>
                     {% if state.biotope_type_details.count > 0 %}
-                        <hr>
-                        <span>{% trans 'Biotope additional type' %}:</span>
+                        <br>
                         {% for detail in state.biotope_type_details.all %}
-                            <br>
-                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                            <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
                         {% endfor %}
                     {% endif %}
                 </td>
diff --git a/ema/templates/ema/detail/includes/states-before.html b/ema/templates/ema/detail/includes/states-before.html
index 1d142cef..f479bd8d 100644
--- a/ema/templates/ema/detail/includes/states-before.html
+++ b/ema/templates/ema/detail/includes/states-before.html
@@ -48,11 +48,9 @@
                 <td>
                     <span>{{ state.biotope_type }}</span>
                     {% if state.biotope_type_details.count > 0 %}
-                        <hr>
-                        <span>{% trans 'Biotope additional type' %}:</span>
+                        <br>
                         {% for detail in state.biotope_type_details.all %}
-                            <br>
-                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                            <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
                         {% endfor %}
                     {% endif %}
                 </td>

From a9215511ac0b27d2b7dc5e442b7aca6a5b475781 Mon Sep 17 00:00:00 2001
From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de>
Date: Wed, 2 Feb 2022 15:16:25 +0100
Subject: [PATCH 07/12] # 86 Proper log detail

* adds support for payment adding/deleting to intervention log
* adds support for deduction adding/deleting to intervention/ecoaccount log
* improves code snippets
* drops add_deduction() methods for ecoaccount and intervention in favor of simpler creation in NewDeductionModalForm
* adds messages
* adds/updates translations
---
 compensation/forms/modalForms.py              |   4 +-
 compensation/models/compensation.py           |   2 +-
 compensation/models/eco_account.py            |  39 +-
 compensation/models/payment.py                |   7 +
 compensation/views/eco_account.py             |   6 +-
 compensation/views/payment.py                 |   5 +-
 intervention/forms/forms.py                   |   7 +-
 intervention/forms/modalForms.py              |  28 +-
 intervention/models/intervention.py           |  27 +-
 .../detail/includes/deductions.html           |   2 +-
 intervention/urls.py                          |   4 +-
 intervention/views.py                         |  35 +-
 konova/forms.py                               |   2 +-
 konova/models/object.py                       |   7 +-
 konova/utils/message_templates.py             |   8 +
 locale/de/LC_MESSAGES/django.mo               | Bin 36575 -> 36588 bytes
 locale/de/LC_MESSAGES/django.po               | 372 +++++++++---------
 17 files changed, 289 insertions(+), 266 deletions(-)

diff --git a/compensation/forms/modalForms.py b/compensation/forms/modalForms.py
index 9e7419b6..9331f60a 100644
--- a/compensation/forms/modalForms.py
+++ b/compensation/forms/modalForms.py
@@ -21,7 +21,7 @@ from konova.contexts import BaseContext
 from konova.forms import BaseModalForm, NewDocumentForm
 from konova.models import DeadlineType
 from konova.utils.message_templates import FORM_INVALID, ADDED_COMPENSATION_STATE, ADDED_DEADLINE, \
-    ADDED_COMPENSATION_ACTION
+    ADDED_COMPENSATION_ACTION, PAYMENT_ADDED
 
 
 class NewPaymentForm(BaseModalForm):
@@ -100,7 +100,7 @@ class NewPaymentForm(BaseModalForm):
 
     def save(self):
         pay = self.instance.add_payment(self)
-        self.instance.mark_as_edited(self.user, self.request)
+        self.instance.mark_as_edited(self.user, self.request, edit_comment=PAYMENT_ADDED)
         return pay
 
 
diff --git a/compensation/models/compensation.py b/compensation/models/compensation.py
index de5a3461..788f4b4c 100644
--- a/compensation/models/compensation.py
+++ b/compensation/models/compensation.py
@@ -326,7 +326,7 @@ class Compensation(AbstractCompensation, CEFMixin, CoherenceMixin):
         Returns:
 
         """
-        self.intervention.mark_as_edited(user, request, edit_comment, reset_recorded)
+        return self.intervention.mark_as_edited(user, request, edit_comment, reset_recorded)
 
     def is_ready_for_publish(self) -> bool:
         """ Not inherited by RecordableObjectMixin
diff --git a/compensation/models/eco_account.py b/compensation/models/eco_account.py
index 8e4d32e1..26ac44d7 100644
--- a/compensation/models/eco_account.py
+++ b/compensation/models/eco_account.py
@@ -9,10 +9,10 @@ import shutil
 
 from django.urls import reverse
 
-from user.models import User
+from konova.utils.message_templates import DEDUCTION_REMOVED
 from django.core.exceptions import ValidationError
 from django.core.validators import MinValueValidator
-from django.db import models, transaction
+from django.db import models
 from django.db.models import Sum, QuerySet
 from django.utils.translation import gettext_lazy as _
 
@@ -22,7 +22,6 @@ from compensation.utils.quality import EcoAccountQualityChecker
 from konova.models import ShareableObjectMixin, RecordableObjectMixin, AbstractDocument, BaseResource, \
     generate_document_file_upload_path
 from konova.settings import DEFAULT_SRID_RLP, LANIS_LINK_TEMPLATE
-from user.models import UserActionLogEntry
 
 
 class EcoAccount(AbstractCompensation, ShareableObjectMixin, RecordableObjectMixin):
@@ -167,34 +166,6 @@ class EcoAccount(AbstractCompensation, ShareableObjectMixin, RecordableObjectMix
         )
         return docs
 
-    def add_deduction(self, form):
-        """ Adds a new deduction to the intervention
-
-        Args:
-            form (NewDeductionModalForm): The form holding the data
-
-        Returns:
-
-        """
-        form_data = form.cleaned_data
-        user = form.user
-
-        with transaction.atomic():
-            # Create log entry
-            user_action_create = UserActionLogEntry.get_created_action(user)
-            user_action_edit = UserActionLogEntry.get_edited_action(user)
-            self.log.add(user_action_edit)
-            self.modified = user_action_edit
-            self.save()
-
-            deduction = EcoAccountDeduction.objects.create(
-                intervention=form_data["intervention"],
-                account=self,
-                surface=form_data["surface"],
-                created=user_action_create,
-            )
-        return deduction
-
     def is_ready_for_publish(self) -> bool:
         """ Checks whether the data passes all constraints for being publishable
 
@@ -295,3 +266,9 @@ class EcoAccountDeduction(BaseResource):
 
     def __str__(self):
         return "{} of {}".format(self.surface, self.account)
+
+    def delete(self, user=None, *args, **kwargs):
+        if user is not None:
+            self.intervention.mark_as_edited(user, edit_comment=DEDUCTION_REMOVED)
+            self.account.mark_as_edited(user, edit_comment=DEDUCTION_REMOVED, reset_recorded=False)
+        super().delete(*args, **kwargs)
\ No newline at end of file
diff --git a/compensation/models/payment.py b/compensation/models/payment.py
index ec56910d..48eec3fc 100644
--- a/compensation/models/payment.py
+++ b/compensation/models/payment.py
@@ -10,6 +10,8 @@ from django.db import models
 
 from intervention.models import Intervention
 from konova.models import BaseResource
+from konova.utils.message_templates import PAYMENT_REMOVED
+from user.models import UserActionLogEntry
 
 
 class Payment(BaseResource):
@@ -35,3 +37,8 @@ class Payment(BaseResource):
         ordering = [
             "-amount",
         ]
+
+    def delete(self, user=None, *args, **kwargs):
+        if user is not None:
+            self.intervention.mark_as_edited(user, edit_comment=PAYMENT_REMOVED)
+        super().delete(*args, **kwargs)
diff --git a/compensation/views/eco_account.py b/compensation/views/eco_account.py
index d1d6ddbf..479e66f8 100644
--- a/compensation/views/eco_account.py
+++ b/compensation/views/eco_account.py
@@ -30,7 +30,7 @@ from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.documents import get_document, remove_document
 from konova.utils.generators import generate_qr_code
 from konova.utils.message_templates import IDENTIFIER_REPLACED, FORM_INVALID, DATA_UNSHARED, DATA_UNSHARED_EXPLANATION, \
-    CANCEL_ACC_RECORDED_OR_DEDUCTED
+    CANCEL_ACC_RECORDED_OR_DEDUCTED, DEDUCTION_REMOVED, DEDUCTION_ADDED
 from konova.utils.user_checks import in_group
 
 
@@ -288,7 +288,7 @@ def deduction_remove_view(request: HttpRequest, id: str, deduction_id: str):
     form = RemoveModalForm(request.POST or None, instance=eco_deduction, request=request)
     return form.process_request(
         request=request,
-        msg_success=_("Deduction removed"),
+        msg_success=DEDUCTION_REMOVED,
         redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
     )
 
@@ -564,7 +564,7 @@ def new_deduction_view(request: HttpRequest, id: str):
     form = NewDeductionModalForm(request.POST or None, instance=acc, request=request)
     return form.process_request(
         request,
-        msg_success=_("Deduction added"),
+        msg_success=DEDUCTION_ADDED,
         redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
     )
 
diff --git a/compensation/views/payment.py b/compensation/views/payment.py
index 7caf847e..b715a3ae 100644
--- a/compensation/views/payment.py
+++ b/compensation/views/payment.py
@@ -16,6 +16,7 @@ from compensation.models import Payment
 from intervention.models import Intervention
 from konova.decorators import default_group_required
 from konova.forms import RemoveModalForm
+from konova.utils.message_templates import PAYMENT_ADDED, PAYMENT_REMOVED
 
 
 @login_required
@@ -34,7 +35,7 @@ def new_payment_view(request: HttpRequest, intervention_id: str):
     form = NewPaymentForm(request.POST or None, instance=intervention, request=request)
     return form.process_request(
         request,
-        msg_success=_("Payment added"),
+        msg_success=PAYMENT_ADDED,
         redirect_url=reverse("intervention:detail", args=(intervention_id,)) + "#related_data"
     )
 
@@ -55,7 +56,7 @@ def payment_remove_view(request: HttpRequest, id: str):
     form = RemoveModalForm(request.POST or None, instance=payment, request=request)
     return form.process_request(
         request=request,
-        msg_success=_("Payment removed"),
+        msg_success=PAYMENT_REMOVED,
         redirect_url=reverse("intervention:detail", args=(payment.intervention_id,)) + "#related_data"
     )
 
diff --git a/intervention/forms/forms.py b/intervention/forms/forms.py
index 6f098151..1c5cf1c6 100644
--- a/intervention/forms/forms.py
+++ b/intervention/forms/forms.py
@@ -7,6 +7,8 @@ Created on: 02.12.20
 """
 from dal import autocomplete
 from django import forms
+
+from konova.utils.message_templates import EDITED_GENERAL_DATA
 from user.models import User
 from django.db import transaction
 from django.urls import reverse, reverse_lazy
@@ -333,7 +335,7 @@ class EditInterventionForm(NewInterventionForm):
             self.instance.responsible.conservation_file_number = conservation_file_number
             self.instance.responsible.save()
 
-            user_action = UserActionLogEntry.get_edited_action(user)
+            user_action = self.instance.mark_as_edited(user, edit_comment=EDITED_GENERAL_DATA)
 
             geometry = geom_form.save(user_action)
             self.instance.geometry = geometry
@@ -347,8 +349,5 @@ class EditInterventionForm(NewInterventionForm):
             self.instance.modified = user_action
             self.instance.save()
 
-            # Uncheck and unrecord intervention due to changed data
-            self.instance.mark_as_edited(user)
-
         return self.instance
 
diff --git a/intervention/forms/modalForms.py b/intervention/forms/modalForms.py
index b7330aec..a240d8f6 100644
--- a/intervention/forms/modalForms.py
+++ b/intervention/forms/modalForms.py
@@ -6,13 +6,14 @@ Created on: 27.09.21
 
 """
 from dal import autocomplete
-from user.models import User
+
+from konova.utils.message_templates import DEDUCTION_ADDED
+from user.models import User, UserActionLogEntry
 from django.db import transaction
 from django import forms
-from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
-from compensation.models import EcoAccount
+from compensation.models import EcoAccount, EcoAccountDeduction
 from intervention.inputs import TextToClipboardInput
 from intervention.models import Intervention, InterventionDocument
 from konova.forms import BaseModalForm, NewDocumentForm
@@ -366,9 +367,26 @@ class NewDeductionModalForm(BaseModalForm):
             )
         return is_valid_surface and super_result
 
+    def __create_deduction(self):
+        """ Creates the deduction
+
+        Returns:
+
+        """
+        with transaction.atomic():
+            user_action_create = UserActionLogEntry.get_created_action(self.user)
+            deduction = EcoAccountDeduction.objects.create(
+                intervention=self.cleaned_data["intervention"],
+                account=self.cleaned_data["account"],
+                surface=self.cleaned_data["surface"],
+                created=user_action_create,
+            )
+        return deduction
+
     def save(self):
-        deduction = self.instance.add_deduction(self)
-        self.instance.mark_as_edited(self.user, self.request, reset_recorded=False)
+        deduction = self.__create_deduction()
+        self.cleaned_data["intervention"].mark_as_edited(self.user, edit_comment=DEDUCTION_ADDED)
+        self.cleaned_data["account"].mark_as_edited(self.user, edit_comment=DEDUCTION_ADDED, reset_recorded=False)
         return deduction
 
 
diff --git a/intervention/models/intervention.py b/intervention/models/intervention.py
index 24018fe7..9bb229fb 100644
--- a/intervention/models/intervention.py
+++ b/intervention/models/intervention.py
@@ -26,7 +26,7 @@ from konova.models import generate_document_file_upload_path, AbstractDocument,
     ShareableObjectMixin, \
     RecordableObjectMixin, CheckableObjectMixin, GeoReferencedMixin
 from konova.settings import LANIS_LINK_TEMPLATE, LANIS_ZOOM_LUT, DEFAULT_SRID_RLP
-from konova.utils.message_templates import DATA_UNSHARED_EXPLANATION
+from konova.utils.message_templates import DATA_UNSHARED_EXPLANATION, DEDUCTION_ADDED
 from user.models import UserActionLogEntry
 
 
@@ -229,28 +229,6 @@ class Intervention(BaseObject, ShareableObjectMixin, RecordableObjectMixin, Chec
                 )
         return revocation
 
-    def add_deduction(self, form):
-        """ Adds a new deduction to the intervention
-
-        Args:
-            form (NewDeductionModalForm): The form holding the data
-
-        Returns:
-
-        """
-        form_data = form.cleaned_data
-        user = form.user
-
-        with transaction.atomic():
-            user_action_create = UserActionLogEntry.get_created_action(user)
-            deduction = EcoAccountDeduction.objects.create(
-                intervention=self,
-                account=form_data["account"],
-                surface=form_data["surface"],
-                created=user_action_create,
-            )
-        return deduction
-
     def mark_as_edited(self, performing_user: User, request: HttpRequest = None, edit_comment: str = None, reset_recorded: bool = True):
         """ In case the object or a related object changed, internal processes need to be started, such as
         unrecord and uncheck
@@ -264,9 +242,10 @@ class Intervention(BaseObject, ShareableObjectMixin, RecordableObjectMixin, Chec
         Returns:
 
         """
-        super().mark_as_edited(performing_user, request, edit_comment, reset_recorded)
+        action = super().mark_as_edited(performing_user, request, edit_comment, reset_recorded)
         if self.checked:
             self.set_unchecked()
+        return action
 
     def set_status_messages(self, request: HttpRequest):
         """ Setter for different information that need to be rendered
diff --git a/intervention/templates/intervention/detail/includes/deductions.html b/intervention/templates/intervention/detail/includes/deductions.html
index bc169082..99f11cb8 100644
--- a/intervention/templates/intervention/detail/includes/deductions.html
+++ b/intervention/templates/intervention/detail/includes/deductions.html
@@ -57,7 +57,7 @@
                 <td class="align-middle">{{ deduction.created.timestamp|default_if_none:""|naturalday}}</td>
                 <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc:remove-deduction' deduction.account.id deduction.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove Deduction' %}">
+                    <button data-form-url="{% url 'intervention:remove-deduction' obj.id deduction.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove Deduction' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/intervention/urls.py b/intervention/urls.py
index dc757da7..4754eb53 100644
--- a/intervention/urls.py
+++ b/intervention/urls.py
@@ -9,7 +9,8 @@ from django.urls import path
 
 from intervention.views import index_view, new_view, detail_view, edit_view, remove_view, new_document_view, share_view, \
     create_share_view, remove_revocation_view, new_revocation_view, check_view, log_view, new_deduction_view, \
-    record_view, remove_document_view, get_document_view, get_revocation_view, new_id_view, report_view
+    record_view, remove_document_view, get_document_view, get_revocation_view, new_id_view, report_view, \
+    remove_deduction_view
 
 app_name = "intervention"
 urlpatterns = [
@@ -33,6 +34,7 @@ urlpatterns = [
 
     # Deductions
     path('<id>/deduction/new', new_deduction_view, name='new-deduction'),
+    path('<id>/remove/<deduction_id>', remove_deduction_view, name='remove-deduction'),
 
     # Revocation routes
     path('<id>/revocation/new', new_revocation_view, name='new-revocation'),
diff --git a/intervention/views.py b/intervention/views.py
index 71fd0989..ea169b3b 100644
--- a/intervention/views.py
+++ b/intervention/views.py
@@ -1,6 +1,7 @@
 from django.contrib.auth.decorators import login_required
+from django.core.exceptions import ObjectDoesNotExist
 from django.utils.translation import gettext_lazy as _
-from django.http import HttpRequest, JsonResponse
+from django.http import HttpRequest, JsonResponse, Http404
 from django.shortcuts import render
 
 from intervention.forms.forms import NewInterventionForm, EditInterventionForm
@@ -15,7 +16,7 @@ from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.documents import remove_document, get_document
 from konova.utils.generators import generate_qr_code
 from konova.utils.message_templates import INTERVENTION_INVALID, FORM_INVALID, IDENTIFIER_REPLACED, \
-    CHECKED_RECORDED_RESET
+    CHECKED_RECORDED_RESET, DEDUCTION_REMOVED, DEDUCTION_ADDED
 from konova.utils.user_checks import in_group
 
 
@@ -506,11 +507,39 @@ def new_deduction_view(request: HttpRequest, id: str):
     form = NewDeductionModalForm(request.POST or None, instance=intervention, request=request)
     return form.process_request(
         request,
-        msg_success=_("Deduction added"),
+        msg_success=DEDUCTION_ADDED,
         redirect_url=reverse("intervention:detail", args=(id,)) + "#related_data",
     )
 
 
+@login_required
+@default_group_required
+@shared_access_required(Intervention, "id")
+def remove_deduction_view(request: HttpRequest, id: str, deduction_id: str):
+    """ Renders a modal view for removing deductions
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The intervention's id
+        deduction_id (str): The deduction's id
+
+    Returns:
+
+    """
+    intervention = get_object_or_404(Intervention, id=id)
+    try:
+        eco_deduction = intervention.deductions.get(id=deduction_id)
+    except ObjectDoesNotExist:
+        raise Http404("Unknown deduction")
+
+    form = RemoveModalForm(request.POST or None, instance=eco_deduction, request=request)
+    return form.process_request(
+        request=request,
+        msg_success=DEDUCTION_REMOVED,
+        redirect_url=reverse("intervention:detail", args=(id,)) + "#related_data"
+    )
+
+
 @login_required
 @conservation_office_group_required
 @shared_access_required(Intervention, "id")
diff --git a/konova/forms.py b/konova/forms.py
index aae83e6a..030599c3 100644
--- a/konova/forms.py
+++ b/konova/forms.py
@@ -327,7 +327,7 @@ class RemoveModalForm(BaseModalForm):
             self.instance.mark_as_deleted(self.user)
         else:
             # If the class does not provide restorable delete functionality, we must delete the entry finally
-            self.instance.delete()
+            self.instance.delete(self.user)
 
 
 class NewDocumentForm(BaseModalForm):
diff --git a/konova/models/object.py b/konova/models/object.py
index c5ad501d..9eba8c1d 100644
--- a/konova/models/object.py
+++ b/konova/models/object.py
@@ -275,9 +275,9 @@ class RecordableObjectMixin(models.Model):
         Returns:
 
         """
-        action = UserActionLogEntry.get_edited_action(performing_user, edit_comment)
-        self.modified = action
-        self.log.add(action)
+        edit_action = UserActionLogEntry.get_edited_action(performing_user, edit_comment)
+        self.modified = edit_action
+        self.log.add(edit_action)
         self.save()
 
         if self.recorded and reset_recorded:
@@ -288,6 +288,7 @@ class RecordableObjectMixin(models.Model):
                     request,
                     CHECKED_RECORDED_RESET
                 )
+        return edit_action
 
     @abstractmethod
     def is_ready_for_publish(self) -> bool:
diff --git a/konova/utils/message_templates.py b/konova/utils/message_templates.py
index 29f8197c..501a5a03 100644
--- a/konova/utils/message_templates.py
+++ b/konova/utils/message_templates.py
@@ -21,6 +21,14 @@ CHECKED_RECORDED_RESET = _("Status of Checked and Recorded reseted")
 # ECO ACCOUNT
 CANCEL_ACC_RECORDED_OR_DEDUCTED = _("Action canceled. Eco account is recorded or deductions exist. Only conservation office member can perform this action.")
 
+# DEDUCTIONS
+DEDUCTION_ADDED = _("Deduction added")
+DEDUCTION_REMOVED = _("Deduction removed")
+
+# PAYMENTS
+PAYMENT_ADDED = _("Payment added")
+PAYMENT_REMOVED = _("Payment removed")
+
 # Edited
 EDITED_GENERAL_DATA = _("Edited general data")
 ADDED_COMPENSATION_STATE = _("Added compensation state")
diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo
index e6edc28bd0a903453509a74318e3587db30c17c5..b708497fbae6e4a938da19633c3c7db6cd4349dd 100644
GIT binary patch
delta 6389
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
Yub{MOy1THbU{+xfSC!Tj7MCUb1>Ac{@&Et;

delta 6381
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
OYg|!4T}9b~`2PZ0nnVf!

diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 6dbcaf9d..8fe01435 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -5,10 +5,10 @@
 #
 #: compensation/filters.py:122 compensation/forms/modalForms.py:35
 #: compensation/forms/modalForms.py:46 compensation/forms/modalForms.py:62
-#: compensation/forms/modalForms.py:256 compensation/forms/modalForms.py:351
+#: compensation/forms/modalForms.py:256 compensation/forms/modalForms.py:350
 #: intervention/forms/forms.py:52 intervention/forms/forms.py:154
-#: intervention/forms/forms.py:166 intervention/forms/modalForms.py:125
-#: intervention/forms/modalForms.py:138 intervention/forms/modalForms.py:151
+#: intervention/forms/forms.py:166 intervention/forms/modalForms.py:123
+#: intervention/forms/modalForms.py:136 intervention/forms/modalForms.py:149
 #: konova/filters/mixins.py:53 konova/filters/mixins.py:54
 #: konova/filters/mixins.py:81 konova/filters/mixins.py:82
 #: konova/filters/mixins.py:94 konova/filters/mixins.py:95
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-31 12:41+0100\n"
+"POT-Creation-Date: 2022-02-02 14:35+0100\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"
@@ -140,7 +140,7 @@ msgstr "Zuständigkeitsbereich"
 #: compensation/templates/compensation/detail/compensation/view.html:63
 #: intervention/tables.py:33
 #: intervention/templates/intervention/detail/view.html:68
-#: user/models/user_action.py:18
+#: user/models/user_action.py:20
 msgid "Checked"
 msgstr "Geprüft"
 
@@ -159,7 +159,7 @@ msgstr "Geprüft"
 #: ema/tables.py:38 ema/templates/ema/detail/view.html:35
 #: intervention/tables.py:39
 #: intervention/templates/intervention/detail/view.html:82
-#: user/models/user_action.py:19
+#: user/models/user_action.py:21
 msgid "Recorded"
 msgstr "Verzeichnet"
 
@@ -214,13 +214,13 @@ msgstr "Abbuchungen"
 #: analysis/templates/analysis/reports/includes/eco_account/deductions.html:9
 #: analysis/templates/analysis/reports/includes/eco_account/deductions.html:11
 #: compensation/forms/modalForms.py:151
-#: compensation/templates/compensation/detail/compensation/includes/states-after.html:39
-#: compensation/templates/compensation/detail/compensation/includes/states-before.html:39
-#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:39
-#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:39
-#: ema/templates/ema/detail/includes/states-after.html:39
-#: ema/templates/ema/detail/includes/states-before.html:39
-#: intervention/forms/modalForms.py:295
+#: compensation/templates/compensation/detail/compensation/includes/states-after.html:36
+#: compensation/templates/compensation/detail/compensation/includes/states-before.html:36
+#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:36
+#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:36
+#: ema/templates/ema/detail/includes/states-after.html:36
+#: ema/templates/ema/detail/includes/states-before.html:36
+#: intervention/forms/modalForms.py:293
 msgid "Surface"
 msgstr "Fläche"
 
@@ -284,7 +284,7 @@ msgid "Type"
 msgstr "Typ"
 
 #: analysis/templates/analysis/reports/includes/old_data/amount.html:24
-#: intervention/forms/modalForms.py:306 intervention/forms/modalForms.py:313
+#: intervention/forms/modalForms.py:304 intervention/forms/modalForms.py:311
 #: intervention/tables.py:89
 #: intervention/templates/intervention/detail/view.html:19
 #: konova/templates/konova/includes/quickstart/interventions.html:4
@@ -295,7 +295,7 @@ msgstr "Eingriff"
 #: analysis/templates/analysis/reports/includes/old_data/amount.html:34
 #: compensation/tables.py:226
 #: compensation/templates/compensation/detail/eco_account/view.html:19
-#: intervention/forms/modalForms.py:279 intervention/forms/modalForms.py:286
+#: intervention/forms/modalForms.py:277 intervention/forms/modalForms.py:284
 #: konova/templates/konova/includes/quickstart/ecoaccounts.html:4
 #: templates/navbars/navbar.html:34
 msgid "Eco-account"
@@ -354,8 +354,8 @@ msgid "Compensation XY; Location ABC"
 msgstr "Kompensation XY; Flur ABC"
 
 #: compensation/forms/forms.py:57 compensation/forms/modalForms.py:61
-#: compensation/forms/modalForms.py:255 compensation/forms/modalForms.py:350
-#: compensation/templates/compensation/detail/compensation/includes/actions.html:37
+#: compensation/forms/modalForms.py:255 compensation/forms/modalForms.py:349
+#: compensation/templates/compensation/detail/compensation/includes/actions.html:35
 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:34
 #: compensation/templates/compensation/detail/compensation/includes/documents.html:31
 #: compensation/templates/compensation/detail/eco_account/includes/actions.html:34
@@ -364,7 +364,7 @@ msgstr "Kompensation XY; Flur ABC"
 #: ema/templates/ema/detail/includes/actions.html:34
 #: ema/templates/ema/detail/includes/deadlines.html:34
 #: ema/templates/ema/detail/includes/documents.html:31
-#: intervention/forms/forms.py:178 intervention/forms/modalForms.py:150
+#: intervention/forms/forms.py:178 intervention/forms/modalForms.py:148
 #: intervention/templates/intervention/detail/includes/documents.html:31
 #: intervention/templates/intervention/detail/includes/payments.html:34
 #: intervention/templates/intervention/detail/includes/revocation.html:38
@@ -372,7 +372,8 @@ msgstr "Kompensation XY; Flur ABC"
 msgid "Comment"
 msgstr "Kommentar"
 
-#: compensation/forms/forms.py:59 intervention/forms/forms.py:180
+#: compensation/forms/forms.py:59 compensation/forms/modalForms.py:351
+#: intervention/forms/forms.py:180
 msgid "Additional comment"
 msgstr "Zusätzlicher Kommentar"
 
@@ -431,7 +432,7 @@ msgstr "kompensiert Eingriff"
 msgid "Select the intervention for which this compensation compensates"
 msgstr "Wählen Sie den Eingriff, für den diese Kompensation bestimmt ist"
 
-#: compensation/forms/forms.py:184 compensation/views/compensation.py:91
+#: compensation/forms/forms.py:184 compensation/views/compensation.py:92
 msgid "New compensation"
 msgstr "Neue Kompensation"
 
@@ -457,7 +458,7 @@ msgstr "Vereinbarungsdatum"
 msgid "When did the parties agree on this?"
 msgstr "Wann wurde dieses Ökokonto offiziell vereinbart?"
 
-#: compensation/forms/forms.py:340 compensation/views/eco_account.py:101
+#: compensation/forms/forms.py:340 compensation/views/eco_account.py:102
 msgid "New Eco-Account"
 msgstr "Neues Ökokonto"
 
@@ -483,8 +484,7 @@ msgid "Due on which date"
 msgstr "Zahlung wird an diesem Datum erwartet"
 
 #: compensation/forms/modalForms.py:63 compensation/forms/modalForms.py:257
-#: compensation/forms/modalForms.py:352 intervention/forms/modalForms.py:152
-#: konova/forms.py:375
+#: intervention/forms/modalForms.py:150 konova/forms.py:375
 msgid "Additional comment, maximum {} letters"
 msgstr "Zusätzlicher Kommentar, maximal {} Zeichen"
 
@@ -505,12 +505,6 @@ msgid "Select the biotope type"
 msgstr "Biotoptyp wählen"
 
 #: compensation/forms/modalForms.py:132 compensation/forms/modalForms.py:144
-#: compensation/templates/compensation/detail/compensation/includes/states-after.html:36
-#: compensation/templates/compensation/detail/compensation/includes/states-before.html:36
-#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:36
-#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:36
-#: ema/templates/ema/detail/includes/states-after.html:36
-#: ema/templates/ema/detail/includes/states-before.html:36
 msgid "Biotope additional type"
 msgstr "Zusatzbezeichnung"
 
@@ -518,7 +512,7 @@ msgstr "Zusatzbezeichnung"
 msgid "Select an additional biotope type"
 msgstr "Zusatzbezeichnung wählen"
 
-#: compensation/forms/modalForms.py:154 intervention/forms/modalForms.py:297
+#: compensation/forms/modalForms.py:154 intervention/forms/modalForms.py:295
 msgid "in m²"
 msgstr ""
 
@@ -546,7 +540,7 @@ msgstr "Fristart wählen"
 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:31
 #: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:31
 #: ema/templates/ema/detail/includes/deadlines.html:31
-#: intervention/forms/modalForms.py:124
+#: intervention/forms/modalForms.py:122
 msgid "Date"
 msgstr "Datum"
 
@@ -571,27 +565,27 @@ msgid "Select the action type"
 msgstr "Maßnahmentyp wählen"
 
 #: compensation/forms/modalForms.py:300
-#: compensation/templates/compensation/detail/compensation/includes/actions.html:41
-#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:38
-#: compensation/templates/compensation/detail/compensation/includes/documents.html:35
-#: compensation/templates/compensation/detail/compensation/includes/states-after.html:43
-#: compensation/templates/compensation/detail/compensation/includes/states-before.html:43
-#: compensation/templates/compensation/detail/eco_account/includes/actions.html:38
-#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:37
-#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:40
-#: compensation/templates/compensation/detail/eco_account/includes/documents.html:34
-#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:43
-#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:43
-#: ema/templates/ema/detail/includes/actions.html:37
-#: ema/templates/ema/detail/includes/deadlines.html:37
-#: ema/templates/ema/detail/includes/documents.html:34
-#: ema/templates/ema/detail/includes/states-after.html:42
-#: ema/templates/ema/detail/includes/states-before.html:42
-#: intervention/templates/intervention/detail/includes/compensations.html:37
-#: intervention/templates/intervention/detail/includes/deductions.html:38
-#: intervention/templates/intervention/detail/includes/documents.html:35
-#: intervention/templates/intervention/detail/includes/payments.html:38
-#: intervention/templates/intervention/detail/includes/revocation.html:42
+#: compensation/templates/compensation/detail/compensation/includes/actions.html:40
+#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:39
+#: compensation/templates/compensation/detail/compensation/includes/documents.html:36
+#: compensation/templates/compensation/detail/compensation/includes/states-after.html:41
+#: compensation/templates/compensation/detail/compensation/includes/states-before.html:41
+#: compensation/templates/compensation/detail/eco_account/includes/actions.html:39
+#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:38
+#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:41
+#: compensation/templates/compensation/detail/eco_account/includes/documents.html:35
+#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:41
+#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:41
+#: ema/templates/ema/detail/includes/actions.html:38
+#: ema/templates/ema/detail/includes/deadlines.html:38
+#: ema/templates/ema/detail/includes/documents.html:35
+#: ema/templates/ema/detail/includes/states-after.html:40
+#: ema/templates/ema/detail/includes/states-before.html:40
+#: intervention/templates/intervention/detail/includes/compensations.html:38
+#: intervention/templates/intervention/detail/includes/deductions.html:39
+#: intervention/templates/intervention/detail/includes/documents.html:36
+#: intervention/templates/intervention/detail/includes/payments.html:39
+#: intervention/templates/intervention/detail/includes/revocation.html:43
 #: templates/log.html:10
 msgid "Action"
 msgstr "Aktionen"
@@ -616,11 +610,11 @@ msgstr "Einheit wählen"
 msgid "Insert the amount"
 msgstr "Menge eingeben"
 
-#: compensation/forms/modalForms.py:363
+#: compensation/forms/modalForms.py:362
 msgid "New action"
 msgstr "Neue Maßnahme"
 
-#: compensation/forms/modalForms.py:364
+#: compensation/forms/modalForms.py:363
 msgid "Insert data for the new action"
 msgstr "Geben Sie die Daten der neuen Maßnahme ein"
 
@@ -652,14 +646,14 @@ msgstr "Stück"
 msgid "Added deadline"
 msgstr "Frist/Termin hinzugefügt"
 
-#: compensation/models/eco_account.py:55
+#: compensation/models/eco_account.py:57
 msgid ""
 "Deductable surface can not be larger than existing surfaces in after states"
 msgstr ""
 "Die abbuchbare Fläche darf die Gesamtfläche der Zielzustände nicht "
 "überschreiten"
 
-#: compensation/models/eco_account.py:62
+#: compensation/models/eco_account.py:64
 msgid ""
 "Deductable surface can not be smaller than the sum of already existing "
 "deductions. Please contact the responsible users for the deductions!"
@@ -692,7 +686,7 @@ msgstr "Am {} von {} geprüft worden"
 
 #: compensation/tables.py:130
 #: compensation/templates/compensation/detail/compensation/view.html:80
-#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:56
+#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:58
 #: compensation/templates/compensation/detail/eco_account/view.html:47
 #: ema/tables.py:102 ema/templates/ema/detail/view.html:38
 #: intervention/tables.py:132
@@ -730,39 +724,35 @@ msgid "Not recorded yet. Can not be used for deductions, yet."
 msgstr ""
 "Noch nicht verzeichnet. Kann noch nicht für Abbuchungen genutzt werden."
 
-#: compensation/templates/compensation/detail/compensation/includes/actions.html:8
+#: compensation/templates/compensation/detail/compensation/includes/actions.html:9
 #: compensation/templates/compensation/detail/eco_account/includes/actions.html:8
 #: ema/templates/ema/detail/includes/actions.html:8
 msgctxt "Compensation"
 msgid "Actions"
 msgstr "Maßnahmen"
 
-#: compensation/templates/compensation/detail/compensation/includes/actions.html:14
+#: compensation/templates/compensation/detail/compensation/includes/actions.html:15
 #: compensation/templates/compensation/detail/eco_account/includes/actions.html:14
 #: ema/templates/ema/detail/includes/actions.html:14
 msgid "Add new action"
 msgstr "Neue Maßnahme hinzufügen"
 
-#: compensation/templates/compensation/detail/compensation/includes/actions.html:28
+#: compensation/templates/compensation/detail/compensation/includes/actions.html:29
 #: compensation/templates/compensation/detail/eco_account/includes/actions.html:28
 #: ema/templates/ema/detail/includes/actions.html:28
 msgid "Action type"
 msgstr "Maßnahmentyp"
 
-#: compensation/templates/compensation/detail/compensation/includes/actions.html:31
-msgid "Action type details"
-msgstr "Zusatzmerkmale"
-
-#: compensation/templates/compensation/detail/compensation/includes/actions.html:34
+#: compensation/templates/compensation/detail/compensation/includes/actions.html:32
 #: compensation/templates/compensation/detail/eco_account/includes/actions.html:31
 #: ema/templates/ema/detail/includes/actions.html:31
 msgctxt "Compensation"
 msgid "Amount"
 msgstr "Menge"
 
-#: compensation/templates/compensation/detail/compensation/includes/actions.html:61
-#: compensation/templates/compensation/detail/eco_account/includes/actions.html:53
-#: ema/templates/ema/detail/includes/actions.html:51
+#: compensation/templates/compensation/detail/compensation/includes/actions.html:66
+#: compensation/templates/compensation/detail/eco_account/includes/actions.html:65
+#: ema/templates/ema/detail/includes/actions.html:63
 msgid "Remove action"
 msgstr "Maßnahme entfernen"
 
@@ -814,9 +804,9 @@ msgstr "Termine und Fristen"
 msgid "Add new deadline"
 msgstr "Frist/Termin hinzufügen"
 
-#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:53
-#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:51
-#: ema/templates/ema/detail/includes/deadlines.html:51
+#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:59
+#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:57
+#: ema/templates/ema/detail/includes/deadlines.html:57
 msgid "Remove deadline"
 msgstr "Frist löschen"
 
@@ -835,10 +825,10 @@ msgstr "Dokumente"
 msgid "Add new document"
 msgstr "Neues Dokument hinzufügen"
 
-#: compensation/templates/compensation/detail/compensation/includes/documents.html:51
-#: compensation/templates/compensation/detail/eco_account/includes/documents.html:49
-#: ema/templates/ema/detail/includes/documents.html:49
-#: intervention/templates/intervention/detail/includes/documents.html:51
+#: compensation/templates/compensation/detail/compensation/includes/documents.html:57
+#: compensation/templates/compensation/detail/eco_account/includes/documents.html:55
+#: ema/templates/ema/detail/includes/documents.html:55
+#: intervention/templates/intervention/detail/includes/documents.html:57
 msgid "Remove document"
 msgstr "Dokument löschen"
 
@@ -855,9 +845,9 @@ msgstr "Zielzustand"
 msgid "Add new state after"
 msgstr "Neuen Zielzustand hinzufügen"
 
-#: compensation/templates/compensation/detail/compensation/includes/states-after.html:26
-#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:26
-#: ema/templates/ema/detail/includes/states-after.html:26
+#: compensation/templates/compensation/detail/compensation/includes/states-after.html:25
+#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:25
+#: ema/templates/ema/detail/includes/states-after.html:25
 msgid "Missing surfaces according to states before: "
 msgstr "Fehlende Flächenmengen laut Ausgangszustand: "
 
@@ -870,12 +860,12 @@ msgstr "Fehlende Flächenmengen laut Ausgangszustand: "
 msgid "Biotope type"
 msgstr "Biotoptyp"
 
-#: compensation/templates/compensation/detail/compensation/includes/states-after.html:64
-#: compensation/templates/compensation/detail/compensation/includes/states-before.html:64
-#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:64
-#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:64
-#: ema/templates/ema/detail/includes/states-after.html:62
-#: ema/templates/ema/detail/includes/states-before.html:62
+#: compensation/templates/compensation/detail/compensation/includes/states-after.html:62
+#: compensation/templates/compensation/detail/compensation/includes/states-before.html:62
+#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:62
+#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:62
+#: ema/templates/ema/detail/includes/states-after.html:60
+#: ema/templates/ema/detail/includes/states-before.html:60
 msgid "Remove state"
 msgstr "Zustand entfernen"
 
@@ -892,9 +882,9 @@ msgstr "Ausgangszustand"
 msgid "Add new state before"
 msgstr "Neuen Ausgangszustand hinzufügen"
 
-#: compensation/templates/compensation/detail/compensation/includes/states-before.html:26
-#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:26
-#: ema/templates/ema/detail/includes/states-before.html:26
+#: compensation/templates/compensation/detail/compensation/includes/states-before.html:25
+#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:25
+#: ema/templates/ema/detail/includes/states-before.html:25
 msgid "Missing surfaces according to states after: "
 msgstr "Fehlende Flächenmengen laut Zielzustand: "
 
@@ -925,7 +915,7 @@ msgstr "Geprüft am "
 
 #: compensation/templates/compensation/detail/compensation/view.html:70
 #: compensation/templates/compensation/detail/compensation/view.html:84
-#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:54
+#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:56
 #: compensation/templates/compensation/detail/eco_account/view.html:51
 #: ema/templates/ema/detail/view.html:42
 #: intervention/templates/intervention/detail/view.html:75
@@ -993,16 +983,16 @@ msgstr "Eingriffskennung"
 
 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:37
 #: intervention/templates/intervention/detail/includes/deductions.html:34
-#: user/models/user_action.py:21
+#: user/models/user_action.py:23
 msgid "Created"
 msgstr "Erstellt"
 
-#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:54
+#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:56
 msgid "Recorded on"
 msgstr "Verzeichnet am"
 
-#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:63
-#: intervention/templates/intervention/detail/includes/deductions.html:58
+#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:65
+#: intervention/templates/intervention/detail/includes/deductions.html:60
 msgid "Remove Deduction"
 msgstr "Abbuchung entfernen"
 
@@ -1086,130 +1076,135 @@ msgstr ""
 msgid "Responsible data"
 msgstr "Daten zu den verantwortlichen Stellen"
 
-#: compensation/views/compensation.py:47
+#: compensation/views/compensation.py:48
 msgid "Compensations - Overview"
 msgstr "Kompensationen - Übersicht"
 
-#: compensation/views/compensation.py:81
+#: compensation/views/compensation.py:82
 msgid "Compensation {} added"
 msgstr "Kompensation {} hinzugefügt"
 
-#: compensation/views/compensation.py:146
+#: compensation/views/compensation.py:147
 msgid "Compensation {} edited"
 msgstr "Kompensation {} bearbeitet"
 
-#: compensation/views/compensation.py:156 compensation/views/eco_account.py:159
-#: ema/views.py:226 intervention/views.py:309
+#: compensation/views/compensation.py:157 compensation/views/eco_account.py:160
+#: ema/views.py:227 intervention/views.py:310
 msgid "Edit {}"
 msgstr "Bearbeite {}"
 
-#: compensation/views/compensation.py:235 compensation/views/eco_account.py:314
-#: ema/views.py:187 intervention/views.py:482
+#: compensation/views/compensation.py:236 compensation/views/eco_account.py:316
+#: ema/views.py:188 intervention/views.py:486
 msgid "Log"
 msgstr "Log"
 
-#: compensation/views/compensation.py:258
+#: compensation/views/compensation.py:259
 msgid "Compensation removed"
 msgstr "Kompensation entfernt"
 
-#: compensation/views/compensation.py:279 compensation/views/eco_account.py:466
-#: ema/views.py:355 intervention/views.py:132
+#: compensation/views/compensation.py:280 compensation/views/eco_account.py:496
+#: ema/views.py:359 intervention/views.py:132
 msgid "Document added"
 msgstr "Dokument hinzugefügt"
 
-#: compensation/views/compensation.py:348 compensation/views/eco_account.py:360
-#: ema/views.py:293
+#: compensation/views/compensation.py:350 compensation/views/eco_account.py:362
+#: ema/views.py:294
 msgid "State added"
 msgstr "Zustand hinzugefügt"
 
-#: compensation/views/compensation.py:369 compensation/views/eco_account.py:381
-#: ema/views.py:314
+#: compensation/views/compensation.py:372 compensation/views/eco_account.py:384
+#: ema/views.py:316
 msgid "Action added"
 msgstr "Maßnahme hinzugefügt"
 
-#: compensation/views/compensation.py:390 compensation/views/eco_account.py:446
-#: ema/views.py:335
+#: compensation/views/compensation.py:394 compensation/views/eco_account.py:475
+#: ema/views.py:338
 msgid "Deadline added"
 msgstr "Frist/Termin hinzugefügt"
 
-#: compensation/views/compensation.py:412 compensation/views/eco_account.py:403
-#: ema/views.py:425
+#: compensation/views/compensation.py:417 compensation/views/eco_account.py:453
+#: ema/views.py:595
+msgid "Deadline removed"
+msgstr "Frist gelöscht"
+
+#: compensation/views/compensation.py:440 compensation/views/eco_account.py:407
+#: ema/views.py:430
 msgid "State removed"
 msgstr "Zustand gelöscht"
 
-#: compensation/views/compensation.py:434 compensation/views/eco_account.py:425
-#: ema/views.py:447
+#: compensation/views/compensation.py:463 compensation/views/eco_account.py:430
+#: ema/views.py:453
 msgid "Action removed"
 msgstr "Maßnahme entfernt"
 
-#: compensation/views/compensation.py:452 compensation/views/eco_account.py:554
-#: ema/views.py:465 intervention/views.py:546
+#: compensation/views/compensation.py:482 compensation/views/eco_account.py:586
+#: ema/views.py:472 intervention/views.py:551
 msgid "Report {}"
 msgstr "Bericht {}"
 
-#: compensation/views/eco_account.py:58
+#: compensation/views/eco_account.py:59
 msgid "Eco-account - Overview"
 msgstr "Ökokonten - Übersicht"
 
-#: compensation/views/eco_account.py:91
+#: compensation/views/eco_account.py:92
 msgid "Eco-Account {} added"
 msgstr "Ökokonto {} hinzugefügt"
 
-#: compensation/views/eco_account.py:149
+#: compensation/views/eco_account.py:150
 msgid "Eco-Account {} edited"
 msgstr "Ökokonto {} bearbeitet"
 
-#: compensation/views/eco_account.py:262
+#: compensation/views/eco_account.py:263
 msgid "Eco-account removed"
 msgstr "Ökokonto entfernt"
 
-#: compensation/views/eco_account.py:290
+#: compensation/views/eco_account.py:291
 msgid "Deduction removed"
 msgstr "Abbuchung entfernt"
 
-#: compensation/views/eco_account.py:335 ema/views.py:268
-#: intervention/views.py:524
+#: compensation/views/eco_account.py:337 ema/views.py:269
+#: intervention/views.py:529
 msgid "{} unrecorded"
 msgstr "{} entzeichnet"
 
-#: compensation/views/eco_account.py:335 ema/views.py:268
-#: intervention/views.py:524
+#: compensation/views/eco_account.py:337 ema/views.py:269
+#: intervention/views.py:529
 msgid "{} recorded"
 msgstr "{} verzeichnet"
 
-#: compensation/views/eco_account.py:536 intervention/views.py:505
+#: compensation/views/eco_account.py:567 intervention/views.py:509
 msgid "Deduction added"
 msgstr "Abbuchung hinzugefügt"
 
-#: compensation/views/eco_account.py:627 ema/views.py:531
-#: intervention/views.py:380
+#: compensation/views/eco_account.py:659 ema/views.py:538
+#: intervention/views.py:383
 msgid "{} has already been shared with you"
 msgstr "{} wurde bereits für Sie freigegeben"
 
-#: compensation/views/eco_account.py:632 ema/views.py:536
-#: intervention/views.py:385
+#: compensation/views/eco_account.py:664 ema/views.py:543
+#: intervention/views.py:388
 msgid "{} has been shared with you"
 msgstr "{} ist nun für Sie freigegeben"
 
-#: compensation/views/eco_account.py:639 ema/views.py:543
-#: intervention/views.py:392
+#: compensation/views/eco_account.py:671 ema/views.py:550
+#: intervention/views.py:395
 msgid "Share link invalid"
 msgstr "Freigabelink ungültig"
 
-#: compensation/views/eco_account.py:662 ema/views.py:566
-#: intervention/views.py:415
+#: compensation/views/eco_account.py:694 ema/views.py:573
+#: intervention/views.py:418
 msgid "Share settings updated"
 msgstr "Freigabe Einstellungen aktualisiert"
 
-#: compensation/views/payment.py:36
+#: compensation/views/payment.py:37
 msgid "Payment added"
 msgstr "Zahlung hinzugefügt"
 
-#: compensation/views/payment.py:56
+#: compensation/views/payment.py:58
 msgid "Payment removed"
 msgstr "Zahlung gelöscht"
 
-#: ema/forms.py:40 ema/views.py:91
+#: ema/forms.py:40 ema/views.py:92
 msgid "New EMA"
 msgstr "Neue EMA hinzufügen"
 
@@ -1237,19 +1232,19 @@ msgstr ""
 msgid "Payment funded compensation"
 msgstr "Ersatzzahlungsmaßnahme"
 
-#: ema/views.py:48
+#: ema/views.py:49
 msgid "EMAs - Overview"
 msgstr "EMAs - Übersicht"
 
-#: ema/views.py:81
+#: ema/views.py:82
 msgid "EMA {} added"
 msgstr "EMA {} hinzugefügt"
 
-#: ema/views.py:216
+#: ema/views.py:217
 msgid "EMA {} edited"
 msgstr "EMA {} bearbeitet"
 
-#: ema/views.py:249
+#: ema/views.py:250
 msgid "EMA removed"
 msgstr "EMA entfernt"
 
@@ -1318,6 +1313,10 @@ msgstr "Neuer Eingriff"
 msgid "Edit intervention"
 msgstr "Eingriff bearbeiten"
 
+#: intervention/forms/forms.py:338
+msgid "General data edited"
+msgstr "Allgemeine Daten bearbeitet"
+
 #: intervention/forms/modalForms.py:25
 msgid "Share link"
 msgstr "Freigabelink"
@@ -1346,38 +1345,38 @@ msgstr "Wählen Sie die Nutzer ab, die keinen Zugriff mehr haben sollen"
 msgid "Share settings for {}"
 msgstr "Freigabe Einstellungen für {}"
 
-#: intervention/forms/modalForms.py:126
+#: intervention/forms/modalForms.py:124
 msgid "Date of revocation"
 msgstr "Datum des Widerspruchs"
 
-#: intervention/forms/modalForms.py:137
+#: intervention/forms/modalForms.py:135
 #: intervention/templates/intervention/detail/includes/revocation.html:35
 msgid "Document"
 msgstr "Dokument"
 
-#: intervention/forms/modalForms.py:140
+#: intervention/forms/modalForms.py:138
 msgid "Must be smaller than 15 Mb"
 msgstr "Muss kleiner als 15 Mb sein"
 
-#: intervention/forms/modalForms.py:164
+#: intervention/forms/modalForms.py:162
 #: intervention/templates/intervention/detail/includes/revocation.html:18
 msgid "Add revocation"
 msgstr "Widerspruch hinzufügen"
 
-#: intervention/forms/modalForms.py:181
+#: intervention/forms/modalForms.py:179
 msgid "Checked intervention data"
 msgstr "Eingriffsdaten geprüft"
 
-#: intervention/forms/modalForms.py:187
+#: intervention/forms/modalForms.py:185
 msgid "Checked compensations data and payments"
 msgstr "Kompensationen und Zahlungen geprüft"
 
-#: intervention/forms/modalForms.py:196
+#: intervention/forms/modalForms.py:194
 #: intervention/templates/intervention/detail/includes/controls.html:19
 msgid "Run check"
 msgstr "Prüfung vornehmen"
 
-#: intervention/forms/modalForms.py:197 konova/forms.py:457
+#: intervention/forms/modalForms.py:195 konova/forms.py:457
 msgid ""
 "I, {} {}, confirm that all necessary control steps have been performed by "
 "myself."
@@ -1385,23 +1384,23 @@ msgstr ""
 "Ich, {} {}, bestätige, dass die notwendigen Kontrollschritte durchgeführt "
 "wurden:"
 
-#: intervention/forms/modalForms.py:281
+#: intervention/forms/modalForms.py:279
 msgid "Only recorded accounts can be selected for deductions"
 msgstr "Nur verzeichnete Ökokonten können für Abbuchungen verwendet werden."
 
-#: intervention/forms/modalForms.py:308
+#: intervention/forms/modalForms.py:306
 msgid "Only shared interventions can be selected"
 msgstr "Nur freigegebene Eingriffe können gewählt werden"
 
-#: intervention/forms/modalForms.py:321
+#: intervention/forms/modalForms.py:319
 msgid "New Deduction"
 msgstr "Neue Abbuchung"
 
-#: intervention/forms/modalForms.py:322
+#: intervention/forms/modalForms.py:320
 msgid "Enter the information for a new deduction from a chosen eco-account"
 msgstr "Geben Sie die Informationen für eine neue Abbuchung ein."
 
-#: intervention/forms/modalForms.py:350
+#: intervention/forms/modalForms.py:348
 msgid ""
 "Eco-account {} is not recorded yet. You can only deduct from recorded "
 "accounts."
@@ -1409,7 +1408,7 @@ msgstr ""
 "Ökokonto {} ist noch nicht verzeichnet. Abbuchungen können nur von "
 "verzeichneten Ökokonten erfolgen."
 
-#: intervention/forms/modalForms.py:363
+#: intervention/forms/modalForms.py:361
 msgid ""
 "The account {} has not enough surface for a deduction of {} m². There are "
 "only {} m² left"
@@ -1418,7 +1417,7 @@ msgstr ""
 "Restfläche. Es stehen noch {} m² zur Verfügung."
 
 #: intervention/tables.py:45
-#: intervention/templates/intervention/detail/includes/revocation.html:56
+#: intervention/templates/intervention/detail/includes/revocation.html:58
 msgid "Revocation"
 msgstr "Widerspruch"
 
@@ -1434,7 +1433,7 @@ msgstr "Widerspruch vom {}, am {} von {} hinzugefügt"
 msgid "Add new compensation"
 msgstr "Neue Kompensation hinzufügen"
 
-#: intervention/templates/intervention/detail/includes/compensations.html:53
+#: intervention/templates/intervention/detail/includes/compensations.html:55
 msgid "Remove compensation"
 msgstr "Kompensation entfernen"
 
@@ -1442,11 +1441,11 @@ msgstr "Kompensation entfernen"
 msgid "Account Identifier"
 msgstr "Ökokonto Kennung"
 
-#: intervention/templates/intervention/detail/includes/deductions.html:45
+#: intervention/templates/intervention/detail/includes/deductions.html:47
 msgid "Eco-account deleted! Deduction invalid!"
 msgstr "Ökokonto gelöscht! Abbuchung ungültig!"
 
-#: intervention/templates/intervention/detail/includes/deductions.html:45
+#: intervention/templates/intervention/detail/includes/deductions.html:47
 msgid "Eco-account not recorded! Deduction invalid!"
 msgstr "Ökokonto nicht verzeichnet! Abbuchung ungültig!"
 
@@ -1464,7 +1463,7 @@ msgctxt "money"
 msgid "Amount"
 msgstr "Betrag"
 
-#: intervention/templates/intervention/detail/includes/payments.html:53
+#: intervention/templates/intervention/detail/includes/payments.html:59
 msgid "Remove payment"
 msgstr "Zahlung entfernen"
 
@@ -1478,7 +1477,7 @@ msgctxt "Revocation"
 msgid "From"
 msgstr "Vom"
 
-#: intervention/templates/intervention/detail/includes/revocation.html:63
+#: intervention/templates/intervention/detail/includes/revocation.html:69
 msgid "Remove revocation"
 msgstr "Widerspruch entfernen"
 
@@ -1520,31 +1519,31 @@ msgstr "Eingriffe - Übersicht"
 msgid "Intervention {} added"
 msgstr "Eingriff {} hinzugefügt"
 
-#: intervention/views.py:248
+#: intervention/views.py:249
 msgid "This intervention has {} revocations"
 msgstr "Dem Eingriff liegen {} Widersprüche vor"
 
-#: intervention/views.py:297
+#: intervention/views.py:298
 msgid "Intervention {} edited"
 msgstr "Eingriff {} bearbeitet"
 
-#: intervention/views.py:333
+#: intervention/views.py:334
 msgid "{} removed"
 msgstr "{} entfernt"
 
-#: intervention/views.py:354
+#: intervention/views.py:356
 msgid "Revocation removed"
 msgstr "Widerspruch entfernt"
 
-#: intervention/views.py:436
+#: intervention/views.py:439
 msgid "Check performed"
 msgstr "Prüfung durchgeführt"
 
-#: intervention/views.py:458
+#: intervention/views.py:461
 msgid "Revocation added"
 msgstr "Widerspruch hinzugefügt"
 
-#: intervention/views.py:529
+#: intervention/views.py:534
 msgid "There are errors on this intervention:"
 msgstr "Es liegen Fehler in diesem Eingriff vor:"
 
@@ -1747,11 +1746,11 @@ msgstr "Kontrolle am"
 msgid "Other"
 msgstr "Sonstige"
 
-#: konova/sub_settings/django_settings.py:155
+#: konova/sub_settings/django_settings.py:159
 msgid "German"
 msgstr ""
 
-#: konova/sub_settings/django_settings.py:156
+#: konova/sub_settings/django_settings.py:160
 msgid "English"
 msgstr ""
 
@@ -1813,31 +1812,31 @@ msgstr "In Zwischenablage kopiert"
 msgid "Document '{}' deleted"
 msgstr "Dokument '{}' gelöscht"
 
-#: konova/utils/mailer.py:70
+#: konova/utils/mailer.py:66
 msgid "{} - Shared access removed"
 msgstr "{} - Zugriff entzogen"
 
-#: konova/utils/mailer.py:92
+#: konova/utils/mailer.py:88
 msgid "{} - Shared access given"
 msgstr "{} - Zugriff freigegeben"
 
-#: konova/utils/mailer.py:114
+#: konova/utils/mailer.py:110
 msgid "{} - Shared data recorded"
 msgstr "{} - Freigegebene Daten verzeichnet"
 
-#: konova/utils/mailer.py:136
+#: konova/utils/mailer.py:132
 msgid "{} - Shared data unrecorded"
 msgstr "{} - Freigegebene Daten entzeichnet"
 
-#: konova/utils/mailer.py:158
+#: konova/utils/mailer.py:154
 msgid "{} - Shared data deleted"
 msgstr "{} - Freigegebene Daten gelöscht"
 
-#: konova/utils/mailer.py:180
+#: konova/utils/mailer.py:176
 msgid "{} - Shared data checked"
 msgstr "{} - Freigegebene Daten geprüft"
 
-#: konova/utils/mailer.py:201 templates/email/api/verify_token.html:4
+#: konova/utils/mailer.py:197 templates/email/api/verify_token.html:4
 msgid "Request for new API token"
 msgstr "Anfrage für neuen API Token"
 
@@ -1927,19 +1926,15 @@ msgstr "fehlt"
 msgid "Home"
 msgstr "Home"
 
-#: konova/views.py:117
-msgid "Deadline removed"
-msgstr "Frist gelöscht"
-
-#: news/models.py:11
+#: news/models.py:12
 msgid "Default"
 msgstr "Standard"
 
-#: news/models.py:12
+#: news/models.py:13
 msgid "Info"
 msgstr ""
 
-#: news/models.py:13
+#: news/models.py:14
 msgid "Warning"
 msgstr "Warnung"
 
@@ -2227,6 +2222,10 @@ msgid "Timestamp"
 msgstr "Zeitpunkt"
 
 #: templates/log.html:13
+msgid "Details"
+msgstr ""
+
+#: templates/log.html:16
 msgid "User"
 msgstr "Nutzer"
 
@@ -2315,15 +2314,15 @@ msgstr "Neuen Token generieren"
 msgid "A new token needs to be validated by an administrator!"
 msgstr "Neue Tokens müssen durch Administratoren freigeschaltet werden!"
 
-#: user/models/user_action.py:20
+#: user/models/user_action.py:22
 msgid "Unrecorded"
 msgstr "Entzeichnet"
 
-#: user/models/user_action.py:22
+#: user/models/user_action.py:24
 msgid "Edited"
 msgstr "Bearbeitet"
 
-#: user/models/user_action.py:23
+#: user/models/user_action.py:25
 msgid "Deleted"
 msgstr "Gelöscht"
 
@@ -3923,6 +3922,9 @@ msgstr ""
 msgid "Unable to connect to qpid with SASL mechanism %s"
 msgstr ""
 
+#~ msgid "Action type details"
+#~ msgstr "Zusatzmerkmale"
+
 #~ msgid "On registered data edited"
 #~ msgstr "Wenn meine freigegebenen Daten bearbeitet wurden"
 

From 1eff3687e82cc2086afbeb5b905ced834ec103de Mon Sep 17 00:00:00 2001
From: mpeltriaux <Michel.Peltriaux@sgdnord.rlp.de>
Date: Thu, 3 Feb 2022 11:58:33 +0100
Subject: [PATCH 08/12] CSS enhancement

* improves css on select2 width, which lead to strange viewport sizing on creation of new major datasets
---
 konova/static/css/konova.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/konova/static/css/konova.css b/konova/static/css/konova.css
index 6d882ec4..d0373ac4 100644
--- a/konova/static/css/konova.css
+++ b/konova/static/css/konova.css
@@ -223,7 +223,7 @@ Overwrites bootstrap .btn:focus box shadow color
 Extends css for django autocomplete light (dal)
 No other approach worked to get the autocomplete fields to full width of parent containers
 */
-.select2-container{
+.select2{
     width: 100% !important;
 }
 .select2-results__option--highlighted{

From e5cd5a2312d23ea95c24e566e3d07cf7d0d03221 Mon Sep 17 00:00:00 2001
From: mpeltriaux <Michel.Peltriaux@sgdnord.rlp.de>
Date: Thu, 3 Feb 2022 12:10:23 +0100
Subject: [PATCH 09/12] #86 Userlogs Revocation

* reworks user logs for adding/removing revocations with more detail on log history
* enhances css to display neat shadow on select2-results
---
 intervention/forms/modalForms.py  | 4 ++--
 intervention/models/revocation.py | 7 ++++++-
 intervention/views.py             | 6 +++---
 konova/static/css/konova.css      | 6 ++++++
 konova/utils/message_templates.py | 4 ++++
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/intervention/forms/modalForms.py b/intervention/forms/modalForms.py
index a240d8f6..f8a419d2 100644
--- a/intervention/forms/modalForms.py
+++ b/intervention/forms/modalForms.py
@@ -7,7 +7,7 @@ Created on: 27.09.21
 """
 from dal import autocomplete
 
-from konova.utils.message_templates import DEDUCTION_ADDED
+from konova.utils.message_templates import DEDUCTION_ADDED, REVOCATION_ADDED
 from user.models import User, UserActionLogEntry
 from django.db import transaction
 from django import forms
@@ -168,7 +168,7 @@ class NewRevocationModalForm(BaseModalForm):
 
     def save(self):
         revocation = self.instance.add_revocation(self)
-        self.instance.mark_as_edited(self.user, self.request)
+        self.instance.mark_as_edited(self.user, self.request, edit_comment=REVOCATION_ADDED)
         return revocation
 
 
diff --git a/intervention/models/revocation.py b/intervention/models/revocation.py
index e996f564..66318735 100644
--- a/intervention/models/revocation.py
+++ b/intervention/models/revocation.py
@@ -10,6 +10,7 @@ import shutil
 
 from django.contrib.gis.db import models
 from konova.models import BaseResource, AbstractDocument, generate_document_file_upload_path
+from konova.utils.message_templates import REVOCATION_REMOVED
 
 
 class Revocation(BaseResource):
@@ -20,10 +21,14 @@ class Revocation(BaseResource):
     legal = models.ForeignKey("Legal", null=False, blank=False, on_delete=models.CASCADE, help_text="Refers to 'Widerspruch am'", related_name="revocations")
     comment = models.TextField(null=True, blank=True)
 
-    def delete(self, *args, **kwargs):
+    def delete(self, user = None, *args, **kwargs):
         # Make sure related objects are being removed as well
         if self.document:
             self.document.delete(*args, **kwargs)
+
+        if user is not None:
+            self.legal.intervention.mark_as_edited(user, edit_comment=REVOCATION_REMOVED)
+
         super().delete()
 
     @property
diff --git a/intervention/views.py b/intervention/views.py
index ea169b3b..75131f67 100644
--- a/intervention/views.py
+++ b/intervention/views.py
@@ -16,7 +16,7 @@ from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.documents import remove_document, get_document
 from konova.utils.generators import generate_qr_code
 from konova.utils.message_templates import INTERVENTION_INVALID, FORM_INVALID, IDENTIFIER_REPLACED, \
-    CHECKED_RECORDED_RESET, DEDUCTION_REMOVED, DEDUCTION_ADDED
+    CHECKED_RECORDED_RESET, DEDUCTION_REMOVED, DEDUCTION_ADDED, REVOCATION_ADDED, REVOCATION_REMOVED
 from konova.utils.user_checks import in_group
 
 
@@ -354,7 +354,7 @@ def remove_revocation_view(request: HttpRequest, id: str):
     form = RemoveModalForm(request.POST or None, instance=obj, request=request)
     return form.process_request(
         request,
-        _("Revocation removed"),
+        REVOCATION_REMOVED,
         redirect_url=reverse("intervention:detail", args=(obj.intervention.id,)) + "#related_data"
     )
 
@@ -459,7 +459,7 @@ def new_revocation_view(request: HttpRequest, id: str):
     form = NewRevocationModalForm(request.POST or None, request.FILES or None, instance=intervention, request=request)
     return form.process_request(
         request,
-        msg_success=_("Revocation added"),
+        msg_success=REVOCATION_ADDED,
         redirect_url=reverse("intervention:detail", args=(id,)) + "#related_data"
     )
 
diff --git a/konova/static/css/konova.css b/konova/static/css/konova.css
index d0373ac4..fd29d3ab 100644
--- a/konova/static/css/konova.css
+++ b/konova/static/css/konova.css
@@ -226,6 +226,12 @@ No other approach worked to get the autocomplete fields to full width of parent
 .select2{
     width: 100% !important;
 }
+/*
+Similar to bootstraps 'shadow-lg'
+ */
+.select2-results{
+    box-shadow: 0 1rem 3rem rgba(0,0,0,.2) !important;
+}
 .select2-results__option--highlighted{
     background-color: var(--rlp-red) !important;
 }
diff --git a/konova/utils/message_templates.py b/konova/utils/message_templates.py
index 501a5a03..04a756e7 100644
--- a/konova/utils/message_templates.py
+++ b/konova/utils/message_templates.py
@@ -29,6 +29,10 @@ DEDUCTION_REMOVED = _("Deduction removed")
 PAYMENT_ADDED = _("Payment added")
 PAYMENT_REMOVED = _("Payment removed")
 
+# REVOCATIONS
+REVOCATION_ADDED = _("Revocation added")
+REVOCATION_REMOVED = _("Revocation removed")
+
 # Edited
 EDITED_GENERAL_DATA = _("Edited general data")
 ADDED_COMPENSATION_STATE = _("Added compensation state")

From 6c80480d0da7d15087f56f44044ea35fbf4f4e53 Mon Sep 17 00:00:00 2001
From: mpeltriaux <Michel.Peltriaux@sgdnord.rlp.de>
Date: Thu, 3 Feb 2022 15:29:22 +0100
Subject: [PATCH 10/12] #86 Userlogs Compensation

* adds log details for adding/removing of compensations for intervention
* adds handy restore-deleted function for admin backend for alls BaseObject derivatives
* adds/updates translations
---
 compensation/forms/forms.py                   |  70 +++--
 compensation/models/compensation.py           |   7 +-
 compensation/views/compensation.py            |   6 +-
 .../detail/includes/compensations.html        |   2 +-
 intervention/urls.py                          |   5 +-
 intervention/views.py                         |  28 +-
 konova/admin.py                               |  20 ++
 konova/utils/message_templates.py             |   4 +
 locale/de/LC_MESSAGES/django.mo               | Bin 36588 -> 36530 bytes
 locale/de/LC_MESSAGES/django.po               | 249 +++++++++---------
 10 files changed, 231 insertions(+), 160 deletions(-)

diff --git a/compensation/forms/forms.py b/compensation/forms/forms.py
index 7ac7f601..72b1a714 100644
--- a/compensation/forms/forms.py
+++ b/compensation/forms/forms.py
@@ -18,7 +18,7 @@ from compensation.models import Compensation, EcoAccount
 from intervention.inputs import GenerateInput
 from intervention.models import Intervention, Responsibility, Legal
 from konova.forms import BaseForm, SimpleGeomForm
-from konova.utils.message_templates import EDITED_GENERAL_DATA
+from konova.utils.message_templates import EDITED_GENERAL_DATA, COMPENSATION_ADDED_TEMPLATE
 from user.models import UserActionLogEntry
 
 
@@ -200,35 +200,49 @@ class NewCompensationForm(AbstractCompensationForm, CEFCompensationFormMixin, Co
         self.initialize_form_field("identifier", identifier)
         self.fields["identifier"].widget.attrs["url"] = reverse_lazy("compensation:new-id")
 
+    def __create_comp(self, user, geom_form) -> Compensation:
+        """ Creates the compensation from form data
+
+        Args:
+            user (User): The performing user
+            geom_form (SimpleGeomForm): The geometry form
+
+        Returns:
+            comp (Compensation): The compensation object
+        """
+        # Fetch data from cleaned POST values
+        identifier = self.cleaned_data.get("identifier", None)
+        title = self.cleaned_data.get("title", None)
+        intervention = self.cleaned_data.get("intervention", None)
+        is_cef = self.cleaned_data.get("is_cef", None)
+        is_coherence_keeping = self.cleaned_data.get("is_coherence_keeping", None)
+        comment = self.cleaned_data.get("comment", None)
+
+        # Create log entry
+        action = UserActionLogEntry.get_created_action(user)
+        # Process the geometry form
+        geometry = geom_form.save(action)
+
+        # Finally create main object
+        comp = Compensation.objects.create(
+            identifier=identifier,
+            title=title,
+            intervention=intervention,
+            created=action,
+            is_cef=is_cef,
+            is_coherence_keeping=is_coherence_keeping,
+            geometry=geometry,
+            comment=comment,
+        )
+
+        # Add the log entry to the main objects log list
+        comp.log.add(action)
+        return comp
+
     def save(self, user: User, geom_form: SimpleGeomForm):
         with transaction.atomic():
-            # Fetch data from cleaned POST values
-            identifier = self.cleaned_data.get("identifier", None)
-            title = self.cleaned_data.get("title", None)
-            intervention = self.cleaned_data.get("intervention", None)
-            is_cef = self.cleaned_data.get("is_cef", None)
-            is_coherence_keeping = self.cleaned_data.get("is_coherence_keeping", None)
-            comment = self.cleaned_data.get("comment", None)
-
-            # Create log entry
-            action = UserActionLogEntry.get_created_action(user)
-            # Process the geometry form
-            geometry = geom_form.save(action)
-
-            # Finally create main object
-            comp = Compensation.objects.create(
-                identifier=identifier,
-                title=title,
-                intervention=intervention,
-                created=action,
-                is_cef=is_cef,
-                is_coherence_keeping=is_coherence_keeping,
-                geometry=geometry,
-                comment=comment,
-            )
-
-            # Add the log entry to the main objects log list
-            comp.log.add(action)
+            comp = self.__create_comp(user, geom_form)
+            comp.intervention.mark_as_edited(user, edit_comment=COMPENSATION_ADDED_TEMPLATE.format(comp.identifier))
         return comp
 
 
diff --git a/compensation/models/compensation.py b/compensation/models/compensation.py
index 788f4b4c..082131c3 100644
--- a/compensation/models/compensation.py
+++ b/compensation/models/compensation.py
@@ -20,7 +20,7 @@ from compensation.utils.quality import CompensationQualityChecker
 from konova.models import BaseObject, AbstractDocument, Deadline, generate_document_file_upload_path, \
     GeoReferencedMixin
 from konova.settings import DEFAULT_SRID_RLP, LANIS_LINK_TEMPLATE
-from konova.utils.message_templates import DATA_UNSHARED_EXPLANATION
+from konova.utils.message_templates import DATA_UNSHARED_EXPLANATION, COMPENSATION_REMOVED_TEMPLATE
 from user.models import UserActionLogEntry
 
 
@@ -235,6 +235,11 @@ class Compensation(AbstractCompensation, CEFMixin, CoherenceMixin):
             self.identifier = self.generate_new_identifier()
         super().save(*args, **kwargs)
 
+    def mark_as_deleted(self, user, send_mail: bool = True):
+        super().mark_as_deleted(user, send_mail)
+        if user is not None:
+            self.intervention.mark_as_edited(user, edit_comment=COMPENSATION_REMOVED_TEMPLATE.format(self.identifier))
+
     def is_shared_with(self, user: User):
         """ Access check
 
diff --git a/compensation/views/compensation.py b/compensation/views/compensation.py
index 43bdf8ce..aa2151fe 100644
--- a/compensation/views/compensation.py
+++ b/compensation/views/compensation.py
@@ -18,7 +18,7 @@ from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.documents import get_document, remove_document
 from konova.utils.generators import generate_qr_code
 from konova.utils.message_templates import FORM_INVALID, IDENTIFIER_REPLACED, DATA_UNSHARED_EXPLANATION, \
-    CHECKED_RECORDED_RESET
+    CHECKED_RECORDED_RESET, COMPENSATION_ADDED_TEMPLATE, COMPENSATION_REMOVED_TEMPLATE
 from konova.utils.user_checks import in_group
 
 
@@ -79,7 +79,7 @@ def new_view(request: HttpRequest, intervention_id: str = None):
                         comp.identifier
                     )
                 )
-            messages.success(request, _("Compensation {} added").format(comp.identifier))
+            messages.success(request, COMPENSATION_ADDED_TEMPLATE.format(comp.identifier))
             return redirect("compensation:detail", id=comp.id)
         else:
             messages.error(request, FORM_INVALID, extra_tags="danger",)
@@ -256,7 +256,7 @@ def remove_view(request: HttpRequest, id: str):
     form = RemoveModalForm(request.POST or None, instance=comp, request=request)
     return form.process_request(
         request=request,
-        msg_success=_("Compensation removed"),
+        msg_success=COMPENSATION_REMOVED_TEMPLATE.format(comp.identifier),
         redirect_url=reverse("compensation:index"),
     )
 
diff --git a/intervention/templates/intervention/detail/includes/compensations.html b/intervention/templates/intervention/detail/includes/compensations.html
index 442d5d83..b7a546dd 100644
--- a/intervention/templates/intervention/detail/includes/compensations.html
+++ b/intervention/templates/intervention/detail/includes/compensations.html
@@ -52,7 +52,7 @@
                 <td class="align-middle">{{ comp.title }}</td>
                 <td>
                 {% if is_default_member and has_access %}
-                    <button data-form-url="{% url 'compensation:remove' comp.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove compensation' %}">
+                    <button data-form-url="{% url 'intervention:remove-compensation' obj.id comp.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove compensation' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                 {% endif %}
diff --git a/intervention/urls.py b/intervention/urls.py
index 4754eb53..1c663124 100644
--- a/intervention/urls.py
+++ b/intervention/urls.py
@@ -10,7 +10,7 @@ from django.urls import path
 from intervention.views import index_view, new_view, detail_view, edit_view, remove_view, new_document_view, share_view, \
     create_share_view, remove_revocation_view, new_revocation_view, check_view, log_view, new_deduction_view, \
     record_view, remove_document_view, get_document_view, get_revocation_view, new_id_view, report_view, \
-    remove_deduction_view
+    remove_deduction_view, remove_compensation_view
 
 app_name = "intervention"
 urlpatterns = [
@@ -27,6 +27,9 @@ urlpatterns = [
     path('<id>/record', record_view, name='record'),
     path('<id>/report', report_view, name='report'),
 
+    # Compensations
+    path('<id>/remove/<comp_id>', remove_compensation_view, name='remove-compensation'),
+
     # Documents
     path('<id>/document/new/', new_document_view, name='new-doc'),
     path('document/<doc_id>', get_document_view, name='get-doc'),
diff --git a/intervention/views.py b/intervention/views.py
index 75131f67..98654411 100644
--- a/intervention/views.py
+++ b/intervention/views.py
@@ -16,7 +16,8 @@ from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.documents import remove_document, get_document
 from konova.utils.generators import generate_qr_code
 from konova.utils.message_templates import INTERVENTION_INVALID, FORM_INVALID, IDENTIFIER_REPLACED, \
-    CHECKED_RECORDED_RESET, DEDUCTION_REMOVED, DEDUCTION_ADDED, REVOCATION_ADDED, REVOCATION_REMOVED
+    CHECKED_RECORDED_RESET, DEDUCTION_REMOVED, DEDUCTION_ADDED, REVOCATION_ADDED, REVOCATION_REMOVED, \
+    COMPENSATION_REMOVED_TEMPLATE
 from konova.utils.user_checks import in_group
 
 
@@ -564,6 +565,31 @@ def record_view(request: HttpRequest, id: str):
     )
 
 
+def remove_compensation_view(request:HttpRequest, id: str, comp_id: str):
+    """ Renders a modal view for removing the compensation
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The compensation's id
+
+    Returns:
+
+    """
+    intervention = get_object_or_404(Intervention, id=id)
+    try:
+        comp = intervention.compensations.get(
+            id=comp_id
+        )
+    except ObjectDoesNotExist:
+        raise Http404("Unknown compensation")
+    form = RemoveModalForm(request.POST or None, instance=comp, request=request)
+    return form.process_request(
+        request=request,
+        msg_success=COMPENSATION_REMOVED_TEMPLATE.format(comp.identifier),
+        redirect_url=reverse("intervention:detail", args=(id,)) + "#related_data",
+    )
+
+
 def report_view(request:HttpRequest, id: str):
     """ Renders the public report view
 
diff --git a/konova/admin.py b/konova/admin.py
index a64d5243..5970b020 100644
--- a/konova/admin.py
+++ b/konova/admin.py
@@ -8,6 +8,8 @@ Created on: 22.07.21
 from django.contrib import admin
 
 from konova.models import Geometry, Deadline, GeometryConflict, Parcel, District
+from konova.utils.message_templates import COMPENSATION_REMOVED_TEMPLATE
+from user.models import UserAction
 
 
 class GeometryAdmin(admin.ModelAdmin):
@@ -78,6 +80,9 @@ class BaseObjectAdmin(BaseResourceAdmin):
         "identifier",
         "title",
     ]
+    actions = [
+        "restore_deleted_data"
+    ]
 
     def get_fields(self, request, obj=None):
         return super().get_fields(request, obj) + ["deleted"]
@@ -87,6 +92,21 @@ class BaseObjectAdmin(BaseResourceAdmin):
             "deleted",
         ]
 
+    def restore_deleted_data(self, request, queryset):
+        queryset = queryset.filter(
+            deleted__isnull=False
+        )
+        for entry in queryset:
+            entry.deleted.delete()
+
+            # Remove delete log entry from related intervention log history
+            logs = entry.intervention.log.filter(
+                action=UserAction.EDITED,
+                comment=COMPENSATION_REMOVED_TEMPLATE.format(entry.identifier)
+            )
+            logs.delete()
+
+
 
 # Outcommented for a cleaner admin backend on production
 #admin.site.register(Geometry, GeometryAdmin)
diff --git a/konova/utils/message_templates.py b/konova/utils/message_templates.py
index 04a756e7..43cdcfbd 100644
--- a/konova/utils/message_templates.py
+++ b/konova/utils/message_templates.py
@@ -21,6 +21,10 @@ CHECKED_RECORDED_RESET = _("Status of Checked and Recorded reseted")
 # ECO ACCOUNT
 CANCEL_ACC_RECORDED_OR_DEDUCTED = _("Action canceled. Eco account is recorded or deductions exist. Only conservation office member can perform this action.")
 
+# COMPENSATION
+COMPENSATION_ADDED_TEMPLATE = _("Compensation {} added")
+COMPENSATION_REMOVED_TEMPLATE = _("Compensation {} removed")
+
 # DEDUCTIONS
 DEDUCTION_ADDED = _("Deduction added")
 DEDUCTION_REMOVED = _("Deduction removed")
diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo
index b708497fbae6e4a938da19633c3c7db6cd4349dd..23892cf84d1776aa8f508d127e5ea2d93a2b6cac 100644
GIT binary patch
delta 10428
zcmZA6dwh@e|Htub%xsvkF~n@cPNvnEbIzx+LgWx~+MLa@)hLH6L_%tPa{6N5oRSX6
z#3-R;$ssu;2}#txUph$orGxL|`MF;H`CYf$YxmdteI4G%>+{*Twz|x=)n(iZ;eksW
zj?w_fse@Tzj`Knp$9b!+Y8~gBM8^r^+$Ho;{w2wA=Hc9ijx!r8B|A=kd=V$%RqToV
z8ad9hxE`Z0>0ZZahTX6d&ctxXah-)Ep;Q!l70z22M0qb(#Di9U0(IjR%*Pv88ONn~
zPDNe+9M(sl)$hb=ln-JRJcm{Bn!oHi&Oam!+6lYQaUw7pbwd-ZjOiGO1F#lO!kReW
z&aW}IA|rD4VmzL(`aiHN<>31rht#Qr8sGyMLHkZ85{+yChGG_~!Cb6?&tnL#LG}Di
z)C2aQ?mJ+9juj|huyQHt{##bAoa)_I8<{+(9=i2NdXt1<9+t;Bn1BmWBQ8Qs?NQVW
zoi(pxFy(;8-hCBNGZ2oNxj0k@(@-<o0d;?W)SejMnDwtpGM|d-_%GDRx1xGpf|`+w
zs42gW>R?b4uYt-~g>n??!6|qTcEo6W4AsyK)O{;a9bRYUx0*2j5maoaLLK=8HML)%
z9()OP;|<i*-bQt(T$<wqVg!a`O;mj{YUC|Z_ot(l?om|3nV5kSu{jpIBnwG?MlHeg
zrd~%Dp&BeiJ#Z6hWW}fsokVr?oRz;tHSizvSFBF?FVy|v&Ag7pqV7vZ4cKi=qJ}%8
z*7y<Bnhi&dDBI3Y!$`^tQRmm9J}<UlH9Uf9@RFVX9re6Gh8c-fFaZ-V0()U2z5kh3
z@e=mp#Cp`!-b9V)57bnaY2o!a!i+;reRI@|^gvzT2Q|XMsD?&jC(K8UcsG{ABN#;c
z&IuCTcou8px2O*MgBn5EmfjSGp{}codY==}Kb5HK8>1R*j#~2!)J*j=N1|pr2Wy~<
z!FvCfk?1vi74^W6%ui8E@Hwi1i{^Jo-<(o>80)p-6~iY`du9`AuWUzF!TAgaVo+=E
zBYGI>)BPB_F(lVX^qN$Dz?-5*sGhe)^)v&u#+j%!o{C!2#i$N$z?xWuT9PBEfm}q*
z$W@HR+o<Q%Y2z(fY8&QXBWp>8Y>Qf(PN=o&j+)BBsD?(NrasT=r=aeeg&O%hJ70k6
zz!KDwtwIfG1M2zPP|qoD!~E-l_o>h(`WUs@j+z%xug_1Y4*i4dTBk}|?<2Gg>Om7w
z4d$Ral#jJ>8s_3M)RI(a=UpF%8c>o;qK2EJHb*<uNP3|<G6>c438<NvYW1_N>_c90
zXEmzflgPKX^Cfo1bEqYZY40`I0=0x)QP;aeNYwBMR6~<d4b4P#U_NRStw7y)9M$uy
zsI|O_TH}xo-b_WI2Gj^OV`-@8bwzcgH)^kpMfQ;E%<>Xvxm~aYHKGzs!oN`sCUo>V
z+7wma1=Uavvag&e*aNp){T<X=m+$0#iG`w;C;_#kDHy8vzl}d(m!lr|sFg>c)-VU_
z;6l_)y^h*5#i-AR{ip{Y#aKLrz3~?2VK>&{5quB(VwEo5OlM&z?K_jL!bLr35$eG{
zR73x^^6RK2+K!s~{irGa0<{D`U^M=Pg;=Mn_q_K|OZg#cCQo8AUP4zlhIaEt7Hg)W
zrl<p|f!?TwM`94>pw=`W%i}Xx3+JO6T5A@eHuC}0%zb9{7cq|V&)t}RePBeUdm~Ol
zm7Ag(NXN3+2ZOOcYS#`!btDVx;sn${7N9<u3a$JuY5<2&9XyBHe7~8MyEFfKKtgx#
z{p^a`d?Qe6xeT=wyHF4Q7^CoO)Na0wdSEy^uN@|%&QCx-DxBw0BQHS)?VQ12jLz^j
zXQE3|fr=E=$XlXbvj<TPj<oVqs1d$su0!pCov7=MU`4!)YVar2Ox;1vK;VO3!;z@_
zqEUOnO|zsUCQ;EFb;HwG2^XOryaIK@2CFZ!@;=mFIfn6g9<^kF4|z)zjO8hZ;b5$R
z4KWXA=>0DwsYgYfp5C`vJJf>;%wmk8e9_b|37Yy?Y=A8>4TqvW2Yjf39LHgJ8`Ysf
zypx*xp%{W=u$<oi$s}c{n1TuTG-^+*^<ThihI&8=Y9xnIQ+v|<67}Ho7>ZX>OL`N-
z@D6H8!yfkTi^Iy48)8-3cUqEY?K4mh7>at}MAXzjY4x*E9e5Gdp=GF%ti<}b0h{3=
z)CZT-$J>l`P}jGza$D4l4MA6HQ9#lN-^Xw)HUBch`g)tM9#-XiGt_nIRzKLxvHCfv
zkuNo0!zz?_phjMTy8ny5%)h3-l!|hA4fQ(RK=rudBer=^<r-#ftB=M?)F)Vd8tQp1
zFd18$V^9P1VH4bkDR}b{=3h6|@8@lrcuc3<8`Y5&sPFA<Rz7N8MSY;$K}~h7{@$85
zMJ+{pybrTb=U+iB<yO?*cptUYB`!(F0LM9v=c%YU&~Y~6Eqn(HA7y>9_aN`j>T9@z
za_hnTy@)q(5B3=1eP9JYM&pzlqLyj`CgKc?z}KvPH)@Z$M@ZC@)8=K2r2Gpm$Kavf
zgVvzdtO#}eLDUFOp=KzMcP$E|Q8U*DRo~y7Z1sy!*KI&PVO{4V61~q?P*eIhR>vB{
zy-%upQS}{B^+QnC=c3kl0jgs=P_N}7)aS=B)Smhcb^V{HO&Kx5+l=)wQty8niF%xY
zTAM7?ROO&H-5k`2pR@WU<|fqZw+A)VC00IbUPi6`bySB!MtU=QKWgf`VI1u{y-C!=
zeAI4UjQWLRC92_K)O&vr)!;GI>+~h6;ZoFnf1(Buoav1`0yT5BP}es>J-0JzX-1%{
zkxwVld$|PF<MpTq?L&3!uz4BP;GdX;p;_K1WpmVX`lC9UgF!e2)v=kVjx0nqyaCJN
zzAWZno9zG<nv!$occ`_xj#|UNQP-6n<z06V>Vfr9*R??{*+X`I1oDbI<ITOeoN~3%
z-gDkY?U@6knSZ^PXQ<E=T}JirCaObWV?1l3ral(SVY1byqGqTSYIF8MT{jjrgSi-o
zGq79$|L}mCkxgU04)1VDG^L-KU!xxMBkBQx<Gdb+p++2!YOp=({6GxBOsmhvB+7G9
z&)tHlxF0p*Uy(jILF2vq-AN?cWKUr=d=53$t58!~gnC~~P(8nbnz0*L0slemnUD#5
zkzpLFp<x(;x#n~%PkA0{fQyltbe;7idhi>lO}G=)p@UckPoZu+gW5C~u{mBwHBft^
zw{&r+`<tOU&;`}dK-6`Uuo+H8J#P#8|Nh@eq6R-et?dyE#1q&G&tP8+&*n1%N24CF
z4IAQa?1)!zE+$UmmBr1NjAL@V-z$8m@_VR`evkgY|8J3K^W8x$L6yh7*C`IQ6m3x>
z=x60&sHMqAt?>eL6~<8BY<`A8lz&DI=y&rk)Ib9!GyiI!Jc*{Pu9=Fuu`{Zn4Ah8+
zVHF&MT8gO{jMJ@tF6zNc%~h!D)?!6`&FZ(IW}tX7>tBhagbH~I!|)PnYJb5Ltdr~Q
zg$z{3dZI?u5B0$_2w%oL)MgCI^BS&)YA7BxvrSRY?_u?W@_7HNQZbGS?dEA1iu3G(
zSFF4awdvkLjieOSf#0wv-bTHi-JkGgC=<0Oo<LrEXD3GBE<1k|)v*gMiI(6xreolf
z-cmed4oAIyd8iu-P$PI1wIo|nd!rcDu@A8k9>aU_PfWq2eDCXeAf{5Dk6qE-P12Yo
zV2aoCGz_QQ1>565R0AvUeq4v`@Dyt8t4;NcLVa?^qh_W9YG%8l?jMNSJ0npY&%<hZ
z|EH1EpyDO0i?5?@EJ2O*Eb4)!sI~tQlkhj3j?qu?VTG%34z_&S`#WL}YAM5}d7lGO
zsDU*>%~V&cO8ZV9tH?r4@#Ch8(UccsJZ?rk;I!5MfJZ3@(+kbS7pOJ9X#R?tsq!<t
zCGLiL{!r8avnB02E=hGPuoD|mQ?v`UDfgoqID&QXG{)f#)Priy^hVSW^}02~n%D}p
z2l^sY?aV^W$WlAM9$k%S4~af%kE0qsiCVLBs42gKYWNze!4P__25O_$JPozBy)X)g
zqXsk+b>Ayk7vDk6<Z*0|zq`!8UYi!rcs=Wbx^cLfk7{rcs)0h(YqbR<@dl=1$SiNK
zw8plSGf*R4fSS4GsLz)*sQWgfI`r`@dQzX{JF5tu?R|hGpnBd3b>VQ+MSn+7Q@RD!
zzyZ`u9z`|u4c5l%r~!qrGgXd8ElF$Cb>m!1@=*_*gBtO2)GmDk^%m^F7(9r2!1q`N
zt3T^4Sxqwrc`=+sY>aDgIi5njHQ9VaW#ckTM7P{LFG;}|Dh6OOPDOQKy`A5R-6)^M
z2Ql_J?;jW^;Y7+ss1C)<_cm>P)E-JfJ*Neh#m<<9=@_l|e+G#zT#b6bMhwO`P&X7|
zdEAM5&|cIG9k%j$)YO)uma5$I-llDUTB>B!R6l@PqVA}@F$62<{U2`^Jc+ttHmX4%
zszWO=7z<IGZ6mhAvu3pg-mdS3x;`6Y@NrDU0&I=DF&=MWAVw`j+IQ+H!347rYUHU_
zZi?zaD^$liVGw56`99_V)YtD2)cqq-*N?XHB&<L=7q!=BpsNdCCeejUQ5`8n)vrT6
za3iY0x2=9V>bhdoX554NlKC&*kM}I{eizI@mFJ?Kw*&Qh?#4d&$0FumA0!XH;JqfJ
zFoyCpjKx)0A3rd^#fp@J7JHw7;dmeA7RY9D#$sihkGgJ|mDgba<<|VTq=ci$|8p2$
z2vj^nA;eCo{@<3rVLpjZ5f^omV+>K5@*Z446cRduscVl<<1RetOO1|jCs5K$_<-&p
zz9Q}(XD!b#Cz@ZP{$b!dE=(dGCI6VvH%x)u+yJ{!w+c_-G@=(#kMjMfW4iaR;{3N3
z6{o4td=DXShqH;7$SdLVc%B$c+)J>Q{#^q8MGT_upf5D$K6f+O-Q#QWPzt@R;#=HG
zET(=0k!sg=pzaX)Eo_0qQAcO;Bw`Kur^s&=&L6}Mg0=A<i>TMJpBNOtmPw=HUlexQ
z37veIysr|Dhsb-|xmlP;-4{d(@tW0tLLNt4rF;fg;@bq@sm>alh5sRRln|x<Og~&2
z=Ysj9J@M{Q!SXTKh{}#cKk{es6tRL_zvr}6J@F5bOx+TkO!Oy)5IKa7&p5Y%xO;?<
z<PyQYU9lD2ZJcRJ++$aq!G^>sm5J3vhTZxm`DXGeM4;7;*L58Fx_;Q7d4HrR&F5S%
zoQn6^b*i6FzMI&nHRwRnil|GJ;iTT@6T}b1JJkI^OeW3|I_lwie3|%($hP_-^JD5>
zC2vQZBvw=IL3~Jr6ElecL?_N|(HiJjN4!AAC47ZQBq~u}PqZg?Q(lESnt3?;DeDX9
zeSC{}*Xozrbstc^N!+mdwm6u$OsuuKceT6Tw1Q}C`Mr3RxM1b;7;6unW_8=}|A?;C
zPa@h9Kl%#l*KpgAMG!i!n99>F|E~%hlZYu+x6pL)bIT9=ui{^_tgK>l;sWLEIMeEn
zktdK3!tVl{@y<F5(~0uLKB5mXhtQ#K4jm0BzlB|hLh`D1{!z-G65kLyvWNqm8)oPI
zmHc?0*ySr|P{X}K7S7o>?9@qfD0P{{@05?*-S3dUM_!BgfEZ=hioSNucJmoLLL9ei
z9<lnl_$qZ{iMo1^_u2_vmuq<)e35w2$}e#)hJ2zf;uuFBNW4v65i9#^`Klq`K)#XC
zZwEShdN_BmI_J}^+>PA-JHcG&P9YMP;AsB|zVl37rsE?b%Ie-DALY9g7ZG)sn#YMy
zq8qg>?Fv%o3t!dv2zMV@3AKD}`hWE(AU{C<3(?H3u1K!$(60#{1F3%k&k=gf`cwWJ
zKf!rKG?7nP$BV=!;t25y^|w(+Dft$CO6b_>|H<!JW-9(n#BtFk;vTCPQ!O7r{g;+s
zB-b$<f5nx=Nb<k%7+%K!{2YDwJ#Li&_9;QxDMN*hqgWoFz>kP|<Y$Q-@?v5J@f`60
zb$5@iNXk;DW4Wnchh8HdB9;+4!Z^2<*g+&ye!UVu%IXY9Bj4Kz(Qa){9rY@lSgc05
z9DYW`5M7BsiPx#u(Ve(Vo=1!$uYo;?D#QrN)d?M=iPl64^$Tz$F`N8DqA7VKa_I3i
zNTCHLdX-Ld^AL5v5k6vp)sgy-PW;?UOd#TY1&I;eALfc$l)m|YS5oCPrtX>&j>pKy
z5>>sTbDBJxyqI{Fyk^n$#NrU&?#69HVy4ZA$sLuQlV4QYcu`Q%^DWOL`SLTnm!;k}
SJTtOrZ|0KVqQ@srulGOV9oYi_

delta 10462
zcmZA62Y63s|Htu@APbREVuU0#h#<tKW|SDE_N=|dPIVZ^iqb}#CRD7}>VvjQt)lv9
zX=$rkTC+sUqZNCUsy?*O`|~?r*Y&^t=eoXL-}^q}zRx{Qf-NijudVQR&qWkm<ZxW^
zbDU^QE9N*0{2gacIn_GOt;&v5jB~d!hq7N4$C-<Za27@<I!<?d2gl+c*a3%Db(}f4
z4a;JKYK~JEdtecK9U~mab(WD7rQ$=c!r6lXl)uNqc*5#0pl-Z}lhMDr<AmZ%<~-E(
zi?IT(vHFAf1mzPLhF38hANtBJ4@u$;sffWyOhVm|f}z+GOW<%Uh10Pl=Gys>%+HWF
za=yokc){v}YdB5;$|aF1CmQvF?J<(}oh~GLv*B12(@_o1!YEvV!T1rX=bxY+a2R#p
zG4nizP`+X12dMi4YI@g|L*18%45E{aZh4XcB*kzx24W6Y!eyv8-j5pEJk$tXHXmUS
z<?v+hzS5`>D32PsI;ak|M2%=C)cwOyYvSc(=3ggrsR+l7SRD7FM&LMVM6RKR{4Z1o
zBWrmLl)*5{RZtIZgr%_~#^5MaL$9LlTaW7SW-ITi#rQ{3@i`Uhz;V<NT|zzh2I|It
zP(vG7+v`vS7Ni`D5g2dv^-*u$3Uz-s)YJ__H9Q{M;Y(N#zjR4nBYA|Hg86m4jx0en
z_&(}^J5X=-C8|TepgNjw<(sGm?wi_c#VH4)?vFurq&n)p`luIno06#EPN+E^h?=u8
zsG)z^&d<XVlygz%H=({4d+-T7jcV|QoiE7i>3QK;0?T40tc{V_7prRjkGF~y*pU+-
zp@!D4zV}7}sG%%|>T#@@j2ilus1fOb8iD?(HynX#XdI^CY}EY+u@Iid0NQtcCee+*
zVHv!M>OkQJ-W!CWhA<j+T_S2f*GAt^qONa>YOp10sC%MDYLL~Bv+``zh-YDx_Ww!}
zJ$NT-JARIO@I~_~YAWua8gd$X7DD>!gkUF3L6(uT2(@;;!P0mfnHA?2_QXn!yifHE
zboH6PNfL{pPkGxV2{lyDpx&TAMqwIiuIHfUdI@T7H=#Os088RA)YM!@y@=D;8<{|i
zqgV#@oW_kAf6ZNID)eT(&Hku48iMM`DAbTnMKv@RH3bW;J{NWWYSf#rv-4X}9oT^y
z;ZIR7bO81I9~(3NdeCXRAP?1{-_W=J&3{m9Agqbkp%`TKIyJEx_Cq}<6V+fAszZxW
zYic=8#GR-qNo?v}-^wM?8?{9>+!M7p2B6+#JgOs8P(9B?jl>eGUt{HM$kuoMjcWKV
z@>AS-fGzPMY6_b-^V;i$nnHItiEfyNYIqi^p=?w`@1Q!c0kw#Bqi(#7>UdytZ!U|Y
zR(}=LNHsyd&@-qh?1p;Ya8ySoAZx{S=96d<tu}Yr1xHYCl#dBmu7%fNDypO1QT4-6
z4P_zg&B?{Kc--n^Q@pvZjHRfrj+&xW4AuVcNTN6CXQrVZ__CE}q2@3Pqwxb&2fjuv
zs?(@1-38QxZ(tnW!)Gyy@t=evuq&R$E?DzvMw<4W3=(x9TNStx^`MQY2X8|)^qG~v
zMqPItwT&*IhWI{e3W8gCKmE$$+msulo_7{CmH$DtcNg76693lTjnz?a*23(Jn#)0`
z1}2~yo{f577HUoxV<4_V4e<t4L;KBRsKxv%>iM^<-brQr<EaQw^*$K&P;cDU%H2^7
zjKl&s34`zjEQm8u9m&9Qn28#J_fczVua!@rUf>F<gAY+3suFD&e<ew6ya%MB_UCZa
z;+ut<%blo>{e*h(Z&(%|p;mJlR-B$w3!7ql)cH*0)8V{_dh>kb<()q<2%EX>yw%wT
zL#XJ8`gHb2ZL=|`24`D&De4V3n_r;Tz$w&q*Re1bZ0|J~h8n3@)Ck0*8m@=B&uvDc
z#n8<hj0uz{pl(=(MQ|hP!Mjn{AF%pkRz8nfD>tzs{*9Wl_-DK+O29zMHLwrX$12+Y
z3rVI?u@}o@;||_WvjM0FZ81+{EM@(YAmdO&-vXb+-dG!5)OTPT>P2p2e=NgZREMUZ
zM!>~j?f-csg{a6zf6T>7xD2(Z_S^Xjs0ZYu-sBo;Xz!X2P!Ikai(+6WZ%T_}G0L&1
zDXoFJuN8*UzSE8*9DAeYJ`ME%7xlmesG)z$>Q|#Wuo=~%ofwRJumT>yx_AZk;fm|*
zEyl*E>-$)_KkD~SXBr7};cUUGn1>M<!e>gBHEW<2UkZj}533((^;69(t6z(H^N-Dg
z7)JRdhGKpf#$OHGr$R#?($$-aqNwc@iRy7x^erAM*EgTC`es;!>r$=08|rzzFcJHj
z^H49i4Qt`~u8e<mlH%RG8(N|kO>0cW38;?jMtv84wDJuzu)Fs`iA4={L)13zj+%;r
zn1mU2emiO^kD{*2b4fJU`PjmbzdmCg<pw?ZEe4}{@f$Jj#br35xA)iUqU@m^l>1^2
zjO@#AH#i#g!Af|Jj|;X#O;sjV#<wvN4_du@hD3|(I;taom<9WJACw5pr9J`mpna$*
zJBGUc66y`_p++d4y;c^Rp+>GBs{REt+v+zW*SXFC67~2ZYCi`I@P@P;7N=YvpTG{N
zZ}(tS{WR3|IjA{)AJwswsO@zH_5HYs+TJAwde=vz7G-S=)BbNsQi6(Zs2-=G<|YF*
zR9UD+xEA%s>#cr=`3-9OokNXKzLozn3l8$uMkuO7RZ#79!XVmrMv&;I-~`kgEk>>8
zO{iZu_MjR*joJm5Pz~NhZKnsQhC>E>_eG;#AOZE}wNWG25H)gLQTL5PR}D-d(H!NX
z_T^SAgZoeqI*01mWz%nn*I+5sZb`&)*bOy;>8Oq_zyMr?dZFd0j%+}+w|@xZUx4Hs
z6&jKYsKxle^dIWYRbkYdltEn=hq|sl>VeHsbJ_<rWuxu9i)?jgo|%VQ%*n&N=NuZw
z_-oNzphEld9%^X(hI>7XKs8j&tcx1@rdSBuSbay-2=zn_@p#mAb5SFhh4Huy3;FR^
zJk*FBbVqnSK8C)<WB!GDP?3?|1InY`yc+6_TcR55XXhtlFy)z6{~9JxUW0n>VXTQi
zqh2_C6u;!4`y`2an2B0si&5L{T~vd+QA2tZwXc6g^}N7nZ^XhdgmN@$%~Zk$n1X6(
z8U|yQxfBB_uSH(abv_``Q0_xL_$$;RJdWznMfArzs2lI0*32WUhkj{Z0}W79mxAg@
zSJZRHqdMZEMl>7Mq4ii-`+p0G9()<KT5qEo{u9-)fHB?&r3f~p9FASEJ+{M@sQa&B
z6}*crFlH>@5FCU%F&`6g)j03>i^G_x{eO={J&hahEw&n{H)(*Hinge2)gLt_FQVSy
z4J$7}P0?o5Tz_Gnz*x%pX7B{>1*>2|>T9B_q%Mixv=OR-=BOd-X^uvX%yd*k8K^g2
zf?>D{H6>dx2zOZhUet4sm?u!zoyEfV%LK+>7hI!4BX9?cpx;E#P}IIIgBsdItd8AL
zYa#>Hv3aN$c>^_43o#ovqSivQNnXQ!QSA&sjqJEdjK3O~V<#43IOR2{RlOaH;%9dL
zJ1gg*7T;CWn^Z{mI*^1NDAz`9)7hvIT7g;<A0pe|xs8$dyK5H&KJWFcBx(vOVJbGk
z2z<p{irR)7QEzex^#VVkrsN80ZQMb1>>*agpvm4pRMbI@;9yKbH=Cp;$v$j_cQF|o
zz2NnHEUE)8Hp6UG13zL7%)_P_`l2`Y9n2o6Z~Oq%)J#E*><rZX*~rMa&T<m<d?P-A
z+c65iLH$s<fV$D|CGSlmQ4g$un)}L_fJrzNd*O0CfwOVa%iiB7?xUu%%@prD&;uj1
z|HqJMsAixV%Cz#^s3CsO+=Vfezru=`j~ba`w5s~@co<utc0t%QZ;nfu)lehV982I#
z^!@&yOQMF?nY*w!<wI6Jj~b!hQH%1ws0IS2d%qtP!+6S7QP1g&dZ8hx?KU1uVmemC
z1*nn!1YHfu5xd|V>W%KBwpR$FqlSy3=Bzks$YU@XE20`qK{e0~HRoedtA0L~#ighh
z+KIaFJ1mD+UB+KS88X9LTs5&2<%y_{Wuk6eYHmg~cmUPFDb%*Qj2hCaGrh%}g4z|&
zV-w6kJ?{(D$o+u&&YYP^Pjq8G73$GHSOLq;^2#l+4CR5So=>y-rRFa5bp$n}mr)J;
zjT*^7R-hUxje1Tc)C;9pxtB{)jf&?{7p^fkqaOGv>WzOu&FMwdo87`#)c>*R{y6l<
zj;JZ?Z1zSrkTVFA@eJl-Xok0I+;t>ls5pw1vFTjT5g1GPO-#fss1BU7^H;Dn<;Yj~
zNr-*0C9cObypHNn?|I&$eGavTMxdTE5esPlPbaBO#Vm}$k5Lz%L_Od<2H{2I2Io2k
z;%(G}9-v03(0s2Pg&OJ#s3~oV0oV^URYOrDJsExbe>RC0$6KiFwbm}!gt}o5s=>pk
z4jsoJJcTv!JT}D0S3NtRR{ea`_3JPe-^0py2pi#D)DCiLyykt;dYFC9f#xvOn~%2g
zI8+DHQ5~CxdczDmpJ~2{g{XfEb^mhI^((Es9^DWsJ|NLz``Au=i@NX#7Q|ClpND$j
zc~pa!to{b-x;v=FcpvpcCO*^q8POFRP|mROUQ~x}WitQTpLeO~jI|bcACkGKZSoGr
z;&zO~6IcQNG^1bl=DZokQ{Nu-Q*9z@Ev?2-+=qqnsFm~3kMdJ~<M;uijANUJQ=9S(
z@(`<6^-9a%Hz(uE#4kF@F`Ur<lK&f*5N{JYf~jkUQ*bvP%!!MMbkitl6E@Zz#2Mo8
z@ss84%`xU_Od)>d!UUo>`2j+|MZ9S@KZ&iVTaG{CRN`5pJms3GW2*PB<NPZy6(^|B
zhx<A5rZ|gule`GNisy*FM0J8W^(_+c{ooIz?qJTNm?U=-+2bRRyy)Ws{)hO8c!T;u
zM6zAmoVstw?_&cTfX@(5lUE^Dksm^SyKw#@J|_ATIu=l`V;|ASk0n%xilr2G+6kS^
zA@8DuqXT&-J2wmYrOi1>R43M1{nzALLYF9?!sYlO!OvP}HO|DVgpRL>E51yBu!Wa#
z!93EA`1mMn`3S5^WecJ^`5Zh>EG3UZZH#WjKSWjP7U2Y<JJFY5h5C*oockB?_y{JM
zNCf3<h%4-F<xE|oj9qaG6N%%5AMrNP&TjpHd=t4oZrZjwMpLIlAFfWm%==4<(ib@Q
zEWU&_>^jxYC;x<4uQ_Nz(ujy5{5h%Z{3CIh*h1Z9Vj^*t&`|-`Vm5J$7;E+0%mdV|
zB5y_<BUVsuOYA2ii0MQRq9x}xYYud*Azr8A0xl%<xh+chU7|Vh3FQ^2qppXukFtLL
ze2N>19ag{CuG>rb9`U=?>wDFQxJazFx*ghOA6P*oTV4$>5kC{<xaJ&|w+Bxl*Rhp&
zK(wZQ9MP1xnKQFOl-q>t2|~wjrt&tHUsHi&Eb*e%Wtuba2g|?pUB!<+E2~(K_?hx{
zbglk-^2+4B@mD`*l(Uw?G$M%joajQ#A#~^mhmLs48}Vu49r6e}-;44g;yj^a2=OK7
z2H1IDC4YQM?9Q3_WR&|GStMuQw^PT={?rX2{-k`=?%qPahrBegml$f-imrCec5@~k
zCXU)Q-K>5tuB2`RQBM2#GdrQ{CRtt<vxsM`oW;2~@-$t<F^aqp@gaE;4E5FWeJ6jH
zd>zry>N=VZ=SmQ%R!$}N{Z5bpZFLgg!r{IX{Qrij%XEA}Z181_0uIYL8XsBqTdtZw
zgc7Z(ZTNrgI+^2FG1C2<+OMcxfE9^s@-OiYQO~X}OrAvK5juKNpN?k<ZL=Pf|HiNJ
z6(W|HOj*Yp#CybHViEQKMIBejH|r~*W2f&=M$W8>w~2~e^d3>#>cxwe_oV)`<-d^Y
z7>IXq88Mjr5q^(1&>w%mg_w^YNk6ZBiv0RPg^uqq5TC~{h`HoH5#z~s5z~oz#8cEg
zKF*L7q)x{YGl2YGL<eFqp(BiQYlx4DM9S-n@J9ii;i#6gqEd_-&8hFa3MUSWQ!a!@
zh*+W(@sQX+y^c1-Me=lFBzZ|}M}!jtDHkVn3?mv5Nz}iJgNWJW`-wW_QOKdk^Q#<%
z`k3HVI`z$OsQZJ+AzrgOQs0rnpPvz<iAp&$D@V5J%oU|5o&SGVQsva5?z$3=e&i#G
zaIff`ARj}%i^w1^wKcEu&fvg_L&uDpJakCTE6MG*UQM1BP&6%e$iVc0u|tQ9OdmRA
o>%a!*5`trgj!hpnbmG|boaDjXx2_tzC@3d*boAD`X;aJp5A4Y5Q~&?~

diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 8fe01435..65808d43 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -6,9 +6,9 @@
 #: compensation/filters.py:122 compensation/forms/modalForms.py:35
 #: compensation/forms/modalForms.py:46 compensation/forms/modalForms.py:62
 #: compensation/forms/modalForms.py:256 compensation/forms/modalForms.py:350
-#: intervention/forms/forms.py:52 intervention/forms/forms.py:154
-#: intervention/forms/forms.py:166 intervention/forms/modalForms.py:123
-#: intervention/forms/modalForms.py:136 intervention/forms/modalForms.py:149
+#: intervention/forms/forms.py:54 intervention/forms/forms.py:156
+#: intervention/forms/forms.py:168 intervention/forms/modalForms.py:124
+#: intervention/forms/modalForms.py:137 intervention/forms/modalForms.py:150
 #: konova/filters/mixins.py:53 konova/filters/mixins.py:54
 #: konova/filters/mixins.py:81 konova/filters/mixins.py:82
 #: konova/filters/mixins.py:94 konova/filters/mixins.py:95
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-02 14:35+0100\n"
+"POT-Creation-Date: 2022-02-03 13:37+0100\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"
@@ -49,7 +49,7 @@ msgstr "Bis"
 #: compensation/templates/compensation/report/eco_account/report.html:16
 #: compensation/utils/quality.py:100 ema/templates/ema/detail/view.html:49
 #: ema/templates/ema/report/report.html:16 ema/utils/quality.py:26
-#: intervention/forms/forms.py:100
+#: intervention/forms/forms.py:102
 #: intervention/templates/intervention/detail/view.html:56
 #: intervention/templates/intervention/report/report.html:37
 #: intervention/utils/quality.py:49 konova/filters/mixins.py:395
@@ -61,9 +61,9 @@ msgid "Select the responsible office"
 msgstr "Verantwortliche Stelle"
 
 #: analysis/forms.py:58 compensation/forms/forms.py:88
-#: compensation/forms/forms.py:165 intervention/forms/forms.py:62
-#: intervention/forms/forms.py:79 intervention/forms/forms.py:95
-#: intervention/forms/forms.py:111 intervention/forms/modalForms.py:45
+#: compensation/forms/forms.py:165 intervention/forms/forms.py:64
+#: intervention/forms/forms.py:81 intervention/forms/forms.py:97
+#: intervention/forms/forms.py:113 intervention/forms/modalForms.py:46
 msgid "Click for selection"
 msgstr "Auswählen..."
 
@@ -220,7 +220,7 @@ msgstr "Abbuchungen"
 #: compensation/templates/compensation/detail/eco_account/includes/states-before.html:36
 #: ema/templates/ema/detail/includes/states-after.html:36
 #: ema/templates/ema/detail/includes/states-before.html:36
-#: intervention/forms/modalForms.py:293
+#: intervention/forms/modalForms.py:294
 msgid "Surface"
 msgstr "Fläche"
 
@@ -270,7 +270,7 @@ msgstr ""
 "    "
 
 #: analysis/templates/analysis/reports/includes/intervention/laws.html:14
-#: intervention/forms/forms.py:67
+#: intervention/forms/forms.py:69
 #: intervention/templates/intervention/detail/view.html:39
 #: intervention/templates/intervention/report/report.html:20
 msgid "Law"
@@ -284,7 +284,7 @@ msgid "Type"
 msgstr "Typ"
 
 #: analysis/templates/analysis/reports/includes/old_data/amount.html:24
-#: intervention/forms/modalForms.py:304 intervention/forms/modalForms.py:311
+#: intervention/forms/modalForms.py:305 intervention/forms/modalForms.py:312
 #: intervention/tables.py:89
 #: intervention/templates/intervention/detail/view.html:19
 #: konova/templates/konova/includes/quickstart/interventions.html:4
@@ -295,7 +295,7 @@ msgstr "Eingriff"
 #: analysis/templates/analysis/reports/includes/old_data/amount.html:34
 #: compensation/tables.py:226
 #: compensation/templates/compensation/detail/eco_account/view.html:19
-#: intervention/forms/modalForms.py:277 intervention/forms/modalForms.py:284
+#: intervention/forms/modalForms.py:278 intervention/forms/modalForms.py:285
 #: konova/templates/konova/includes/quickstart/ecoaccounts.html:4
 #: templates/navbars/navbar.html:34
 msgid "Eco-account"
@@ -314,13 +314,13 @@ msgid "Show only unrecorded"
 msgstr "Nur unverzeichnete anzeigen"
 
 #: compensation/forms/forms.py:32 compensation/tables.py:25
-#: compensation/tables.py:167 ema/tables.py:28 intervention/forms/forms.py:26
+#: compensation/tables.py:167 ema/tables.py:28 intervention/forms/forms.py:28
 #: intervention/tables.py:23
 #: intervention/templates/intervention/detail/includes/compensations.html:30
 msgid "Identifier"
 msgstr "Kennung"
 
-#: compensation/forms/forms.py:35 intervention/forms/forms.py:29
+#: compensation/forms/forms.py:35 intervention/forms/forms.py:31
 #: user/forms.py:126
 msgid "Generated automatically"
 msgstr "Automatisch generiert"
@@ -335,7 +335,7 @@ msgstr "Automatisch generiert"
 #: compensation/templates/compensation/report/eco_account/report.html:12
 #: ema/tables.py:33 ema/templates/ema/detail/includes/documents.html:28
 #: ema/templates/ema/detail/view.html:31
-#: ema/templates/ema/report/report.html:12 intervention/forms/forms.py:38
+#: ema/templates/ema/report/report.html:12 intervention/forms/forms.py:40
 #: intervention/tables.py:28
 #: intervention/templates/intervention/detail/includes/compensations.html:33
 #: intervention/templates/intervention/detail/includes/documents.html:28
@@ -345,7 +345,7 @@ msgstr "Automatisch generiert"
 msgid "Title"
 msgstr "Bezeichnung"
 
-#: compensation/forms/forms.py:46 intervention/forms/forms.py:40
+#: compensation/forms/forms.py:46 intervention/forms/forms.py:42
 msgid "An explanatory name"
 msgstr "Aussagekräftiger Titel"
 
@@ -364,7 +364,7 @@ msgstr "Kompensation XY; Flur ABC"
 #: ema/templates/ema/detail/includes/actions.html:34
 #: ema/templates/ema/detail/includes/deadlines.html:34
 #: ema/templates/ema/detail/includes/documents.html:31
-#: intervention/forms/forms.py:178 intervention/forms/modalForms.py:148
+#: intervention/forms/forms.py:180 intervention/forms/modalForms.py:149
 #: intervention/templates/intervention/detail/includes/documents.html:31
 #: intervention/templates/intervention/detail/includes/payments.html:34
 #: intervention/templates/intervention/detail/includes/revocation.html:38
@@ -373,7 +373,7 @@ msgid "Comment"
 msgstr "Kommentar"
 
 #: compensation/forms/forms.py:59 compensation/forms/modalForms.py:351
-#: intervention/forms/forms.py:180
+#: intervention/forms/forms.py:182
 msgid "Additional comment"
 msgstr "Zusätzlicher Kommentar"
 
@@ -382,14 +382,14 @@ msgstr "Zusätzlicher Kommentar"
 #: compensation/templates/compensation/report/eco_account/report.html:20
 #: compensation/utils/quality.py:102 ema/templates/ema/detail/view.html:53
 #: ema/templates/ema/report/report.html:20 ema/utils/quality.py:28
-#: intervention/forms/forms.py:128
+#: intervention/forms/forms.py:130
 #: intervention/templates/intervention/detail/view.html:60
 #: intervention/templates/intervention/report/report.html:41
 #: intervention/utils/quality.py:42
 msgid "Conservation office file number"
 msgstr "Aktenzeichen Eintragungsstelle"
 
-#: compensation/forms/forms.py:99 intervention/forms/forms.py:134
+#: compensation/forms/forms.py:99 intervention/forms/forms.py:136
 msgid "ETS-123/ABC.456"
 msgstr ""
 
@@ -401,7 +401,7 @@ msgstr "Maßnahmenträger"
 msgid "Who handles the eco-account"
 msgstr "Wer für die Herrichtung des Ökokontos verantwortlich ist"
 
-#: compensation/forms/forms.py:112 intervention/forms/forms.py:147
+#: compensation/forms/forms.py:112 intervention/forms/forms.py:149
 msgid "Company Mustermann"
 msgstr "Firma Mustermann"
 
@@ -436,37 +436,37 @@ msgstr "Wählen Sie den Eingriff, für den diese Kompensation bestimmt ist"
 msgid "New compensation"
 msgstr "Neue Kompensation"
 
-#: compensation/forms/forms.py:241
+#: compensation/forms/forms.py:255
 msgid "Edit compensation"
 msgstr "Bearbeite Kompensation"
 
-#: compensation/forms/forms.py:302 compensation/utils/quality.py:84
+#: compensation/forms/forms.py:316 compensation/utils/quality.py:84
 msgid "Available Surface"
 msgstr "Verfügbare Fläche"
 
-#: compensation/forms/forms.py:305
+#: compensation/forms/forms.py:319
 msgid "The amount that can be used for deductions"
 msgstr "Die für Abbuchungen zur Verfügung stehende Menge"
 
-#: compensation/forms/forms.py:314
+#: compensation/forms/forms.py:328
 #: compensation/templates/compensation/detail/eco_account/view.html:66
 #: compensation/utils/quality.py:72
 msgid "Agreement date"
 msgstr "Vereinbarungsdatum"
 
-#: compensation/forms/forms.py:316
+#: compensation/forms/forms.py:330
 msgid "When did the parties agree on this?"
 msgstr "Wann wurde dieses Ökokonto offiziell vereinbart?"
 
-#: compensation/forms/forms.py:340 compensation/views/eco_account.py:102
+#: compensation/forms/forms.py:354 compensation/views/eco_account.py:102
 msgid "New Eco-Account"
 msgstr "Neues Ökokonto"
 
-#: compensation/forms/forms.py:349
+#: compensation/forms/forms.py:363
 msgid "Eco-Account XY; Location ABC"
 msgstr "Ökokonto XY; Flur ABC"
 
-#: compensation/forms/forms.py:403
+#: compensation/forms/forms.py:417
 msgid "Edit Eco-Account"
 msgstr "Ökokonto bearbeiten"
 
@@ -484,7 +484,7 @@ msgid "Due on which date"
 msgstr "Zahlung wird an diesem Datum erwartet"
 
 #: compensation/forms/modalForms.py:63 compensation/forms/modalForms.py:257
-#: intervention/forms/modalForms.py:150 konova/forms.py:375
+#: intervention/forms/modalForms.py:151 konova/forms.py:375
 msgid "Additional comment, maximum {} letters"
 msgstr "Zusätzlicher Kommentar, maximal {} Zeichen"
 
@@ -512,7 +512,7 @@ msgstr "Zusatzbezeichnung"
 msgid "Select an additional biotope type"
 msgstr "Zusatzbezeichnung wählen"
 
-#: compensation/forms/modalForms.py:154 intervention/forms/modalForms.py:295
+#: compensation/forms/modalForms.py:154 intervention/forms/modalForms.py:296
 msgid "in m²"
 msgstr ""
 
@@ -540,7 +540,7 @@ msgstr "Fristart wählen"
 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:31
 #: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:31
 #: ema/templates/ema/detail/includes/deadlines.html:31
-#: intervention/forms/modalForms.py:122
+#: intervention/forms/modalForms.py:123
 msgid "Date"
 msgstr "Datum"
 
@@ -642,18 +642,18 @@ msgstr ""
 msgid "Pieces"
 msgstr "Stück"
 
-#: compensation/models/compensation.py:63 konova/utils/message_templates.py:27
+#: compensation/models/compensation.py:63 konova/utils/message_templates.py:43
 msgid "Added deadline"
 msgstr "Frist/Termin hinzugefügt"
 
-#: compensation/models/eco_account.py:57
+#: compensation/models/eco_account.py:56
 msgid ""
 "Deductable surface can not be larger than existing surfaces in after states"
 msgstr ""
 "Die abbuchbare Fläche darf die Gesamtfläche der Zielzustände nicht "
 "überschreiten"
 
-#: compensation/models/eco_account.py:64
+#: compensation/models/eco_account.py:63
 msgid ""
 "Deductable surface can not be smaller than the sum of already existing "
 "deductions. Please contact the responsible users for the deductions!"
@@ -943,14 +943,14 @@ msgstr "Zuletzt bearbeitet"
 
 #: compensation/templates/compensation/detail/compensation/view.html:99
 #: compensation/templates/compensation/detail/eco_account/view.html:82
-#: ema/templates/ema/detail/view.html:76 intervention/forms/modalForms.py:52
+#: ema/templates/ema/detail/view.html:76 intervention/forms/modalForms.py:53
 #: intervention/templates/intervention/detail/view.html:116
 msgid "Shared with"
 msgstr "Freigegeben für"
 
 #: compensation/templates/compensation/detail/eco_account/includes/controls.html:15
 #: ema/templates/ema/detail/includes/controls.html:15
-#: intervention/forms/modalForms.py:66
+#: intervention/forms/modalForms.py:67
 #: intervention/templates/intervention/detail/includes/controls.html:15
 msgid "Share"
 msgstr "Freigabe"
@@ -1080,30 +1080,22 @@ msgstr "Daten zu den verantwortlichen Stellen"
 msgid "Compensations - Overview"
 msgstr "Kompensationen - Übersicht"
 
-#: compensation/views/compensation.py:82
-msgid "Compensation {} added"
-msgstr "Kompensation {} hinzugefügt"
-
 #: compensation/views/compensation.py:147
 msgid "Compensation {} edited"
 msgstr "Kompensation {} bearbeitet"
 
 #: compensation/views/compensation.py:157 compensation/views/eco_account.py:160
-#: ema/views.py:227 intervention/views.py:310
+#: ema/views.py:227 intervention/views.py:311
 msgid "Edit {}"
 msgstr "Bearbeite {}"
 
 #: compensation/views/compensation.py:236 compensation/views/eco_account.py:316
-#: ema/views.py:188 intervention/views.py:486
+#: ema/views.py:188 intervention/views.py:487
 msgid "Log"
 msgstr "Log"
 
-#: compensation/views/compensation.py:259
-msgid "Compensation removed"
-msgstr "Kompensation entfernt"
-
 #: compensation/views/compensation.py:280 compensation/views/eco_account.py:496
-#: ema/views.py:359 intervention/views.py:132
+#: ema/views.py:359 intervention/views.py:133
 msgid "Document added"
 msgstr "Dokument hinzugefügt"
 
@@ -1138,7 +1130,7 @@ msgid "Action removed"
 msgstr "Maßnahme entfernt"
 
 #: compensation/views/compensation.py:482 compensation/views/eco_account.py:586
-#: ema/views.py:472 intervention/views.py:551
+#: ema/views.py:472 intervention/views.py:580
 msgid "Report {}"
 msgstr "Bericht {}"
 
@@ -1158,52 +1150,36 @@ msgstr "Ökokonto {} bearbeitet"
 msgid "Eco-account removed"
 msgstr "Ökokonto entfernt"
 
-#: compensation/views/eco_account.py:291
-msgid "Deduction removed"
-msgstr "Abbuchung entfernt"
-
 #: compensation/views/eco_account.py:337 ema/views.py:269
-#: intervention/views.py:529
+#: intervention/views.py:558
 msgid "{} unrecorded"
 msgstr "{} entzeichnet"
 
 #: compensation/views/eco_account.py:337 ema/views.py:269
-#: intervention/views.py:529
+#: intervention/views.py:558
 msgid "{} recorded"
 msgstr "{} verzeichnet"
 
-#: compensation/views/eco_account.py:567 intervention/views.py:509
-msgid "Deduction added"
-msgstr "Abbuchung hinzugefügt"
-
 #: compensation/views/eco_account.py:659 ema/views.py:538
-#: intervention/views.py:383
+#: intervention/views.py:384
 msgid "{} has already been shared with you"
 msgstr "{} wurde bereits für Sie freigegeben"
 
 #: compensation/views/eco_account.py:664 ema/views.py:543
-#: intervention/views.py:388
+#: intervention/views.py:389
 msgid "{} has been shared with you"
 msgstr "{} ist nun für Sie freigegeben"
 
 #: compensation/views/eco_account.py:671 ema/views.py:550
-#: intervention/views.py:395
+#: intervention/views.py:396
 msgid "Share link invalid"
 msgstr "Freigabelink ungültig"
 
 #: compensation/views/eco_account.py:694 ema/views.py:573
-#: intervention/views.py:418
+#: intervention/views.py:419
 msgid "Share settings updated"
 msgstr "Freigabe Einstellungen aktualisiert"
 
-#: compensation/views/payment.py:37
-msgid "Payment added"
-msgstr "Zahlung hinzugefügt"
-
-#: compensation/views/payment.py:58
-msgid "Payment removed"
-msgstr "Zahlung gelöscht"
-
 #: ema/forms.py:40 ema/views.py:92
 msgid "New EMA"
 msgstr "Neue EMA hinzufügen"
@@ -1248,88 +1224,84 @@ msgstr "EMA {} bearbeitet"
 msgid "EMA removed"
 msgstr "EMA entfernt"
 
-#: intervention/forms/forms.py:44
+#: intervention/forms/forms.py:46
 msgid "Construction XY; Location ABC"
 msgstr "Bauvorhaben XY; Flur ABC"
 
-#: intervention/forms/forms.py:50
+#: intervention/forms/forms.py:52
 #: intervention/templates/intervention/detail/view.html:35
 #: intervention/templates/intervention/report/report.html:16
 #: intervention/utils/quality.py:82
 msgid "Process type"
 msgstr "Verfahrenstyp"
 
-#: intervention/forms/forms.py:69
+#: intervention/forms/forms.py:71
 msgid "Multiple selection possible"
 msgstr "Mehrfachauswahl möglich"
 
-#: intervention/forms/forms.py:84
+#: intervention/forms/forms.py:86
 #: intervention/templates/intervention/detail/view.html:48
 #: intervention/templates/intervention/report/report.html:29
 #: intervention/utils/quality.py:46 konova/filters/mixins.py:363
 msgid "Registration office"
 msgstr "Zulassungsbehörde"
 
-#: intervention/forms/forms.py:116
+#: intervention/forms/forms.py:118
 #: intervention/templates/intervention/detail/view.html:52
 #: intervention/templates/intervention/report/report.html:33
 #: intervention/utils/quality.py:39
 msgid "Registration office file number"
 msgstr "Aktenzeichen Zulassungsbehörde"
 
-#: intervention/forms/forms.py:122
+#: intervention/forms/forms.py:124
 msgid "ZB-123/ABC.456"
 msgstr ""
 
-#: intervention/forms/forms.py:140
+#: intervention/forms/forms.py:142
 #: intervention/templates/intervention/detail/view.html:64
 #: intervention/templates/intervention/report/report.html:45
 #: intervention/utils/quality.py:52
 msgid "Intervention handler"
 msgstr "Eingriffsverursacher"
 
-#: intervention/forms/forms.py:144
+#: intervention/forms/forms.py:146
 msgid "Who performs the intervention"
 msgstr "Wer führt den Eingriff durch"
 
-#: intervention/forms/forms.py:153
+#: intervention/forms/forms.py:155
 #: intervention/templates/intervention/detail/view.html:96
 #: intervention/templates/intervention/report/report.html:83
 #: intervention/utils/quality.py:73
 msgid "Registration date"
 msgstr "Datum Zulassung bzw. Satzungsbeschluss"
 
-#: intervention/forms/forms.py:165
+#: intervention/forms/forms.py:167
 #: intervention/templates/intervention/detail/view.html:100
 #: intervention/templates/intervention/report/report.html:87
 msgid "Binding on"
 msgstr "Datum Bestandskraft"
 
-#: intervention/forms/forms.py:191 intervention/views.py:91
+#: intervention/forms/forms.py:193 intervention/views.py:92
 msgid "New intervention"
 msgstr "Neuer Eingriff"
 
-#: intervention/forms/forms.py:269
+#: intervention/forms/forms.py:271
 msgid "Edit intervention"
 msgstr "Eingriff bearbeiten"
 
-#: intervention/forms/forms.py:338
-msgid "General data edited"
-msgstr "Allgemeine Daten bearbeitet"
-
-#: intervention/forms/modalForms.py:25
+#: intervention/forms/modalForms.py:26
 msgid "Share link"
 msgstr "Freigabelink"
 
-#: intervention/forms/modalForms.py:27
+#: intervention/forms/modalForms.py:28
 msgid "Send this link to users who you want to have writing access on the data"
 msgstr "Andere Nutzer erhalten über diesen Link Zugriff auf die Daten"
 
-#: intervention/forms/modalForms.py:37
+#: intervention/forms/modalForms.py:38
 msgid "Add user to share with"
 msgstr "Nutzer direkt hinzufügen"
 
-#: intervention/forms/modalForms.py:39
+#: intervention/forms/modalForms.py:40
 msgid ""
 "Multiple selection possible - You can only select users which do not already "
 "have access. Enter the full username."
@@ -1337,46 +1309,46 @@ msgstr ""
 "Mehrfachauswahl möglich - Sie können nur Nutzer wählen, für die der Eintrag "
 "noch nicht freigegeben wurde. Geben Sie den ganzen Nutzernamen an."
 
-#: intervention/forms/modalForms.py:55
+#: intervention/forms/modalForms.py:56
 msgid "Remove check to remove access for this user"
 msgstr "Wählen Sie die Nutzer ab, die keinen Zugriff mehr haben sollen"
 
-#: intervention/forms/modalForms.py:67
+#: intervention/forms/modalForms.py:68
 msgid "Share settings for {}"
 msgstr "Freigabe Einstellungen für {}"
 
-#: intervention/forms/modalForms.py:124
+#: intervention/forms/modalForms.py:125
 msgid "Date of revocation"
 msgstr "Datum des Widerspruchs"
 
-#: intervention/forms/modalForms.py:135
+#: intervention/forms/modalForms.py:136
 #: intervention/templates/intervention/detail/includes/revocation.html:35
 msgid "Document"
 msgstr "Dokument"
 
-#: intervention/forms/modalForms.py:138
+#: intervention/forms/modalForms.py:139
 msgid "Must be smaller than 15 Mb"
 msgstr "Muss kleiner als 15 Mb sein"
 
-#: intervention/forms/modalForms.py:162
+#: intervention/forms/modalForms.py:163
 #: intervention/templates/intervention/detail/includes/revocation.html:18
 msgid "Add revocation"
 msgstr "Widerspruch hinzufügen"
 
-#: intervention/forms/modalForms.py:179
+#: intervention/forms/modalForms.py:180
 msgid "Checked intervention data"
 msgstr "Eingriffsdaten geprüft"
 
-#: intervention/forms/modalForms.py:185
+#: intervention/forms/modalForms.py:186
 msgid "Checked compensations data and payments"
 msgstr "Kompensationen und Zahlungen geprüft"
 
-#: intervention/forms/modalForms.py:194
+#: intervention/forms/modalForms.py:195
 #: intervention/templates/intervention/detail/includes/controls.html:19
 msgid "Run check"
 msgstr "Prüfung vornehmen"
 
-#: intervention/forms/modalForms.py:195 konova/forms.py:457
+#: intervention/forms/modalForms.py:196 konova/forms.py:457
 msgid ""
 "I, {} {}, confirm that all necessary control steps have been performed by "
 "myself."
@@ -1384,23 +1356,23 @@ msgstr ""
 "Ich, {} {}, bestätige, dass die notwendigen Kontrollschritte durchgeführt "
 "wurden:"
 
-#: intervention/forms/modalForms.py:279
+#: intervention/forms/modalForms.py:280
 msgid "Only recorded accounts can be selected for deductions"
 msgstr "Nur verzeichnete Ökokonten können für Abbuchungen verwendet werden."
 
-#: intervention/forms/modalForms.py:306
+#: intervention/forms/modalForms.py:307
 msgid "Only shared interventions can be selected"
 msgstr "Nur freigegebene Eingriffe können gewählt werden"
 
-#: intervention/forms/modalForms.py:319
+#: intervention/forms/modalForms.py:320
 msgid "New Deduction"
 msgstr "Neue Abbuchung"
 
-#: intervention/forms/modalForms.py:320
+#: intervention/forms/modalForms.py:321
 msgid "Enter the information for a new deduction from a chosen eco-account"
 msgstr "Geben Sie die Informationen für eine neue Abbuchung ein."
 
-#: intervention/forms/modalForms.py:348
+#: intervention/forms/modalForms.py:349
 msgid ""
 "Eco-account {} is not recorded yet. You can only deduct from recorded "
 "accounts."
@@ -1408,7 +1380,7 @@ msgstr ""
 "Ökokonto {} ist noch nicht verzeichnet. Abbuchungen können nur von "
 "verzeichneten Ökokonten erfolgen."
 
-#: intervention/forms/modalForms.py:361
+#: intervention/forms/modalForms.py:362
 msgid ""
 "The account {} has not enough surface for a deduction of {} m². There are "
 "only {} m² left"
@@ -1511,39 +1483,31 @@ msgstr ""
 "Kein Ausgleich jeglicher Art gefunden (Kompensation, Ersatzzahlung, "
 "Abbuchung)"
 
-#: intervention/views.py:48
+#: intervention/views.py:49
 msgid "Interventions - Overview"
 msgstr "Eingriffe - Übersicht"
 
-#: intervention/views.py:81
+#: intervention/views.py:82
 msgid "Intervention {} added"
 msgstr "Eingriff {} hinzugefügt"
 
-#: intervention/views.py:249
+#: intervention/views.py:250
 msgid "This intervention has {} revocations"
 msgstr "Dem Eingriff liegen {} Widersprüche vor"
 
-#: intervention/views.py:298
+#: intervention/views.py:299
 msgid "Intervention {} edited"
 msgstr "Eingriff {} bearbeitet"
 
-#: intervention/views.py:334
+#: intervention/views.py:335
 msgid "{} removed"
 msgstr "{} entfernt"
 
-#: intervention/views.py:356
-msgid "Revocation removed"
-msgstr "Widerspruch entfernt"
-
-#: intervention/views.py:439
+#: intervention/views.py:440
 msgid "Check performed"
 msgstr "Prüfung durchgeführt"
 
-#: intervention/views.py:461
-msgid "Revocation added"
-msgstr "Widerspruch hinzugefügt"
-
-#: intervention/views.py:534
+#: intervention/views.py:563
 msgid "There are errors on this intervention:"
 msgstr "Es liegen Fehler in diesem Eingriff vor:"
 
@@ -1891,18 +1855,50 @@ msgstr ""
 "vor. Nur Eintragungsstellennutzer können diese Aktion jetzt durchführen."
 
 #: konova/utils/message_templates.py:25
+msgid "Compensation {} added"
+msgstr "Kompensation {} hinzugefügt"
+
+#: konova/utils/message_templates.py:26
+msgid "Compensation {} removed"
+msgstr "Kompensation {} entfernt"
+
+#: konova/utils/message_templates.py:29
+msgid "Deduction added"
+msgstr "Abbuchung hinzugefügt"
+
+#: konova/utils/message_templates.py:30
+msgid "Deduction removed"
+msgstr "Abbuchung entfernt"
+
+#: konova/utils/message_templates.py:33
+msgid "Payment added"
+msgstr "Zahlung hinzugefügt"
+
+#: konova/utils/message_templates.py:34
+msgid "Payment removed"
+msgstr "Zahlung gelöscht"
+
+#: konova/utils/message_templates.py:37
+msgid "Revocation added"
+msgstr "Widerspruch hinzugefügt"
+
+#: konova/utils/message_templates.py:38
+msgid "Revocation removed"
+msgstr "Widerspruch entfernt"
+
+#: konova/utils/message_templates.py:41
 msgid "Edited general data"
 msgstr "Allgemeine Daten bearbeitet"
 
-#: konova/utils/message_templates.py:26
+#: konova/utils/message_templates.py:42
 msgid "Added compensation state"
 msgstr "Zustand hinzugefügt"
 
-#: konova/utils/message_templates.py:28
+#: konova/utils/message_templates.py:44
 msgid "Added compensation action"
 msgstr "Maßnahme hinzufügen"
 
-#: konova/utils/message_templates.py:31
+#: konova/utils/message_templates.py:47
 msgid "Geometry conflict detected with {}"
 msgstr "Geometriekonflikt mit folgenden Einträgen erkannt: {}"
 
@@ -3922,6 +3918,9 @@ msgstr ""
 msgid "Unable to connect to qpid with SASL mechanism %s"
 msgstr ""
 
+#~ msgid "General data edited"
+#~ msgstr "Allgemeine Daten bearbeitet"
+
 #~ msgid "Action type details"
 #~ msgstr "Zusatzmerkmale"
 

From fb8b33895054ffea087d2f473632ba3ecc73957f Mon Sep 17 00:00:00 2001
From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de>
Date: Fri, 4 Feb 2022 09:18:46 +0100
Subject: [PATCH 11/12] # 86 More log details Documents

* adds more log details on adding/removing documents
* fixes bug in admin backend where restoring of non-compensation entries led to an error
* fixes bug where deleting of revocation without an attached file would lead to an error
---
 compensation/admin.py               | 13 +++++++++++++
 compensation/models/compensation.py |  8 ++++++--
 compensation/models/eco_account.py  |  7 +++++--
 compensation/views/compensation.py  |  4 ++--
 compensation/views/eco_account.py   |  4 ++--
 ema/models/ema.py                   |  7 +++++--
 ema/views.py                        |  5 +++--
 intervention/models/intervention.py |  7 +++++--
 intervention/models/revocation.py   |  9 +++++++--
 intervention/views.py               |  4 ++--
 konova/admin.py                     |  7 -------
 konova/utils/documents.py           |  3 ++-
 konova/utils/message_templates.py   |  4 ++++
 13 files changed, 56 insertions(+), 26 deletions(-)

diff --git a/compensation/admin.py b/compensation/admin.py
index 6519a1e8..5f792f76 100644
--- a/compensation/admin.py
+++ b/compensation/admin.py
@@ -3,6 +3,8 @@ from django.contrib import admin
 from compensation.models import Compensation, CompensationAction, CompensationState, Payment, \
     EcoAccountDeduction, EcoAccount
 from konova.admin import BaseObjectAdmin, BaseResourceAdmin
+from konova.utils.message_templates import COMPENSATION_REMOVED_TEMPLATE
+from user.models import UserAction
 
 
 class AbstractCompensationAdmin(BaseObjectAdmin):
@@ -42,6 +44,17 @@ class CompensationAdmin(AbstractCompensationAdmin):
             "intervention",
         ]
 
+    def restore_deleted_data(self, request, queryset):
+        super().restore_deleted_data(request, queryset)
+
+        for entry in queryset:
+            # Remove delete log entry from related intervention log history
+            logs = entry.intervention.log.filter(
+                action=UserAction.EDITED,
+                comment=COMPENSATION_REMOVED_TEMPLATE.format(entry.identifier)
+            )
+            logs.delete()
+
 
 class EcoAccountAdmin(AbstractCompensationAdmin):
     list_display = [
diff --git a/compensation/models/compensation.py b/compensation/models/compensation.py
index 082131c3..f50553f0 100644
--- a/compensation/models/compensation.py
+++ b/compensation/models/compensation.py
@@ -20,7 +20,8 @@ from compensation.utils.quality import CompensationQualityChecker
 from konova.models import BaseObject, AbstractDocument, Deadline, generate_document_file_upload_path, \
     GeoReferencedMixin
 from konova.settings import DEFAULT_SRID_RLP, LANIS_LINK_TEMPLATE
-from konova.utils.message_templates import DATA_UNSHARED_EXPLANATION, COMPENSATION_REMOVED_TEMPLATE
+from konova.utils.message_templates import DATA_UNSHARED_EXPLANATION, COMPENSATION_REMOVED_TEMPLATE, \
+    DOCUMENT_REMOVED_TEMPLATE
 from user.models import UserActionLogEntry
 
 
@@ -358,7 +359,7 @@ class CompensationDocument(AbstractDocument):
         max_length=1000,
     )
 
-    def delete(self, *args, **kwargs):
+    def delete(self, user=None, *args, **kwargs):
         """
         Custom delete functionality for CompensationDocuments.
         Removes the folder from the file system if there are no further documents for this entry.
@@ -380,6 +381,9 @@ class CompensationDocument(AbstractDocument):
             folder_path = self.file.path.split("/")[:-1]
             folder_path = "/".join(folder_path)
 
+        if user:
+            self.instance.mark_as_edited(user, edit_comment=DOCUMENT_REMOVED_TEMPLATE.format(self.title))
+
         # Remove the file itself
         super().delete(*args, **kwargs)
 
diff --git a/compensation/models/eco_account.py b/compensation/models/eco_account.py
index 26ac44d7..af660615 100644
--- a/compensation/models/eco_account.py
+++ b/compensation/models/eco_account.py
@@ -9,7 +9,7 @@ import shutil
 
 from django.urls import reverse
 
-from konova.utils.message_templates import DEDUCTION_REMOVED
+from konova.utils.message_templates import DEDUCTION_REMOVED, DOCUMENT_REMOVED_TEMPLATE
 from django.core.exceptions import ValidationError
 from django.core.validators import MinValueValidator
 from django.db import models
@@ -199,7 +199,7 @@ class EcoAccountDocument(AbstractDocument):
         max_length=1000,
     )
 
-    def delete(self, *args, **kwargs):
+    def delete(self, user=None, *args, **kwargs):
         """
         Custom delete functionality for EcoAccountDocuments.
         Removes the folder from the file system if there are no further documents for this entry.
@@ -221,6 +221,9 @@ class EcoAccountDocument(AbstractDocument):
             folder_path = self.file.path.split("/")[:-1]
             folder_path = "/".join(folder_path)
 
+        if user:
+            self.instance.mark_as_edited(user, edit_comment=DOCUMENT_REMOVED_TEMPLATE.format(self.title))
+
         # Remove the file itself
         super().delete(*args, **kwargs)
 
diff --git a/compensation/views/compensation.py b/compensation/views/compensation.py
index aa2151fe..f6176e03 100644
--- a/compensation/views/compensation.py
+++ b/compensation/views/compensation.py
@@ -18,7 +18,7 @@ from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.documents import get_document, remove_document
 from konova.utils.generators import generate_qr_code
 from konova.utils.message_templates import FORM_INVALID, IDENTIFIER_REPLACED, DATA_UNSHARED_EXPLANATION, \
-    CHECKED_RECORDED_RESET, COMPENSATION_ADDED_TEMPLATE, COMPENSATION_REMOVED_TEMPLATE
+    CHECKED_RECORDED_RESET, COMPENSATION_ADDED_TEMPLATE, COMPENSATION_REMOVED_TEMPLATE, DOCUMENT_ADDED
 from konova.utils.user_checks import in_group
 
 
@@ -277,7 +277,7 @@ def new_document_view(request: HttpRequest, id: str):
     form = NewCompensationDocumentForm(request.POST or None, request.FILES or None, instance=comp, request=request)
     return form.process_request(
         request,
-        msg_success=_("Document added"),
+        msg_success=DOCUMENT_ADDED,
         redirect_url=reverse("compensation:detail", args=(id,)) + "#related_data"
     )
 
diff --git a/compensation/views/eco_account.py b/compensation/views/eco_account.py
index 479e66f8..d04359ef 100644
--- a/compensation/views/eco_account.py
+++ b/compensation/views/eco_account.py
@@ -30,7 +30,7 @@ from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.documents import get_document, remove_document
 from konova.utils.generators import generate_qr_code
 from konova.utils.message_templates import IDENTIFIER_REPLACED, FORM_INVALID, DATA_UNSHARED, DATA_UNSHARED_EXPLANATION, \
-    CANCEL_ACC_RECORDED_OR_DEDUCTED, DEDUCTION_REMOVED, DEDUCTION_ADDED
+    CANCEL_ACC_RECORDED_OR_DEDUCTED, DEDUCTION_REMOVED, DEDUCTION_ADDED, DOCUMENT_ADDED
 from konova.utils.user_checks import in_group
 
 
@@ -493,7 +493,7 @@ def new_document_view(request: HttpRequest, id: str):
     form = NewEcoAccountDocumentForm(request.POST or None, request.FILES or None, instance=acc, request=request)
     return form.process_request(
         request,
-        msg_success=_("Document added"),
+        msg_success=DOCUMENT_ADDED,
         redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data",
     )
 
diff --git a/ema/models/ema.py b/ema/models/ema.py
index de67ed8e..b145acba 100644
--- a/ema/models/ema.py
+++ b/ema/models/ema.py
@@ -18,7 +18,7 @@ from ema.managers import EmaManager
 from ema.utils.quality import EmaQualityChecker
 from konova.models import AbstractDocument, generate_document_file_upload_path, RecordableObjectMixin, ShareableObjectMixin
 from konova.settings import DEFAULT_SRID_RLP, LANIS_LINK_TEMPLATE
-from konova.utils.message_templates import DATA_UNSHARED_EXPLANATION
+from konova.utils.message_templates import DATA_UNSHARED_EXPLANATION, DOCUMENT_REMOVED_TEMPLATE
 
 
 class Ema(AbstractCompensation, ShareableObjectMixin, RecordableObjectMixin):
@@ -143,7 +143,7 @@ class EmaDocument(AbstractDocument):
         max_length=1000,
     )
 
-    def delete(self, *args, **kwargs):
+    def delete(self, user=None, *args, **kwargs):
         """
         Custom delete functionality for EcoAccountDocuments.
         Removes the folder from the file system if there are no further documents for this entry.
@@ -165,6 +165,9 @@ class EmaDocument(AbstractDocument):
             folder_path = self.file.path.split("/")[:-1]
             folder_path = "/".join(folder_path)
 
+        if user:
+            self.instance.mark_as_edited(user, edit_comment=DOCUMENT_REMOVED_TEMPLATE.format(self.title))
+
         # Remove the file itself
         super().delete(*args, **kwargs)
 
diff --git a/ema/views.py b/ema/views.py
index 01d8ea24..ff372170 100644
--- a/ema/views.py
+++ b/ema/views.py
@@ -20,7 +20,8 @@ from konova.settings import DEFAULT_GROUP, ZB_GROUP, ETS_GROUP
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.documents import get_document, remove_document
 from konova.utils.generators import generate_qr_code
-from konova.utils.message_templates import IDENTIFIER_REPLACED, FORM_INVALID, DATA_UNSHARED, DATA_UNSHARED_EXPLANATION
+from konova.utils.message_templates import IDENTIFIER_REPLACED, FORM_INVALID, DATA_UNSHARED, DATA_UNSHARED_EXPLANATION, \
+    DOCUMENT_ADDED
 from konova.utils.user_checks import in_group
 
 
@@ -356,7 +357,7 @@ def document_new_view(request: HttpRequest, id: str):
     form = NewEmaDocumentForm(request.POST or None, request.FILES or None, instance=ema, request=request)
     return form.process_request(
         request,
-        msg_success=_("Document added"),
+        msg_success=DOCUMENT_ADDED,
         redirect_url=reverse("ema:detail", args=(id,)) + "#related_data"
     )
 
diff --git a/intervention/models/intervention.py b/intervention/models/intervention.py
index 9bb229fb..06b9174d 100644
--- a/intervention/models/intervention.py
+++ b/intervention/models/intervention.py
@@ -26,7 +26,7 @@ from konova.models import generate_document_file_upload_path, AbstractDocument,
     ShareableObjectMixin, \
     RecordableObjectMixin, CheckableObjectMixin, GeoReferencedMixin
 from konova.settings import LANIS_LINK_TEMPLATE, LANIS_ZOOM_LUT, DEFAULT_SRID_RLP
-from konova.utils.message_templates import DATA_UNSHARED_EXPLANATION, DEDUCTION_ADDED
+from konova.utils.message_templates import DATA_UNSHARED_EXPLANATION, DEDUCTION_ADDED, DOCUMENT_REMOVED_TEMPLATE
 from user.models import UserActionLogEntry
 
 
@@ -302,7 +302,7 @@ class InterventionDocument(AbstractDocument):
         max_length=1000,
     )
 
-    def delete(self, *args, **kwargs):
+    def delete(self, user=None, *args, **kwargs):
         """
         Custom delete functionality for InterventionDocuments.
         Removes the folder from the file system if there are no further documents for this entry.
@@ -324,6 +324,9 @@ class InterventionDocument(AbstractDocument):
             folder_path = self.file.path.split("/")[:-1]
             folder_path = "/".join(folder_path)
 
+        if user:
+            self.instance.mark_as_edited(user, edit_comment=DOCUMENT_REMOVED_TEMPLATE.format(self.title))
+
         # Remove the file itself
         super().delete(*args, **kwargs)
 
diff --git a/intervention/models/revocation.py b/intervention/models/revocation.py
index 66318735..da39b001 100644
--- a/intervention/models/revocation.py
+++ b/intervention/models/revocation.py
@@ -9,6 +9,8 @@ Created on: 15.11.21
 import shutil
 
 from django.contrib.gis.db import models
+from django.core.exceptions import ObjectDoesNotExist
+
 from konova.models import BaseResource, AbstractDocument, generate_document_file_upload_path
 from konova.utils.message_templates import REVOCATION_REMOVED
 
@@ -21,10 +23,13 @@ class Revocation(BaseResource):
     legal = models.ForeignKey("Legal", null=False, blank=False, on_delete=models.CASCADE, help_text="Refers to 'Widerspruch am'", related_name="revocations")
     comment = models.TextField(null=True, blank=True)
 
-    def delete(self, user = None, *args, **kwargs):
+    def delete(self, user=None, *args, **kwargs):
         # Make sure related objects are being removed as well
-        if self.document:
+        try:
             self.document.delete(*args, **kwargs)
+        except ObjectDoesNotExist:
+            # No file to delete
+            pass
 
         if user is not None:
             self.legal.intervention.mark_as_edited(user, edit_comment=REVOCATION_REMOVED)
diff --git a/intervention/views.py b/intervention/views.py
index 98654411..a518a9da 100644
--- a/intervention/views.py
+++ b/intervention/views.py
@@ -17,7 +17,7 @@ from konova.utils.documents import remove_document, get_document
 from konova.utils.generators import generate_qr_code
 from konova.utils.message_templates import INTERVENTION_INVALID, FORM_INVALID, IDENTIFIER_REPLACED, \
     CHECKED_RECORDED_RESET, DEDUCTION_REMOVED, DEDUCTION_ADDED, REVOCATION_ADDED, REVOCATION_REMOVED, \
-    COMPENSATION_REMOVED_TEMPLATE
+    COMPENSATION_REMOVED_TEMPLATE, DOCUMENT_ADDED
 from konova.utils.user_checks import in_group
 
 
@@ -131,7 +131,7 @@ def new_document_view(request: HttpRequest, id: str):
     form = NewInterventionDocumentForm(request.POST or None, request.FILES or None, instance=intervention, request=request)
     return form.process_request(
         request,
-        msg_success=_("Document added"),
+        msg_success=DOCUMENT_ADDED,
         redirect_url=reverse("intervention:detail", args=(id,)) + "#related_data"
     )
 
diff --git a/konova/admin.py b/konova/admin.py
index 5970b020..81db8fe2 100644
--- a/konova/admin.py
+++ b/konova/admin.py
@@ -99,13 +99,6 @@ class BaseObjectAdmin(BaseResourceAdmin):
         for entry in queryset:
             entry.deleted.delete()
 
-            # Remove delete log entry from related intervention log history
-            logs = entry.intervention.log.filter(
-                action=UserAction.EDITED,
-                comment=COMPENSATION_REMOVED_TEMPLATE.format(entry.identifier)
-            )
-            logs.delete()
-
 
 
 # Outcommented for a cleaner admin backend on production
diff --git a/konova/utils/documents.py b/konova/utils/documents.py
index 2ce1fee6..63a7d328 100644
--- a/konova/utils/documents.py
+++ b/konova/utils/documents.py
@@ -10,6 +10,7 @@ from django.utils.translation import gettext_lazy as _
 
 from konova.forms import RemoveModalForm
 from konova.models import AbstractDocument
+from konova.utils.message_templates import DOCUMENT_REMOVED_TEMPLATE
 
 
 def get_document(doc: AbstractDocument):
@@ -49,5 +50,5 @@ def remove_document(request: HttpRequest, doc: AbstractDocument):
     form = RemoveModalForm(request.POST or None, instance=doc, request=request)
     return form.process_request(
         request=request,
-        msg_success=_("Document '{}' deleted").format(title)
+        msg_success=DOCUMENT_REMOVED_TEMPLATE.format(title)
     )
\ No newline at end of file
diff --git a/konova/utils/message_templates.py b/konova/utils/message_templates.py
index 43cdcfbd..79a190ca 100644
--- a/konova/utils/message_templates.py
+++ b/konova/utils/message_templates.py
@@ -37,6 +37,10 @@ PAYMENT_REMOVED = _("Payment removed")
 REVOCATION_ADDED = _("Revocation added")
 REVOCATION_REMOVED = _("Revocation removed")
 
+# DOCUMENTS
+DOCUMENT_REMOVED_TEMPLATE = _("Document '{}' deleted")
+DOCUMENT_ADDED = _("Document added")
+
 # Edited
 EDITED_GENERAL_DATA = _("Edited general data")
 ADDED_COMPENSATION_STATE = _("Added compensation state")

From fd04c314cd64ee562373818c4d054df79d32f167 Mon Sep 17 00:00:00 2001
From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de>
Date: Fri, 4 Feb 2022 13:55:50 +0100
Subject: [PATCH 12/12] # 86 Minor html/css tweaks

* improves minor things like display related breakpoints for certain html elements
* improves css for select2 for better group-result distinction
---
 .../templates/analysis/reports/detail.html    |  4 +--
 .../detail/compensation/view.html             | 36 ++++++++++---------
 .../compensation/detail/eco_account/view.html | 20 +++++------
 .../report/compensation/report.html           |  4 +--
 .../report/eco_account/report.html            |  4 +--
 ema/templates/ema/detail/view.html            | 18 +++++-----
 ema/templates/ema/report/report.html          |  4 +--
 .../templates/intervention/detail/view.html   | 20 +++++------
 .../templates/intervention/report/report.html |  4 +--
 konova/static/css/konova.css                  |  9 +++++
 templates/base.html                           |  4 +--
 11 files changed, 69 insertions(+), 58 deletions(-)

diff --git a/analysis/templates/analysis/reports/detail.html b/analysis/templates/analysis/reports/detail.html
index ac4f08e2..31ca65c6 100644
--- a/analysis/templates/analysis/reports/detail.html
+++ b/analysis/templates/analysis/reports/detail.html
@@ -3,11 +3,11 @@
 
 {% block body %}
     <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             <h3>{% trans 'Evaluation report' %} {{office.long_name}}</h3>
             <h5>{% trans 'From' %} {{report.date_from.date}} {% trans 'to' %} {{report.date_to.date}}</h5>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             <div class="d-flex justify-content-end">
                 <div class="dropdown">
                     <div class="btn btn" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
diff --git a/compensation/templates/compensation/detail/compensation/view.html b/compensation/templates/compensation/detail/compensation/view.html
index 7b167658..3f843c0a 100644
--- a/compensation/templates/compensation/detail/compensation/view.html
+++ b/compensation/templates/compensation/detail/compensation/view.html
@@ -14,16 +14,16 @@
 {% block body %}
 
     <div id="detail-header" class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             <h3>{% trans 'Compensation' %}<br> {{obj.identifier}}</h3>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             {% include 'compensation/detail/compensation/includes/controls.html' %}
         </div>
     </div>
     <hr>
     <div id="data" class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             <div class="table-container">
                 <table class="table table-hover">
                     <tr>
@@ -105,38 +105,40 @@
                 </table>
             </div>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            <div class="row">
-                {% include 'map/geom_form.html' %}
-            </div>
-            <div class="row">
-                {% include 'konova/includes/parcels.html' %}
-            </div>
-            <div class="row">
-                {% include 'konova/includes/comment_card.html' %}
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
+            <div class="col">
+                <div class="row">
+                    {% include 'map/geom_form.html' %}
+                </div>
+                <div class="row">
+                    {% include 'konova/includes/parcels.html' %}
+                </div>
+                <div class="row">
+                    {% include 'konova/includes/comment_card.html' %}
+                </div>
             </div>
         </div>
     </div>
     <hr>
     <div id="related_data">
         <div class="row">
-            <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
                 {% include 'compensation/detail/compensation/includes/states-before.html' %}
             </div>
-            <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
                 {% include 'compensation/detail/compensation/includes/states-after.html' %}
             </div>
         </div>
         <div class="row">
-            <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
                 {% include 'compensation/detail/compensation/includes/actions.html' %}
             </div>
-            <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
                 {% include 'compensation/detail/compensation/includes/deadlines.html' %}
             </div>
         </div>
         <div class="row">
-            <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
                 {% include 'compensation/detail/compensation/includes/documents.html' %}
             </div>
         </div>
diff --git a/compensation/templates/compensation/detail/eco_account/view.html b/compensation/templates/compensation/detail/eco_account/view.html
index 033eda33..f276f931 100644
--- a/compensation/templates/compensation/detail/eco_account/view.html
+++ b/compensation/templates/compensation/detail/eco_account/view.html
@@ -14,16 +14,16 @@
 {% block body %}
 
     <div id="detail-header" class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             <h3>{% trans 'Eco-account' %}<br> {{obj.identifier}}</h3>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             {% include 'compensation/detail/eco_account/includes/controls.html' %}
         </div>
     </div>
     <hr>
     <div id="data" class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             <div class="table-container">
                 <table class="table table-hover">
                     <tr>
@@ -88,7 +88,7 @@
                 </table>
             </div>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             <div class="row">
                 {% include 'map/geom_form.html' %}
             </div>
@@ -104,26 +104,26 @@
 
     <div id="related_data">
         <div class="row">
-            <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
                 {% include 'compensation/detail/eco_account/includes/states-before.html' %}
             </div>
-            <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
                 {% include 'compensation/detail/eco_account/includes/states-after.html' %}
             </div>
         </div>
         <div class="row">
-            <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
                 {% include 'compensation/detail/eco_account/includes/actions.html' %}
             </div>
-            <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
                 {% include 'compensation/detail/eco_account/includes/deadlines.html' %}
             </div>
         </div>
         <div class="row">
-            <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
                 {% include 'compensation/detail/eco_account/includes/documents.html' %}
             </div>
-            <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
                 {% include 'compensation/detail/eco_account/includes/deductions.html' %}
             </div>
         </div>
diff --git a/compensation/templates/compensation/report/compensation/report.html b/compensation/templates/compensation/report/compensation/report.html
index df991ad0..25130f72 100644
--- a/compensation/templates/compensation/report/compensation/report.html
+++ b/compensation/templates/compensation/report/compensation/report.html
@@ -3,7 +3,7 @@
 
 {% block body %}
 <div class="row">
-    <div class="col-sm-12 col-md-12 col-lg-6">
+    <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
         <h3>{% trans 'Report' %}</h3>
         <h4>{{obj.identifier}}</h4>
         <div class="table-container">
@@ -33,7 +33,7 @@
         {% include 'compensation/detail/compensation/includes/states-after.html' %}
         {% include 'compensation/detail/compensation/includes/actions.html' %}
     </div>
-    <div class="col-sm-12 col-md-12 col-lg-6">
+    <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
         <div class="row">
             {% include 'map/geom_form.html' %}
         </div>
diff --git a/compensation/templates/compensation/report/eco_account/report.html b/compensation/templates/compensation/report/eco_account/report.html
index 1aef1d4b..1b08eb8b 100644
--- a/compensation/templates/compensation/report/eco_account/report.html
+++ b/compensation/templates/compensation/report/eco_account/report.html
@@ -3,7 +3,7 @@
 
 {% block body %}
 <div class="row">
-    <div class="col-sm-12 col-md-12 col-lg-6">
+    <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
         <h3>{% trans 'Report' %}</h3>
         <h4>{{obj.identifier}}</h4>
         <div class="table-container">
@@ -50,7 +50,7 @@
         {% include 'compensation/detail/compensation/includes/states-after.html' %}
         {% include 'compensation/detail/compensation/includes/actions.html' %}
     </div>
-    <div class="col-sm-12 col-md-12 col-lg-6">
+    <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
         <div class="row">
             {% include 'map/geom_form.html' %}
         </div>
diff --git a/ema/templates/ema/detail/view.html b/ema/templates/ema/detail/view.html
index 3e7f2d30..32ddd66b 100644
--- a/ema/templates/ema/detail/view.html
+++ b/ema/templates/ema/detail/view.html
@@ -14,16 +14,16 @@
 {% block body %}
 
     <div id="detail-header" class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             <h3>{% trans 'Payment funded compensation' %} <br> {{obj.identifier}}</h3>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             {% include 'ema/detail/includes/controls.html' %}
         </div>
     </div>
     <hr>
     <div id="data" class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             <div class="table-container">
                 <table class="table table-hover">
                     <tr>
@@ -82,7 +82,7 @@
                 </table>
             </div>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             <div class="row">
             {% include 'map/geom_form.html' %}
             </div>
@@ -97,23 +97,23 @@
     <hr>
     <div id="related_data">
         <div class="row">
-            <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
                 {% include 'ema/detail/includes/states-before.html' %}
             </div>
-            <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
                 {% include 'ema/detail/includes/states-after.html' %}
             </div>
         </div>
         <div class="row">
-            <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
                 {% include 'ema/detail/includes/actions.html' %}
             </div>
-            <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
                 {% include 'ema/detail/includes/deadlines.html' %}
             </div>
         </div>
         <div class="row">
-            <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
                 {% include 'ema/detail/includes/documents.html' %}
             </div>
         </div>
diff --git a/ema/templates/ema/report/report.html b/ema/templates/ema/report/report.html
index 10ec7aa1..64ce6da2 100644
--- a/ema/templates/ema/report/report.html
+++ b/ema/templates/ema/report/report.html
@@ -3,7 +3,7 @@
 
 {% block body %}
 <div class="row">
-    <div class="col-sm-12 col-md-12 col-lg-6">
+    <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
         <h3>{% trans 'Report' %}</h3>
         <h4>{{obj.identifier}}</h4>
         <div class="table-container">
@@ -37,7 +37,7 @@
         {% include 'compensation/detail/compensation/includes/states-after.html' %}
         {% include 'compensation/detail/compensation/includes/actions.html' %}
     </div>
-    <div class="col-sm-12 col-md-12 col-lg-6">
+    <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
         <div class="row">
             {% include 'map/geom_form.html' %}
         </div>
diff --git a/intervention/templates/intervention/detail/view.html b/intervention/templates/intervention/detail/view.html
index 86220949..8e7fc6ca 100644
--- a/intervention/templates/intervention/detail/view.html
+++ b/intervention/templates/intervention/detail/view.html
@@ -14,16 +14,16 @@
 {% block body %}
 
     <div id="detail-header" class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             <h3>{% trans 'Intervention' %}<br> {{obj.identifier}}</h3>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             {% include 'intervention/detail/includes/controls.html' %}
         </div>
     </div>
     <hr>
     <div id="data" class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             <div class="table-container">
                 <table class="table table-hover">
                     <tr {% if not obj.title %}class="alert alert-danger" title="{% trans 'Missing' %}" {% endif %}>
@@ -122,7 +122,7 @@
                 </table>
             </div>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
+        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             <div class="row">
                 {% include 'map/geom_form.html' %}
             </div>
@@ -138,26 +138,26 @@
 
     <div id="related_data">
         <div class="row">
-            <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
                 {% include 'intervention/detail/includes/compensations.html' %}
             </div>
-            <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
                 {% include 'intervention/detail/includes/payments.html' %}
             </div>
         </div>
         <div class="row">
-            <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
                 {% include 'intervention/detail/includes/deductions.html' %}
             </div>
-            <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
                 {% include 'intervention/detail/includes/revocation.html' %}
             </div>
         </div>
         <div class="row">
-            <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
                 {% include 'intervention/detail/includes/documents.html' %}
             </div>
-            <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
             </div>
         </div>
     </div>
diff --git a/intervention/templates/intervention/report/report.html b/intervention/templates/intervention/report/report.html
index ca5aa109..5d378197 100644
--- a/intervention/templates/intervention/report/report.html
+++ b/intervention/templates/intervention/report/report.html
@@ -3,7 +3,7 @@
 
 {% block body %}
 <div class="row">
-    <div class="col-sm-12 col-md-12 col-lg-6">
+    <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
         <h3>{% trans 'Report' %}</h3>
         <h4>{{obj.identifier}}</h4>
         <div class="table-container">
@@ -96,7 +96,7 @@
             </table>
         </div>
     </div>
-    <div class="col-sm-12 col-md-12 col-lg-6">
+    <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
         <div class="row">
             {% include 'map/geom_form.html' %}
         </div>
diff --git a/konova/static/css/konova.css b/konova/static/css/konova.css
index fd29d3ab..a10e124b 100644
--- a/konova/static/css/konova.css
+++ b/konova/static/css/konova.css
@@ -235,6 +235,15 @@ Similar to bootstraps 'shadow-lg'
 .select2-results__option--highlighted{
     background-color: var(--rlp-red) !important;
 }
+.select2-container--default .select2-results__group{
+    background-color: var(--rlp-gray-light);
+}
+.select2-container--default .select2-results__option .select2-results__option{
+    padding-left: 2em !important;
+}
 .select2-container--default .select2-results > .select2-results__options{
     max-height: 500px !important;
+}
+.select2-container--default .select2-results__option .select2-results__option{
+    padding-left: 2em;
 }
\ No newline at end of file
diff --git a/templates/base.html b/templates/base.html
index d0656ee3..c418daad 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -30,12 +30,12 @@
         </div>
         {% endfor %}
     </div>
-    <div class="container-fluid mt-3">
+    <div class="container-fluid mt-3 px-4">
         {% comment %}
             The modal wrapper, which can be used on every view can stay on the base.html template
         {% endcomment %}
         <div class="modal fade" tabindex="-1" role="dialog" id="modal">
-          <div class="modal-dialog modal-md modal-lg" role="document">
+          <div class="modal-dialog modal-md modal-xl" role="document">
             <div class="modal-content"></div>
           </div>
         </div>