From 11d2aa07ae9ed3b9f18f8c1a8381e967dabe5b66 Mon Sep 17 00:00:00 2001
From: George Katsikas <giorgakis.katsikas@gmail.com>
Date: Wed, 14 Aug 2024 14:06:48 +0200
Subject: [PATCH] update officer hourly rate
---
scipost_django/finances/forms.py | 3 ++-
scipost_django/finances/models/work_log.py | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/scipost_django/finances/forms.py b/scipost_django/finances/forms.py
index 697479e9a..bed2be131 100644
--- a/scipost_django/finances/forms.py
+++ b/scipost_django/finances/forms.py
@@ -28,6 +28,7 @@ from organizations.models import Organization
from scipost.fields import UserModelChoiceField
from .models import Subsidy, SubsidyPayment, SubsidyAttachment, WorkLog
+from .models.work_log import HOURLY_RATE
class SubsidyForm(forms.ModelForm):
@@ -472,7 +473,7 @@ class LogsFilterForm(forms.Form):
required=True, widget=forms.DateInput(attrs={"type": "date"})
)
end = forms.DateField(required=True, widget=forms.DateInput(attrs={"type": "date"}))
- hourly_rate = forms.FloatField(min_value=0, initial=WorkLog.HOURLY_RATE)
+ hourly_rate = forms.FloatField(min_value=0, initial=HOURLY_RATE)
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
diff --git a/scipost_django/finances/models/work_log.py b/scipost_django/finances/models/work_log.py
index b808707ae..9f52b9701 100644
--- a/scipost_django/finances/models/work_log.py
+++ b/scipost_django/finances/models/work_log.py
@@ -10,10 +10,10 @@ from django.utils import timezone
from ..utils import id_to_slug
+HOURLY_RATE = 24.0
-class WorkLog(models.Model):
- HOURLY_RATE = 22.0
+class WorkLog(models.Model):
user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
comments = models.TextField(blank=True)
log_type = models.CharField(max_length=128, blank=True)
--
GitLab