From 67e019073a68a01755c2d3fddd569f386f3a3839 Mon Sep 17 00:00:00 2001 From: Christian Merten Date: Sun, 24 Nov 2024 22:38:44 +0100 Subject: [PATCH] finance: fix allowance per day and rounding --- jdav_web/finance/models.py | 2 +- jdav_web/jdav_web/settings/local.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jdav_web/finance/models.py b/jdav_web/finance/models.py index 91f0a6c..1cfc2a4 100644 --- a/jdav_web/finance/models.py +++ b/jdav_web/finance/models.py @@ -283,7 +283,7 @@ class Statement(CommonModel): if self.excursion is None: return 0 - return self.total_staff / self.excursion.staff_count + return cvt_to_decimal(self.total_staff / self.excursion.staff_count) @property def total_staff(self): diff --git a/jdav_web/jdav_web/settings/local.py b/jdav_web/jdav_web/settings/local.py index 2e68dfd..4e3d49e 100644 --- a/jdav_web/jdav_web/settings/local.py +++ b/jdav_web/jdav_web/settings/local.py @@ -22,7 +22,7 @@ MAX_AGE_GOOD_CONDUCT_CERTIFICATE_MONTHS = 24 # finance -ALLOWANCE_PER_DAY = 10 +ALLOWANCE_PER_DAY = 22 MAX_NIGHT_COST = 11 CLOUD_LINK = 'https://nc.cloud-jdav-hd.de'