diff --git a/dasettings/templates/dasettings/calc_content.html b/dasettings/templates/dasettings/calc_content.html
index 6a097be..8f1e836 100644
--- a/dasettings/templates/dasettings/calc_content.html
+++ b/dasettings/templates/dasettings/calc_content.html
@@ -22,7 +22,7 @@
{% loadMWST user as mwst %}
- | Gesetzliche MwSt. (16%) | {{mwst|floatformat:2|intcomma}} € |
+ Gesetzliche MwSt. (19%) | {{mwst|floatformat:2|intcomma}} € |
|
diff --git a/dasettings/views.py b/dasettings/views.py
index 00dd38d..548a426 100644
--- a/dasettings/views.py
+++ b/dasettings/views.py
@@ -314,7 +314,7 @@ def GetBillPDF(request, pk):
r = requests.get("https://api.lexoffice.io/v1/invoices/"+bill.lexid+"/document", data=json_data, headers=headers)
json.loads(r.text)
-
+
base64String = requests.get("https://api.lexoffice.io/v1/files/"+json.loads(r.text)["documentFileId"]+"/", data=json_data, headers=headers)
buffer = BytesIO.BytesIO()
@@ -1754,7 +1754,10 @@ class BillPlanUpdate(UpdateView):
self.object = form.save(commit=False)
+
r = requests.post("https://api.lexoffice.io/v1/invoices/?finalize=true", data=json_data, headers=headers)
+ # Als ENTWURF Rechnung anlegen
+ #r = requests.post("https://api.lexoffice.io/v1/invoices/", data=json_data, headers=headers)
if(r.status_code == 201):
messages.success(self.request, f"Rechnung erstellt!")
diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc
index f6489ba..9936dda 100644
Binary files a/digitaleagentur/__pycache__/settings.cpython-38.pyc and b/digitaleagentur/__pycache__/settings.cpython-38.pyc differ
diff --git a/dump.rdb b/dump.rdb
new file mode 100644
index 0000000..63fc6ac
Binary files /dev/null and b/dump.rdb differ
diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
index a2108b9..bb137c7 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/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py
index d31f8dd..64befb7 100644
--- a/standards/templatetags/counter_tag.py
+++ b/standards/templatetags/counter_tag.py
@@ -730,7 +730,7 @@ def loadMWST(user):
else:
usercount = usercount - 3
- mwst = (21.0 + usercount*3)/100 * 16
+ mwst = (21.0 + usercount*3)/100 * 19
return mwst
@@ -743,7 +743,7 @@ def loadFinalMoney(user):
else:
usercount = usercount - 3
- finalMoney = (21.0 + usercount*3) * 1.16
+ finalMoney = (21.0 + usercount*3) * 1.19
return finalMoney
@register.simple_tag
@@ -755,7 +755,7 @@ def loadFinalMoneyByAgency(agency):
else:
usercount = usercount - 3
- finalMoney = (21.0 + usercount*3) * 1.16
+ finalMoney = (21.0 + usercount*3) * 1.19
return finalMoney
diff --git a/users/views.py b/users/views.py
index fdce121..8fc8905 100644
--- a/users/views.py
+++ b/users/views.py
@@ -1447,6 +1447,8 @@ def cronactionsbill(request, code):
# Monatliche Berechnung
# Alle Rechnungen laden, deren Letzter Tag HEUTE ist und bei ausgewähltem Paymentplan 1 eine neue Rechnung erstellen, Mailverschicke, Nutzeraccouns zählen und neue Rechnung in der Agentur hinterlegen
new_bills = AgencyBills.objects.filter(end=today)
+
+
for bill in new_bills:
if bill.agency.paymentstatus == 0 and bill.agency.paymentplan == 1:
@@ -1534,7 +1536,11 @@ def cronactionsbill(request, code):
}
}
json_data = json.dumps(lexdata)
+ # WIEDER RAUSNEHMEN
+ # NEUE RECHNUNG ALs ENTWURF
+ #r = requests.post("https://api.lexoffice.io/v1/invoices/", data=json_data, headers=headers)
+ # RICHTIGE RECHNUNG
r = requests.post("https://api.lexoffice.io/v1/invoices/?finalize=true", data=json_data, headers=headers)
if(r.status_code == 201):