From f8b3e5c8fd92dc7c4759c10aa5dd342591db29a1 Mon Sep 17 00:00:00 2001
From: mipel <hadunan@gmail.com>
Date: Tue, 10 Aug 2021 10:42:04 +0200
Subject: [PATCH] EcoAccount withdraws

* adds functionality for withdraws from eco accounts in detail view of interventions and eco account as well
* adds get_surface() method to AbstractCompensation class to provide a simple getter for a sql calculation
* adds get_surface_withdraws() method to EcoAccount class to provide a simple getter for a sql calculation
* renames some routes to match coherent rout naming
* adds logic check on NewWithdrawForm
* renames templates/table directory to templates/form, since there are form-table templates inside --> more clarity
* adds new autocomplete routes to konova/urls.py for Interventions and EcoAccounts
* adds/updates translations
* adds/updates template comments
* updates requirements.txt
---
 compensation/models.py                        |  21 +-
 .../eco_account/includes/withdraws.html       |  14 +-
 compensation/urls.py                          |   1 +
 compensation/views/eco_account_views.py       |  26 ++-
 intervention/forms.py                         | 124 +++++++++++
 .../detail/includes/revocation.html           |   4 +-
 .../detail/includes/withdraws.html            |  14 +-
 intervention/urls.py                          |   9 +-
 intervention/views.py                         |  22 +-
 konova/autocompletes.py                       |  38 ++++
 konova/templates/konova/form.html             |   2 +-
 konova/urls.py                                |   5 +-
 locale/de/LC_MESSAGES/django.mo               | Bin 16199 -> 16955 bytes
 locale/de/LC_MESSAGES/django.po               | 205 ++++++++++--------
 requirements.txt                              |   2 +-
 templates/base.html                           |   3 +-
 templates/footer.html                         |  11 +
 .../{table => form}/generic_table_form.html   |   2 +-
 .../generic_table_form_body.html              |   0
 templates/modal/modal_form.html               |   4 +-
 user/templates/user/notifications.html        |   2 +-
 21 files changed, 388 insertions(+), 121 deletions(-)
 rename templates/{table => form}/generic_table_form.html (93%)
 rename templates/{table => form}/generic_table_form_body.html (100%)

diff --git a/compensation/models.py b/compensation/models.py
index 1d3e7cc..8c45bcf 100644
--- a/compensation/models.py
+++ b/compensation/models.py
@@ -7,9 +7,8 @@ Created on: 17.11.20
 """
 from django.contrib.auth.models import User
 from django.contrib.gis.db import models
-from django.core.validators import MinValueValidator, MaxValueValidator
-from django.db import transaction
-from django.utils import timezone
+from django.core.validators import MinValueValidator
+from django.db.models import Sum
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
 
@@ -121,6 +120,14 @@ class AbstractCompensation(BaseObject):
     class Meta:
         abstract = True
 
+    def get_surface(self) -> float:
+        """ Calculates the compensation's/account's surface
+
+        Returns:
+            sum_surface (float)
+        """
+        return self.after_states.all().aggregate(Sum("surface"))["surface__sum"]
+
 
 class Compensation(AbstractCompensation):
     """
@@ -188,6 +195,14 @@ class EcoAccount(AbstractCompensation):
     def __str__(self):
         return "{}".format(self.identifier)
 
+    def get_surface_withdraws(self) -> float:
+        """ Calculates the compensation's/account's surface
+
+        Returns:
+            sum_surface (float)
+        """
+        return self.withdraws.all().aggregate(Sum("surface"))["surface__sum"]
+
 
 class EcoAccountWithdraw(BaseResource):
     """
diff --git a/compensation/templates/compensation/detail/eco_account/includes/withdraws.html b/compensation/templates/compensation/detail/eco_account/includes/withdraws.html
index d085742..6a00356 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/withdraws.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/withdraws.html
@@ -11,12 +11,10 @@
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
                     {% if is_default_member and has_access  %}
-                    <a href="{% url 'compensation:new' %}" title="{% trans 'Add new withdraw' %}">
-                        <button class="btn btn-outline-default">
-                            {% fa5_icon 'plus' %}
-                            {% fa5_icon 'tree' %}
-                        </button>
-                    </a>
+                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc-new-withdraw' obj.id %}" title="{% trans 'Add new withdraw' %}">
+                        {% fa5_icon 'plus' %}
+                        {% fa5_icon 'tree' %}
+                    </button>
                     {% endif %}
                 </div>
             </div>
@@ -32,6 +30,9 @@
                 <th scope="col">
                     {% trans 'Amount' %}
                 </th>
+                <th scope="col">
+                    {% trans 'Created' %}
+                </th>
                 <th scope="col">
                     {% trans 'Action' %}
                 </th>
@@ -46,6 +47,7 @@
                     </a>
                 </td>
                 <td class="align-middle">{{ withdraw.surface|floatformat:2|intcomma }} m²</td>
+                <td class="align-middle">{{ withdraw.created.timestamp|default_if_none:""|naturalday}}</td>
                 <td>
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:withdraw-remove' withdraw.account.id withdraw.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove Withdraw' %}">
diff --git a/compensation/urls.py b/compensation/urls.py
index 4600e85..7b12765 100644
--- a/compensation/urls.py
+++ b/compensation/urls.py
@@ -36,6 +36,7 @@ urlaptterns_eco_acc = [
 
     # Eco-account withdraws
     path('acc/<id>/remove/<withdraw_id>', eco_account_views.withdraw_remove_view, name='withdraw-remove'),
+    path('acc/<id>/withdraw/new', eco_account_views.new_withdraw_view, name='acc-new-withdraw'),
 
 ]
 urlpatterns_compensation = [
diff --git a/compensation/views/eco_account_views.py b/compensation/views/eco_account_views.py
index d0ba4a9..9dfdbd8 100644
--- a/compensation/views/eco_account_views.py
+++ b/compensation/views/eco_account_views.py
@@ -16,6 +16,7 @@ from django.shortcuts import render, get_object_or_404
 from compensation.forms import NewStateModalForm, NewActionModalForm, NewDeadlineModalForm
 from compensation.models import EcoAccount
 from compensation.tables import EcoAccountTable
+from intervention.forms import NewWithdrawForm
 from konova.contexts import BaseContext
 from konova.decorators import any_group_check, default_group_required
 from konova.forms import RemoveModalForm, SimpleGeomForm, NewDocumentForm
@@ -94,8 +95,7 @@ def open_view(request: HttpRequest, id: str):
     diff_states = abs(sum_before_states - sum_after_states)
 
     # Calculate rest of available surface for withdraws
-    withdraws = acc.withdraws.all()
-    withdraw_surfaces = withdraws.aggregate(Sum("surface"))["surface__sum"] or 0
+    withdraw_surfaces = acc.get_surface_withdraws() or 0
     available = int(((sum_after_states - withdraw_surfaces) / sum_after_states) * 100)
 
     context = {
@@ -259,4 +259,24 @@ def new_document_view(request: HttpRequest, id: str):
     return form.process_request(
         request,
         msg_success=_("Document added")
-    )
\ No newline at end of file
+    )
+
+
+@login_required
+@default_group_required
+def new_withdraw_view(request: HttpRequest, id: str):
+    """ Renders a modal form view for creating withdraws
+
+    Args:
+        request ():
+        id ():
+
+    Returns:
+
+    """
+    acc = get_object_or_404(EcoAccount, id=id)
+    form = NewWithdrawForm(request.POST or None, instance=acc, user=request.user)
+    return form.process_request(
+        request,
+        msg_success=_("Withdraw added")
+    )
diff --git a/intervention/forms.py b/intervention/forms.py
index e61528a..0641880 100644
--- a/intervention/forms.py
+++ b/intervention/forms.py
@@ -14,6 +14,7 @@ from django.db import transaction
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
+from compensation.models import EcoAccountWithdraw, EcoAccount
 from intervention.models import Intervention, Revocation
 from konova.forms import BaseForm, BaseModalForm
 from konova.models import Document
@@ -423,3 +424,126 @@ class RunCheckForm(BaseModalForm):
             self.instance.checked = user_action
             self.instance.log.add(user_action)
             self.instance.save()
+
+
+class NewWithdrawForm(BaseModalForm):
+    """ Form for creating new withdraws
+
+    Can be used for Intervention view as well as for EcoAccount views.
+
+    Parameter 'instance' can be an intervention, as well as an ecoAccount.
+    An instance check handles both workflows properly.
+
+    """
+    account = forms.ModelChoiceField(
+        label=_("Eco-account"),
+        label_suffix="",
+        help_text=_("Only recorded accounts can be selected for withdraws"),
+        queryset=EcoAccount.objects.filter(deleted=None, recorded__isnull=False),
+        widget=autocomplete.ModelSelect2(
+            url="accounts-autocomplete",
+            attrs={
+                "data-placeholder": _("Eco-account"),
+                "data-minimum-input-length": 3,
+                "readonly": True,
+            }
+        ),
+    )
+    surface = forms.DecimalField(
+        min_value=0.00,
+        decimal_places=2,
+        label=_("Surface"),
+        label_suffix="",
+        help_text=_("in m²"),
+    )
+    intervention = forms.ModelChoiceField(
+        label=_("Intervention"),
+        label_suffix="",
+        help_text=_("Only shared interventions can be selected"),
+        queryset=Intervention.objects.filter(deleted=None),
+        widget=autocomplete.ModelSelect2(
+            url="interventions-autocomplete",
+            attrs={
+                "data-placeholder": _("Intervention"),
+                "data-minimum-input-length": 3,
+            }
+        ),
+    )
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.form_title = _("New Withdraw")
+        self.form_caption = _("Enter the information for a new withdraw from a chosen eco-account")
+        self.is_intervention_initially = False
+
+        # Add a placeholder for field 'surface' without having to define the whole widget above
+        self.fields["surface"].widget.attrs["placeholder"] = "0,00"
+
+        # Check for Intervention or EcoAccount
+        if isinstance(self.instance, Intervention):
+            # Form has been called with a given intervention
+            self.initialize_form_field("intervention", self.instance)
+            self.disable_form_field("intervention")
+            self.is_intervention_initially = True
+        elif isinstance(self.instance, EcoAccount):
+            # Form has been called with a given account --> make it initial in the form and read-only
+            self.initialize_form_field("account", self.instance)
+            self.disable_form_field("account")
+        else:
+            raise NotImplementedError
+
+    def is_valid(self):
+        """ Custom validity check
+
+        Makes sure the withdraw can not contain more surface than the account still provides
+
+        Returns:
+            is_valid (bool)
+        """
+        super_result = super().is_valid()
+        if self.is_intervention_initially:
+            acc = self.cleaned_data["account"]
+        else:
+            acc = self.instance
+
+        sum_surface = acc.get_surface()
+        sum_surface_withdraws = acc.get_surface_withdraws()
+        rest_surface = sum_surface - sum_surface_withdraws
+        form_surface = float(self.cleaned_data["surface"])
+        is_valid_surface = form_surface < rest_surface
+        if not is_valid_surface:
+            self.add_error(
+                "surface",
+                    _("The account {} has not enough surface for a withdraw of {} m². There are only {} m² left").format(acc.identifier, form_surface, rest_surface),
+            )
+        return is_valid_surface and super_result
+
+    def save(self):
+        with transaction.atomic():
+            # Create log entry
+            user_action_edit = UserActionLogEntry.objects.create(
+                user=self.user,
+                action=UserAction.EDITED
+            )
+            user_action_create = UserActionLogEntry.objects.create(
+                user=self.user,
+                action=UserAction.CREATED
+            )
+            self.instance.log.add(user_action_edit)
+
+            # Create withdraw depending on Intervention or EcoAccount as the initial instance
+            if self.is_intervention_initially:
+                withdraw = EcoAccountWithdraw.objects.create(
+                    intervention=self.instance,
+                    account=self.cleaned_data["account"],
+                    surface=self.cleaned_data["surface"],
+                    created=user_action_create,
+                )
+            else:
+                withdraw = EcoAccountWithdraw.objects.create(
+                    intervention=self.cleaned_data["intervention"],
+                    account=self.instance,
+                    surface=self.cleaned_data["surface"],
+                    created=user_action_create,
+                )
+        return withdraw
\ No newline at end of file
diff --git a/intervention/templates/intervention/detail/includes/revocation.html b/intervention/templates/intervention/detail/includes/revocation.html
index 22f78e6..694fe87 100644
--- a/intervention/templates/intervention/detail/includes/revocation.html
+++ b/intervention/templates/intervention/detail/includes/revocation.html
@@ -14,7 +14,7 @@
                         Only show add-button if no revocation exists, yet.
                     {% endcomment %}
                     {% if is_default_member and has_access and not intervention.legal.revocation %}
-                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'intervention:revocation-new' intervention.id %}" title="{% trans 'Add revocation' %}">
+                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'intervention:new-revocation' intervention.id %}" title="{% trans 'Add revocation' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'ban' %}
                     </button>
@@ -56,7 +56,7 @@
                 </td>
                 <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'intervention:revocation-remove' 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" title="{% trans 'Remove revocation' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/intervention/templates/intervention/detail/includes/withdraws.html b/intervention/templates/intervention/detail/includes/withdraws.html
index 8a170bd..ba57706 100644
--- a/intervention/templates/intervention/detail/includes/withdraws.html
+++ b/intervention/templates/intervention/detail/includes/withdraws.html
@@ -11,12 +11,10 @@
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
                     {% if is_default_member and has_access  %}
-                    <a href="{% url 'compensation:new' %}" title="{% trans 'Add new withdraw' %}">
-                        <button class="btn btn-outline-default">
-                            {% fa5_icon 'plus' %}
-                            {% fa5_icon 'tree' %}
-                        </button>
-                    </a>
+                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'intervention:acc-new-withdraw' intervention.id %}" title="{% trans 'Add new withdraw' %}">
+                        {% fa5_icon 'plus' %}
+                        {% fa5_icon 'tree' %}
+                    </button>
                     {% endif %}
                 </div>
             </div>
@@ -32,6 +30,9 @@
                 <th scope="col">
                     {% trans 'Amount' %}
                 </th>
+                <th scope="col">
+                    {% trans 'Created' %}
+                </th>
                 <th scope="col">
                     {% trans 'Action' %}
                 </th>
@@ -49,6 +50,7 @@
                     </a>
                 </td>
                 <td class="align-middle">{{ withdraw.surface|floatformat:2|intcomma }} m²</td>
+                <td class="align-middle">{{ withdraw.created.timestamp|default_if_none:""|naturalday}}</td>
                 <td>
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:withdraw-remove' withdraw.account.id withdraw.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove Withdraw' %}">
diff --git a/intervention/urls.py b/intervention/urls.py
index e580d4b..05f580b 100644
--- a/intervention/urls.py
+++ b/intervention/urls.py
@@ -8,7 +8,7 @@ Created on: 30.11.20
 from django.urls import path
 
 from intervention.views import index_view, new_view, open_view, edit_view, remove_view, new_document_view, share_view, \
-    create_share_view, remove_revocation_view, new_revocation_view, run_check_view, log_view
+    create_share_view, remove_revocation_view, new_revocation_view, run_check_view, log_view, new_withdraw_view
 
 app_name = "intervention"
 urlpatterns = [
@@ -23,7 +23,10 @@ urlpatterns = [
     path('<id>/share', create_share_view, name='share-create'),
     path('<id>/check', run_check_view, name='run-check'),
 
+    # Withdraws
+    path('<id>/withdraw/new', new_withdraw_view, name='acc-new-withdraw'),
+
     # Revocation routes
-    path('<id>/revocation/new', new_revocation_view, name='revocation-new'),
-    path('revocation/<id>/remove', remove_revocation_view, name='revocation-remove'),
+    path('<id>/revocation/new', new_revocation_view, name='new-revocation'),
+    path('revocation/<id>/remove', remove_revocation_view, name='remove-revocation'),
 ]
\ No newline at end of file
diff --git a/intervention/views.py b/intervention/views.py
index 5a7e920..0f8f8c8 100644
--- a/intervention/views.py
+++ b/intervention/views.py
@@ -5,7 +5,7 @@ from django.http import HttpRequest
 from django.shortcuts import render, get_object_or_404
 
 from intervention.forms import NewInterventionForm, EditInterventionForm, ShareInterventionForm, NewRevocationForm, \
-    RunCheckForm
+    RunCheckForm, NewWithdrawForm
 from intervention.models import Intervention, Revocation
 from intervention.tables import InterventionTable
 from konova.contexts import BaseContext
@@ -392,3 +392,23 @@ def log_view(request: HttpRequest, id: str):
     }
     context = BaseContext(request, context).context
     return render(request, template, context)
+
+
+@login_required
+@default_group_required
+def new_withdraw_view(request: HttpRequest, id: str):
+    """ Renders a modal form view for creating withdraws
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The intervention's id which shall get a new withdraw
+
+    Returns:
+
+    """
+    intervention = get_object_or_404(Intervention, id=id)
+    form = NewWithdrawForm(request.POST or None, instance=intervention, user=request.user)
+    return form.process_request(
+        request,
+        msg_success=_("Withdraw added")
+    )
diff --git a/konova/autocompletes.py b/konova/autocompletes.py
index 21319bf..cf01e02 100644
--- a/konova/autocompletes.py
+++ b/konova/autocompletes.py
@@ -7,6 +7,8 @@ Created on: 07.12.20
 """
 from dal_select2.views import Select2QuerySetView
 
+from compensation.models import EcoAccount
+from intervention.models import Intervention
 from organisation.models import Organisation
 
 
@@ -35,4 +37,40 @@ class NonOfficialOrganisationAutocomplete(Select2QuerySetView):
             qs = qs.order_by(
                 "name"
             )
+        return qs
+
+
+class EcoAccountAutocomplete(Select2QuerySetView):
+    def get_queryset(self):
+        if self.request.user.is_anonymous:
+            return EcoAccount.objects.none()
+        qs = EcoAccount.objects.filter(
+            deleted=None,
+            recorded__isnull=False,
+        )
+        if self.q:
+            qs = qs.filter(
+                identifier__icontains=self.q
+            )
+            qs = qs.order_by(
+                "identifier"
+            )
+        return qs
+
+
+class InterventionAutocomplete(Select2QuerySetView):
+    def get_queryset(self):
+        if self.request.user.is_anonymous:
+            return Intervention.objects.none()
+        qs = Intervention.objects.filter(
+            deleted=None,
+            users__in=[self.request.user],
+        )
+        if self.q:
+            qs = qs.filter(
+                identifier__icontains=self.q
+            )
+            qs = qs.order_by(
+                "identifier"
+            )
         return qs
\ No newline at end of file
diff --git a/konova/templates/konova/form.html b/konova/templates/konova/form.html
index 8b339f8..3efd152 100644
--- a/konova/templates/konova/form.html
+++ b/konova/templates/konova/form.html
@@ -3,6 +3,6 @@
 
 {% block body %}
 <div class="column">
-    {% include 'table/generic_table_form.html' %}
+    {% include 'form/generic_table_form.html' %}
 </div>
 {% endblock %}
\ No newline at end of file
diff --git a/konova/urls.py b/konova/urls.py
index 9d54f9c..5d20c15 100644
--- a/konova/urls.py
+++ b/konova/urls.py
@@ -18,7 +18,8 @@ from django.contrib import admin
 from django.urls import path, include
 from simple_sso.sso_client.client import Client
 
-from konova.autocompletes import OrganisationAutocomplete, NonOfficialOrganisationAutocomplete
+from konova.autocompletes import OrganisationAutocomplete, NonOfficialOrganisationAutocomplete, EcoAccountAutocomplete, \
+    InterventionAutocomplete
 from konova.settings import SSO_SERVER, SSO_PUBLIC_KEY, SSO_PRIVATE_KEY, DEBUG
 from konova.views import logout_view, home_view, get_document_view, remove_document_view, remove_deadline_view
 
@@ -45,6 +46,8 @@ urlpatterns = [
     # Autocomplete paths
     path("atcmplt/orgs", OrganisationAutocomplete.as_view(), name="orgs-autocomplete"),
     path("atcmplt/orgs/other", NonOfficialOrganisationAutocomplete.as_view(), name="other-orgs-autocomplete"),
+    path("atcmplt/eco-accounts", EcoAccountAutocomplete.as_view(), name="accounts-autocomplete"),
+    path("atcmplt/interventions", InterventionAutocomplete.as_view(), name="interventions-autocomplete"),
 ]
 
 if DEBUG:
diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo
index da217ac55128b31910c4d840edbf0a02c472833b..0c0691763d1770b8e72b21b6d6c011864d795d69 100644
GIT binary patch
delta 6258
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

delta 5528
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

diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 85e8719..5c3ad1c 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@
 #: compensation/forms.py:203 compensation/forms.py:271
 #: intervention/filters.py:26 intervention/filters.py:40
 #: intervention/filters.py:47 intervention/filters.py:48
-#: intervention/forms.py:318 intervention/forms.py:330
-#: intervention/forms.py:342 konova/forms.py:91 konova/forms.py:227
+#: intervention/forms.py:321 intervention/forms.py:333
+#: intervention/forms.py:345 konova/forms.py:91 konova/forms.py:227
 #: konova/forms.py:260 konova/forms.py:265 konova/forms.py:277
 #: konova/forms.py:289 konova/forms.py:302 user/forms.py:38
 #, fuzzy
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-09 15:06+0200\n"
+"POT-Creation-Date: 2021-08-10 10:30+0200\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"
@@ -27,8 +27,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: compensation/forms.py:41 compensation/forms.py:260
-#: compensation/templates/compensation/detail/eco_account/includes/withdraws.html:33
-#: intervention/templates/intervention/detail/includes/withdraws.html:33
+#: compensation/templates/compensation/detail/eco_account/includes/withdraws.html:31
+#: intervention/templates/intervention/detail/includes/withdraws.html:31
 msgid "Amount"
 msgstr "Menge"
 
@@ -78,10 +78,11 @@ msgstr "Biotoptyp wählen"
 #: 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
+#: intervention/forms.py:449
 msgid "Surface"
 msgstr "Fläche"
 
-#: compensation/forms.py:106
+#: compensation/forms.py:106 intervention/forms.py:451
 msgid "in m²"
 msgstr ""
 
@@ -112,7 +113,7 @@ msgstr "Fristart wählen"
 #: compensation/forms.py:187
 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:31
 #: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:31
-#: intervention/forms.py:317
+#: intervention/forms.py:320
 msgid "Date"
 msgstr "Datum"
 
@@ -127,7 +128,7 @@ msgstr "Datum wählen"
 #: compensation/templates/compensation/detail/eco_account/includes/actions.html:34
 #: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:34
 #: compensation/templates/compensation/detail/eco_account/includes/documents.html:31
-#: intervention/forms.py:341
+#: intervention/forms.py:344
 #: intervention/templates/intervention/detail/includes/documents.html:31
 #: intervention/templates/intervention/detail/includes/revocation.html:35
 #: konova/forms.py:288
@@ -135,7 +136,7 @@ msgid "Comment"
 msgstr "Kommentar"
 
 #: compensation/forms.py:204 compensation/forms.py:272
-#: intervention/forms.py:343 konova/forms.py:290
+#: intervention/forms.py:346 konova/forms.py:290
 msgid "Additional comment, maximum {} letters"
 msgstr "Zusätzlicher Kommentar, maximal {} Zeichen"
 
@@ -183,32 +184,32 @@ msgstr "Geben Sie die Daten der neuen Maßnahme ein"
 msgid "Added action"
 msgstr "Maßnahme hinzugefügt"
 
-#: compensation/models.py:59
+#: compensation/models.py:60
 msgid "cm"
 msgstr ""
 
-#: compensation/models.py:60
+#: compensation/models.py:61
 msgid "m"
 msgstr ""
 
-#: compensation/models.py:61
+#: compensation/models.py:62
 msgid "km"
 msgstr ""
 
-#: compensation/models.py:62
+#: compensation/models.py:63
 msgid "m²"
 msgstr ""
 
-#: compensation/models.py:63
+#: compensation/models.py:64
 msgid "ha"
 msgstr ""
 
-#: compensation/models.py:64
+#: compensation/models.py:65
 msgid "Pieces"
 msgstr "Stück"
 
 #: compensation/tables.py:26 compensation/tables.py:166
-#: intervention/forms.py:28 intervention/tables.py:23
+#: intervention/forms.py:31 intervention/tables.py:23
 #: intervention/templates/intervention/detail/includes/compensations.html:30
 msgid "Identifier"
 msgstr "Kennung"
@@ -218,7 +219,7 @@ msgstr "Kennung"
 #: compensation/templates/compensation/detail/compensation/view.html:24
 #: compensation/templates/compensation/detail/eco_account/includes/documents.html:28
 #: compensation/templates/compensation/detail/eco_account/view.html:24
-#: intervention/forms.py:35 intervention/tables.py:28
+#: intervention/forms.py:38 intervention/tables.py:28
 #: intervention/templates/intervention/detail/includes/compensations.html:33
 #: intervention/templates/intervention/detail/includes/documents.html:28
 #: intervention/templates/intervention/detail/view.html:24 konova/forms.py:259
@@ -309,6 +310,7 @@ msgstr "Ökokonten"
 
 #: compensation/tables.py:224
 #: compensation/templates/compensation/detail/eco_account/view.html:12
+#: intervention/forms.py:433 intervention/forms.py:440
 #: konova/templates/konova/home.html:88 templates/navbar.html:34
 msgid "Eco-account"
 msgstr "Ökokonto"
@@ -350,12 +352,12 @@ msgstr "Menge"
 #: compensation/templates/compensation/detail/eco_account/includes/documents.html:34
 #: compensation/templates/compensation/detail/eco_account/includes/states-after.html:39
 #: compensation/templates/compensation/detail/eco_account/includes/states-before.html:39
-#: compensation/templates/compensation/detail/eco_account/includes/withdraws.html:36
+#: compensation/templates/compensation/detail/eco_account/includes/withdraws.html:37
 #: intervention/templates/intervention/detail/includes/compensations.html:36
 #: intervention/templates/intervention/detail/includes/documents.html:34
 #: intervention/templates/intervention/detail/includes/payments.html:37
 #: intervention/templates/intervention/detail/includes/revocation.html:41
-#: intervention/templates/intervention/detail/includes/withdraws.html:36
+#: intervention/templates/intervention/detail/includes/withdraws.html:37
 #: templates/log.html:10
 msgid "Action"
 msgstr "Aktionen"
@@ -408,7 +410,7 @@ msgstr "Neue Frist hinzufügen"
 
 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:28
 #: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:28
-#: intervention/forms.py:40
+#: intervention/forms.py:43
 msgid "Type"
 msgstr "Typ"
 
@@ -511,7 +513,7 @@ msgstr "Zuletzt bearbeitet"
 
 #: compensation/templates/compensation/detail/compensation/view.html:72
 #: compensation/templates/compensation/detail/eco_account/view.html:58
-#: intervention/forms.py:251
+#: intervention/forms.py:254
 #: intervention/templates/intervention/detail/view.html:104
 msgid "Shared with"
 msgstr "Freigegeben für"
@@ -532,17 +534,23 @@ msgstr "Ökokonto Abbuchungen"
 msgid "Add new withdraw"
 msgstr "Neue Abbuchung hinzufügen"
 
-#: compensation/templates/compensation/detail/eco_account/includes/withdraws.html:30
+#: compensation/templates/compensation/detail/eco_account/includes/withdraws.html:28
 msgid "Intervention Identifier"
 msgstr "Eingriffskennung"
 
-#: compensation/templates/compensation/detail/eco_account/includes/withdraws.html:51
-#: intervention/templates/intervention/detail/includes/withdraws.html:54
+#: compensation/templates/compensation/detail/eco_account/includes/withdraws.html:34
+#: intervention/templates/intervention/detail/includes/withdraws.html:34
+#: user/models.py:50
+msgid "Created"
+msgstr "Erstellt"
+
+#: compensation/templates/compensation/detail/eco_account/includes/withdraws.html:53
+#: intervention/templates/intervention/detail/includes/withdraws.html:56
 msgid "Remove Withdraw"
 msgstr "Abbuchung entfernen"
 
 #: compensation/views/compensation_views.py:121
-#: compensation/views/eco_account_views.py:184 intervention/views.py:391
+#: compensation/views/eco_account_views.py:185 intervention/views.py:391
 msgid "Log"
 msgstr "Log"
 
@@ -551,22 +559,22 @@ msgid "Compensation removed"
 msgstr "Kompensation entfernt"
 
 #: compensation/views/compensation_views.py:161
-#: compensation/views/eco_account_views.py:261 intervention/views.py:96
+#: compensation/views/eco_account_views.py:262 intervention/views.py:96
 msgid "Document added"
 msgstr "Dokument hinzugefügt"
 
 #: compensation/views/compensation_views.py:180
-#: compensation/views/eco_account_views.py:205
+#: compensation/views/eco_account_views.py:206
 msgid "State added"
 msgstr "Zustand hinzugefügt"
 
 #: compensation/views/compensation_views.py:199
-#: compensation/views/eco_account_views.py:224
+#: compensation/views/eco_account_views.py:225
 msgid "Action added"
 msgstr "Maßnahme hinzugefügt"
 
 #: compensation/views/compensation_views.py:218
-#: compensation/views/eco_account_views.py:243
+#: compensation/views/eco_account_views.py:244
 msgid "Deadline added"
 msgstr "Frist hinzugefügt"
 
@@ -578,14 +586,18 @@ msgstr "Zustand gelöscht"
 msgid "Action removed"
 msgstr "Maßnahme entfernt"
 
-#: compensation/views/eco_account_views.py:134
+#: compensation/views/eco_account_views.py:135
 msgid "Eco-account removed"
 msgstr "Ökokonto entfernt"
 
-#: compensation/views/eco_account_views.py:161
+#: compensation/views/eco_account_views.py:162
 msgid "Withdraw removed"
 msgstr "Abbuchung entfernt"
 
+#: compensation/views/eco_account_views.py:282 intervention/views.py:413
+msgid "Withdraw added"
+msgstr "Abbuchung hinzugefügt"
+
 #: compensation/views/payment_views.py:43
 msgid "Payment added"
 msgstr "Zahlung hinzugefügt"
@@ -610,125 +622,125 @@ msgstr "Gemarkung"
 msgid "Search for district"
 msgstr "Nach Gemarkung suchen"
 
-#: intervention/forms.py:31
+#: intervention/forms.py:34
 msgid "Generated automatically if none was given"
 msgstr "Wird automatisch erzeugt, falls nicht angegeben"
 
-#: intervention/forms.py:43
+#: intervention/forms.py:46
 msgid "Which intervention type is this"
 msgstr "Welcher Eingriffstyp"
 
-#: intervention/forms.py:46
+#: intervention/forms.py:49
 #: intervention/templates/intervention/detail/view.html:32
 msgid "Law"
 msgstr "Gesetz"
 
-#: intervention/forms.py:49
+#: intervention/forms.py:52
 msgid "Based on which law"
 msgstr "Basiert auf welchem Recht"
 
-#: intervention/forms.py:52
+#: intervention/forms.py:55
 #: intervention/templates/intervention/detail/view.html:52
 msgid "Intervention handler"
 msgstr "Eingriffsverursacher"
 
-#: intervention/forms.py:55
+#: intervention/forms.py:58
 msgid "Who performs the intervention"
 msgstr "Wer führt den Eingriff durch"
 
-#: intervention/forms.py:58
+#: intervention/forms.py:61
 msgid "Data provider"
 msgstr "Datenbereitsteller"
 
-#: intervention/forms.py:60
+#: intervention/forms.py:63
 msgid "Who provides the data for the intervention"
 msgstr "Wer stellt die Daten für den Eingriff zur Verfügung"
 
-#: intervention/forms.py:65
+#: intervention/forms.py:68
 msgid "Organization"
 msgstr "Organisation"
 
-#: intervention/forms.py:71
+#: intervention/forms.py:74
 msgid "Data provider details"
 msgstr "Datenbereitsteller Details"
 
-#: intervention/forms.py:74
+#: intervention/forms.py:77
 msgid "Further details"
 msgstr "Weitere Details"
 
-#: intervention/forms.py:87
+#: intervention/forms.py:90
 msgid "Map"
 msgstr "Karte"
 
-#: intervention/forms.py:89
+#: intervention/forms.py:92
 msgid "Where does the intervention take place"
 msgstr "Wo findet der Eingriff statt"
 
-#: intervention/forms.py:97
+#: intervention/forms.py:100
 msgid "Files"
 msgstr "Dateien"
 
-#: intervention/forms.py:104
+#: intervention/forms.py:107
 msgid "New intervention"
 msgstr "Neuer Eingriff"
 
-#: intervention/forms.py:146
+#: intervention/forms.py:149
 msgid "Edit intervention"
 msgstr "Eingriff bearbeiten"
 
-#: intervention/forms.py:240
+#: intervention/forms.py:243
 msgid "Share link"
 msgstr "Freigabelink"
 
-#: intervention/forms.py:242
+#: intervention/forms.py:245
 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.py:254
+#: intervention/forms.py:257
 msgid "Remove check to remove access for this user"
 msgstr "Wählen Sie die Nutzer ab, die keinen Zugriff mehr haben sollen"
 
-#: intervention/forms.py:265
+#: intervention/forms.py:268
 #: intervention/templates/intervention/detail/includes/controls.html:15
 msgid "Share"
 msgstr "Freigabe"
 
-#: intervention/forms.py:266
+#: intervention/forms.py:269
 msgid "Share settings for {}"
 msgstr "Freigabe Einstellungen für {}"
 
-#: intervention/forms.py:319
+#: intervention/forms.py:322
 msgid "Date of revocation"
 msgstr "Datum des Widerspruchs"
 
-#: intervention/forms.py:329
+#: intervention/forms.py:332
 #: intervention/templates/intervention/detail/includes/revocation.html:38
 msgid "Document"
 msgstr "Dokument"
 
-#: intervention/forms.py:331 konova/forms.py:278
+#: intervention/forms.py:334 konova/forms.py:278
 msgid "Must be smaller than 15 Mb"
 msgstr "Muss kleiner als 15 Mb sein"
 
-#: intervention/forms.py:354
+#: intervention/forms.py:357
 #: intervention/templates/intervention/detail/includes/revocation.html:18
 msgid "Add revocation"
 msgstr "Widerspruch hinzufügen"
 
-#: intervention/forms.py:390
+#: intervention/forms.py:393
 msgid "Checked intervention data"
 msgstr "Eingriffsdaten geprüft"
 
-#: intervention/forms.py:396
+#: intervention/forms.py:399
 msgid "Checked compensations data and payments"
 msgstr "Kompensationen und Zahlungen geprüft"
 
-#: intervention/forms.py:404
+#: intervention/forms.py:407
 #: intervention/templates/intervention/detail/includes/controls.html:19
 msgid "Run check"
 msgstr "Prüfung vornehmen"
 
-#: intervention/forms.py:405
+#: intervention/forms.py:408
 msgid ""
 "I, {} {}, confirm that all necessary control steps have been performed by "
 "myself."
@@ -736,6 +748,37 @@ msgstr ""
 "Ich, {} {}, bestätige, dass die notwendigen Kontrollschritte durchgeführt "
 "wurden:"
 
+#: intervention/forms.py:435
+msgid "Only recorded accounts can be selected for withdraws"
+msgstr ""
+"Nur verzeichnete Ökokonten können für Abbuchungen verwendet werden."
+
+#: intervention/forms.py:454 intervention/forms.py:461
+#: intervention/tables.py:92 intervention/tables.py:172
+#: intervention/templates/intervention/detail/view.html:12
+#: konova/templates/konova/home.html:11 templates/navbar.html:22
+msgid "Intervention"
+msgstr "Eingriff"
+
+#: intervention/forms.py:456
+msgid "Only shared interventions can be selected"
+msgstr "Nur freigegebene Eingriffe können gewählt werden"
+
+#: intervention/forms.py:469
+msgid "New Withdraw"
+msgstr "Neue Abbuchung"
+
+#: intervention/forms.py:470
+msgid "Enter the information for a new withdraw from a chosen eco-account"
+msgstr "Geben Sie die Informationen für eine neue Abbuchung ein."
+
+#: intervention/forms.py:511
+msgid ""
+"The account {} has not enough surface for a withdraw of {} m². There are "
+"only {} m² left"
+msgstr ""
+"Das Ökokonto {} hat für eine Abbuchung von {} m² nicht ausreichend Restfläche. Es stehen noch {} m² zur Verfügung."
+
 #: intervention/models.py:203
 #: intervention/templates/intervention/detail/view.html:23
 #: intervention/templates/intervention/detail/view.html:27
@@ -756,12 +799,6 @@ msgstr "Existiert"
 msgid "Interventions"
 msgstr "Eingriffe"
 
-#: intervention/tables.py:92 intervention/tables.py:172
-#: intervention/templates/intervention/detail/view.html:12
-#: konova/templates/konova/home.html:11 templates/navbar.html:22
-msgid "Intervention"
-msgstr "Eingriff"
-
 #: intervention/tables.py:179
 msgid "Edit {}"
 msgstr "Bearbeite {}"
@@ -817,11 +854,11 @@ msgstr "Vom"
 msgid "Remove revocation"
 msgstr "Widerspruch entfernen"
 
-#: intervention/templates/intervention/detail/includes/withdraws.html:30
+#: intervention/templates/intervention/detail/includes/withdraws.html:28
 msgid "Account Identifier"
 msgstr "Ökokonto Kennung"
 
-#: intervention/templates/intervention/detail/includes/withdraws.html:42
+#: intervention/templates/intervention/detail/includes/withdraws.html:43
 msgid "Eco-account deleted! Withdraw invalid!"
 msgstr "Ökokonto gelöscht! Abbuchung ungültig!"
 
@@ -1101,6 +1138,18 @@ msgstr ""
 msgid "Contact"
 msgstr "Kontakt"
 
+#: templates/form/generic_table_form.html:23
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: templates/form/generic_table_form.html:27
+msgid "Save"
+msgstr "Speichern"
+
+#: templates/form/generic_table_form_body.html:21
+msgid "Fields with * are required."
+msgstr "* sind Pflichtfelder."
+
 #: templates/generic_index.html:19
 msgid "New entry"
 msgstr "Neuer Eintrag"
@@ -1185,18 +1234,6 @@ msgstr "Einstellungen"
 msgid "Logout"
 msgstr "Abmelden"
 
-#: templates/table/generic_table_form.html:23
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: templates/table/generic_table_form.html:27
-msgid "Save"
-msgstr "Speichern"
-
-#: templates/table/generic_table_form_body.html:21
-msgid "Fields with * are required."
-msgstr "* sind Pflichtfelder."
-
 #: user/forms.py:23
 msgid "Notifications"
 msgstr "Benachrichtigungen"
@@ -1225,10 +1262,6 @@ msgstr ""
 msgid "User contact data"
 msgstr "Kontaktdaten"
 
-#: user/models.py:50
-msgid "Created"
-msgstr "Erstellt"
-
 #: user/models.py:51
 msgid "Edited"
 msgstr "Bearbeitet"
@@ -2599,10 +2632,6 @@ msgstr ""
 #~ msgid "Registration document identifier"
 #~ msgstr "Aktenzeichen Eintragungsstelle"
 
-#~ msgid "Enter these basic information for the new process."
-#~ msgstr ""
-#~ "Geben Sie die grundlegenden Informationen für einen neuen Vorgang ein."
-
 #~ msgid "Edit process"
 #~ msgstr "Vorgang bearbeiten"
 
diff --git a/requirements.txt b/requirements.txt
index c0e6822..8fb68da 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ beautifulsoup4==4.9.3
 certifi==2020.11.8
 chardet==3.0.4
 Django==3.1.3
-django-autocomplete-light==3.8.1
+django-autocomplete-light==3.8.2
 django-bootstrap-modal-forms==2.2.0
 django-bootstrap4==3.0.1
 django-debug-toolbar==3.1.1
diff --git a/templates/base.html b/templates/base.html
index 65487e2..e8b4cb2 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -9,11 +9,10 @@
     {% fontawesome_5_static %}
     <link rel="stylesheet" href="{% static 'css/konova.css' %}">
     {% comment %}
-        Adds script for modal rendering
+        Adds script for modal rendering. Script depends on Jquery, therefore it needs to be loaded afterwards.
     {% endcomment %}
     <script src="{% static 'js/jquery.bootstrap.modal.forms.min.js' %}"></script>
     {% block head %}
-
     {% endblock %}
 </head>
 <body>
diff --git a/templates/footer.html b/templates/footer.html
index eb83bc7..227f5ac 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -14,4 +14,15 @@
         </div>
     </div>
 
+    {% comment %}
+        "Why is there a form.media call???"
+        We use modal forms, right?
+        And we use dal (django-autocomplete-light), right?
+        In order to get these nice autocomplete (js triggered) form fields to work, we need to load form.media
+        somewhere. BUT when these fields are called inside a modal form (which we use quiet often), the form.media
+        can not be called properly due to some deprecated functions of jquery regarding synchronous calling.
+        So, we simply call the form.media in here, in case there is any form.media to be loaded.
+    {% endcomment %}
+    {{ form.media }}
+
 </footer>
\ No newline at end of file
diff --git a/templates/table/generic_table_form.html b/templates/form/generic_table_form.html
similarity index 93%
rename from templates/table/generic_table_form.html
rename to templates/form/generic_table_form.html
index 27fa3af..d5cbef4 100644
--- a/templates/table/generic_table_form.html
+++ b/templates/form/generic_table_form.html
@@ -16,7 +16,7 @@
     {% endif %}
     <form method="post" action="{{ form.action_url }}" {% for attr_key, attr_val in form.form_attrs.items %} {{attr_key}}="{{attr_val}}"{% endfor %}>
         {% csrf_token %}
-        {% include 'table/generic_table_form_body.html' %}
+        {% include 'form/generic_table_form_body.html' %}
         <div class="row">
             <div class="col-md">
                 <a href="{{ form.cancel_redirect }}">
diff --git a/templates/table/generic_table_form_body.html b/templates/form/generic_table_form_body.html
similarity index 100%
rename from templates/table/generic_table_form_body.html
rename to templates/form/generic_table_form_body.html
diff --git a/templates/modal/modal_form.html b/templates/modal/modal_form.html
index c169820..9a21717 100644
--- a/templates/modal/modal_form.html
+++ b/templates/modal/modal_form.html
@@ -1,4 +1,4 @@
-{% load i18n l10n %}
+{% load i18n l10n bootstrap4 %}
 {% comment %}
     A generic modal form template which is based on django-bootstrap-modal-forms package
     https://pypi.org/project/django-bootstrap-modal-forms/
@@ -18,7 +18,7 @@
         <article>
             {{ form.form_caption }}
         </article>
-        {% include 'table/generic_table_form_body.html' %}
+        {% include 'form/generic_table_form_body.html' %}
     </div>
     {% if form.render_submit %}
     <div class="modal-footer">
diff --git a/user/templates/user/notifications.html b/user/templates/user/notifications.html
index 2825174..e20f81a 100644
--- a/user/templates/user/notifications.html
+++ b/user/templates/user/notifications.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
 
 {% block body %}
-    {% include 'table/generic_table_form.html' %}
+    {% include 'form/generic_table_form.html' %}
 {% endblock %}
\ No newline at end of file