diff --git a/sapl/materia/migrations/0029_auto_20180901_1628.py b/sapl/materia/migrations/0029_auto_20180901_1628.py new file mode 100644 index 000000000..defe6d2d0 --- /dev/null +++ b/sapl/materia/migrations/0029_auto_20180901_1628.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.13 on 2018-09-01 19:28 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('materia', '0028_auto_20180418_1629'), + ] + + operations = [ + migrations.AlterModelOptions( + name='regimetramitacao', + options={'verbose_name': 'Regime de Tramitação', 'verbose_name_plural': 'Regimes de Tramitação'}, + ), + ] diff --git a/sapl/materia/models.py b/sapl/materia/models.py index 2cb6b679b..80993aea3 100644 --- a/sapl/materia/models.py +++ b/sapl/materia/models.py @@ -1,4 +1,5 @@ +import reversion from django.contrib.auth.models import Group from django.contrib.contenttypes.fields import GenericRelation from django.contrib.contenttypes.models import ContentType @@ -9,7 +10,6 @@ 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,7 +20,6 @@ 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')] @@ -107,8 +106,8 @@ class RegimeTramitacao(models.Model): descricao = models.CharField(max_length=50, verbose_name=_('Descrição')) class Meta: - verbose_name = _('Regime Tramitação') - verbose_name_plural = _('Regimes Tramitação') + verbose_name = _('Regime de Tramitação') + verbose_name_plural = _('Regimes de Tramitação') def __str__(self): return self.descricao @@ -263,8 +262,8 @@ class MateriaLegislativa(models.Model): if self.ano and self.numero_protocolo: try: protocolo = Protocolo.objects.get( - ano=self.ano, - numero=self.numero_protocolo) + ano=self.ano, + numero=self.numero_protocolo) if protocolo.timestamp: return protocolo.timestamp.date() else: