black formatting
This commit is contained in:
@@ -252,9 +252,7 @@ class BillUpdateForm(forms.ModelForm):
|
||||
self.fields["saving"].required = False
|
||||
|
||||
# only digital bill field
|
||||
self.fields[
|
||||
"only_digital_new"
|
||||
].label = "Ich habe eine neue digitale Rechnung."
|
||||
self.fields["only_digital_new"].label = "Ich habe eine neue digitale Rechnung."
|
||||
self.fields["only_digital_new"].required = False
|
||||
|
||||
# Resolution fields
|
||||
@@ -443,11 +441,7 @@ class BillAdminForm(forms.ModelForm):
|
||||
self.fields["bill_creator"].widget.can_delete_related = False
|
||||
|
||||
# delete wiref id from list if there are already 8 bills in wiref form.
|
||||
qs = (
|
||||
self.fields["wiref"]
|
||||
.queryset.annotate(num_bills=Count("bill"))
|
||||
.filter(num_bills__lt=8)
|
||||
)
|
||||
qs = self.fields["wiref"].queryset.annotate(num_bills=Count("bill")).filter(num_bills__lt=8)
|
||||
|
||||
# delete wiref id from if status is not opened.
|
||||
qs = qs.filter(status=Wiref.Status.OPENED)
|
||||
|
||||
@@ -34,9 +34,7 @@ class BankData(models.Model):
|
||||
|
||||
|
||||
class Resolution(models.Model):
|
||||
id = models.CharField(
|
||||
primary_key=True, max_length=128, verbose_name="Beschlussnummer"
|
||||
)
|
||||
id = models.CharField(primary_key=True, max_length=128, verbose_name="Beschlussnummer")
|
||||
name = models.CharField(max_length=128, verbose_name="Bezeichnung")
|
||||
|
||||
is_visible = models.BooleanField(default=False, verbose_name="sichtbar")
|
||||
@@ -47,9 +45,7 @@ class Resolution(models.Model):
|
||||
FINANCE = "F", "Finanzbeschluss"
|
||||
FSREF = "R", "FsRef-Beschluss"
|
||||
|
||||
option = models.CharField(
|
||||
max_length=1, choices=Option.choices, verbose_name="Beschluss"
|
||||
)
|
||||
option = models.CharField(max_length=1, choices=Option.choices, verbose_name="Beschluss")
|
||||
|
||||
date = models.DateField(verbose_name="Datum")
|
||||
voting = models.CharField(max_length=15, verbose_name="Abstimmungsverhalten")
|
||||
@@ -142,9 +138,7 @@ class Bill(models.Model):
|
||||
|
||||
date = models.DateField()
|
||||
invoice = models.TextField()
|
||||
amount = models.DecimalField(
|
||||
max_digits=7, decimal_places=2, verbose_name="Betrag (EUR)"
|
||||
)
|
||||
amount = models.DecimalField(max_digits=7, decimal_places=2, verbose_name="Betrag (EUR)")
|
||||
purpose = models.CharField(max_length=140, verbose_name="Verwendungszweck")
|
||||
|
||||
class Affiliation(models.TextChoices):
|
||||
|
||||
@@ -22,9 +22,7 @@ urlpatterns = [
|
||||
BillCreateDoneView.as_view(),
|
||||
name="bill_create_done",
|
||||
),
|
||||
path(
|
||||
"create-resolution/", ResolutionCreateView.as_view(), name="resolution_create"
|
||||
),
|
||||
path("create-resolution/", ResolutionCreateView.as_view(), name="resolution_create"),
|
||||
path("resolutions/", ResolutionListView.as_view(), name="resolution_list"),
|
||||
path(
|
||||
"resolutions/<str:id>/",
|
||||
|
||||
@@ -46,9 +46,7 @@ class BillCreateView(LoginRequiredMixin, CreateView):
|
||||
|
||||
# Disable old bank data.
|
||||
qs = BankData.objects.filter(
|
||||
~Q(id=obj.id)
|
||||
& Q(bankdata_creator=obj.bankdata_creator)
|
||||
& Q(is_disabled=False)
|
||||
~Q(id=obj.id) & Q(bankdata_creator=obj.bankdata_creator) & Q(is_disabled=False)
|
||||
)
|
||||
qs.update(is_disabled=True)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user