ruff formating

fet2020/finance/admin.py

@@ -108,7 +108,7 @@ class BillPeriodeFilter(admin.SimpleListFilter):
 
         if self.value():
             try:
-                period = datetime.strptime(self.value()[:4], "%Y")
+                period = datetime.strptime(self.value()[:4], "%Y")  # noqa: DTZ007
             except Exception:
                 # If choice is 'All', return all bills.
                 qs = queryset
@@ -671,7 +671,8 @@ class WirefAdmin(admin.ModelAdmin):
             else:
                 self.message_user(
                     request,
-                    "Das PDF-Dokument konnte nicht generiert werden, da der Status nicht auf 'Offen' gesetzt ist.",
+                    "Das PDF-Dokument konnte nicht generiert werden, da der Status nicht auf "
+                    "'Offen' gesetzt ist.",
                     messages.WARNING,
                 )
             return HttpResponseRedirect(".")

fet2020/finance/forms.py

@@ -1,7 +1,7 @@
-from datetime import datetime
-from dateutil.relativedelta import relativedelta
+import datetime
 import decimal
 
+from dateutil.relativedelta import relativedelta
 from django import forms
 from django.core.validators import ValidationError
 from django.db.models import Count, Q
@@ -35,8 +35,10 @@ def get_cleaned_data(cleaned_data):
             cleaned_data["resolution"] = Resolution.objects.get(
                 Q(id=resolution) | Q(name=resolution),
             )
-        except Exception:
-            raise ValidationError({"resolution_text": "Es gibt keinen Beschluss mit dieser ID."})
+        except Exception as exc:
+            raise ValidationError(
+                {"resolution_text": "Es gibt keinen Beschluss mit dieser ID."}
+            ) from exc
 
     # If payer is 'Me', you need name, iban and bic data.
     if payer == Bill.Payer.ME:
@@ -575,7 +577,7 @@ class BillAdminForm(forms.ModelForm):
         self.fields["resolution"].queryset = self.fields["resolution"].queryset.filter(
             (
                 Q(option=Resolution.Option.FINANCE)
-                & Q(date__gt=datetime.now().date() - relativedelta(years=2))
+                & Q(date__gt=datetime.datetime.now(tz=datetime.UTC).date() - relativedelta(years=2))
             )
             | Q(option=Resolution.Option.PERMANENT)
         )

fet2020/finance/models.py

@@ -162,7 +162,7 @@ class Resolution(models.Model):
 
 
 class Wiref(models.Model):
-    wiref_id = models.CharField(max_length=10, blank=True, null=True)
+    wiref_id = models.CharField(max_length=10, blank=True, default="")
 
     file_field = models.FileField(
         upload_to="uploads/finance/wiref/",
@@ -253,7 +253,7 @@ class Bill(models.Model):
         null=True,
     )
 
-    comment = models.TextField(blank=True, null=True)
+    comment = models.TextField(blank=True, default="")
 
     class Status(models.TextChoices):
         SUBMITTED = "S", "Eingereicht"

fet2020/finance/utils.py

@@ -1,10 +1,10 @@
 import datetime
 import io
-import os
+from pathlib import Path
 
 from django.core.files import File
 from pypdf import PdfReader, PdfWriter
-from pypdf.constants import FieldDictionaryAttributes as FA
+from pypdf.constants import FieldDictionaryAttributes as FA  # noqa: N814
 
 from .models import Bill, Fee, Wiref
 
@@ -34,7 +34,7 @@ def generate_pdf(wiref):
         )
 
     # Get budget year
-    today = datetime.date.today()
+    today = datetime.datetime.now(tz=datetime.UTC).date()
     if today.month < 7:
         budget_year = f"{today.year - 1}-{today.year}"
     else:
@@ -55,7 +55,7 @@ def generate_pdf(wiref):
     )
 
     # Write data in pdf
-    pdf_path = os.path.join(os.path.dirname(__file__), "static/wiref/Vorlage.pdf")
+    pdf_path = Path(Path(__file__).parent) / "static/wiref/Vorlage.pdf"
     reader = PdfReader(pdf_path)
     writer = PdfWriter()
     writer.append(reader)
@@ -117,7 +117,7 @@ def generate_fee_pdf(fee: Fee):
         )
 
     # Write data in pdf
-    pdf_path = os.path.join(os.path.dirname(__file__), "static/fee/Honorarnote-Vorlage.pdf")
+    pdf_path = Path(Path(__file__).parent) / "static/fee/Honorarnote-Vorlage.pdf"
     reader = PdfReader(pdf_path)
     writer = PdfWriter()
     writer.append(reader)