Fix migrations na master

sapl/materia/migrations/0059_auto_20191001_1450.py → sapl/materia/migrations/0058_auto_20191001_1450.py

@@ -8,7 +8,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('materia', '0058_auto_20191001_1115'),
+        ('materia', '0057_materiaemtramitacao'),
     ]
 
     operations = [

sapl/sessao/migrations/0051_merge_20191204_1129.py → sapl/materia/migrations/0059_merge_20191003_0854.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-12-04 14:29
+# Generated by Django 1.11.20 on 2019-10-03 11:54
 from __future__ import unicode_literals
 
 from django.db import migrations
@@ -8,9 +8,9 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('sessao', '0048_auto_20190829_1253'),
-        ('sessao', '0050_auto_20191029_1441'),
+        ('materia', '0058_auto_20191001_1450'),
+        ('materia', '0058_auto_20191001_1115'),
     ]
 
     operations = [
-    ]
+    ]

sapl/materia/migrations/0063_auto_20191010_1228.py → sapl/materia/migrations/0060_auto_20190930_1136.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-10-10 15:28
+# Generated by Django 1.11.20 on 2019-09-30 14:36
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -8,7 +8,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('materia', '0062_remove_tramitacao_turno'),
+        ('materia', '0059_merge_20191003_0854'),
     ]
 
     operations = [
@@ -17,4 +17,4 @@ class Migration(migrations.Migration):
             name='texto',
             field=models.TextField(blank=True, verbose_name='Texto da Ação'),
         ),
-    ]
+    ]

sapl/materia/migrations/0061_auto_20191118_2036.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-11-18 23:36
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('materia', '0060_auto_20190905_1134'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='documentoacessorio',
-            name='autor',
-            field=models.CharField(blank=True, max_length=200, verbose_name='Autor'),
-        ),
-    ]

sapl/materia/migrations/0061_auto_20191120_1440.py

@@ -10,7 +10,7 @@ import sapl.utils
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('materia', '0060_auto_20190905_1134'),
+        ('materia', '0060_auto_20190930_1136'),
     ]
 
     operations = [

sapl/materia/migrations/0060_auto_20190905_1134.py → sapl/materia/migrations/0062_auto_20190905_1134.py

@@ -9,7 +9,7 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('materia', '0059_auto_20191001_1450'),
+        ('materia', '0061_auto_20191120_1440'),
     ]
 
     operations = [

sapl/materia/migrations/0061_auto_20190905_1135.py → sapl/materia/migrations/0063_auto_20190905_1135.py

@@ -37,7 +37,7 @@ def migra_tipos_turnos_tramitacao(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('materia', '0060_auto_20190905_1134'),
+        ('materia', '0062_auto_20190905_1134')
     ]
 
     operations = [

sapl/materia/migrations/0064_merge_20191121_1346.py

@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-11-21 16:46
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('materia', '0063_auto_20191010_1228'),
-        ('materia', '0061_auto_20191118_2036'),
-    ]
-
-    operations = [
-    ]

sapl/materia/migrations/0062_remove_tramitacao_turno.py → sapl/materia/migrations/0064_remove_tramitacao_turno.py

@@ -8,7 +8,7 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('materia', '0061_auto_20190905_1135'),
+        ('materia', '0063_auto_20190905_1135')
     ]
 
     operations = [

sapl/materia/migrations/0065_merge_20191204_1129.py

@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-12-04 14:29
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('materia', '0061_auto_20191120_1440'),
-        ('materia', '0064_merge_20191121_1346'),
-    ]
-
-    operations = [
-    ]

sapl/sessao/migrations/0048_auto_20190829_1253.py → sapl/sessao/migrations/0047_auto_20190829_1253.py

@@ -8,7 +8,8 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('sessao', '0047_merge_20191009_1535'),
+        ('sessao', '0046_auto_20190827_1228'),
+        ('sessao', '0046_auto_20191001_1115'),
     ]
 
     operations = [
@@ -27,4 +28,4 @@ class Migration(migrations.Migration):
             name='data_hora',
             field=models.DateTimeField(auto_now=True, null=True, verbose_name='Data/Hora'),
         ),
-    ]
+    ]

sapl/sessao/migrations/0047_merge_20191009_1535.py

@@ -2,7 +2,7 @@
 # Generated by Django 1.11.20 on 2019-10-09 18:35
 from __future__ import unicode_literals
 
-from django.db import migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

sapl/sessao/migrations/0048_auto_20191029_1418.py

@@ -10,7 +10,7 @@ import sapl.utils
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('sessao', '0047_merge_20191009_1535'),
+        ('sessao', '0047_auto_20190829_1253')
     ]
 
     operations = [

sapl/sessao/migrations/0051_merge_20191209_0910.py

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-10-09 18:35
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sessao', '0047_merge_20191009_1535'),
+        ('sessao', '0050_auto_20191029_1441')
+    ]