Merge branch 'feature/#3_accounting_dialog' into develop

# Conflicts:
#	billard/models.py
#	billard/views.py

billard/migrations/0017_accounting_reporter_uuid.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-02-27 07:57
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('billard', '0016_auto_20170225_1822'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='accounting',
+            name='reporter_uuid',
+            field=models.UUIDField(blank=True, null=True, verbose_name='Reporter UUID'),
+        ),
+    ]

billard/migrations/0018_auto_20170302_2058.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-03-02 20:58
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('billard', '0017_accounting_reporter_uuid'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='accounting',
+            name='prize_hh',
+            field=models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True, verbose_name='Preis Happy Hour'),
+        ),
+        migrations.AddField(
+            model_name='accounting',
+            name='prize_normal',
+            field=models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True, verbose_name='Preis Normalzeit'),
+        ),
+        migrations.AddField(
+            model_name='client',
+            name='report_user',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='reporting_clients', to=settings.AUTH_USER_MODEL, verbose_name='Reporting Benutzer'),
+        ),
+    ]