From 79efc588a41a0c7f148f374bede7536118ccd19c Mon Sep 17 00:00:00 2001 From: Victor Fabre Date: Fri, 6 Jul 2018 10:12:01 -0300 Subject: [PATCH] Fix #2054 (#2056) --- sapl/relatorios/views.py | 3 ++- sapl/templates/protocoloadm/comprovante.html | 18 +++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/sapl/relatorios/views.py b/sapl/relatorios/views.py index 0bad27889..28d6010e4 100644 --- a/sapl/relatorios/views.py +++ b/sapl/relatorios/views.py @@ -963,7 +963,8 @@ def get_etiqueta_protocolos(prots): dic['num_documento'] = '' for documento in DocumentoAdministrativo.objects.filter( protocolo=p): - dic['num_documento'] = str(documento) + dic['num_documento'] = documento.tipo.sigla + ' ' + \ + str(documento.numero) + '/' + str(documento.ano) dic['ident_processo'] = dic['num_materia'] or dic['num_documento'] diff --git a/sapl/templates/protocoloadm/comprovante.html b/sapl/templates/protocoloadm/comprovante.html index e4258c263..f4ec4cc62 100644 --- a/sapl/templates/protocoloadm/comprovante.html +++ b/sapl/templates/protocoloadm/comprovante.html @@ -70,15 +70,15 @@ Autor {{ protocolo.autor }} - {% else %} - - Assunto - {{ protocolo.assunto_ementa }} - - - Interessado - {{ protocolo.interessado }} - + {% else %} + + Assunto + {{ protocolo.assunto_ementa }} + + + Interessado + {{ protocolo.interessado }} + {% endif %} Natureza