diff --git a/sapl/base/views.py b/sapl/base/views.py index 3ec3a37a6..3174a275a 100644 --- a/sapl/base/views.py +++ b/sapl/base/views.py @@ -56,7 +56,7 @@ from sapl.parlamentares.models import (Parlamentar, Legislatura, Mandato, Filiac from sapl.protocoloadm.models import (Protocolo, TipoDocumentoAdministrativo, StatusTramitacaoAdministrativo, DocumentoAdministrativo, Anexado) -from sapl.sessao.models import (Bancada, PresencaOrdemDia, SessaoPlenaria, OrdemDia, +from sapl.sessao.models import (PresencaOrdemDia, SessaoPlenaria, OrdemDia, SessaoPlenariaPresenca, TipoSessaoPlenaria) from sapl.utils import (parlamentares_ativos, gerar_hash_arquivo, SEPARADOR_HASH_PROPOSICAO, show_results_filter_set, mail_service_configured, diff --git a/sapl/protocoloadm/migrations/0024_merge_20190821_1418.py b/sapl/protocoloadm/migrations/0024_merge_20190821_1418.py index 6bd5eea65..07543e7e9 100644 --- a/sapl/protocoloadm/migrations/0024_merge_20190821_1418.py +++ b/sapl/protocoloadm/migrations/0024_merge_20190821_1418.py @@ -9,7 +9,7 @@ class Migration(migrations.Migration): dependencies = [ ('protocoloadm', '0023_auto_20190711_1755'), - ('protocoloadm', '0023_merge_20190802_1112'), + ('protocoloadm', '0023_merge_20190802_1117'), ] operations = [