diff --git a/sigi/apps/convenios/reports.py b/sigi/apps/convenios/reports.py index 0cb0474..f873f2e 100644 --- a/sigi/apps/convenios/reports.py +++ b/sigi/apps/convenios/reports.py @@ -52,6 +52,12 @@ class ConvenioReport(ReportDefault): top=label_top, width=2 * cm, ), + Label( + text=_(u"Projeto"), + left=label_left[5] * cm, + top=label_top + 0.4 * cm, + width=2 * cm, + ), Label( text=_(u"Data do Convênio"), left=label_left[3] * cm, @@ -64,12 +70,6 @@ class ConvenioReport(ReportDefault): top=label_top, width=2 * cm, ), - Label( - text=_(u"Projeto"), - left=label_left[5] * cm, - top=label_top + 0.4 * cm, - width=2 * cm, - ), Label( text=_(u"Orgão"), left=label_left[6] * cm, @@ -98,6 +98,10 @@ class ConvenioReport(ReportDefault): attribute_name='num_convenio', left=label_left[2] * cm ), + ObjectValue( + attribute_name='projeto.sigla', + left=label_left[5] * cm + ), ObjectValue( attribute_name='data_retorno_assinatura', left=label_left[3] * cm, @@ -110,10 +114,6 @@ class ConvenioReport(ReportDefault): get_value=lambda instance: instance.data_pub_diario.strftime('%d/%m/%Y') if instance.data_pub_diario is not None else '-' ), - ObjectValue( - attribute_name='projeto.sigla', - left=label_left[5] * cm - ), ObjectValue( attribute_name='casa_legislativa.nome', left=label_left[6] * cm @@ -160,12 +160,6 @@ class ConvenioReportSemAceite(ConvenioReport): left=label_left[2] * cm, top=label_top, width=2 * cm, - ), - Label( - text=_(u"Data do Convênio"), - left=label_left[3] * cm, - top=label_top, - width=2 * cm, ), Label( text=_(u"Projeto"), @@ -173,6 +167,12 @@ class ConvenioReportSemAceite(ConvenioReport): top=label_top, width=2 * cm, ), + Label( + text=_(u"Data do Convênio"), + left=label_left[3] * cm, + top=label_top, + width=2 * cm, + ), Label( text=_(u"Orgão"), left=label_left[5] * cm, @@ -198,16 +198,16 @@ class ConvenioReportSemAceite(ConvenioReport): attribute_name='num_convenio', left=label_left[2] * cm ), + ObjectValue( + attribute_name='projeto.sigla', + left=label_left[4], + ), ObjectValue( attribute_name='data_retorno_assinatura', left=label_left[3] * cm, get_value=lambda instance: instance.data_retorno_assinatura.strftime('%d/%m/%Y') if instance.data_retorno_assinatura is not None else '-' ), - ObjectValue( - attribute_name='projeto.sigla', - left=label_left[4], - ), ObjectValue( attribute_name='casa_legislativa.nome', left=label_left[5] * cm