diff --git a/scipost_django/finances/forms.py b/scipost_django/finances/forms.py index 697479e9a85f9d8ee4c01d15baa45450d1450e26..bed2be131399fb391f4642c82b4dc401aa083fe0 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 b808707ae1b06bb2b976da62c2a2891ec5dbd77d..9f52b97014c4cb131bd707737c7f8f16891fd911 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)