Merge branch 'master' into order-wizard-clean

requirements.txt

@@ -4,4 +4,4 @@ django-debug-toolbar==1.7
 docutils==0.13.1
 sqlparse==0.2.3
 freezegun==0.3.8
-django-formtools==2.0
+django-formtools==2.0

src/feedback/migrations/0030_auto_20170112_1308.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.4 on 2017-01-12 13:08
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('feedback', '0029_auto_20161227_1258'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='barcodeallowedstate',
+            options={'verbose_name': 'Erlaubter Zustand', 'verbose_name_plural': 'Erlaubte Zustaende'},
+        ),
+        migrations.AlterField(
+            model_name='barcodeallowedstate',
+            name='allow_state',
+            field=models.IntegerField(choices=[(100, 'Angelegt'), (600, 'Gedruckt'), (700, 'Versandt'), (800, 'B\xf6gen eingegangen'), (900, 'B\xf6gen gescannt'), (1000, 'Ergebnisse versandt')], null=True),
+        ),
+        migrations.AlterUniqueTogether(
+            name='barcodeallowedstate',
+            unique_together=set([('barcode_scanner', 'allow_state')]),
+        ),
+    ]

src/feedback/migrations/0030_remove_person_fachgebiet.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.4 on 2017-01-11 12:48
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('feedback', '0029_auto_20161227_1258'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='person',
+            name='fachgebiet',
+        ),
+    ]

src/feedback/migrations/0031_person_fachgebiet.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.4 on 2017-01-11 12:49
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('feedback', '0030_remove_person_fachgebiet'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='person',
+            name='fachgebiet',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='feedback.Fachgebiet'),
+        ),
+    ]

src/feedback/migrations/0032_merge_20170114_1715.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-01-14 17:15
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('feedback', '0030_auto_20170112_1308'),
+        ('feedback', '0031_person_fachgebiet'),
+    ]
+
+    operations = [
+    ]

src/feedback/tests/test_models.py

@@ -292,6 +292,7 @@ def test_person_admin_assign_fachgebiet(self):
         self.assertEqual(self.fb_p1.fachgebiet, self.fachgebiet1)
 
 
+
 class BarcodeScanTest(TestCase):
     def setUp(self):
         self.barcode_scanner = BarcodeScanner.objects.create(token="LRh73Ds22", description="description1")
@@ -311,6 +312,7 @@ def test_equal_state_onscanners(self):
     def test_same_state_onscanner(self):
         BarcodeAllowedState.objects.create(barcode_scanner=self.barcode_scanner,
                                            allow_state=Veranstaltung.STATUS_GEDRUCKT)
+
         with self.assertRaises(IntegrityError):
             BarcodeAllowedState.objects.create(barcode_scanner=self.barcode_scanner,
                                                allow_state=Veranstaltung.STATUS_GEDRUCKT)