From ebdf8b282fbc33344ea54271b2c869aa8ecfdeef Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Thu, 4 Feb 2021 22:20:58 +0100 Subject: [PATCH] Rechnungsdatum Korrigiert --- adm/views.py | 3 ++- dasettings/views.py | 10 +++++++++- .../__pycache__/settings.cpython-38.pyc | Bin 4787 -> 4787 bytes users/views.py | 6 +++--- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/adm/views.py b/adm/views.py index be92f27..c8218ca 100644 --- a/adm/views.py +++ b/adm/views.py @@ -177,7 +177,8 @@ class AdmAddBill(CreateView): start_date = form.cleaned_data["start"] start_date_string = start_date.strftime("%d.%m.%Y") - end_date = start_date + relativedelta(days=30) + end_date = start_date + relativedelta(months=1) + end_date = end_date - relativedelta(days=1) end_date_string= end_date.strftime("%d.%m.%Y") # Rechnungsdatum passt ja diff --git a/dasettings/views.py b/dasettings/views.py index e4cecc2..05608ae 100644 --- a/dasettings/views.py +++ b/dasettings/views.py @@ -1984,12 +1984,20 @@ class BillPlanUpdate(UpdateView): } plan = 1 - + + ''' start_date = month start_date_string = month.strftime("%d.%m.%Y") end_date = month + relativedelta(months=1) end_date = end_date - relativedelta(days=1) end_date_string= end_date.strftime("%d.%m.%Y") + ''' + start_date = month + relativedelta(days=1) + start_date_string = start_date.strftime("%d.%m.%Y") + # 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") # TASK: Was passiert bei Änderungen der Agenturdaten? diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index 1e8fc7ba3ed980e692160cc87051dfc4d40b4e62..cf0e8ca54ad870bce3be6885ae98efb2f6412ee6 100644 GIT binary patch delta 20 acmdn2x>=Pwl$V!_0SF{hWj1oJ5CQ-%JOo7m delta 20 acmdn2x>=Pwl$V!_0SKmLOKs#{Ap`(2!34$t diff --git a/users/views.py b/users/views.py index 7a6dbbc..f220a14 100644 --- a/users/views.py +++ b/users/views.py @@ -1881,11 +1881,11 @@ def cronactionsbill(request, code): plan = 1 - start_date = month - start_date_string = month.strftime("%d.%m.%Y") + start_date = month + relativedelta(days=1) + start_date_string = start_date.strftime("%d.%m.%Y") # 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 = end_date - relativedelta(days=1) end_date_string= end_date.strftime("%d.%m.%Y") voucher_date_today = date.today().strftime("%Y-%m-%d")