From 5593435d73a33e1c0f35cc308b9c6055383f9912 Mon Sep 17 00:00:00 2001
From: Talitha Pumar <tapumar@gmail.com>
Date: Mon, 16 Apr 2018 11:30:59 -0300
Subject: [PATCH] Fix #1838 (#1847)

---
 sapl/relatorios/templates/pdf_etiqueta_protocolo_gerar.py | 6 +++++-
 sapl/relatorios/views.py                                  | 5 +----
 2 files changed, 6 insertions(+), 5 deletions(-)

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<para style="P2"><b>' + \
                 dic['data'] + '</b></para>\n'
         tmp_data += '\t\t<para style="P2"><b>' + \
-            dic['natureza'] + '</b></para>\n'
+            dic['natureza']
+        if dic['ident_processo']:
+            tmp_data +=  ' - ' + dic['ident_processo'] + '</b></para>\n'
+        else:
+            tmp_data += '</b></para>\n'
 
     tmp_data += '\t</story>\n'
     return tmp_data
diff --git a/sapl/relatorios/views.py b/sapl/relatorios/views.py
index 00f33e44e..517e23229 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(