From 05e6a18ade939ab8fe70e33c1e1d8d0e4fab3a48 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 3 Sep 2018 15:48:00 -0300 Subject: [PATCH] =?UTF-8?q?HOT-FIX:=20concatena=C3=A7=C3=A3o=20de=20string?= =?UTF-8?q?=20da=20epigrafe=20de=20proposi=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/materia/models.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sapl/materia/models.py b/sapl/materia/models.py index 80993aea3..a43a798b0 100644 --- a/sapl/materia/models.py +++ b/sapl/materia/models.py @@ -1,5 +1,4 @@ -import reversion from django.contrib.auth.models import Group from django.contrib.contenttypes.fields import GenericRelation from django.contrib.contenttypes.models import ContentType @@ -10,6 +9,7 @@ from django.template import defaultfilters from django.utils import formats, timezone from django.utils.translation import ugettext_lazy as _ from model_utils import Choices +import reversion from sapl.base.models import SEQUENCIA_NUMERACAO, Autor from sapl.comissoes.models import Comissao @@ -20,6 +20,7 @@ from sapl.utils import (RANGE_ANOS, YES_NO_CHOICES, SaplGenericForeignKey, SaplGenericRelation, restringe_tipos_de_arquivo_txt, texto_upload_path) + EM_TRAMITACAO = [(1, 'Sim'), (0, 'Não')] @@ -776,7 +777,7 @@ class Proposicao(models.Model): def epigrafe(self): return _('%(tipo)s nº %(numero)s de %(data)s') % { 'tipo': self.tipo, - 'numero': self.numero, + 'numero': self.numero_proposicao, 'data': defaultfilters.date( self.data_envio if self.data_envio else timezone.now(), "d \d\e F \d\e Y"