diff --git a/analysis/utils/report.py b/analysis/utils/report.py
index 1fd86604..3bfd6370 100644
--- a/analysis/utils/report.py
+++ b/analysis/utils/report.py
@@ -498,7 +498,7 @@ class TimespanReport:
self.queryset_comps_recorded_count = self.queryset_comps_recorded.count()
self.queryset_acc = EcoAccount.objects.filter(
- #legal__registration_date__lte=LKOMPVZVO_PUBLISH_DATE,
+ legal__registration_date__lte=LKOMPVZVO_PUBLISH_DATE,
responsible__conservation_office__id=id,
deleted=None,
created__timestamp__gte=date_from,
diff --git a/compensation/forms/forms.py b/compensation/forms/forms.py
index 59054836..eadee2f4 100644
--- a/compensation/forms/forms.py
+++ b/compensation/forms/forms.py
@@ -16,7 +16,7 @@ from codelist.models import KonovaCode
from codelist.settings import CODELIST_COMPENSATION_FUNDING_ID, CODELIST_CONSERVATION_OFFICE_ID
from compensation.models import Compensation, EcoAccount
from intervention.inputs import GenerateInput
-from intervention.models import Intervention, ResponsibilityData
+from intervention.models import Intervention, ResponsibilityData, LegalData
from konova.forms import BaseForm, SimpleGeomForm
from user.models import UserActionLogEntry, UserAction
@@ -298,11 +298,25 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix
}
)
)
+ registration_date = forms.DateField(
+ label=_("Agreement date"),
+ label_suffix="",
+ help_text=_("When did the parties agree on this?"),
+ required=False,
+ widget=forms.DateInput(
+ attrs={
+ "type": "date",
+ "class": "form-control",
+ },
+ format="%d.%m.%Y"
+ )
+ )
field_order = [
"identifier",
"title",
"conservation_office",
+ "registration_date",
"surface",
"conservation_file_number",
"handler",
@@ -329,6 +343,7 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix
identifier = self.cleaned_data.get("identifier", None)
title = self.cleaned_data.get("title", None)
fundings = self.cleaned_data.get("fundings", None)
+ registration_date = self.cleaned_data.get("registration_date", None)
handler = self.cleaned_data.get("handler", None)
surface = self.cleaned_data.get("surface", None)
conservation_office = self.cleaned_data.get("conservation_office", None)
@@ -349,6 +364,10 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix
conservation_office=conservation_office,
)
+ legal = LegalData.objects.create(
+ registration_date=registration_date
+ )
+
# Finally create main object
acc = EcoAccount.objects.create(
identifier=identifier,
@@ -358,6 +377,7 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix
created=action,
geometry=geometry,
comment=comment,
+ legal=legal
)
acc.fundings.set(fundings)
acc.users.add(user)
@@ -380,11 +400,15 @@ class EditEcoAccountForm(NewEcoAccountForm):
self.cancel_redirect = reverse("compensation:acc-detail", args=(self.instance.id,))
# Initialize form data
+ reg_date = self.instance.legal.registration_date
+ if reg_date is not None:
+ reg_date = reg_date.isoformat()
form_data = {
"identifier": self.instance.identifier,
"title": self.instance.title,
"surface": self.instance.deductable_surface,
"handler": self.instance.responsible.handler,
+ "registration_date": reg_date,
"conservation_office": self.instance.responsible.conservation_office,
"conservation_file_number": self.instance.responsible.conservation_file_number,
"fundings": self.instance.fundings.all(),
@@ -402,6 +426,7 @@ class EditEcoAccountForm(NewEcoAccountForm):
identifier = self.cleaned_data.get("identifier", None)
title = self.cleaned_data.get("title", None)
fundings = self.cleaned_data.get("fundings", None)
+ registration_date = self.cleaned_data.get("registration_date", None)
handler = self.cleaned_data.get("handler", None)
surface = self.cleaned_data.get("surface", None)
conservation_office = self.cleaned_data.get("conservation_office", None)
@@ -422,6 +447,10 @@ class EditEcoAccountForm(NewEcoAccountForm):
self.instance.responsible.conservation_file_number = conservation_file_number
self.instance.responsible.save()
+ # Update legal data
+ self.instance.legal.registration_date = registration_date
+ self.instance.legal.save()
+
# Update main oject data
self.instance.identifier = identifier
self.instance.title = title
diff --git a/compensation/models.py b/compensation/models.py
index 4f9cc919..d2d18be5 100644
--- a/compensation/models.py
+++ b/compensation/models.py
@@ -19,7 +19,7 @@ from codelist.settings import CODELIST_COMPENSATION_ACTION_ID, CODELIST_BIOTOPES
CODELIST_COMPENSATION_FUNDING_ID
from compensation.managers import CompensationStateManager, EcoAccountDeductionManager, CompensationActionManager, \
EcoAccountManager, CompensationManager
-from intervention.models import Intervention, ResponsibilityData
+from intervention.models import Intervention, ResponsibilityData, LegalData
from konova.models import BaseObject, BaseResource, Geometry, UuidModel, AbstractDocument, \
generate_document_file_upload_path
from konova.settings import DEFAULT_SRID_RLP, LANIS_LINK_TEMPLATE
@@ -309,6 +309,14 @@ class EcoAccount(AbstractCompensation):
default=0,
)
+ legal = models.OneToOneField(
+ LegalData,
+ on_delete=models.SET_NULL,
+ null=True,
+ blank=True,
+ help_text="Holds data on legal dates or law"
+ )
+
objects = EcoAccountManager()
def __str__(self):
diff --git a/compensation/templates/compensation/detail/eco_account/view.html b/compensation/templates/compensation/detail/eco_account/view.html
index e839e6e9..6f7eca99 100644
--- a/compensation/templates/compensation/detail/eco_account/view.html
+++ b/compensation/templates/compensation/detail/eco_account/view.html
@@ -61,6 +61,10 @@
{% trans 'Conservation office file number' %} |
{{obj.responsible.conservation_file_number|default_if_none:""}} |
+
+ {% trans 'Agreement date' %} |
+ {{obj.legal.registration_date|default_if_none:""}} |
+
{% trans 'Action handler' %} |
{{obj.responsible.handler|default_if_none:""}} |
diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo
index baf99f19..8a1e11b3 100644
Binary files a/locale/de/LC_MESSAGES/django.mo and b/locale/de/LC_MESSAGES/django.mo differ
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 74b0ecab..2ac3f918 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -11,15 +11,15 @@
#: intervention/forms/forms.py:53 intervention/forms/forms.py:155
#: intervention/forms/forms.py:167 intervention/forms/modalForms.py:107
#: intervention/forms/modalForms.py:120 intervention/forms/modalForms.py:133
-#: konova/forms.py:142 konova/forms.py:246 konova/forms.py:312
-#: konova/forms.py:339 konova/forms.py:349 konova/forms.py:362
-#: konova/forms.py:374 konova/forms.py:395 user/forms.py:38
+#: konova/forms.py:142 konova/forms.py:247 konova/forms.py:313
+#: konova/forms.py:340 konova/forms.py:350 konova/forms.py:363
+#: konova/forms.py:375 konova/forms.py:396 user/forms.py:38
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-20 13:37+0200\n"
+"POT-Creation-Date: 2021-10-22 13:14+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -37,7 +37,7 @@ msgstr "Vom"
msgid "To"
msgstr "Bis"
-#: analysis/forms.py:47 compensation/forms/forms.py:93
+#: analysis/forms.py:47 compensation/forms/forms.py:94
#: compensation/templates/compensation/detail/eco_account/view.html:58
#: compensation/templates/compensation/report/eco_account/report.html:16
#: ema/templates/ema/detail/view.html:42
@@ -47,12 +47,12 @@ msgstr "Bis"
msgid "Conservation office"
msgstr "Eintragungsstelle"
-#: analysis/forms.py:49 compensation/forms/forms.py:95
+#: analysis/forms.py:49 compensation/forms/forms.py:96
msgid "Select the responsible office"
msgstr "Verantwortliche Stelle"
-#: analysis/forms.py:58 compensation/forms/forms.py:67
-#: compensation/forms/forms.py:104 compensation/forms/forms.py:155
+#: analysis/forms.py:58 compensation/forms/forms.py:68
+#: compensation/forms/forms.py:105 compensation/forms/forms.py:156
#: intervention/forms/forms.py:63 intervention/forms/forms.py:80
#: intervention/forms/forms.py:96 intervention/forms/forms.py:112
msgid "Click for selection"
@@ -66,6 +66,10 @@ msgstr "Bericht generieren"
msgid "Select a timespan and the desired conservation office"
msgstr "Wählen Sie die Zeitspanne und die gewünschte Eintragungsstelle"
+#: analysis/forms.py:69 konova/forms.py:194
+msgid "Continue"
+msgstr "Weiter"
+
#: analysis/templates/analysis/reports/detail.html:7
msgid "Evaluation report"
msgstr "Auswertungsbericht"
@@ -74,6 +78,10 @@ msgstr "Auswertungsbericht"
msgid "to"
msgstr "bis"
+#: analysis/templates/analysis/reports/detail.html:14
+msgid "Download"
+msgstr ""
+
#: analysis/templates/analysis/reports/includes/compensation/amount.html:3
#: analysis/templates/analysis/reports/includes/eco_account/amount.html:3
#: analysis/templates/analysis/reports/includes/intervention/amount.html:3
@@ -85,7 +93,6 @@ msgid "Amount"
msgstr "Menge"
#: analysis/templates/analysis/reports/includes/compensation/amount.html:5
-#: analysis/templates/analysis/reports/includes/eco_account/amount.html:5
#: analysis/templates/analysis/reports/includes/intervention/amount.html:5
#: analysis/templates/analysis/reports/includes/old_data/amount.html:5
msgid ""
@@ -99,7 +106,7 @@ msgstr ""
" "
#: analysis/templates/analysis/reports/includes/compensation/amount.html:9
-#: analysis/templates/analysis/reports/includes/eco_account/amount.html:9
+#: analysis/templates/analysis/reports/includes/eco_account/amount.html:5
#: analysis/templates/analysis/reports/includes/intervention/amount.html:9
#: analysis/templates/analysis/reports/includes/old_data/amount.html:9
msgid ""
@@ -120,7 +127,6 @@ msgstr "Zuständigkeitsbereich"
#: analysis/templates/analysis/reports/includes/intervention/amount.html:17
#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:8
#: analysis/templates/analysis/reports/includes/intervention/laws.html:17
-#: analysis/templates/analysis/reports/includes/old_data/amount.html:17
#: compensation/tables.py:35
#: compensation/templates/compensation/detail/compensation/view.html:43
#: intervention/tables.py:33
@@ -129,7 +135,7 @@ msgid "Checked"
msgstr "Geprüft"
#: analysis/templates/analysis/reports/includes/compensation/amount.html:19
-#: analysis/templates/analysis/reports/includes/eco_account/amount.html:19
+#: analysis/templates/analysis/reports/includes/eco_account/amount.html:13
#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:8
#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:9
#: analysis/templates/analysis/reports/includes/intervention/amount.html:18
@@ -152,7 +158,7 @@ msgstr "Einzelflächen"
#: analysis/templates/analysis/reports/includes/compensation/amount.html:21
#: analysis/templates/analysis/reports/includes/compensation/amount.html:47
-#: analysis/templates/analysis/reports/includes/eco_account/amount.html:20
+#: analysis/templates/analysis/reports/includes/eco_account/amount.html:14
#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:10
#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:11
#: analysis/templates/analysis/reports/includes/intervention/amount.html:19
@@ -184,15 +190,6 @@ msgstr "Andere Zulassungsbehörden"
msgid "Compensations"
msgstr "Kompensationen"
-#: analysis/templates/analysis/reports/includes/eco_account/amount.html:17
-#: analysis/templates/analysis/reports/includes/old_data/card_old_interventions.html:13
-msgid "Before"
-msgstr "Vor"
-
-#: analysis/templates/analysis/reports/includes/eco_account/amount.html:18
-msgid "After"
-msgstr "Nach"
-
#: analysis/templates/analysis/reports/includes/eco_account/card_eco_account.html:11
msgid "Eco-Accounts"
msgstr "Ökokonten"
@@ -229,6 +226,7 @@ msgid "Compensation type"
msgstr "Kompensationsart"
#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:15
+#: analysis/templates/analysis/reports/includes/old_data/amount.html:29
#: compensation/tables.py:84
#: compensation/templates/compensation/detail/compensation/view.html:19
#: konova/templates/konova/home.html:49 templates/navbars/navbar.html:28
@@ -265,26 +263,53 @@ msgstr ""
msgid "Law"
msgstr "Gesetz"
+#: analysis/templates/analysis/reports/includes/old_data/amount.html:17
+#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:28
+#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:28
+#: ema/templates/ema/detail/includes/deadlines.html:28
+msgid "Type"
+msgstr "Typ"
+
+#: analysis/templates/analysis/reports/includes/old_data/amount.html:24
+#: intervention/forms/modalForms.py:285 intervention/forms/modalForms.py:292
+#: intervention/tables.py:88
+#: intervention/templates/intervention/detail/view.html:19
+#: konova/templates/konova/home.html:11 templates/navbars/navbar.html:22
+msgid "Intervention"
+msgstr "Eingriff"
+
+#: analysis/templates/analysis/reports/includes/old_data/amount.html:34
+#: compensation/tables.py:224
+#: compensation/templates/compensation/detail/eco_account/view.html:19
+#: intervention/forms/modalForms.py:258 intervention/forms/modalForms.py:265
+#: konova/templates/konova/home.html:88 templates/navbars/navbar.html:34
+msgid "Eco-account"
+msgstr "Ökokonto"
+
#: analysis/templates/analysis/reports/includes/old_data/card_old_interventions.html:11
msgid "Old interventions"
msgstr "Altfälle"
+#: analysis/templates/analysis/reports/includes/old_data/card_old_interventions.html:13
+msgid "Before"
+msgstr "Vor"
+
#: compensation/filters.py:70
msgid "Show only unrecorded"
msgstr "Nur unverzeichnete anzeigen"
-#: compensation/forms/forms.py:31 compensation/tables.py:25
+#: compensation/forms/forms.py:32 compensation/tables.py:25
#: compensation/tables.py:166 ema/tables.py:28 intervention/forms/forms.py:27
#: intervention/tables.py:23
#: intervention/templates/intervention/detail/includes/compensations.html:30
msgid "Identifier"
msgstr "Kennung"
-#: compensation/forms/forms.py:34 intervention/forms/forms.py:30
+#: compensation/forms/forms.py:35 intervention/forms/forms.py:30
msgid "Generated automatically"
msgstr "Automatisch generiert"
-#: compensation/forms/forms.py:43 compensation/tables.py:30
+#: compensation/forms/forms.py:44 compensation/tables.py:30
#: compensation/tables.py:171
#: compensation/templates/compensation/detail/compensation/includes/documents.html:28
#: compensation/templates/compensation/detail/compensation/view.html:31
@@ -300,27 +325,27 @@ msgstr "Automatisch generiert"
#: intervention/templates/intervention/detail/includes/documents.html:28
#: intervention/templates/intervention/detail/view.html:31
#: intervention/templates/intervention/report/report.html:12
-#: konova/forms.py:338
+#: konova/forms.py:339
msgid "Title"
msgstr "Bezeichnung"
-#: compensation/forms/forms.py:45 intervention/forms/forms.py:41
+#: compensation/forms/forms.py:46 intervention/forms/forms.py:41
msgid "An explanatory name"
msgstr "Aussagekräftiger Titel"
-#: compensation/forms/forms.py:49 ema/forms.py:47 ema/forms.py:105
+#: compensation/forms/forms.py:50 ema/forms.py:47 ema/forms.py:105
msgid "Compensation XY; Location ABC"
msgstr "Kompensation XY; Flur ABC"
-#: compensation/forms/forms.py:55
+#: compensation/forms/forms.py:56
msgid "Fundings"
msgstr "Förderungen"
-#: compensation/forms/forms.py:58
+#: compensation/forms/forms.py:59
msgid "Select fundings for this compensation"
msgstr "Wählen Sie ggf. Fördermittelprojekte"
-#: compensation/forms/forms.py:73 compensation/forms/modalForms.py:61
+#: compensation/forms/forms.py:74 compensation/forms/modalForms.py:61
#: compensation/forms/modalForms.py:272 compensation/forms/modalForms.py:367
#: compensation/templates/compensation/detail/compensation/includes/actions.html:34
#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:34
@@ -335,15 +360,15 @@ msgstr "Wählen Sie ggf. Fördermittelprojekte"
#: intervention/templates/intervention/detail/includes/documents.html:31
#: intervention/templates/intervention/detail/includes/payments.html:34
#: intervention/templates/intervention/detail/includes/revocation.html:38
-#: konova/forms.py:373 konova/templates/konova/comment_card.html:16
+#: konova/forms.py:374 konova/templates/konova/comment_card.html:16
msgid "Comment"
msgstr "Kommentar"
-#: compensation/forms/forms.py:75 intervention/forms/forms.py:181
+#: compensation/forms/forms.py:76 intervention/forms/forms.py:181
msgid "Additional comment"
msgstr "Zusätzlicher Kommentar"
-#: compensation/forms/forms.py:109
+#: compensation/forms/forms.py:110
#: compensation/templates/compensation/detail/eco_account/view.html:62
#: compensation/templates/compensation/report/eco_account/report.html:20
#: ema/templates/ema/detail/view.html:46
@@ -353,57 +378,65 @@ msgstr "Zusätzlicher Kommentar"
msgid "Conservation office file number"
msgstr "Aktenzeichen Eintragungsstelle"
-#: compensation/forms/forms.py:115 intervention/forms/forms.py:135
+#: compensation/forms/forms.py:116 intervention/forms/forms.py:135
msgid "ETS-123/ABC.456"
msgstr ""
-#: compensation/forms/forms.py:121
+#: compensation/forms/forms.py:122
msgid "Eco-account handler"
msgstr "Maßnahmenträger"
-#: compensation/forms/forms.py:125
+#: compensation/forms/forms.py:126
msgid "Who handles the eco-account"
msgstr "Wer für die Herrichtung des Ökokontos verantwortlich ist"
-#: compensation/forms/forms.py:128 intervention/forms/forms.py:148
+#: compensation/forms/forms.py:129 intervention/forms/forms.py:148
msgid "Company Mustermann"
msgstr "Firma Mustermann"
-#: compensation/forms/forms.py:146
+#: compensation/forms/forms.py:147
#: compensation/templates/compensation/detail/compensation/view.html:35
#: compensation/templates/compensation/report/compensation/report.html:16
msgid "compensates intervention"
msgstr "kompensiert Eingriff"
-#: compensation/forms/forms.py:148
+#: compensation/forms/forms.py:149
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:173
+#: compensation/forms/forms.py:174
msgid "New compensation"
msgstr "Neue Kompensation"
-#: compensation/forms/forms.py:231
+#: compensation/forms/forms.py:232
msgid "Edit compensation"
msgstr "Bearbeite Kompensation"
-#: compensation/forms/forms.py:290
+#: compensation/forms/forms.py:291
msgid "Available Surface"
msgstr "Verfügbare Fläche"
-#: compensation/forms/forms.py:293
+#: compensation/forms/forms.py:294
msgid "The amount that can be used for deductions"
msgstr "Die für Abbuchungen zur Verfügung stehende Menge"
-#: compensation/forms/forms.py:315
+#: compensation/forms/forms.py:303
+msgid "Agreement date"
+msgstr "Vereinbarungsdatum"
+
+#: compensation/forms/forms.py:304
+msgid "When did the parties agree on this?"
+msgstr "Wann wurde dieses Ökokonto offiziell vereinbart?"
+
+#: compensation/forms/forms.py:329
msgid "New Eco-Account"
msgstr "Neues Ökokonto"
-#: compensation/forms/forms.py:324
+#: compensation/forms/forms.py:338
msgid "Eco-Account XY; Location ABC"
msgstr "Ökokonto XY; Flur ABC"
-#: compensation/forms/forms.py:377
+#: compensation/forms/forms.py:397
msgid "Edit Eco-Account"
msgstr "Ökokonto bearbeiten"
@@ -422,7 +455,7 @@ msgstr "Zahlung wird an diesem Datum erwartet"
#: compensation/forms/modalForms.py:63 compensation/forms/modalForms.py:274
#: compensation/forms/modalForms.py:369 intervention/forms/modalForms.py:134
-#: konova/forms.py:375
+#: konova/forms.py:376
msgid "Additional comment, maximum {} letters"
msgstr "Zusätzlicher Kommentar, maximal {} Zeichen"
@@ -462,7 +495,7 @@ msgstr "Geben Sie die Daten des neuen Zustandes ein"
msgid "Added state"
msgstr "Zustand hinzugefügt"
-#: compensation/forms/modalForms.py:190 konova/forms.py:195
+#: compensation/forms/modalForms.py:190 konova/forms.py:196
msgid "Object removed"
msgstr "Objekt entfernt"
@@ -580,14 +613,14 @@ msgstr ""
msgid "Pieces"
msgstr "Stück"
-#: compensation/models.py:321
+#: compensation/models.py:329
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.py:328
+#: compensation/models.py:336
msgid ""
"Deductable surface can not be smaller than the sum of already existing "
"deductions. Please contact the responsible users for the deductions!"
@@ -653,13 +686,6 @@ msgstr "Verfügbar"
msgid "Eco Accounts"
msgstr "Ökokonten"
-#: compensation/tables.py:224
-#: compensation/templates/compensation/detail/eco_account/view.html:19
-#: intervention/forms/modalForms.py:258 intervention/forms/modalForms.py:265
-#: konova/templates/konova/home.html:88 templates/navbars/navbar.html:34
-msgid "Eco-account"
-msgstr "Ökokonto"
-
#: compensation/tables.py:257
msgid "Not recorded yet. Can not be used for deductions, yet."
msgstr ""
@@ -745,12 +771,6 @@ msgstr "Termine und Fristen"
msgid "Add new deadline"
msgstr "Frist/Termin hinzufügen"
-#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:28
-#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:28
-#: ema/templates/ema/detail/includes/deadlines.html:28
-msgid "Type"
-msgstr "Typ"
-
#: 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
@@ -768,7 +788,7 @@ msgstr "Dokumente"
#: compensation/templates/compensation/detail/eco_account/includes/documents.html:14
#: ema/templates/ema/detail/includes/documents.html:14
#: intervention/templates/intervention/detail/includes/documents.html:14
-#: konova/forms.py:394
+#: konova/forms.py:395
msgid "Add new document"
msgstr "Neues Dokument hinzufügen"
@@ -1220,7 +1240,7 @@ msgstr "Datum des Widerspruchs"
msgid "Document"
msgstr "Dokument"
-#: intervention/forms/modalForms.py:122 konova/forms.py:363
+#: intervention/forms/modalForms.py:122 konova/forms.py:364
msgid "Must be smaller than 15 Mb"
msgstr "Muss kleiner als 15 Mb sein"
@@ -1242,7 +1262,7 @@ msgstr "Kompensationen und Zahlungen geprüft"
msgid "Run check"
msgstr "Prüfung vornehmen"
-#: intervention/forms/modalForms.py:201 konova/forms.py:448
+#: intervention/forms/modalForms.py:201 konova/forms.py:449
msgid ""
"I, {} {}, confirm that all necessary control steps have been performed by "
"myself."
@@ -1254,13 +1274,6 @@ msgstr ""
msgid "Only recorded accounts can be selected for deductions"
msgstr "Nur verzeichnete Ökokonten können für Abbuchungen verwendet werden."
-#: intervention/forms/modalForms.py:285 intervention/forms/modalForms.py:292
-#: intervention/tables.py:88
-#: intervention/templates/intervention/detail/view.html:19
-#: konova/templates/konova/home.html:11 templates/navbars/navbar.html:22
-msgid "Intervention"
-msgstr "Eingriff"
-
#: intervention/forms/modalForms.py:287
msgid "Only shared interventions can be selected"
msgstr "Nur freigegebene Eingriffe können gewählt werden"
@@ -1474,11 +1487,11 @@ msgstr "Speichern"
msgid "Not editable"
msgstr "Nicht editierbar"
-#: konova/forms.py:141 konova/forms.py:311
+#: konova/forms.py:141 konova/forms.py:312
msgid "Confirm"
msgstr "Bestätige"
-#: konova/forms.py:153 konova/forms.py:320
+#: konova/forms.py:153 konova/forms.py:321
msgid "Remove"
msgstr "Löschen"
@@ -1486,48 +1499,48 @@ msgstr "Löschen"
msgid "You are about to remove {} {}"
msgstr "Sie sind dabei {} {} zu löschen"
-#: konova/forms.py:245 templates/form/collapsable/form.html:45
+#: konova/forms.py:246 templates/form/collapsable/form.html:45
msgid "Geometry"
msgstr "Geometrie"
-#: konova/forms.py:321
+#: konova/forms.py:322
msgid "Are you sure?"
msgstr "Sind Sie sicher?"
-#: konova/forms.py:348
+#: konova/forms.py:349
msgid "Created on"
msgstr "Erstellt"
-#: konova/forms.py:350
+#: konova/forms.py:351
msgid "When has this file been created? Important for photos."
msgstr "Wann wurde diese Datei erstellt oder das Foto aufgenommen?"
-#: konova/forms.py:361
+#: konova/forms.py:362
#: venv/lib/python3.7/site-packages/django/db/models/fields/files.py:231
msgid "File"
msgstr "Datei"
-#: konova/forms.py:425
+#: konova/forms.py:426
msgid "Added document"
msgstr "Dokument hinzugefügt"
-#: konova/forms.py:439
+#: konova/forms.py:440
msgid "Confirm record"
msgstr "Verzeichnen bestätigen"
-#: konova/forms.py:447
+#: konova/forms.py:448
msgid "Record data"
msgstr "Daten verzeichnen"
-#: konova/forms.py:454
+#: konova/forms.py:455
msgid "Confirm unrecord"
msgstr "Entzeichnen bestätigen"
-#: konova/forms.py:455
+#: konova/forms.py:456
msgid "Unrecord data"
msgstr "Daten entzeichnen"
-#: konova/forms.py:456
+#: konova/forms.py:457
msgid "I, {} {}, confirm that this data must be unrecorded."
msgstr ""
"Ich, {} {}, bestätige, dass diese Daten wieder entzeichnet werden müssen."
@@ -1777,10 +1790,6 @@ msgstr "Nutzer"
msgid "No geometry added, yet."
msgstr "Keine Geometrie vorhanden"
-#: templates/modal/modal_form.html:25
-msgid "Continue"
-msgstr "Weiter"
-
#: templates/navbars/navbar.html:4
msgid "Kompensationsverzeichnis Service Portal"
msgstr ""
@@ -3106,6 +3115,9 @@ msgstr ""
msgid "A fontawesome icon field"
msgstr ""
+#~ msgid "After"
+#~ msgstr "Nach"
+
#~ msgid "Total interventions"
#~ msgstr "Insgesamt"