From 6e73662b4d7111f0effc744605c11ee4e6c8fffa Mon Sep 17 00:00:00 2001
From: Ronan Tavares Camargo <ronan.camargo@centralit.com.br>
Date: Thu, 12 May 2016 15:14:50 -0300
Subject: [PATCH] Corrigindo erro de merge

---
 citgrp-patrimonio-web/src/main/resources/reports/BemPatrimonialAnaliticoUAeEndereco.jrxml | 237 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
 1 file changed, 70 insertions(+), 167 deletions(-)

diff --git a/citgrp-patrimonio-web/src/main/resources/reports/BemPatrimonialAnaliticoUAeEndereco.jrxml b/citgrp-patrimonio-web/src/main/resources/reports/BemPatrimonialAnaliticoUAeEndereco.jrxml
index 3efe3ad..50637bb 100644
--- a/citgrp-patrimonio-web/src/main/resources/reports/BemPatrimonialAnaliticoUAeEndereco.jrxml
+++ b/citgrp-patrimonio-web/src/main/resources/reports/BemPatrimonialAnaliticoUAeEndereco.jrxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 6.2.1.final using JasperReports Library version 6.2.1  -->
-<!-- 2016-05-10T10:18:03 -->
+<!-- 2016-05-12T15:13:42 -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BemPatrimonialAnaliticoUAeEndereco" language="groovy" pageWidth="555" pageHeight="802" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="9fdf75fd-580c-4f39-b59f-a80b7105f175">
 	<property name="ireport.zoom" value="1.8150000000000004"/>
 	<property name="ireport.x" value="0"/>
@@ -124,40 +124,31 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]>
 	<group name="ORGAO" isStartNewColumn="true">
 		<groupExpression><![CDATA[$F{idorgao}]]></groupExpression>
 		<groupHeader>
-			<band height="15" splitType="Prevent">
-				<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+			<band height="20" splitType="Prevent">
 				<textField>
-					<reportElement x="0" y="0" width="555" height="15" uuid="ca290805-90a4-480f-a2ff-0e93109e2240">
-						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
-					</reportElement>
-					<textElement verticalAlignment="Middle" markup="styled">
-						<font size="8"/>
-					</textElement>
+					<reportElement x="0" y="0" width="555" height="20" uuid="ca290805-90a4-480f-a2ff-0e93109e2240"/>
+					<textElement verticalAlignment="Middle" markup="styled"/>
 					<textFieldExpression><![CDATA["<b>Órgão: </b>" + $F{orgao}]]></textFieldExpression>
 				</textField>
 			</band>
 		</groupHeader>
 		<groupFooter>
-			<band height="17">
-				<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+			<band height="20">
 				<textField pattern="#,##0.00">
-					<reportElement mode="Transparent" x="482" y="0" width="71" height="17" backcolor="#CCCCCC" uuid="92d29dbc-10f4-4399-93e9-9c2df007cba6"/>
-					<box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
+					<reportElement mode="Transparent" x="482" y="0" width="71" height="20" backcolor="#CCCCCC" uuid="92d29dbc-10f4-4399-93e9-9c2df007cba6"/>
+					<box>
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
 						<bottomPen lineWidth="0.5"/>
 						<rightPen lineWidth="0.5"/>
 					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="6"/>
 						<paragraph rightIndent="3"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{TOTAL_GERAL_AQUISICAO}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement mode="Transparent" x="0" y="0" width="482" height="17" forecolor="#000000" backcolor="#CCCCCC" uuid="30c20b02-b6b6-40bd-a470-42e29f8f32ab">
-						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
-					</reportElement>
+					<reportElement mode="Transparent" x="0" y="0" width="482" height="20" forecolor="#000000" backcolor="#CCCCCC" uuid="30c20b02-b6b6-40bd-a470-42e29f8f32ab"/>
 					<box>
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -165,7 +156,7 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]>
 						<rightPen lineWidth="0.5"/>
 					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="7" isBold="true"/>
+						<font isBold="true"/>
 						<paragraph rightIndent="3"/>
 					</textElement>
 					<textFieldExpression><![CDATA["Total por Órgão:"]]></textFieldExpression>
@@ -176,40 +167,31 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]>
 	<group name="UG">
 		<groupExpression><![CDATA[$F{idgestora}]]></groupExpression>
 		<groupHeader>
-			<band height="15">
-				<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+			<band height="20">
 				<textField>
-					<reportElement x="0" y="0" width="555" height="15" uuid="9bc1859c-4340-4a65-b5ea-01e82822af03">
-						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
-					</reportElement>
-					<textElement verticalAlignment="Middle" markup="styled">
-						<font size="8"/>
-					</textElement>
+					<reportElement x="0" y="0" width="555" height="20" uuid="9bc1859c-4340-4a65-b5ea-01e82822af03"/>
+					<textElement verticalAlignment="Middle" markup="styled"/>
 					<textFieldExpression><![CDATA["<b>U.G.: </b>" + $F{gestora}]]></textFieldExpression>
 				</textField>
 			</band>
 		</groupHeader>
 		<groupFooter>
-			<band height="17">
-				<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+			<band height="20">
 				<textField pattern="#,##0.00">
-					<reportElement mode="Transparent" x="482" y="0" width="71" height="17" backcolor="#CCCCCC" uuid="7bbf63ea-7676-4ea2-bbd3-6fdb04a569fa"/>
-					<box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
+					<reportElement mode="Transparent" x="482" y="0" width="71" height="20" backcolor="#CCCCCC" uuid="7bbf63ea-7676-4ea2-bbd3-6fdb04a569fa"/>
+					<box>
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
 						<bottomPen lineWidth="0.5"/>
 						<rightPen lineWidth="0.5"/>
 					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="6"/>
 						<paragraph rightIndent="3"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{TOTAL_GERAL_AQUISICAO}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement mode="Transparent" x="0" y="0" width="482" height="17" forecolor="#000000" backcolor="#CCCCCC" uuid="022773ce-c9dc-4fb6-83fb-109fcb6c7f79">
-						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
-					</reportElement>
+					<reportElement mode="Transparent" x="0" y="0" width="482" height="20" forecolor="#000000" backcolor="#CCCCCC" uuid="022773ce-c9dc-4fb6-83fb-109fcb6c7f79"/>
 					<box>
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -217,7 +199,7 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]>
 						<rightPen lineWidth="0.5"/>
 					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="7" isBold="true"/>
+						<font isBold="true"/>
 						<paragraph rightIndent="3"/>
 					</textElement>
 					<textFieldExpression><![CDATA["Total por U.G.:"]]></textFieldExpression>
@@ -228,47 +210,36 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]>
 	<group name="UA">
 		<groupExpression><![CDATA[$F{estruturaadministrativaid}]]></groupExpression>
 		<groupHeader>
-			<band height="30">
-				<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+			<band height="39">
 				<textField>
-					<reportElement x="0" y="15" width="555" height="15" uuid="358a412c-642c-4489-9669-d3b9889a59e0"/>
-					<textElement verticalAlignment="Middle" markup="styled">
-						<font size="8"/>
-					</textElement>
+					<reportElement x="0" y="19" width="555" height="20" uuid="358a412c-642c-4489-9669-d3b9889a59e0"/>
+					<textElement verticalAlignment="Middle" markup="styled"/>
 					<textFieldExpression><![CDATA["<b>Responsável U.A: </b>" + ( $F{responsavelua} != null ? $F{responsavelua} : "" )]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement x="0" y="0" width="555" height="15" uuid="4fe698b9-7956-4bc7-81a9-5102582d037e">
-						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
-					</reportElement>
-					<textElement verticalAlignment="Middle" markup="styled">
-						<font size="8"/>
-					</textElement>
+					<reportElement x="0" y="0" width="555" height="20" uuid="4fe698b9-7956-4bc7-81a9-5102582d037e"/>
+					<textElement verticalAlignment="Middle" markup="styled"/>
 					<textFieldExpression><![CDATA["<b>Unidade Administrativa: </b>" + $F{estruturaadministrativa}]]></textFieldExpression>
 				</textField>
 			</band>
 		</groupHeader>
 		<groupFooter>
-			<band height="17">
-				<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+			<band height="20">
 				<textField pattern="#,##0.00">
-					<reportElement x="482" y="0" width="71" height="17" uuid="70897358-9542-440f-a085-23a5f063be61"/>
-					<box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
+					<reportElement x="482" y="0" width="71" height="20" uuid="70897358-9542-440f-a085-23a5f063be61"/>
+					<box>
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
 						<bottomPen lineWidth="0.5"/>
 						<rightPen lineWidth="0.5"/>
 					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="6"/>
 						<paragraph rightIndent="3"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{TOTAL_AQUISICAO_UA}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement mode="Transparent" x="0" y="0" width="482" height="17" backcolor="#CCCCCC" uuid="b34c3d88-44de-437d-a6bc-5126bae0a563">
-						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
-					</reportElement>
+					<reportElement mode="Transparent" x="0" y="0" width="482" height="20" backcolor="#CCCCCC" uuid="b34c3d88-44de-437d-a6bc-5126bae0a563"/>
 					<box>
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -276,7 +247,7 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]>
 						<rightPen lineWidth="0.5"/>
 					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="7" isBold="true"/>
+						<font isBold="true"/>
 						<paragraph rightIndent="3"/>
 					</textElement>
 					<textFieldExpression><![CDATA["Total por U.A.:"]]></textFieldExpression>
@@ -287,116 +258,87 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]>
 	<group name="UL">
 		<groupExpression><![CDATA[$F{estruturalocalizadoraid}]]></groupExpression>
 		<groupHeader>
-			<band height="45">
-				<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+			<band height="62">
 				<staticText>
-					<reportElement x="31" y="25" width="57" height="20" uuid="297476d7-a6a3-4ca7-b498-b668fdfc1807"/>
+					<reportElement x="31" y="32" width="57" height="30" uuid="297476d7-a6a3-4ca7-b498-b668fdfc1807"/>
 					<box>
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
 						<bottomPen lineWidth="0.5"/>
 						<rightPen lineWidth="0.5"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font size="7" isBold="true"/>
-					</textElement>
+					<textElement textAlignment="Center" verticalAlignment="Middle"/>
 					<text><![CDATA[Patrimônio]]></text>
 				</staticText>
 				<staticText>
-<<<<<<< HEAD
 					<reportElement x="88" y="32" width="125" height="30" uuid="7f75ae5e-1e4b-478a-83b2-45693bf9253a"/>
-=======
-					<reportElement x="88" y="25" width="180" height="20" uuid="7f75ae5e-1e4b-478a-83b2-45693bf9253a"/>
->>>>>>> tarefa-2359
 					<box>
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
 						<bottomPen lineWidth="0.5"/>
 						<rightPen lineWidth="0.5"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font size="7" isBold="true"/>
-					</textElement>
+					<textElement textAlignment="Center" verticalAlignment="Middle"/>
 					<text><![CDATA[Descrição]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="411" y="25" width="71" height="20" uuid="08955c0b-402a-4912-8154-765e9d62b149"/>
+					<reportElement x="411" y="32" width="71" height="30" uuid="08955c0b-402a-4912-8154-765e9d62b149"/>
 					<box>
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
 						<bottomPen lineWidth="0.5"/>
 						<rightPen lineWidth="0.5"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font size="7" isBold="true"/>
-					</textElement>
+					<textElement textAlignment="Center" verticalAlignment="Middle"/>
 					<text><![CDATA[Data Aquisição]]></text>
 				</staticText>
 				<staticText>
-<<<<<<< HEAD
 					<reportElement style="table" x="213" y="32" width="70" height="30" uuid="4d0449aa-a6a8-4f4b-90c4-d405271c1a9c"/>
-=======
-					<reportElement x="268" y="25" width="74" height="20" uuid="4d0449aa-a6a8-4f4b-90c4-d405271c1a9c"/>
->>>>>>> tarefa-2359
 					<box>
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
 						<bottomPen lineWidth="0.5"/>
 						<rightPen lineWidth="0.5"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font size="7" isBold="true"/>
-					</textElement>
+					<textElement textAlignment="Center" verticalAlignment="Middle"/>
 					<text><![CDATA[Stiuação Física]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="342" y="25" width="69" height="20" uuid="7785375d-eeed-40ed-81b2-702172084d2a"/>
+					<reportElement x="342" y="32" width="69" height="30" uuid="7785375d-eeed-40ed-81b2-702172084d2a"/>
 					<box>
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
 						<bottomPen lineWidth="0.5"/>
 						<rightPen lineWidth="0.5"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font size="7" isBold="true"/>
-					</textElement>
+					<textElement textAlignment="Center" verticalAlignment="Middle"/>
 					<text><![CDATA[Conta]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="482" y="25" width="71" height="20" uuid="1062e607-d314-484d-8184-6dd0f77148f8"/>
+					<reportElement x="482" y="32" width="71" height="30" uuid="1062e607-d314-484d-8184-6dd0f77148f8"/>
 					<box>
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
 						<bottomPen lineWidth="0.5"/>
 						<rightPen lineWidth="0.5"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font size="7" isBold="true"/>
-					</textElement>
+					<textElement textAlignment="Center" verticalAlignment="Middle"/>
 					<text><![CDATA[Valor de Aquisição]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="0" y="25" width="31" height="20" uuid="f3d3dd71-ca88-4b43-ba13-e14a3227f6a2">
-						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
-					</reportElement>
+					<reportElement x="0" y="32" width="31" height="30" uuid="f3d3dd71-ca88-4b43-ba13-e14a3227f6a2"/>
 					<box>
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
 						<bottomPen lineWidth="0.5"/>
 						<rightPen lineWidth="0.5"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font size="7" isBold="true"/>
-					</textElement>
+					<textElement textAlignment="Center" verticalAlignment="Middle"/>
 					<text><![CDATA[Item]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="0" y="10" width="555" height="15" uuid="d3137e58-c2c1-4263-a7bb-1065cf42550b">
-						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
-					</reportElement>
-					<textElement verticalAlignment="Middle" markup="styled">
-						<font size="8"/>
-					</textElement>
+					<reportElement x="0" y="10" width="555" height="20" uuid="d3137e58-c2c1-4263-a7bb-1065cf42550b"/>
+					<textElement verticalAlignment="Middle" markup="styled"/>
 					<textFieldExpression><![CDATA["<b>Endereço: </b>" + $F{endereco}]]></textFieldExpression>
 				</textField>
 				<staticText>
@@ -413,12 +355,9 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]>
 			</band>
 		</groupHeader>
 		<groupFooter>
-			<band height="17">
-				<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+			<band height="20">
 				<textField>
-					<reportElement mode="Transparent" x="0" y="0" width="482" height="17" backcolor="#CCCCCC" uuid="f2ea7bcc-11dc-4d86-b892-5452fa6de216">
-						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
-					</reportElement>
+					<reportElement mode="Transparent" x="0" y="0" width="482" height="20" backcolor="#CCCCCC" uuid="f2ea7bcc-11dc-4d86-b892-5452fa6de216"/>
 					<box>
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -426,23 +365,20 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]>
 						<rightPen lineWidth="0.5"/>
 					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="7" isBold="true"/>
+						<font isBold="true"/>
 						<paragraph rightIndent="3"/>
 					</textElement>
 					<textFieldExpression><![CDATA["Total por Endereço:"]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement x="482" y="0" width="71" height="17" uuid="47f022b0-eed0-40ca-bd4c-d67b4c250573">
-						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
-					</reportElement>
-					<box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
+					<reportElement x="482" y="0" width="71" height="20" uuid="47f022b0-eed0-40ca-bd4c-d67b4c250573"/>
+					<box>
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
 						<bottomPen lineWidth="0.5"/>
 						<rightPen lineWidth="0.5"/>
 					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="6"/>
 						<paragraph rightIndent="3"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{TOTAL_AQUISICAO_UL}]]></textFieldExpression>
@@ -454,115 +390,89 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]>
 		<band splitType="Stretch"/>
 	</background>
 	<detail>
-		<band height="17" splitType="Prevent">
-			<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+		<band height="20" splitType="Prevent">
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="31" y="0" width="57" height="17" uuid="7e0f9476-2de2-43b0-b73f-0bda736252ae"/>
-				<box topPadding="5" leftPadding="5" bottomPadding="5" rightPadding="5">
+				<reportElement stretchType="RelativeToTallestObject" x="31" y="0" width="57" height="20" uuid="7e0f9476-2de2-43b0-b73f-0bda736252ae"/>
+				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
 					<rightPen lineWidth="0.5"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="6"/>
-				</textElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{numeropatrimonial}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-<<<<<<< HEAD
 				<reportElement stretchType="RelativeToTallestObject" x="88" y="0" width="125" height="20" uuid="60b42d10-a6c2-448b-89d5-22cde01bc01d"/>
 				<box>
-=======
-				<reportElement stretchType="RelativeToTallestObject" x="88" y="0" width="180" height="17" uuid="60b42d10-a6c2-448b-89d5-22cde01bc01d"/>
-				<box topPadding="5" leftPadding="5" bottomPadding="5" rightPadding="5">
->>>>>>> tarefa-2359
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
 					<rightPen lineWidth="0.5"/>
 				</box>
 				<textElement verticalAlignment="Middle">
-					<font size="6"/>
+					<font size="9"/>
 					<paragraph leftIndent="2" rightIndent="2"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{materialdescricao} + " - " + $F{caracteristicamaterial}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="411" y="0" width="71" height="17" uuid="58f8d58e-eed6-4070-b28d-160a36fe99dc"/>
-				<box topPadding="5" leftPadding="5" bottomPadding="5" rightPadding="5">
+				<reportElement stretchType="RelativeToTallestObject" x="411" y="0" width="71" height="20" uuid="58f8d58e-eed6-4070-b28d-160a36fe99dc"/>
+				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
 					<rightPen lineWidth="0.5"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="6"/>
-				</textElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{dataaquisicao}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-<<<<<<< HEAD
 				<reportElement stretchType="RelativeToTallestObject" x="213" y="0" width="70" height="20" uuid="04dd801f-38ab-4df9-a9a8-fa4e34cdc0d8"/>
 				<box>
-=======
-				<reportElement stretchType="RelativeToTallestObject" x="268" y="0" width="74" height="17" uuid="04dd801f-38ab-4df9-a9a8-fa4e34cdc0d8"/>
-				<box topPadding="5" leftPadding="5" bottomPadding="5" rightPadding="5">
->>>>>>> tarefa-2359
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
 					<rightPen lineWidth="0.5"/>
 				</box>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font size="6"/>
 					<paragraph leftIndent="2"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{situacaofisica}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="482" y="0" width="71" height="17" uuid="30d1a2ec-a168-4e6b-b982-635e8aec1017"/>
-				<box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
+				<reportElement stretchType="RelativeToTallestObject" x="482" y="0" width="71" height="20" uuid="30d1a2ec-a168-4e6b-b982-635e8aec1017"/>
+				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
 					<rightPen lineWidth="0.5"/>
 				</box>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font size="6"/>
 					<paragraph rightIndent="3"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{valoraquisicao}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="31" height="17" uuid="dfa8c602-17b9-4091-b6c1-6c6235f6706b">
-					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
-				</reportElement>
-				<box topPadding="5" leftPadding="5" bottomPadding="5" rightPadding="5">
+				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="31" height="20" uuid="dfa8c602-17b9-4091-b6c1-6c6235f6706b"/>
+				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
 					<rightPen lineWidth="0.5"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="6"/>
-				</textElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$V{UL_COUNT}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="342" y="0" width="69" height="17" uuid="1f37cabe-8329-43c1-ad1b-326a56f07eb5"/>
-				<box topPadding="5" leftPadding="5" bottomPadding="5" rightPadding="5">
+				<reportElement stretchType="RelativeToTallestObject" x="342" y="0" width="69" height="20" uuid="1f37cabe-8329-43c1-ad1b-326a56f07eb5"/>
+				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
 					<rightPen lineWidth="0.5"/>
 				</box>
-<<<<<<< HEAD
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-=======
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font size="6"/>
->>>>>>> tarefa-2359
 					<paragraph leftIndent="2"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{contacontabil}]]></textFieldExpression>
@@ -583,12 +493,9 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]>
 		</band>
 	</detail>
 	<summary>
-		<band height="17">
-			<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+		<band height="20">
 			<textField>
-				<reportElement mode="Transparent" x="0" y="0" width="482" height="17" forecolor="#000000" backcolor="#CCCCCC" uuid="d6104a9e-2160-4570-bf52-41cd4c118a56">
-					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
-				</reportElement>
+				<reportElement mode="Transparent" x="0" y="0" width="482" height="20" forecolor="#000000" backcolor="#CCCCCC" uuid="d6104a9e-2160-4570-bf52-41cd4c118a56"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -596,21 +503,20 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]>
 					<rightPen lineWidth="0.5"/>
 				</box>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font size="7" isBold="true"/>
+					<font isBold="true"/>
 					<paragraph rightIndent="3"/>
 				</textElement>
 				<textFieldExpression><![CDATA["Total Geral:"]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement mode="Transparent" x="482" y="0" width="71" height="17" backcolor="#CCCCCC" uuid="478b456d-ba28-4b8e-89ae-6dffdfccab81"/>
-				<box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
+				<reportElement mode="Transparent" x="482" y="0" width="71" height="20" backcolor="#CCCCCC" uuid="478b456d-ba28-4b8e-89ae-6dffdfccab81"/>
+				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
 					<rightPen lineWidth="0.5"/>
 				</box>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font size="6"/>
 					<paragraph rightIndent="3"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{TOTAL_GERAL_AQUISICAO}]]></textFieldExpression>
@@ -618,14 +524,11 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]>
 		</band>
 	</summary>
 	<noData>
-		<band height="17">
-			<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+		<band height="20">
 			<staticText>
-				<reportElement x="0" y="0" width="555" height="17" uuid="068d2c48-e1b4-4a65-aedc-14223738c988">
-					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
-				</reportElement>
+				<reportElement x="0" y="0" width="555" height="20" uuid="068d2c48-e1b4-4a65-aedc-14223738c988"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="8" isBold="true"/>
+					<font isBold="true"/>
 				</textElement>
 				<text><![CDATA[Seção vazia]]></text>
 			</staticText>
--
libgit2 0.21.2