diff --git a/sapl/relatorios/templates/pdf_etiqueta_protocolo_gerar.py b/sapl/relatorios/templates/pdf_etiqueta_protocolo_gerar.py index 142065450..38057791f 100755 --- a/sapl/relatorios/templates/pdf_etiqueta_protocolo_gerar.py +++ b/sapl/relatorios/templates/pdf_etiqueta_protocolo_gerar.py @@ -96,7 +96,11 @@ def protocolos(lst_protocolos, dic_cabecalho): tmp_data += '\t\t' + \ dic['data'] + '\n' tmp_data += '\t\t' + \ - dic['natureza'] + '\n' + dic['natureza'] + if dic['ident_processo']: + tmp_data += ' - ' + dic['ident_processo'] + '\n' + else: + tmp_data += '\n' tmp_data += '\t\n' return tmp_data diff --git a/sapl/relatorios/views.py b/sapl/relatorios/views.py index b38077309..adfdaec37 100644 --- a/sapl/relatorios/views.py +++ b/sapl/relatorios/views.py @@ -955,10 +955,7 @@ def get_etiqueta_protocolos(prots): if p.tipo_processo == 0: dic['natureza'] = 'Administrativo' if p.tipo_processo == 1: - if dic['num_materia']: - dic['natureza'] = dic['num_materia'] - else: - dic['natureza'] = 'Legislativo' + dic['natureza'] = 'Legislativo' dic['num_documento'] = '' for documento in DocumentoAdministrativo.objects.filter(