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

Rechnungeserstellung usw.

This commit is contained in:
holger.trampe 2021-01-04 17:05:30 +01:00
parent 36a5cdcb71
commit 3da29bdef0
7 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dasettings/templates/dasettings/calc_content.html
View File

@ -22,7 +22,7 @@
</tr> </tr>
<tr> <tr>
{% loadMWST user as mwst %} {% loadMWST user as mwst %}
<td>Gesetzliche MwSt. (16%)</td><td>{{mwst|floatformat:2|intcomma}} €</td> <td>Gesetzliche MwSt. (19%)</td><td>{{mwst|floatformat:2|intcomma}} €</td>
</tr> </tr>
<tr> <tr>
<td colspan="2"><hr></td> <td colspan="2"><hr></td>

5
dasettings/views.py
View File

@ -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) r = requests.get("https://api.lexoffice.io/v1/invoices/"+bill.lexid+"/document", data=json_data, headers=headers)
json.loads(r.text) json.loads(r.text)
base64String = requests.get("https://api.lexoffice.io/v1/files/"+json.loads(r.text)["documentFileId"]+"/", data=json_data, headers=headers) base64String = requests.get("https://api.lexoffice.io/v1/files/"+json.loads(r.text)["documentFileId"]+"/", data=json_data, headers=headers)
buffer = BytesIO.BytesIO() buffer = BytesIO.BytesIO()
@ -1754,7 +1754,10 @@ class BillPlanUpdate(UpdateView):
self.object = form.save(commit=False) self.object = form.save(commit=False)
r = requests.post("https://api.lexoffice.io/v1/invoices/?finalize=true", data=json_data, headers=headers) 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): if(r.status_code == 201):
messages.success(self.request, f"Rechnung erstellt!") messages.success(self.request, f"Rechnung erstellt!")

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

Binary file not shown.

BIN
dump.rdb Normal file
View File

Binary file not shown.

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

Binary file not shown.

6
standards/templatetags/counter_tag.py
View File

@ -730,7 +730,7 @@ def loadMWST(user):
else: else:
usercount = usercount - 3 usercount = usercount - 3
mwst = (21.0 + usercount*3)/100 * 16 mwst = (21.0 + usercount*3)/100 * 19
return mwst return mwst
@ -743,7 +743,7 @@ def loadFinalMoney(user):
else: else:
usercount = usercount - 3 usercount = usercount - 3
finalMoney = (21.0 + usercount*3) * 1.16 finalMoney = (21.0 + usercount*3) * 1.19
return finalMoney return finalMoney
@register.simple_tag @register.simple_tag
@ -755,7 +755,7 @@ def loadFinalMoneyByAgency(agency):
else: else:
usercount = usercount - 3 usercount = usercount - 3
finalMoney = (21.0 + usercount*3) * 1.16 finalMoney = (21.0 + usercount*3) * 1.19
return finalMoney return finalMoney

6
users/views.py
View File

@ -1447,6 +1447,8 @@ def cronactionsbill(request, code):
# Monatliche Berechnung # 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 # 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) new_bills = AgencyBills.objects.filter(end=today)
for bill in new_bills: for bill in new_bills:
if bill.agency.paymentstatus == 0 and bill.agency.paymentplan == 1: if bill.agency.paymentstatus == 0 and bill.agency.paymentplan == 1:
@ -1534,7 +1536,11 @@ def cronactionsbill(request, code):
} }
} }
json_data = json.dumps(lexdata) 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) r = requests.post("https://api.lexoffice.io/v1/invoices/?finalize=true", data=json_data, headers=headers)
if(r.status_code == 201): if(r.status_code == 201):