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 a766d22..1e8fc7b 100644 Binary files a/digitaleagentur/__pycache__/settings.cpython-38.pyc and b/digitaleagentur/__pycache__/settings.cpython-38.pyc differ diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc index a6f841f..5433c82 100644 Binary files a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc and b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc differ 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")