Merge branch 'master' of someserver.de:k4ever

Conflicts: k4ever/k4ever.db
2010-12-01 23:57:01 +01:00 · 2010-12-01 23:57:01 +01:00 · 6206ef90b5
parent 60fe5ca2d2 3bfcd4ead7
commit 6206ef90b5
2 changed files with 1 additions and 1 deletions
--- a/k4ever/k4ever.db
+++ b/k4ever/k4ever.db
--- a/k4ever/main/templates/base.html
+++ b/k4ever/main/templates/base.html
@ -17,7 +17,7 @@
 				<h1>Kasse</h1>
 				{% if user.is_authenticated %}
 					{% include "main/navigation-login.html" %}
-					<span class="balance">Kontostand: {{ user.get_profile.balance }} €</span>
+					<span class="balance">Kontostand: {{ user.get_profile.balance|floatformat:2 }} €</span>
 				{% else %}
 					{% include "main/navigation.html" %}
 				{% endif %}