From 745cb4dc912f4a0aa28c04cdb3c72694184601c3 Mon Sep 17 00:00:00 2001
From: Eduardo Edson Batista Cordeiro Alves <eduardoalves@interlegis.leg.br>
Date: Thu, 25 Aug 2016 15:17:27 -0300
Subject: [PATCH] Fix relatorio pauta

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

diff --git a/sapl/relatorios/templates/pdf_sessao_plenaria_gerar.py b/sapl/relatorios/templates/pdf_sessao_plenaria_gerar.py
index 13b3ae8c5..54cf0be69 100644
--- a/sapl/relatorios/templates/pdf_sessao_plenaria_gerar.py
+++ b/sapl/relatorios/templates/pdf_sessao_plenaria_gerar.py
@@ -13,8 +13,8 @@ def cabecalho(inf_basicas_dic, imagem):
     """
     """
     tmp = ''
-    tmp += '\t\t\t\t<image x="2.1cm" y="25.7cm" width="59" height="62" file="' + \
-        imagem + '"/>\n'
+    # tmp += '\t\t\t\t<image x="2.1cm" y="25.7cm" width="59" height="62" file="' + \
+    #     imagem + '"/>\n'
     tmp += '\t\t\t\t<lines>2cm 25.4cm 19cm 25.4cm</lines>\n'
     tmp += '\t\t\t\t<setFont name="Helvetica-Bold" size="16"/>\n'
     tmp += '\t\t\t\t<drawString x="5cm" y="27.1cm">' + \
@@ -235,8 +235,8 @@ def votacao(lst_votacao):
         txt_ementa = votacao['txt_ementa'].replace('&', '&amp;')
         tmp += '<td><para style="P4">' + txt_ementa + '</para></td>\n'
         tmp += '<td><para style="P3"><b>' + \
-            votacao['nom_resultado'] + '</b></para>\n' + '<para style="P3">' + \
-            votacao['votacao_observacao'] + '</para></td></tr>\n'
+            str(votacao['nom_resultado']) + '</b></para>\n' + '<para style="P3">' + \
+            str(votacao['votacao_observacao']) + '</para></td></tr>\n'
 
     tmp += '\t\t</blockTable>\n'
     return tmp
diff --git a/sapl/relatorios/views.py b/sapl/relatorios/views.py
index 29b05bade..72dbd9797 100644
--- a/sapl/relatorios/views.py
+++ b/sapl/relatorios/views.py
@@ -564,7 +564,8 @@ def get_sessao_plenaria(sessao, casa):
             materia=expediente_materia.materia).first()
         if numeracao is not None:
             dic_expediente_materia["des_numeracao"] = (
-                str(numeracao.numero) + '/' + str(numeracao.ano))
+                str(numeracao.numero_materia) + '/' + str(
+                    numeracao.ano_materia))
 
         dic_expediente_materia["des_turno"] = ' '
         tram = Tramitacao.objects.filter(