/", FeeUpdateView.as_view(), name="fee_update"),
# Resolution views
path("create-resolution/", ResolutionCreateView.as_view(), name="resolution_create"),
path("resolutions/", ResolutionListView.as_view(), name="resolution_list"),
diff --git a/fet2020/finance/utils.py b/fet2020/finance/utils.py
index 6211348a..832198cf 100644
--- a/fet2020/finance/utils.py
+++ b/fet2020/finance/utils.py
@@ -6,7 +6,7 @@ from django.core.files import File
from pypdf import PdfReader, PdfWriter
from pypdf.constants import FieldDictionaryAttributes as FA # noqa: N814
-from .models import Bill, Fee, Wiref
+from .models import Bill, Wiref
def generate_pdf(wiref):
@@ -82,56 +82,56 @@ def generate_pdf(wiref):
return True
-def generate_fee_pdf(fee: Fee):
- if not fee or fee.status != Fee.Status.SUBMITTED:
- return False
+# def generate_fee_pdf(fee: Fee):
+# if not fee or fee.status != Fee.Status.SUBMITTED:
+# return False
- # Get data for pdf
- data = {}
- data.update(
- {
- "Full_Name": fee.bankdata.name,
- "Adresse": fee.bankdata.address,
- # Change to the correct date format
- "Date": str(fee.date_created.strftime("%d.%m.%Y")),
- "Honorarnoten-Nummer": str(fee.pk),
- "Taetigkeit_1": fee.job,
- # Change to the correct date format
- "Date_1": str(fee.date_start.strftime("%d.%m.%Y")),
- # Change to the correct date format
- "Date_2": str(fee.date_end.strftime("%d.%m.%Y")),
- # Replace decimal separator from '.' to ','
- "EUR_1": str(fee.amount).replace(".", ","),
- "IBAN": fee.bankdata.iban,
- "BIC": fee.bankdata.bic,
- },
- )
+# # Get data for pdf
+# data = {}
+# data.update(
+# {
+# "Full_Name": fee.bankdata.name,
+# "Adresse": fee.bankdata.address,
+# # Change to the correct date format
+# "Date": str(fee.date_created.strftime("%d.%m.%Y")),
+# "Honorarnoten-Nummer": str(fee.pk),
+# "Taetigkeit_1": fee.job,
+# # Change to the correct date format
+# "Date_1": str(fee.date_start.strftime("%d.%m.%Y")),
+# # Change to the correct date format
+# "Date_2": str(fee.date_end.strftime("%d.%m.%Y")),
+# # Replace decimal separator from '.' to ','
+# "EUR_1": str(fee.amount).replace(".", ","),
+# "IBAN": fee.bankdata.iban,
+# "BIC": fee.bankdata.bic,
+# },
+# )
- # Add mail only if a fet user create the fee
- if fee.fee_creator:
- mail = fee.fee_creator.mailaccount
- data.update(
- {
- "Email": mail,
- },
- )
+# # Add mail only if a fet user create the fee
+# if fee.fee_creator:
+# mail = fee.fee_creator.mailaccount
+# data.update(
+# {
+# "Email": mail,
+# },
+# )
- # Write data in pdf
- pdf_path = Path(Path(__file__).parent) / "static/fee/Honorarnote-Vorlage.pdf"
- reader = PdfReader(pdf_path)
- writer = PdfWriter()
- writer.append(reader)
+# # Write data in pdf
+# pdf_path = Path(Path(__file__).parent) / "static/fee/Honorarnote-Vorlage.pdf"
+# reader = PdfReader(pdf_path)
+# writer = PdfWriter()
+# writer.append(reader)
- writer.update_page_form_field_values(
- writer.pages[0],
- data,
- )
+# writer.update_page_form_field_values(
+# writer.pages[0],
+# data,
+# )
- with io.BytesIO() as bytes_stream:
- writer.write(bytes_stream)
+# with io.BytesIO() as bytes_stream:
+# writer.write(bytes_stream)
- # Save pdf in fee
- fee_name = f"Honorarnote-{fee.pk}.pdf"
- fee.file_field.save(fee_name, File(bytes_stream, fee_name))
+# # Save pdf in fee
+# fee_name = f"Honorarnote-{fee.pk}.pdf"
+# fee.file_field.save(fee_name, File(bytes_stream, fee_name))
- return True
+# return True
diff --git a/fet2020/finance/views.py b/fet2020/finance/views.py
index 5fef41b5..80ae92a9 100644
--- a/fet2020/finance/views.py
+++ b/fet2020/finance/views.py
@@ -1,5 +1,5 @@
from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
-from django.db.models import CharField, F, Q, Value
+from django.db.models import CharField, Q, Value
from django.shortcuts import redirect
from django.urls import reverse, reverse_lazy
from django.views.generic import ListView, TemplateView
@@ -12,12 +12,10 @@ from posts.models import FetMeeting
from .forms import (
BillCreateForm,
BillUpdateForm,
- FeeCreateForm,
- FeeUpdateForm,
ResolutionCreateForm,
ResolutionUpdateForm,
)
-from .models import BankData, Bill, Fee, Resolution
+from .models import BankData, Bill, Resolution
def set_bankdata(
@@ -91,26 +89,26 @@ class BillListView(LoginRequiredMixin, ListView):
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
- context["fee_status"] = Fee.Status
+ # context["fee_status"] = Fee.Status
context["bill_status"] = Bill.Status
return context
def get_queryset(self):
- qs1 = (
- Fee.objects.filter(fee_creator__username=self.request.user)
- .values("amount", "status", "id")
- .annotate(
- date=F("date_start"), purpose=F("job"), model=Value("FEE", output_field=CharField())
- )
- )
- qs2 = (
+ # qs1 = (
+ # Fee.objects.filter(fee_creator__username=self.request.user)
+ # .values("amount", "status", "id")
+ # .annotate(
+ # date=F("date_start"), purpose=F("job"), model=Value("FEE", output_field=CharField())
+ # )
+ # )
+ qs = (
Bill.objects.filter(bill_creator__username=self.request.user)
.values("amount", "status", "id", "date", "purpose")
.annotate(model=Value("BILL", output_field=CharField()))
)
- qs = qs1.union(qs2, all=True)
+ # qs = qs1.union(qs2, all=True)
return qs.order_by("-date", "purpose")
@@ -148,55 +146,55 @@ class BillUpdateView(LoginRequiredMixin, UserPassesTestMixin, UpdateView):
return redirect("finance:bill_list")
-class FeeCreateView(LoginRequiredMixin, CreateView):
- form_class = FeeCreateForm
- model = Fee
- template_name = "finance/fee/create.html"
+# class FeeCreateView(LoginRequiredMixin, CreateView):
+# form_class = FeeCreateForm
+# model = Fee
+# template_name = "finance/fee/create.html"
- def form_valid(self, form):
- # Get or create bankdata object.
- creator = form.cleaned_data["fee_creator"]
- name = form.cleaned_data["name_text"]
- iban = form.cleaned_data["iban_text"]
- bic = form.cleaned_data["bic_text"]
- address = form.cleaned_data["address_text"]
- saving = form.cleaned_data["saving"]
- form.instance.bankdata = set_bankdata(creator, name, iban, bic, saving, address)
+# def form_valid(self, form):
+# # Get or create bankdata object.
+# creator = form.cleaned_data["fee_creator"]
+# name = form.cleaned_data["name_text"]
+# iban = form.cleaned_data["iban_text"]
+# bic = form.cleaned_data["bic_text"]
+# address = form.cleaned_data["address_text"]
+# saving = form.cleaned_data["saving"]
+# form.instance.bankdata = set_bankdata(creator, name, iban, bic, saving, address)
- add_log_action(self.request, form, "finance", "fee", True)
- return super().form_valid(form)
+# add_log_action(self.request, form, "finance", "fee", True)
+# return super().form_valid(form)
- def get_form_kwargs(self):
- kwargs = super().get_form_kwargs()
+# def get_form_kwargs(self):
+# kwargs = super().get_form_kwargs()
- # Request user for fee creator.
- kwargs["user"] = self.request.user
- return kwargs
+# # Request user for fee creator.
+# kwargs["user"] = self.request.user
+# return kwargs
- def get_success_url(self):
- return reverse("finance:fee_create_done", kwargs={"pk": self.object.pk})
+# def get_success_url(self):
+# return reverse("finance:fee_create_done", kwargs={"pk": self.object.pk})
-class FeeCreateDoneView(LoginRequiredMixin, TemplateView):
- template_name = "finance/fee/create_done.html"
+# class FeeCreateDoneView(LoginRequiredMixin, TemplateView):
+# template_name = "finance/fee/create_done.html"
-class FeeUpdateView(LoginRequiredMixin, UserPassesTestMixin, UpdateView):
- form_class = FeeUpdateForm
- model = Fee
- success_url = reverse_lazy("finance:bill_list")
- template_name = "finance/fee/update.html"
+# class FeeUpdateView(LoginRequiredMixin, UserPassesTestMixin, UpdateView):
+# form_class = FeeUpdateForm
+# model = Fee
+# success_url = reverse_lazy("finance:bill_list")
+# template_name = "finance/fee/update.html"
- def form_valid(self, form):
- add_log_action(self.request, form, "finance", "fee", False)
- return super().form_valid(form)
+# def form_valid(self, form):
+# add_log_action(self.request, form, "finance", "fee", False)
+# return super().form_valid(form)
- # Call fee if it's only yours.
- def test_func(self):
- return self.get_object().fee_creator.username == self.request.user.username
+# # Call fee if it's only yours.
+# def test_func(self):
+# return self.get_object().fee_creator.username == self.request.user.username
- def handle_no_permission(self):
- return redirect("finance:bill_list")
+# def handle_no_permission(self):
+# return redirect("finance:bill_list")
class ResolutionCreateView(LoginRequiredMixin, CreateView):
diff --git a/fet2020/templates/admin/submit_line.html b/fet2020/templates/admin/submit_line.html
index 3073b497..ec1e5bda 100644
--- a/fet2020/templates/admin/submit_line.html
+++ b/fet2020/templates/admin/submit_line.html
@@ -7,6 +7,5 @@
{% translate 'Close' %}
{% endif %}
{% if generate_pdf %}{% endif %}
- {% if generate_fee_pdf %}{% endif %}
{{ block.super }}
{% endblock submit-row %}
diff --git a/fet2020/templates/finance/index.html b/fet2020/templates/finance/index.html
index 0836fbbf..99003e69 100644
--- a/fet2020/templates/finance/index.html
+++ b/fet2020/templates/finance/index.html
@@ -39,23 +39,11 @@
{% elif result.status == bill_status.FINISHED %}
{{ bill_status.FINISHED.label }}
{% endif %}
- {% elif result.model == "FEE" %}
- {% if result.status == fee_status.SUBMITTED %}
- {{ fee_status.SUBMITTED.label }}
- {% elif result.status == fee_status.APPROVED %}
- {{ fee_status.APPROVED.label }}
- {% elif result.status == fee_status.PAYOUT %}
- {{ fee_status.PAYOUT.label }}
- {% elif result.status == fee_status.CLEARED %}
- {{ fee_status.CLEARED.label }}
- {% endif %}
{% endif %}
|
{% if result.model == "BILL" %}
- {% elif result.model == "FEE" %}
-
{% endif %}
|
diff --git a/fet2020/templates/home.html b/fet2020/templates/home.html
index 27742107..ee9563f8 100644
--- a/fet2020/templates/home.html
+++ b/fet2020/templates/home.html
@@ -49,12 +49,6 @@
Neue Rechnung einreichen
-
-
-
- Neue Honorarnote einreichen
-
-