DigitaleAgentur___ALT
/
digitaleagenturnc
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rechnungsdatum angepasst, kleine Schrift gelöst

This commit is contained in:
holger.trampe 2021-02-03 10:38:25 +01:00
parent 80aba1e850
commit 30cb18ece5
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dasettings/views.py
View File

@ -1987,7 +1987,8 @@ class BillPlanUpdate(UpdateView):
start_date = month start_date = month
start_date_string = month.strftime("%d.%m.%Y") 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") end_date_string= end_date.strftime("%d.%m.%Y")
voucher_date_today = date.today().strftime("%Y-%m-%d") voucher_date_today = date.today().strftime("%Y-%m-%d")

BIN
digitaleagentur/__pycache__/settings.cpython-38.pyc
View File

Binary file not shown.

BIN
standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
View File

Binary file not shown.

3
users/templates/users/dashboard.html
View File

@ -7,8 +7,9 @@
<small>Letzter Login: {{ request.user.last_login }} <small>Letzter Login: {{ request.user.last_login }}
{% getlocalweather request.user as weatherdata %} {% getlocalweather request.user as weatherdata %}
{% if request.user.profile.agency.city|length > 0 and weatherdata.0 != None %} {% if request.user.profile.agency.city|length > 0 and weatherdata.0 != None %}
{{weatherdata.0}}&nbsp;<img src='https://openweathermap.org/img/wn/{{weatherdata.1}}.png' width="45px" style="margin-bottom: -5px; padding-right: -20px; margin-left: -10px; margin-top: -15px; margin-right: -6px;">&nbsp;{{weatherdata.2}}</small> {{weatherdata.0}}&nbsp;<img src='https://openweathermap.org/img/wn/{{weatherdata.1}}.png' width="45px" style="margin-bottom: -5px; padding-right: -20px; margin-left: -10px; margin-top: -15px; margin-right: -6px;">&nbsp;{{weatherdata.2}}
{% endif %} {% endif %}
</small>
<hr> <hr>
<h5>Agentur: <b>{{ request.user.profile.agency.name }}</b></h5> <h5>Agentur: <b>{{ request.user.profile.agency.name }}</b></h5>
<hr> <hr>

9
users/views.py
View File

@ -1861,8 +1861,9 @@ def cronactionsbill(request, code):
agency = bill.agency agency = bill.agency
month = today month = today
# 30 Tage weiter, nicht einen Monat! # Einen Monat weiter und dann wieder einen Tag zurück
next_month = today + relativedelta(days=30) next_month = today + relativedelta(months=1)
next_month = next_month - relativedelta(days=1)
# USERCOUNT BERECHNEN # USERCOUNT BERECHNEN
usercount = len(User.objects.filter(profile__agency=agency)) usercount = len(User.objects.filter(profile__agency=agency))
@ -1882,7 +1883,9 @@ def cronactionsbill(request, code):
start_date = month start_date = month
start_date_string = month.strftime("%d.%m.%Y") 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") end_date_string= end_date.strftime("%d.%m.%Y")
voucher_date_today = date.today().strftime("%Y-%m-%d") voucher_date_today = date.today().strftime("%Y-%m-%d")