merge email sending

Merge branch 'master' of https://github.com/ulrichknecht/baroness
2016-04-06 22:39:48 +02:00
parent 0bd185482d cd38d16430
commit 024d38bad6
11 changed files with 152 additions and 52 deletions
--- a/app/templates/billing.html
+++ b/app/templates/billing.html
@@ -23,7 +23,7 @@
 			<tr>
 				<td>{{user.longname}}</td>
 				<td>{% if user.isblack %} &#9745; {% else %} &#9744; {% endif %}</td>
-				<td>{{dept}} € </td>
+				<td>{{debt[user.id-1]}} € </td>
 				<td> <input  type="number" name="{{user.name}}_payed" step="any" required value="0" /> € </td>
 				<td>Einzelne Rechnung <a href="/billing/send_personal_bill/{{user.name}}">versenden</a></td>
 			</tr>