diff --git a/compensation/account_urls.py b/compensation/account_urls.py index 222f2fc..5daa6c8 100644 --- a/compensation/account_urls.py +++ b/compensation/account_urls.py @@ -24,8 +24,8 @@ urlpatterns = [ # Document remove route can be found in konova/urls.py path('/document/new/', new_document_view, name='acc-new-doc'), - # Eco-account withdraws - path('/remove/', withdraw_remove_view, name='withdraw-remove'), - path('/withdraw/new', new_withdraw_view, name='acc-new-withdraw'), + # Eco-account deductions + path('/remove/', deduction_remove_view, name='deduction-remove'), + path('/deduct/new', new_deduction_view, name='acc-new-deduction'), ] \ No newline at end of file diff --git a/compensation/admin.py b/compensation/admin.py index e77450a..4d14858 100644 --- a/compensation/admin.py +++ b/compensation/admin.py @@ -1,7 +1,7 @@ from django.contrib import admin from compensation.models import Compensation, CompensationAction, CompensationState, Payment, \ - EcoAccountWithdraw, EcoAccount + EcoAccountDeduction, EcoAccount class CompensationStateAdmin(admin.ModelAdmin): @@ -47,7 +47,7 @@ class PaymentAdmin(admin.ModelAdmin): ] -class EcoAccountWithdrawAdmin(admin.ModelAdmin): +class EcoAccountDeductionAdmin(admin.ModelAdmin): list_display = [ "id", "account", @@ -61,4 +61,4 @@ admin.site.register(Payment, PaymentAdmin) admin.site.register(CompensationAction, CompensationActionAdmin) admin.site.register(CompensationState, CompensationStateAdmin) admin.site.register(EcoAccount, EcoAccountAdmin) -admin.site.register(EcoAccountWithdraw, EcoAccountWithdrawAdmin) +admin.site.register(EcoAccountDeduction, EcoAccountDeductionAdmin) diff --git a/compensation/models.py b/compensation/models.py index c54d44f..556f100 100644 --- a/compensation/models.py +++ b/compensation/models.py @@ -201,7 +201,7 @@ class Compensation(AbstractCompensation): class EcoAccount(AbstractCompensation): """ An eco account is a kind of 'prepaid' compensation. It can be compared to an account that already has been filled - with some kind of currency. From this account one is able to 'withdraw' currency for current projects. + with some kind of currency. From this account one is able to deduct currency for current projects. """ # Users having access on this object # Not needed in regular Compensation since their access is defined by the linked intervention's access @@ -232,13 +232,13 @@ class EcoAccount(AbstractCompensation): self.identifier = new_id super().save(*args, **kwargs) - def get_surface_withdraws(self) -> float: - """ Calculates the compensation's/account's surface + def get_deductions_surface(self) -> float: + """ Calculates the account's deductions sum surface Returns: sum_surface (float) """ - return self.withdraws.all().aggregate(Sum("surface"))["surface__sum"] or 0 + return self.deductions.all().aggregate(Sum("surface"))["surface__sum"] or 0 def get_available_rest(self, as_percentage: bool = False): """ Calculates available rest surface of the eco account @@ -250,12 +250,12 @@ class EcoAccount(AbstractCompensation): """ ret_val = 0 - withdraws = self.withdraws.filter( + deductions = self.deductions.filter( intervention__deleted=None, ) - withdraw_surfaces = withdraws.aggregate(Sum("surface"))["surface__sum"] or 0 - after_states_surfaces = self.after_states.all().aggregate(Sum("surface"))["surface__sum"] or withdraw_surfaces ## no division by zero - ret_val = after_states_surfaces - withdraw_surfaces + deductions_surfaces = deductions.aggregate(Sum("surface"))["surface__sum"] or 0 + after_states_surfaces = self.after_states.all().aggregate(Sum("surface"))["surface__sum"] or deductions_surfaces ## no division by zero + ret_val = after_states_surfaces - deductions_surfaces if as_percentage: if after_states_surfaces > 0: @@ -299,22 +299,22 @@ class EcoAccount(AbstractCompensation): return ret_msgs -class EcoAccountWithdraw(BaseResource): +class EcoAccountDeduction(BaseResource): """ - A withdraw object for eco accounts + A deduction object for eco accounts """ account = models.ForeignKey( EcoAccount, on_delete=models.SET_NULL, null=True, blank=True, - help_text="Withdrawn from", - related_name="withdraws", + help_text="Deducted from", + related_name="deductions", ) surface = models.FloatField( null=True, blank=True, - help_text="Amount withdrawn (m²)", + help_text="Amount deducted (m²)", validators=[ MinValueValidator(limit_value=0.00), ] @@ -324,8 +324,8 @@ class EcoAccountWithdraw(BaseResource): on_delete=models.CASCADE, null=True, blank=True, - help_text="Withdrawn for", - related_name="withdraws", + help_text="Deducted for", + related_name="deductions", ) def __str__(self): diff --git a/compensation/tables.py b/compensation/tables.py index db01f7c..c7487dc 100644 --- a/compensation/tables.py +++ b/compensation/tables.py @@ -252,7 +252,7 @@ class EcoAccountTable(BaseTable): """ html = "" checked = value is not None - tooltip = _("Not recorded yet. Can not be used for withdraws, yet.") + tooltip = _("Not recorded yet. Can not be used for deductions, yet.") if checked: value = value.timestamp value = localtime(value) diff --git a/compensation/templates/compensation/detail/eco_account/includes/withdraws.html b/compensation/templates/compensation/detail/eco_account/includes/deductions.html similarity index 64% rename from compensation/templates/compensation/detail/eco_account/includes/withdraws.html rename to compensation/templates/compensation/detail/eco_account/includes/deductions.html index 19fe679..5306193 100644 --- a/compensation/templates/compensation/detail/eco_account/includes/withdraws.html +++ b/compensation/templates/compensation/detail/eco_account/includes/deductions.html @@ -1,17 +1,17 @@ {% load i18n l10n fontawesome_5 humanize %} -
+
- {{withdraws.count}} - {% trans 'Eco Account Withdraws' %} + {{deductions.count}} + {% trans 'Eco Account Deductions' %}
{% if is_default_member and has_access %} - @@ -42,25 +42,25 @@ - {% for withdraw in withdraws %} + {% for deduction in deductions %} - - {{ withdraw.intervention.identifier }} + + {{ deduction.intervention.identifier }} - {% if withdraw.intervention.recorded %} - + {% if deduction.intervention.recorded %} + {% else %} - + {% endif %} - {{ withdraw.surface|floatformat:2|intcomma }} m² - {{ withdraw.created.timestamp|default_if_none:""|naturalday}} + {{ deduction.surface|floatformat:2|intcomma }} m² + {{ deduction.created.timestamp|default_if_none:""|naturalday}} {% if is_default_member and has_access %} - {% endif %} diff --git a/compensation/templates/compensation/detail/eco_account/view.html b/compensation/templates/compensation/detail/eco_account/view.html index 2c114e4..f591b2c 100644 --- a/compensation/templates/compensation/detail/eco_account/view.html +++ b/compensation/templates/compensation/detail/eco_account/view.html @@ -110,7 +110,7 @@ {% include 'compensation/detail/eco_account/includes/documents.html' %}
- {% include 'compensation/detail/eco_account/includes/withdraws.html' %} + {% include 'compensation/detail/eco_account/includes/deductions.html' %}
diff --git a/compensation/views/eco_account_views.py b/compensation/views/eco_account_views.py index 282717f..86677ff 100644 --- a/compensation/views/eco_account_views.py +++ b/compensation/views/eco_account_views.py @@ -16,7 +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 intervention.forms import NewDeductionForm from konova.contexts import BaseContext from konova.decorators import any_group_check, default_group_required, conservation_office_group_required from konova.forms import RemoveModalForm, SimpleGeomForm, NewDocumentForm, RecordModalForm @@ -94,10 +94,10 @@ def open_view(request: HttpRequest, id: str): sum_after_states = after_states.aggregate(Sum("surface"))["surface__sum"] or 0 diff_states = abs(sum_before_states - sum_after_states) - # Calculate rest of available surface for withdraws + # Calculate rest of available surface for deductions available = acc.get_available_rest(as_percentage=True) - withdraws = acc.withdraws.filter( + deductions = acc.deductions.filter( intervention__deleted=None, ) @@ -115,7 +115,7 @@ def open_view(request: HttpRequest, id: str): "is_zb_member": in_group(_user, ZB_GROUP), "is_ets_member": in_group(_user, ETS_GROUP), "LANIS_LINK": acc.get_LANIS_link(), - "withdraws": withdraws, + "deductions": deductions, } context = BaseContext(request, context).context return render(request, template, context) @@ -143,27 +143,27 @@ def remove_view(request: HttpRequest, id: str): @login_required @default_group_required -def withdraw_remove_view(request: HttpRequest, id: str, withdraw_id: str): - """ Renders a modal view for removing withdraws +def deduction_remove_view(request: HttpRequest, id: str, deduction_id: str): + """ Renders a modal view for removing deductions Args: request (HttpRequest): The incoming request id (str): The eco account's id - withdraw_id (str): The withdraw's id + deduction_id (str): The deduction's id Returns: """ acc = get_object_or_404(EcoAccount, id=id) try: - eco_withdraw = acc.withdraws.get(id=withdraw_id) + eco_deduction = acc.deductions.get(id=deduction_id) except ObjectDoesNotExist: - raise Http404("Unknown withdraw") + raise Http404("Unknown deduction") - form = RemoveModalForm(request.POST or None, instance=eco_withdraw, user=request.user) + form = RemoveModalForm(request.POST or None, instance=eco_deduction, user=request.user) return form.process_request( request=request, - msg_success=_("Withdraw removed") + msg_success=_("Deduction removed") ) @@ -291,19 +291,19 @@ def new_document_view(request: HttpRequest, id: str): @login_required @default_group_required -def new_withdraw_view(request: HttpRequest, id: str): - """ Renders a modal form view for creating withdraws +def new_deduction_view(request: HttpRequest, id: str): + """ Renders a modal form view for creating deductions Args: - request (): - id (): + request (HttpRequest): THe incoming request + id (str): The eco account's id Returns: """ acc = get_object_or_404(EcoAccount, id=id) - form = NewWithdrawForm(request.POST or None, instance=acc, user=request.user) + form = NewDeductionForm(request.POST or None, instance=acc, user=request.user) return form.process_request( request, - msg_success=_("Withdraw added") + msg_success=_("Deduction added") ) diff --git a/intervention/forms.py b/intervention/forms.py index c7032f7..25ff7d3 100644 --- a/intervention/forms.py +++ b/intervention/forms.py @@ -14,7 +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 compensation.models import EcoAccountDeduction, EcoAccount from intervention.models import Intervention, Revocation from konova.forms import BaseForm, BaseModalForm from konova.models import Document @@ -451,8 +451,8 @@ class RunCheckForm(BaseModalForm): ) -class NewWithdrawForm(BaseModalForm): - """ Form for creating new withdraws +class NewDeductionForm(BaseModalForm): + """ Form for creating new deduction Can be used for Intervention view as well as for EcoAccount views. @@ -463,7 +463,7 @@ class NewWithdrawForm(BaseModalForm): account = forms.ModelChoiceField( label=_("Eco-account"), label_suffix="", - help_text=_("Only recorded accounts can be selected for withdraws"), + help_text=_("Only recorded accounts can be selected for deductions"), queryset=EcoAccount.objects.filter(deleted=None), widget=autocomplete.ModelSelect2( url="accounts-autocomplete", @@ -497,8 +497,8 @@ class NewWithdrawForm(BaseModalForm): 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.form_title = _("New Deduction") + self.form_caption = _("Enter the information for a new deduction from a chosen eco-account") self.is_intervention_initially = False # Add a placeholder for field 'surface' without having to define the whole widget above @@ -520,7 +520,7 @@ class NewWithdrawForm(BaseModalForm): def is_valid(self): """ Custom validity check - Makes sure the withdraw can not contain more surface than the account still provides + Makes sure the deduction can not contain more surface than the account still provides Returns: is_valid (bool) @@ -534,20 +534,20 @@ class NewWithdrawForm(BaseModalForm): if not acc.recorded: self.add_error( "account", - _("Eco-account {} is not recorded yet. You can only withdraw from recorded accounts.").format(acc.identifier) + _("Eco-account {} is not recorded yet. You can only deduct from recorded accounts.").format(acc.identifier) ) return False # Calculate valid surface sum_surface = acc.get_surface() - sum_surface_withdraws = acc.get_surface_withdraws() - rest_surface = sum_surface - sum_surface_withdraws + sum_surface_deductions = acc.get_deductions_surface() + rest_surface = sum_surface - sum_surface_deductions 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), + _("The account {} has not enough surface for a deduction of {} m². There are only {} m² left").format(acc.identifier, form_surface, rest_surface), ) return is_valid_surface and super_result @@ -566,19 +566,19 @@ class NewWithdrawForm(BaseModalForm): self.instance.modified = user_action_edit self.instance.save() - # Create withdraw depending on Intervention or EcoAccount as the initial instance + # Create deductions depending on Intervention or EcoAccount as the initial instance if self.is_intervention_initially: - withdraw = EcoAccountWithdraw.objects.create( + deduction = EcoAccountDeduction.objects.create( intervention=self.instance, account=self.cleaned_data["account"], surface=self.cleaned_data["surface"], created=user_action_create, ) else: - withdraw = EcoAccountWithdraw.objects.create( + deduction = EcoAccountDeduction.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 + return deduction \ No newline at end of file diff --git a/intervention/templates/intervention/detail/includes/withdraws.html b/intervention/templates/intervention/detail/includes/deductions.html similarity index 62% rename from intervention/templates/intervention/detail/includes/withdraws.html rename to intervention/templates/intervention/detail/includes/deductions.html index be22e20..bfbfa36 100644 --- a/intervention/templates/intervention/detail/includes/withdraws.html +++ b/intervention/templates/intervention/detail/includes/deductions.html @@ -1,17 +1,17 @@ {% load i18n l10n fontawesome_5 humanize %} -
+
- {{intervention.withdraws.count}} - {% trans 'Eco Account Withdraws' %} + {{intervention.deductions.count}} + {% trans 'Eco Account Deductions' %}
{% if is_default_member and has_access %} - @@ -39,21 +39,21 @@ - {% for withdraw in intervention.withdraws.all %} - + {% for deduction in intervention.deductions.all %} + - - {% if withdraw.account.deleted or not withdraw.account.recorded %} + + {% if deduction.account.deleted or not deduction.account.recorded %} {% fa5_icon 'exclamation-triangle' %} {% endif %} - {{ withdraw.account.identifier }} + {{ deduction.account.identifier }} - {{ withdraw.surface|floatformat:2|intcomma }} m² - {{ withdraw.created.timestamp|default_if_none:""|naturalday}} + {{ deduction.surface|floatformat:2|intcomma }} m² + {{ deduction.created.timestamp|default_if_none:""|naturalday}} {% if is_default_member and has_access %} - {% endif %} diff --git a/intervention/templates/intervention/detail/view.html b/intervention/templates/intervention/detail/view.html index 8c6c095..ee0acc4 100644 --- a/intervention/templates/intervention/detail/view.html +++ b/intervention/templates/intervention/detail/view.html @@ -133,7 +133,7 @@
- {% include 'intervention/detail/includes/withdraws.html' %} + {% include 'intervention/detail/includes/deductions.html' %}
{% include 'intervention/detail/includes/revocation.html' %} diff --git a/intervention/urls.py b/intervention/urls.py index 97f8241..2172e16 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, new_withdraw_view, \ + create_share_view, remove_revocation_view, new_revocation_view, run_check_view, log_view, new_deduction_view, \ record_view app_name = "intervention" @@ -25,8 +25,8 @@ urlpatterns = [ path('/check', run_check_view, name='run-check'), path('/record', record_view, name='record'), - # Withdraws - path('/withdraw/new', new_withdraw_view, name='acc-new-withdraw'), + # Deductions + path('/deduction/new', new_deduction_view, name='acc-new-deduction'), # Revocation routes path('/revocation/new', new_revocation_view, name='new-revocation'), diff --git a/intervention/views.py b/intervention/views.py index 7e1531a..e8893ce 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, NewWithdrawForm + RunCheckForm, NewDeductionForm from intervention.models import Intervention, Revocation from intervention.tables import InterventionTable from konova.contexts import BaseContext @@ -341,21 +341,21 @@ def log_view(request: HttpRequest, id: str): @login_required @default_group_required -def new_withdraw_view(request: HttpRequest, id: str): - """ Renders a modal form view for creating withdraws +def new_deduction_view(request: HttpRequest, id: str): + """ Renders a modal form view for creating deductions Args: request (HttpRequest): The incoming request - id (str): The intervention's id which shall get a new withdraw + id (str): The intervention's id which shall benefit from this deduction Returns: """ intervention = get_object_or_404(Intervention, id=id) - form = NewWithdrawForm(request.POST or None, instance=intervention, user=request.user) + form = NewDeductionForm(request.POST or None, instance=intervention, user=request.user) return form.process_request( request, - msg_success=_("Withdraw added") + msg_success=_("Deduction added") ) diff --git a/konova/templates/konova/home.html b/konova/templates/konova/home.html index 15fb65d..918eae5 100644 --- a/konova/templates/konova/home.html +++ b/konova/templates/konova/home.html @@ -127,7 +127,7 @@ diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 2118a30..2ee5306 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 bdd247e..b3405d5 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -172,7 +172,7 @@ msgstr "Maßnahmentyp wählen" #: 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:37 +#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:37 #: ema/templates/ema/detail/includes/actions.html:37 #: ema/templates/ema/detail/includes/deadlines.html:37 #: ema/templates/ema/detail/includes/documents.html:34 @@ -182,7 +182,7 @@ msgstr "Maßnahmentyp wählen" #: 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:37 +#: intervention/templates/intervention/detail/includes/deductions.html:37 #: templates/log.html:10 msgid "Action" msgstr "Aktionen" @@ -196,8 +196,8 @@ msgid "Select the unit" msgstr "Einheit wählen" #: compensation/forms.py:334 -#: compensation/templates/compensation/detail/eco_account/includes/withdraws.html:31 -#: intervention/templates/intervention/detail/includes/withdraws.html:31 +#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:31 +#: intervention/templates/intervention/detail/includes/deductions.html:31 msgid "Amount" msgstr "Menge" @@ -353,7 +353,7 @@ msgid "Eco-account" msgstr "Ökokonto" #: compensation/tables.py:255 -msgid "Not recorded yet. Can not be used for withdraws, yet." +msgid "Not recorded yet. Can not be used for deductions, yet." msgstr "" "Noch nicht verzeichnet. Kann noch nicht für Abbuchungen genutzt werden." @@ -576,39 +576,39 @@ msgstr "Entzeichnen" msgid "Record" msgstr "Verzeichnen" -#: compensation/templates/compensation/detail/eco_account/includes/withdraws.html:8 -#: intervention/templates/intervention/detail/includes/withdraws.html:8 -msgid "Eco Account Withdraws" +#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:8 +#: intervention/templates/intervention/detail/includes/deductions.html:8 +msgid "Eco Account Deductions" msgstr "Ökokonto Abbuchungen" -#: compensation/templates/compensation/detail/eco_account/includes/withdraws.html:14 -#: intervention/templates/intervention/detail/includes/withdraws.html:14 -msgid "Add new withdraw" +#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:14 +#: intervention/templates/intervention/detail/includes/deductions.html:14 +msgid "Add new deduction" msgstr "Neue Abbuchung hinzufügen" -#: compensation/templates/compensation/detail/eco_account/includes/withdraws.html:28 +#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:28 msgid "Intervention Identifier" msgstr "Eingriffskennung" -#: compensation/templates/compensation/detail/eco_account/includes/withdraws.html:34 -#: intervention/templates/intervention/detail/includes/withdraws.html:34 +#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:34 +#: intervention/templates/intervention/detail/includes/deductions.html:34 #: user/models.py:51 msgid "Created" msgstr "Erstellt" -#: compensation/templates/compensation/detail/eco_account/includes/withdraws.html:43 -#: intervention/templates/intervention/detail/includes/withdraws.html:43 -msgid "Eco-account deleted! Withdraw invalid!" +#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:43 +#: intervention/templates/intervention/detail/includes/deductions.html:43 +msgid "Eco-account deleted! Deduction invalid!" msgstr "Ökokonto gelöscht! Abbuchung ungültig!" -#: compensation/templates/compensation/detail/eco_account/includes/withdraws.html:43 -#: intervention/templates/intervention/detail/includes/withdraws.html:43 -msgid "Eco-account not recorded! Withdraw invalid!" +#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:43 +#: intervention/templates/intervention/detail/includes/deductions.html:43 +msgid "Eco-account not recorded! Deduction invalid!" msgstr "Ökokonto nicht verzeichnet! Abbuchung ungültig!" -#: compensation/templates/compensation/detail/eco_account/includes/withdraws.html:56 -#: intervention/templates/intervention/detail/includes/withdraws.html:56 -msgid "Remove Withdraw" +#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:56 +#: intervention/templates/intervention/detail/includes/deductions.html:56 +msgid "Remove Deduction" msgstr "Abbuchung entfernen" #: compensation/templates/compensation/detail/eco_account/view.html:57 @@ -687,7 +687,7 @@ msgid "Eco-account removed" msgstr "Ökokonto entfernt" #: compensation/views/eco_account_views.py:161 -msgid "Withdraw removed" +msgid "Deduction removed" msgstr "Abbuchung entfernt" #: compensation/views/eco_account_views.py:204 ema/views.py:170 @@ -701,7 +701,7 @@ msgid "{} recorded" msgstr "{} verzeichnet" #: compensation/views/eco_account_views.py:303 intervention/views.py:358 -msgid "Withdraw added" +msgid "Deduction added" msgstr "Abbuchung hinzugefügt" #: compensation/views/payment_views.py:36 @@ -874,7 +874,7 @@ msgstr "" "wurden:" #: intervention/forms.py:464 -msgid "Only recorded accounts can be selected for withdraws" +msgid "Only recorded accounts can be selected for deductions" msgstr "Nur verzeichnete Ökokonten können für Abbuchungen verwendet werden." #: intervention/forms.py:483 intervention/forms.py:490 @@ -889,16 +889,16 @@ msgid "Only shared interventions can be selected" msgstr "Nur freigegebene Eingriffe können gewählt werden" #: intervention/forms.py:498 -msgid "New Withdraw" +msgid "New Deduction" msgstr "Neue Abbuchung" #: intervention/forms.py:499 -msgid "Enter the information for a new withdraw from a chosen eco-account" +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.py:535 msgid "" -"Eco-account {} is not recorded yet. You can only withdraw from recorded " +"Eco-account {} is not recorded yet. You can only deduct from recorded " "accounts." msgstr "" "Ökokonto {} ist noch nicht verzeichnet. Abbuchungen können nur von " @@ -906,7 +906,7 @@ msgstr "" #: intervention/forms.py:548 msgid "" -"The account {} has not enough surface for a withdraw of {} m². There are " +"The account {} has not enough surface for a deduction of {} m². There are " "only {} m² left" msgstr "" "Das Ökokonto {} hat für eine Abbuchung von {} m² nicht ausreichend " @@ -992,7 +992,7 @@ msgstr "Vom" msgid "Remove revocation" msgstr "Widerspruch entfernen" -#: intervention/templates/intervention/detail/includes/withdraws.html:28 +#: intervention/templates/intervention/detail/includes/deductions.html:28 msgid "Account Identifier" msgstr "Ökokonto Kennung" @@ -1230,7 +1230,7 @@ msgid "Show" msgstr "Anzeigen" #: konova/templates/konova/home.html:130 -msgid "Withdraw" +msgid "Deduct" msgstr "Abbuchen" #: konova/utils/message_templates.py:11 @@ -2759,7 +2759,7 @@ msgstr "" #~ msgid "New eco-account" #~ msgstr "Neues Ökokonto" -#~ msgid "Withdraw from eco-account" +#~ msgid "Deduct from eco-account" #~ msgstr "Von Konto abbuchen" #~ msgid "You are currently working as "