From 8e65e3f3205e16d2ef2b152536c546209b29c7f7 Mon Sep 17 00:00:00 2001
From: Cesar Carvalho <cesaraugc@gmail.com>
Date: Wed, 17 Apr 2019 14:37:15 -0300
Subject: [PATCH] Corrige CHOICES de tramitacao

---
 .../migrations/0036_auto_20190417_1432.py     | 20 +++++++++++++++++++
 sapl/base/models.py                           |  6 +-----
 .../migrations/0047_auto_20190417_1432.py     | 20 +++++++++++++++++++
 sapl/materia/models.py                        |  4 ++--
 4 files changed, 43 insertions(+), 7 deletions(-)
 create mode 100644 sapl/base/migrations/0036_auto_20190417_1432.py
 create mode 100644 sapl/materia/migrations/0047_auto_20190417_1432.py

diff --git a/sapl/base/migrations/0036_auto_20190417_1432.py b/sapl/base/migrations/0036_auto_20190417_1432.py
new file mode 100644
index 000000000..47720668a
--- /dev/null
+++ b/sapl/base/migrations/0036_auto_20190417_1432.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-04-17 17:32
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0035_auto_20190417_1009'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='appconfig',
+            name='sequencia_numeracao_protocolo',
+            field=models.CharField(choices=[('A', 'Sequencial por ano'), ('L', 'Sequencial por legislatura'), ('U', 'Sequencial único')], default='A', max_length=1, verbose_name='Sequência de numeração de protocolos'),
+        ),
+    ]
diff --git a/sapl/base/models.py b/sapl/base/models.py
index 5696749c9..eea9241d9 100644
--- a/sapl/base/models.py
+++ b/sapl/base/models.py
@@ -18,11 +18,7 @@ TIPO_DOCUMENTO_ADMINISTRATIVO = ((DOC_ADM_OSTENSIVO, _('Ostensiva')),
 RELATORIO_ATOS_ACESSADOS = (('S', _('Sim')),
                             ('N', _('Não')))
 
-SEQUENCIA_NUMERACAO = (('A', _('Sequencial por ano para cada autor')),
-                       ('L', _('Sequencial por legislatura')),
-                       ('U', _('Sequencial único')))
-
-SEQUENCIA_NUMERACAO_PROTOCOLO = (('A', _('Sequencial por ano para cada autor')),
+SEQUENCIA_NUMERACAO_PROTOCOLO = (('A', _('Sequencial por ano')),
                        ('L', _('Sequencial por legislatura')),
                        ('U', _('Sequencial único')))
 
diff --git a/sapl/materia/migrations/0047_auto_20190417_1432.py b/sapl/materia/migrations/0047_auto_20190417_1432.py
new file mode 100644
index 000000000..12783fe3a
--- /dev/null
+++ b/sapl/materia/migrations/0047_auto_20190417_1432.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-04-17 17:32
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('materia', '0046_auto_20190417_0941'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='tipomaterialegislativa',
+            name='sequencia_numeracao',
+            field=models.CharField(blank=True, choices=[('A', 'Sequencial por ano'), ('L', 'Sequencial por legislatura'), ('U', 'Sequencial único')], max_length=1, verbose_name='Sequência de numeração'),
+        ),
+    ]
diff --git a/sapl/materia/models.py b/sapl/materia/models.py
index c7aaaed15..db535e406 100644
--- a/sapl/materia/models.py
+++ b/sapl/materia/models.py
@@ -10,7 +10,7 @@ from django.utils.translation import ugettext_lazy as _
 from model_utils import Choices
 import reversion
 
-from sapl.base.models import SEQUENCIA_NUMERACAO, Autor
+from sapl.base.models import SEQUENCIA_NUMERACAO_PROTOCOLO, Autor
 from sapl.comissoes.models import Comissao
 from sapl.compilacao.models import (PerfilEstruturalTextoArticulado,
                                     TextoArticulado)
@@ -128,7 +128,7 @@ class TipoMateriaLegislativa(models.Model):
         max_length=1,
         blank=True,
         verbose_name=_('Sequência de numeração'),
-        choices=SEQUENCIA_NUMERACAO)
+        choices=SEQUENCIA_NUMERACAO_PROTOCOLO)
 
     sequencia_regimental = models.PositiveIntegerField(
         default=0,