From 51d6a89d118336657bd3cc1c5d2cf2b00cf29c78 Mon Sep 17 00:00:00 2001 From: Patrick Mayr Date: Wed, 17 Jan 2024 20:05:56 +0000 Subject: [PATCH] add bank data if available --- fet2020/finance/forms.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/fet2020/finance/forms.py b/fet2020/finance/forms.py index aa5bd442..1a49bc30 100644 --- a/fet2020/finance/forms.py +++ b/fet2020/finance/forms.py @@ -1,6 +1,6 @@ from django import forms from django.core.validators import ValidationError -from django.db.models import Count +from django.db.models import Count, Q from django.forms import DateInput from members.models import Member @@ -69,7 +69,9 @@ class BillCreateForm(forms.ModelForm): super().__init__(*args, **kwargs) # to get the self.fields set - self.fields["bill_creator"].initial = Member.objects.get(username=user.username) + member = Member.objects.get(username=user.username) + + self.fields["bill_creator"].initial = member self.fields["bill_creator"].disabled = True self.fields["invoice"].placeholder = "Firmenname\nStraße\nPLZ Ort" @@ -78,6 +80,14 @@ class BillCreateForm(forms.ModelForm): # bank data fields self.fields["payer"].autofocus = True + bank_data = BankData.objects.filter( + Q(bankdata_creator=member) & Q(is_disabled=False) + ).first() + if bank_data is not None: + self.fields["name_text"].initial = bank_data.name + self.fields["iban_text"].initial = bank_data.iban + self.fields["bic_text"].initial = bank_data.bic + self.fields["name_text"].label = "Kontoinhaber:in" self.fields["name_text"].required = False