From 9211068dc70c93096e355c0c3390fe1f1c5fc12a Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Mon, 15 Nov 2021 15:55:09 +0100 Subject: [PATCH] #38 User requests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * implements 5) "Add 'Maßnahmentyp' for KOMs " * prepares model and form fields as mixins for easy extension to eco accounts and emas (possibly in the future?) --- compensation/forms/forms.py | 40 ++++- compensation/models.py | 32 +++- .../detail/compensation/view.html | 22 ++- konova/static/css/konova.css | 7 +- konova/templatetags/ksp_filters.py | 2 + locale/de/LC_MESSAGES/django.mo | Bin 27204 -> 27805 bytes locale/de/LC_MESSAGES/django.po | 153 ++++++++++-------- 7 files changed, 188 insertions(+), 68 deletions(-) diff --git a/compensation/forms/forms.py b/compensation/forms/forms.py index 52575d32..212efa63 100644 --- a/compensation/forms/forms.py +++ b/compensation/forms/forms.py @@ -115,7 +115,33 @@ class CompensationResponsibleFormMixin(forms.Form): ) -class NewCompensationForm(AbstractCompensationForm): +class CEFCompensationFormMixin(forms.Form): + """ A form mixin, providing CEF compensation field + + """ + is_cef = forms.BooleanField( + label_suffix="", + label=_("Is CEF"), + help_text=_("Optionally: Whether this compensation is a CEF compensation?"), + required=False, + widget=forms.CheckboxInput() + ) + + +class CoherenceCompensationFormMixin(forms.Form): + """ A form mixin, providing coherence compensation field + + """ + is_coherence_keeping = forms.BooleanField( + label_suffix="", + label=_("Is coherence keeping"), + help_text=_("Optionally: Whether this compensation is a coherence keeping compensation?"), + required=False, + widget=forms.CheckboxInput() + ) + + +class NewCompensationForm(AbstractCompensationForm, CEFCompensationFormMixin, CoherenceCompensationFormMixin): """ Form for creating new compensations. Can be initialized with an intervention id for preselecting the related intervention. @@ -146,6 +172,8 @@ class NewCompensationForm(AbstractCompensationForm): "identifier", "title", "intervention", + "is_cef", + "is_coherence_keeping", "comment", ] @@ -177,6 +205,8 @@ class NewCompensationForm(AbstractCompensationForm): 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 @@ -193,6 +223,8 @@ class NewCompensationForm(AbstractCompensationForm): title=title, intervention=intervention, created=action, + is_cef=is_cef, + is_coherence_keeping=is_coherence_keeping, geometry=geometry, comment=comment, ) @@ -217,6 +249,8 @@ class EditCompensationForm(NewCompensationForm): "identifier": self.instance.identifier, "title": self.instance.title, "intervention": self.instance.intervention, + "is_cef": self.instance.is_cef, + "is_coherence_keeping": self.instance.is_coherence_keeping, "comment": self.instance.comment, } disabled_fields = [] @@ -231,6 +265,8 @@ class EditCompensationForm(NewCompensationForm): 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 @@ -247,6 +283,8 @@ class EditCompensationForm(NewCompensationForm): self.instance.title = title self.instance.intervention = intervention self.instance.geometry = geometry + self.instance.is_cef = is_cef + self.instance.is_coherence_keeping = is_coherence_keeping self.instance.comment = comment self.instance.modified = action self.instance.save() diff --git a/compensation/models.py b/compensation/models.py index 30d5daad..a0cf80de 100644 --- a/compensation/models.py +++ b/compensation/models.py @@ -189,7 +189,37 @@ class AbstractCompensation(BaseObject): return checker -class Compensation(AbstractCompensation): +class CEFMixin(models.Model): + """ Provides CEF flag as Mixin + + """ + is_cef = models.BooleanField( + blank=True, + null=True, + default=False, + help_text="Flag if compensation is a 'CEF-Maßnahme'" + ) + + class Meta: + abstract = True + + +class CoherenceMixin(models.Model): + """ Provides coherence keeping flag as Mixin + + """ + is_coherence_keeping = models.BooleanField( + blank=True, + null=True, + default=False, + help_text="Flag if compensation is a 'Kohärenzsicherung'" + ) + + class Meta: + abstract = True + + +class Compensation(AbstractCompensation, CEFMixin, CoherenceMixin): """ Regular compensation, linked to an intervention """ diff --git a/compensation/templates/compensation/detail/compensation/view.html b/compensation/templates/compensation/detail/compensation/view.html index 2adcd02e..581bf799 100644 --- a/compensation/templates/compensation/detail/compensation/view.html +++ b/compensation/templates/compensation/detail/compensation/view.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% load i18n l10n static fontawesome_5 humanize %} +{% load i18n l10n static fontawesome_5 humanize ksp_filters %} {% block head %} {% comment %} @@ -38,6 +38,26 @@ + + {% trans 'Is CEF compensation' %} + + {% if obj.is_cef %} + {% trans 'Yes' %} + {% else %} + {% trans 'No' %} + {% endif %} + + + + {% trans 'Is Coherence keeping compensation' %} + + {% if obj.is_coherence_keeping %} + {% trans 'Yes' %} + {% else %} + {% trans 'No' %} + {% endif %} + + {% trans 'Checked' %} diff --git a/konova/static/css/konova.css b/konova/static/css/konova.css index 6de1f8f8..294287ea 100644 --- a/konova/static/css/konova.css +++ b/konova/static/css/konova.css @@ -186,12 +186,15 @@ Overwrites bootstrap .btn:focus box shadow color background-color: var(--rlp-gray-light); } -.check-star{ +.check-star, .c-goldenrod{ color: goldenrod; } -.registered-bookmark{ +.registered-bookmark, .c-green{ color: green; } +.c-red{ + color: red; +} /* PAGINATION */ .page-item > .page-link{ diff --git a/konova/templatetags/ksp_filters.py b/konova/templatetags/ksp_filters.py index 1472d503..f311a538 100644 --- a/konova/templatetags/ksp_filters.py +++ b/konova/templatetags/ksp_filters.py @@ -8,6 +8,8 @@ Created on: 05.07.21 from django import template # Create custom library +from django.utils.html import format_html + from news.models import ServerMessageImportance register = template.Library() diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 066b53d9fcd24334359875c6ffb6bd53833d6cb6..19aafdf15b66d4a86f1026633938f195b28b6f14 100644 GIT binary patch delta 9112 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 X^3N{av_j?Vms4v7W;Yx>rs)3whBJMy diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 95b12183..388a9b86 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -9,8 +9,8 @@ #: intervention/filters.py:26 intervention/filters.py:40 #: intervention/filters.py:47 intervention/filters.py:48 #: intervention/forms/forms.py:53 intervention/forms/forms.py:155 -#: intervention/forms/forms.py:167 intervention/forms/modalForms.py:123 -#: intervention/forms/modalForms.py:136 intervention/forms/modalForms.py:149 +#: intervention/forms/forms.py:167 intervention/forms/modalForms.py:133 +#: intervention/forms/modalForms.py:146 intervention/forms/modalForms.py:159 #: 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 @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-15 13:40+0100\n" +"POT-Creation-Date: 2021-11-15 15:48+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -54,9 +54,9 @@ msgid "Select the responsible office" msgstr "Verantwortliche Stelle" #: analysis/forms.py:58 compensation/forms/forms.py:87 -#: compensation/forms/forms.py:138 intervention/forms/forms.py:63 +#: compensation/forms/forms.py:164 intervention/forms/forms.py:63 #: intervention/forms/forms.py:80 intervention/forms/forms.py:96 -#: intervention/forms/forms.py:112 intervention/forms/modalForms.py:48 +#: intervention/forms/forms.py:112 intervention/forms/modalForms.py:47 msgid "Click for selection" msgstr "Auswählen..." @@ -130,7 +130,7 @@ msgstr "Zuständigkeitsbereich" #: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:8 #: analysis/templates/analysis/reports/includes/intervention/laws.html:17 #: compensation/tables.py:35 -#: compensation/templates/compensation/detail/compensation/view.html:43 +#: compensation/templates/compensation/detail/compensation/view.html:63 #: intervention/tables.py:33 #: intervention/templates/intervention/detail/view.html:68 user/models.py:48 msgid "Checked" @@ -145,7 +145,7 @@ msgstr "Geprüft" #: analysis/templates/analysis/reports/includes/intervention/laws.html:20 #: analysis/templates/analysis/reports/includes/old_data/amount.html:18 #: compensation/tables.py:41 compensation/tables.py:181 -#: compensation/templates/compensation/detail/compensation/view.html:57 +#: compensation/templates/compensation/detail/compensation/view.html:77 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:31 #: compensation/templates/compensation/detail/eco_account/view.html:44 #: ema/tables.py:38 ema/templates/ema/detail/view.html:28 @@ -210,7 +210,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:291 +#: intervention/forms/modalForms.py:301 msgid "Surface" msgstr "Fläche" @@ -273,7 +273,7 @@ msgid "Type" msgstr "Typ" #: analysis/templates/analysis/reports/includes/old_data/amount.html:24 -#: intervention/forms/modalForms.py:302 intervention/forms/modalForms.py:309 +#: intervention/forms/modalForms.py:312 intervention/forms/modalForms.py:319 #: intervention/tables.py:88 #: intervention/templates/intervention/detail/view.html:19 #: konova/templates/konova/home.html:11 templates/navbars/navbar.html:22 @@ -283,7 +283,7 @@ 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:275 intervention/forms/modalForms.py:282 +#: intervention/forms/modalForms.py:285 intervention/forms/modalForms.py:292 #: konova/templates/konova/home.html:88 templates/navbars/navbar.html:34 msgid "Eco-account" msgstr "Ökokonto" @@ -350,7 +350,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:179 intervention/forms/modalForms.py:148 +#: intervention/forms/forms.py:179 intervention/forms/modalForms.py:158 #: intervention/templates/intervention/detail/includes/documents.html:31 #: intervention/templates/intervention/detail/includes/payments.html:34 #: intervention/templates/intervention/detail/includes/revocation.html:38 @@ -390,51 +390,69 @@ msgstr "Wer für die Herrichtung des Ökokontos verantwortlich ist" msgid "Company Mustermann" msgstr "Firma Mustermann" -#: compensation/forms/forms.py:129 +#: compensation/forms/forms.py:124 +msgid "Is CEF" +msgstr "Ist CEF-Maßnahme" + +#: compensation/forms/forms.py:125 +msgid "Optionally: Whether this compensation is a CEF compensation?" +msgstr "Optional: Handelt es sich um eine CEF-Maßnahme?" + +#: compensation/forms/forms.py:137 +msgid "Is coherence keeping" +msgstr "Ist Kohärenzsicherungsmaßnahme" + +#: compensation/forms/forms.py:138 +msgid "" +"Optionally: Whether this compensation is a coherence keeping compensation?" +msgstr "" +"Optional: Handelt es sich um eine Kohärenzsicherungsmaßnahme?" + +#: compensation/forms/forms.py:155 #: 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:131 +#: compensation/forms/forms.py:157 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:155 +#: compensation/forms/forms.py:183 msgid "New compensation" msgstr "Neue Kompensation" -#: compensation/forms/forms.py:211 +#: compensation/forms/forms.py:243 msgid "Edit compensation" msgstr "Bearbeite Kompensation" -#: compensation/forms/forms.py:267 compensation/utils/quality.py:84 +#: compensation/forms/forms.py:305 compensation/utils/quality.py:84 msgid "Available Surface" msgstr "Verfügbare Fläche" -#: compensation/forms/forms.py:270 +#: compensation/forms/forms.py:308 msgid "The amount that can be used for deductions" msgstr "Die für Abbuchungen zur Verfügung stehende Menge" -#: compensation/forms/forms.py:279 +#: compensation/forms/forms.py:317 #: compensation/templates/compensation/detail/eco_account/view.html:66 #: compensation/utils/quality.py:72 msgid "Agreement date" msgstr "Vereinbarungsdatum" -#: compensation/forms/forms.py:281 +#: compensation/forms/forms.py:319 msgid "When did the parties agree on this?" msgstr "Wann wurde dieses Ökokonto offiziell vereinbart?" -#: compensation/forms/forms.py:305 +#: compensation/forms/forms.py:343 msgid "New Eco-Account" msgstr "Neues Ökokonto" -#: compensation/forms/forms.py:314 +#: compensation/forms/forms.py:352 msgid "Eco-Account XY; Location ABC" msgstr "Ökokonto XY; Flur ABC" -#: compensation/forms/forms.py:371 +#: compensation/forms/forms.py:409 msgid "Edit Eco-Account" msgstr "Ökokonto bearbeiten" @@ -452,7 +470,7 @@ msgid "Due on which date" 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:150 +#: compensation/forms/modalForms.py:369 intervention/forms/modalForms.py:160 #: konova/forms.py:376 msgid "Additional comment, maximum {} letters" msgstr "Zusätzlicher Kommentar, maximal {} Zeichen" @@ -477,7 +495,7 @@ msgstr "Biotoptyp" msgid "Select the biotope type" msgstr "Biotoptyp wählen" -#: compensation/forms/modalForms.py:155 intervention/forms/modalForms.py:293 +#: compensation/forms/modalForms.py:155 intervention/forms/modalForms.py:303 msgid "in m²" msgstr "" @@ -509,7 +527,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:132 msgid "Date" msgstr "Datum" @@ -587,38 +605,38 @@ msgstr "Geben Sie die Daten der neuen Maßnahme ein" msgid "Added action" msgstr "Maßnahme hinzugefügt" -#: compensation/models.py:82 +#: compensation/models.py:81 msgid "cm" msgstr "" -#: compensation/models.py:83 +#: compensation/models.py:82 msgid "m" msgstr "" -#: compensation/models.py:84 +#: compensation/models.py:83 msgid "km" msgstr "" -#: compensation/models.py:85 +#: compensation/models.py:84 msgid "m²" msgstr "" -#: compensation/models.py:86 +#: compensation/models.py:85 msgid "ha" msgstr "" -#: compensation/models.py:87 +#: compensation/models.py:86 msgid "Pieces" msgstr "Stück" -#: compensation/models.py:345 +#: compensation/models.py:374 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:352 +#: compensation/models.py:381 msgid "" "Deductable surface can not be smaller than the sum of already existing " "deductions. Please contact the responsible users for the deductions!" @@ -650,7 +668,7 @@ msgid "Checked on {} by {}" msgstr "Am {} von {} geprüft worden" #: compensation/tables.py:129 -#: compensation/templates/compensation/detail/compensation/view.html:60 +#: compensation/templates/compensation/detail/compensation/view.html:80 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:56 #: compensation/templates/compensation/detail/eco_account/view.html:47 #: ema/tables.py:101 ema/templates/ema/detail/view.html:31 @@ -853,13 +871,21 @@ msgstr "Neuen Ausgangszustand hinzufügen" msgid "Missing surfaces according to states after: " msgstr "Fehlende Flächenmengen laut Zielzustand: " -#: compensation/templates/compensation/detail/compensation/view.html:50 +#: compensation/templates/compensation/detail/compensation/view.html:43 +msgid "Is CEF compensation" +msgstr "Ist CEF Maßnahme" + +#: compensation/templates/compensation/detail/compensation/view.html:53 +msgid "Is Coherence keeping compensation" +msgstr "Ist Kohärenzsicherungsmaßnahme" + +#: compensation/templates/compensation/detail/compensation/view.html:70 #: intervention/templates/intervention/detail/view.html:75 msgid "Checked on " msgstr "Geprüft am " -#: compensation/templates/compensation/detail/compensation/view.html:50 -#: compensation/templates/compensation/detail/compensation/view.html:64 +#: 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/view.html:51 #: ema/templates/ema/detail/view.html:35 @@ -868,14 +894,14 @@ msgstr "Geprüft am " msgid "by" msgstr "von" -#: compensation/templates/compensation/detail/compensation/view.html:64 +#: compensation/templates/compensation/detail/compensation/view.html:84 #: compensation/templates/compensation/detail/eco_account/view.html:51 #: ema/templates/ema/detail/view.html:35 #: intervention/templates/intervention/detail/view.html:89 msgid "Recorded on " msgstr "Verzeichnet am" -#: compensation/templates/compensation/detail/compensation/view.html:71 +#: compensation/templates/compensation/detail/compensation/view.html:91 #: compensation/templates/compensation/detail/eco_account/view.html:74 #: compensation/templates/compensation/report/compensation/report.html:24 #: compensation/templates/compensation/report/eco_account/report.html:41 @@ -886,16 +912,16 @@ msgstr "Verzeichnet am" msgid "Last modified" msgstr "Zuletzt bearbeitet" -#: compensation/templates/compensation/detail/compensation/view.html:79 +#: compensation/templates/compensation/detail/compensation/view.html:99 #: compensation/templates/compensation/detail/eco_account/view.html:82 -#: ema/templates/ema/detail/view.html:69 intervention/forms/modalForms.py:55 +#: ema/templates/ema/detail/view.html:69 intervention/forms/modalForms.py:54 #: 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:69 +#: intervention/forms/modalForms.py:68 #: intervention/templates/intervention/detail/includes/controls.html:15 msgid "Share" msgstr "Freigabe" @@ -1249,65 +1275,66 @@ msgstr "Neuer Eingriff" msgid "Edit intervention" msgstr "Eingriff bearbeiten" -#: intervention/forms/modalForms.py:28 +#: intervention/forms/modalForms.py:27 msgid "Share link" msgstr "Freigabelink" -#: intervention/forms/modalForms.py:30 +#: intervention/forms/modalForms.py:29 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:40 +#: intervention/forms/modalForms.py:39 msgid "Add user to share with" msgstr "Nutzer direkt hinzufügen" -#: intervention/forms/modalForms.py:42 +#: intervention/forms/modalForms.py:41 msgid "" "Multiple selection possible - You can only select users which do not already " "have access" msgstr "" -"Mehrfachauswahl möglich - Sie können nur Nutzer wählen, für die der Eintrag noch nicht freigegeben wurde" +"Mehrfachauswahl möglich - Sie können nur Nutzer wählen, für die der Eintrag " +"noch nicht freigegeben wurde" -#: intervention/forms/modalForms.py:58 +#: intervention/forms/modalForms.py:57 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:70 +#: intervention/forms/modalForms.py:69 msgid "Share settings for {}" msgstr "Freigabe Einstellungen für {}" -#: intervention/forms/modalForms.py:124 +#: intervention/forms/modalForms.py:134 msgid "Date of revocation" msgstr "Datum des Widerspruchs" -#: intervention/forms/modalForms.py:135 +#: intervention/forms/modalForms.py:145 #: intervention/templates/intervention/detail/includes/revocation.html:35 msgid "Document" msgstr "Dokument" -#: intervention/forms/modalForms.py:138 konova/forms.py:364 +#: intervention/forms/modalForms.py:148 konova/forms.py:364 msgid "Must be smaller than 15 Mb" msgstr "Muss kleiner als 15 Mb sein" -#: intervention/forms/modalForms.py:162 +#: intervention/forms/modalForms.py:172 #: intervention/templates/intervention/detail/includes/revocation.html:18 msgid "Add revocation" msgstr "Widerspruch hinzufügen" -#: intervention/forms/modalForms.py:204 +#: intervention/forms/modalForms.py:214 msgid "Checked intervention data" msgstr "Eingriffsdaten geprüft" -#: intervention/forms/modalForms.py:210 +#: intervention/forms/modalForms.py:220 msgid "Checked compensations data and payments" msgstr "Kompensationen und Zahlungen geprüft" -#: intervention/forms/modalForms.py:218 +#: intervention/forms/modalForms.py:228 #: intervention/templates/intervention/detail/includes/controls.html:19 msgid "Run check" msgstr "Prüfung vornehmen" -#: intervention/forms/modalForms.py:219 konova/forms.py:449 +#: intervention/forms/modalForms.py:229 konova/forms.py:449 msgid "" "I, {} {}, confirm that all necessary control steps have been performed by " "myself." @@ -1315,23 +1342,23 @@ msgstr "" "Ich, {} {}, bestätige, dass die notwendigen Kontrollschritte durchgeführt " "wurden:" -#: intervention/forms/modalForms.py:277 +#: intervention/forms/modalForms.py:287 msgid "Only recorded accounts can be selected for deductions" msgstr "Nur verzeichnete Ökokonten können für Abbuchungen verwendet werden." -#: intervention/forms/modalForms.py:304 +#: intervention/forms/modalForms.py:314 msgid "Only shared interventions can be selected" msgstr "Nur freigegebene Eingriffe können gewählt werden" -#: intervention/forms/modalForms.py:317 +#: intervention/forms/modalForms.py:327 msgid "New Deduction" msgstr "Neue Abbuchung" -#: intervention/forms/modalForms.py:318 +#: intervention/forms/modalForms.py:328 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:351 +#: intervention/forms/modalForms.py:361 msgid "" "Eco-account {} is not recorded yet. You can only deduct from recorded " "accounts." @@ -1339,7 +1366,7 @@ msgstr "" "Ökokonto {} ist noch nicht verzeichnet. Abbuchungen können nur von " "verzeichneten Ökokonten erfolgen." -#: intervention/forms/modalForms.py:364 +#: intervention/forms/modalForms.py:374 msgid "" "The account {} has not enough surface for a deduction of {} m². There are " "only {} m² left"