bugs und karten

adm/templates/adm/adm_bills.html

@@ -71,4 +71,71 @@
 	    }); 	
 	})
 </script>
+
+<h4>Rechungsübersicht STORNO
+	<span style="float: right;">
+		<a class="btn btn-primary btn-sm" href="{% url 'admbill-add' %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Rechnung</a>
+	</span>
+</h4>
+<hr>
+<table class="table table-hover" id="ag_storno" >
+  <thead>
+  <tr>
+    <th scope="col">Agentur</th>
+	<th scope="col">Rechnungsnummer</th>
+    <th scope="col">Rechnungsdatum</th>
+    <th scope="col">Leistung Start</th>
+    <th scope="col">Leistung Ende</th>
+    <th scope="col">Betrag</th>
+    <th scope="col">Status</th>
+  </tr>
+</thead>
+<tbody >
+	{% for ele in bills_storno %}
+	<tr>
+		<td><a href="{% url 'adm-agency-single' ele.agency.pk %}">{{ele.agency.name}}</a></td>
+		<td><a href="{% url 'ag-getbillpdf' ele.pk %}" target="_blank">{{ele.billnumber}}</a></td>
+		<td data-sort='{{ele.billdate|date:"U"}}'>{{ele.billdate|date:"d.m.Y"}}</td>
+		<td data-sort='{{ele.start|date:"U"}}'>{{ele.start|date:"d.m.Y"}}</td>
+		<td data-sort='{{ele.end|date:"U"}}'>{{ele.end|date:"d.m.Y"}}</td>
+		<td>
+			{% loadBillValue ele as fm %}
+			{% if fm != False %}
+				{{fm|floatformat:2|intcomma}} €
+			{% else %}
+				Fehler bei Rechnungsabfrage (ID {{ele.pk}})
+			{% endif %}
+		</td>
+		<td>
+			{% if ele.billstatus == "open" %} <i class="far fa-times-circle" style="color: red"></i> {% elif ele.billstatus == "paid" %} <i class="far fa-check-circle"  style="color: green"></i> {% endif %}
+		</td>
+	</tr>
+	{% endfor %}
+</tbody>
+</table>
+</div>
+<script type="text/javascript">
+	$(document).ready(function(){
+       $('#ag_storno').DataTable({
+       	 order: [2, 'desc'],
+	      "language": {
+	        "search" : "Suche",
+	        "info": "Zeige _START_ bis _END_ von _TOTAL_ Einträgen",
+	        "lengthMenu":     "Zeige _MENU_ Einträge",
+	        "zeroRecords": "Nichts gefunden",
+	        "infoEmpty": "Keine Einträge",
+	        "paginate": {
+	            "first":      "Erste",
+	            "last":       "Letzte",
+	            "next":       "Nächste",
+	            "previous":   "Zurück"
+	        },
+	      },
+	      "pageLength": 50,
+	      "buttons" : {
+	        "className" : "btn-danger"
+	      }
+	    }); 	
+	})
+</script>
 {% endblock content %}

adm/views.py

@@ -135,7 +135,8 @@ class AdmBills(TemplateView):
 		context = super().get_context_data(**kwargs)
 
 		context.update({'active_link' : "adm-bills"})
-		context.update({'bills' : AgencyBills.objects.all()})
+		context.update({'bills' : AgencyBills.objects.all().exclude(billstatus="voided")})
+		context.update({'bills_storno' : AgencyBills.objects.filter(billstatus="voided")})
 		return context
 
 

timemanagement/templates/timemanagement/timemanagement_singleview.html

@@ -78,6 +78,33 @@
               {% if abday != False or isfreename != False %}
                 {% if isfreename != False %}
                   {{isfreename}} 
+                  {% for workday in workdays %}
+                    {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
+                        <br />
+                        {{workday.start|date:"H:i"}} - {{workday.end|date:"H:i"}},
+                        {% getsumworkdayexcludebreak workday as sumworkday %}
+                        {{ sumworkday }},
+                        {% getsumbreak workday as sumbreakofday %}
+                        {{sumbreakofday}} min. ({{workday.breaks.all|length}}),
+                        {% getsumworkday workday as sumwd %}
+                        {{sumwd}},
+                        {% gettimeoveralldiff workday user as erg%}
+                        {% if erg.1 == 0 %}
+                          <span style="color: green">+{{erg.0}}</span>
+                        {% elif erg.1 == 1 %}
+                          <span>{{erg.0}}</span>
+                        {% else %}
+                          <span style="color: red">-{{erg.0}}</span>
+                        {% endif %}
+
+                        {% if breakmonthline < da %}
+                        <button  class="btn btn-secondary btn-sm ml-2" onclick="window.location.href='{% url 'tm-update' workday.pk %}'"><small><i class="fas fa-pen"></i></small></button>
+                        <button  class="btn btn-secondary btn-sm " onclick="javascript:$('#confirm-delete_{{workday.pk}}').modal('toggle')"><small><i class="fas fa-trash"></i></small></button>
+                        {% endif %}
+                    {% endif %}
+                  {% endfor %}
+
+
                 {% else %}
                   {{abday.reason}}
                 {% endif %}

users/views.py

@@ -285,7 +285,7 @@ def loadPreStructure(agency):
 	a_verkaufen = Areas(agency=agency, name="Verkaufen", color="#8e44ad", desc="", created_area_by=None)
 	a_verkaufen.save()
 
-	a_verkaufen_tasks = ["Aktionen", "Antragsprozesse", "Cross-Selling", "Kooperationen", "Leads", "Skype-Beratung", "Telefon-Beratung", "Terminvorbereitung", "Verkaufsgespräch", "Terminnachbereitung", "Terminierung/KKM"]
+	a_verkaufen_tasks = ["Aktionen", "Antragsprozesse", "Cross-Selling", "Kooperationen", "Leads", "Videoberatung", "Telefon-Beratung", "Terminvorbereitung", "Verkaufsgespräch", "Terminnachbereitung", "Terminierung/KKM"]
 
 	for l in a_verkaufen_tasks:
 		temp = Tasks(agency=agency, area=a_verkaufen, name=l)
@@ -295,21 +295,21 @@ def loadPreStructure(agency):
 	a_verwalten = Areas(agency=agency, name="Verwalten", color="#f39c12", desc="", created_area_by=None)
 	a_verwalten.save()
 
-	a_verwalten_tasks = ["Agenturverwaltung", "Vertragsverwaltung", "EASY Anwendungen", "Host-Anwendungen", "Fremdverträge", "Kundenanschreiben", "Schaden und Leistung", "Textbaustein"]
+	a_verwalten_tasks = ["Agenturverwaltung", "Vertragsverwaltung", "EASY Anwendungen", "Host-Anwendungen", "Fremdverträge", "Kundenanschreiben", "Schaden und Leistung", "Textbaustein", "Bestellungen", "Büroordnung", "Post", "Technik"]
 
 	for l in a_verwalten_tasks:
 		temp = Tasks(agency=agency, area=a_verwalten, name=l)
 		temp.save()
 
 	# BÜRPO INTERN
-	a_buerointern = Areas(agency=agency, name="Büroabläufe intern", color="#c0392b", desc="", created_area_by=None)
+	#a_buerointern = Areas(agency=agency, name="Büroabläufe intern", color="#c0392b", desc="", created_area_by=None)
-	a_buerointern.save()
+	#a_buerointern.save()
 
-	a_buero_tasks = ["Bestellungen", "Büroordnung", "Post", "Technik"]
+	#a_buero_tasks = []
 
-	for l in a_buero_tasks:
+	#for l in a_buero_tasks:
-		temp = Tasks(agency=agency, area=a_buerointern, name=l)
+	#	temp = Tasks(agency=agency, area=a_buerointern, name=l)
-		temp.save()
+	#	temp.save()
 
 	# AG-Netzwork Joins
 	# Join ID 8, 7, 6, 5
@@ -1895,6 +1895,10 @@ def cronactionsbill(request, code):
 					bill.billstatus="paid"
 					bill.save()
 					mailstatus += "\n VOUCHERSTATUS BILL CHANGED TO PAID: " + str(bill.pk)
+				elif(json.loads(r.text)["voucherStatus"] == "voided"):
+					bill.billstatus="voided"
+					bill.save()
+					mailstatus += "\n VOUCHERSTATUS BILL CHANGED TO VOIDED: " + str(bill.pk)
 				else:
 					bill.billstatus="open"
 					bill.save()