From 30cb18ece57f61f8194d51587002a095ae48b5b5 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Wed, 3 Feb 2021 10:38:25 +0100 Subject: [PATCH] =?UTF-8?q?Rechnungsdatum=20angepasst,=20kleine=20Schrift?= =?UTF-8?q?=20gel=C3=B6st?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dasettings/views.py | 3 ++- .../__pycache__/settings.cpython-38.pyc | Bin 4787 -> 4787 bytes .../__pycache__/counter_tag.cpython-38.pyc | Bin 23287 -> 23287 bytes users/templates/users/dashboard.html | 3 ++- users/views.py | 9 ++++++--- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dasettings/views.py b/dasettings/views.py index e980a25..e4cecc2 100644 --- a/dasettings/views.py +++ b/dasettings/views.py @@ -1987,7 +1987,8 @@ class BillPlanUpdate(UpdateView): start_date = month start_date_string = month.strftime("%d.%m.%Y") - end_date = month + relativedelta(days=30) + end_date = month + relativedelta(months=1) + end_date = end_date - relativedelta(days=1) end_date_string= end_date.strftime("%d.%m.%Y") voucher_date_today = date.today().strftime("%Y-%m-%d") diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index a766d22ace448ebe10861e50e2876daf4600efe9..1e8fc7ba3ed980e692160cc87051dfc4d40b4e62 100644 GIT binary patch delta 20 acmdn2x>=Pwl$V!_0SKmLOKs#{Ap`(2!34$t delta 20 acmdn2x>=Pwl$V!_0SK6$2yNtEAp`(1V+5lB diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc index a6f841f29c958e247f0c502952c54c0f414b7f5e..5433c822bb492eff6debe2ed339b9575b14a1e0b 100644 GIT binary patch delta 22 ccmeyqmGS#lM($8vUM>b8P*0ND$o(b?08`Zlga7~l delta 22 ccmeyqmGS#lM($8vUM>b8==d(Yk^4;)09n@ua{vGU diff --git a/users/templates/users/dashboard.html b/users/templates/users/dashboard.html index 20ad1c6..b662fca 100644 --- a/users/templates/users/dashboard.html +++ b/users/templates/users/dashboard.html @@ -7,8 +7,9 @@ Letzter Login: {{ request.user.last_login }} {% getlocalweather request.user as weatherdata %} {% if request.user.profile.agency.city|length > 0 and weatherdata.0 != None %} - {{weatherdata.0}}  {{weatherdata.2}} + {{weatherdata.0}}  {{weatherdata.2}} {% endif %} +
Agentur: {{ request.user.profile.agency.name }}
diff --git a/users/views.py b/users/views.py index 72d74f3..7a6dbbc 100644 --- a/users/views.py +++ b/users/views.py @@ -1861,8 +1861,9 @@ def cronactionsbill(request, code): agency = bill.agency month = today - # 30 Tage weiter, nicht einen Monat! - next_month = today + relativedelta(days=30) + # Einen Monat weiter und dann wieder einen Tag zurück + next_month = today + relativedelta(months=1) + next_month = next_month - relativedelta(days=1) # USERCOUNT BERECHNEN usercount = len(User.objects.filter(profile__agency=agency)) @@ -1882,7 +1883,9 @@ def cronactionsbill(request, code): start_date = month start_date_string = month.strftime("%d.%m.%Y") - end_date = month + relativedelta(days=30) + # Einen Monat weiter und dann wieder einen Tag zurück + end_date = month + relativedelta(months=1) + end_date = end_date - relativedelta(days=1) end_date_string= end_date.strftime("%d.%m.%Y") voucher_date_today = date.today().strftime("%Y-%m-%d")