diff --git a/sapl/sessao/migrations/0026_auto_20160926_1445.py b/sapl/sessao/migrations/0026_auto_20160926_1445.py new file mode 100644 index 000000000..6380bb8df --- /dev/null +++ b/sapl/sessao/migrations/0026_auto_20160926_1445.py @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-09-26 17:45 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('sessao', '0025_auto_20160919_1503'), + ] + + operations = [ + migrations.AlterField( + model_name='expedientemateria', + name='materia', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='materia.MateriaLegislativa', verbose_name='Matéria'), + ), + migrations.AlterField( + model_name='expedientemateria', + name='resultado', + field=models.TextField(blank=True, verbose_name='Resultado'), + ), + migrations.AlterField( + model_name='ordemdia', + name='materia', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='materia.MateriaLegislativa', verbose_name='Matéria'), + ), + migrations.AlterField( + model_name='ordemdia', + name='resultado', + field=models.TextField(blank=True, verbose_name='Resultado'), + ), + ] diff --git a/sapl/sessao/models.py b/sapl/sessao/models.py index 42d8d02ea..78ff6a410 100644 --- a/sapl/sessao/models.py +++ b/sapl/sessao/models.py @@ -140,12 +140,13 @@ class AbstractOrdemDia(models.Model): ) sessao_plenaria = models.ForeignKey(SessaoPlenaria) - materia = models.ForeignKey(MateriaLegislativa) + materia = models.ForeignKey(MateriaLegislativa, + verbose_name=_('Matéria')) data_ordem = models.DateField(verbose_name=_('Data da Sessão')) observacao = models.TextField( blank=True, verbose_name=_('Ementa')) numero_ordem = models.PositiveIntegerField(verbose_name=_('Nº Ordem')) - resultado = models.TextField(blank=True) + resultado = models.TextField(blank=True, verbose_name=_('Resultado')) tipo_votacao = models.PositiveIntegerField( verbose_name=_('Tipo de votação'), choices=TIPO_VOTACAO_CHOICES) votacao_aberta = models.NullBooleanField(