Merge

protocoloadm/urls.py

@@ -37,8 +37,6 @@ urlpatterns = [
         include(DocumentoAcessorioAdministrativoCrud.get_urls())),
     url(r'^protocoloadm/status-tramitacao-adm/',
         include(StatusTramitacaoAdministrativoCrud.get_urls())),
-    url(r'^protocoloadm/tipo-instituicao/',
-        include(TipoInstituicaoCrud.get_urls())),
     url(r'^protocoloadm/protocolo-doc/',
         include(ProtocoloDocumentoCrud.get_urls())),
     url(r'^protocoloadm/protocolo-mat/',

templates/protocoloadm/proposicao_view.html.BACKUP.12159.html

@@ -1,7 +0,0 @@
-{% extends "protocoloadm/protocoloadm_detail.html" %}
-{% load i18n %}
-{% load crispy_forms_tags %}
-
-{% block detail_content %}
-	{{ form.as_p }}
-{% endblock detail_content %}

templates/protocoloadm/protocolo_filter.html

@@ -86,4 +86,4 @@
 
 {% endif %}
 
-{% endblock detail_content %}
+{% endblock detail_content %}