Merge branch 'adm-1.16.0'

geovane.filho
2 parents 4b1a89fa 1663761b
Showing 24 changed files with 239 additions and 150 deletions Show diff stats
citgrp-patrimonio-api/src/main/java/br/com/centralit/api/dao/impl/HistoricoBemPatrimonialDaoHibernate.java
citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/BemPatrimonialServiceImpl.java
citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/EntradaServiceImpl.java
citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/HistoricoBemPatrimonialServiceImpl.java
citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/SaidaTemporariaServiceImpl.java
citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/TransferenciaServiceImpl.java
citgrp-patrimonio-web/src/main/java/br/com/centralit/controller/ReportEntradaController.java
citgrp-patrimonio-web/src/main/java/br/com/centralit/listener/StartupListenerPatrimonio.java
citgrp-patrimonio-web/src/main/resources/reports/termoResponsabilidade.jrxml
citgrp-patrimonio-web/src/main/resources/reports/termoResponsabilidadeColaborador.jrxml
citgrp-patrimonio-web/src/main/resources/reports/termoResponsabilidadeInventarioPorUL.jrxml
citgrp-patrimonio-web/src/main/resources/reports/termoResponsabilidadeUnidade.jrxml
citgrp-patrimonio-web/src/main/resources/reports/termoTransferencia.jrxml
citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/BemPatrimonialController.js
citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/EntradaListController.js
citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/directive/BuscaBensPatrimoniaisDirective.js
citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/directive/html/busca_avancada/abaGeral.html
citgrp-patrimonio-web/src/main/webapp/html/bemPatrimonial/bemPatrimonialEdit.html
citgrp-patrimonio-web/src/main/webapp/html/definicaoDetentor/definicaoDetentorEdit.html
citgrp-patrimonio-web/src/main/webapp/html/emissaoTermoResponsabilidade/emissaoTermoResponsabilidadeEdit.html
@@ -79,8 +79,8 @@ public class HistoricoBemPatrimonialDaoHibernate extends CitGenericDAOImpl imple
 		search.addFilterEqual("bemPatrimonial.id", idBemPatrimonial);
-		search.addSorts(Sort.desc("id"), Sort.desc("dataOperacao"));
-
+		search.addSorts(Sort.desc("dataOperacao"), Sort.desc("id"));
+		
 		return this.search(search, this.persistentClass);
 	}
@@ -649,7 +649,7 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl&lt;BemPatrimonial
 		}
 		// Verifica se é uma alteração pelo inventário
-		if (UtilObjeto.isReferencia(alteracaoBemVH.getDominioTipoAlteracaoIndividual()) && UtilObjeto.isReferencia(alteracaoBemVH.getDominioTipoAlteracaoIndividual()) && alteracaoBemVH.getDominioTipoAlteracaoIndividual().getCodigo().equals(Dominio.TIPO_ALTERACAO_BEM_PATRIMONIAL_INDIVIDUAL_INVENTARIO)) {
+		if (UtilObjeto.isReferencia(alteracaoBemVH.getDominioTipoAlteracaoIndividual()) && alteracaoBemVH.getDominioTipoAlteracaoIndividual().getCodigo().equals(Dominio.TIPO_ALTERACAO_BEM_PATRIMONIAL_INDIVIDUAL_INVENTARIO)) {
 			this.alterarBemPorInventario(alteracaoBemVH);
 		}
 	}
@@ -696,7 +696,7 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl&lt;BemPatrimonial
 				BemPatrimonialAlteracaoItem itemValorLiquido = new BemPatrimonialAlteracaoItem(campoValorLiquido, bemPatrimonial.getValorLiquido().toString(), alteracaoBemVH.getNovoValorBruto().toString());
 				itensAlterados.add(itemValorLiquido);
-				if (alteracaoBemVH.getVidaUtil() != null && ( bemPatrimonial.getVidaUtilRestante() != alteracaoBemVH.getVidaUtil() )) {
+				if (alteracaoBemVH.getVidaUtil() != null && ( bemPatrimonial.getVidaUtilRestante().intValue() != alteracaoBemVH.getVidaUtil().intValue() )) {
 					Dominio campoVidaUtilRestante = this.dominioService.findByChaveAndCodigo(DominioMaterial.CAMPO_REFERENCIA, DominioMaterial.CAMPO_REFERENCIA_BEM_PATRIMONIAL_VIDA_UTIL_RESTANTE_CODIGO);
 					BemPatrimonialAlteracaoItem itemVidaUtil = new BemPatrimonialAlteracaoItem(campoVidaUtilRestante, bemPatrimonial.getVidaUtilRestante().toString(), alteracaoBemVH.getVidaUtil().toString());
@@ -1078,7 +1078,7 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl&lt;BemPatrimonial
 			itensAlterados = new ArrayList<BemPatrimonialAlteracaoItem>();
 		}
-		if (alteracaoBemVH.getVidaUtil() != null && ( bemPatrimonial.getVidaUtilRestante() != alteracaoBemVH.getVidaUtil() )) {
+		if (alteracaoBemVH.getVidaUtil() != null && ( bemPatrimonial.getVidaUtilRestante().intValue() != alteracaoBemVH.getVidaUtil().intValue() )) {
 			Dominio campoVidaUtilRestante = this.dominioService.findByChaveAndCodigo(DominioMaterial.CAMPO_REFERENCIA, DominioMaterial.CAMPO_REFERENCIA_BEM_PATRIMONIAL_VIDA_UTIL_RESTANTE_CODIGO);
 			BemPatrimonialAlteracaoItem itemVidaUtil = new BemPatrimonialAlteracaoItem(campoVidaUtilRestante, bemPatrimonial.getVidaUtilRestante().toString(), alteracaoBemVH.getVidaUtil().toString());
@@ -1141,13 +1141,13 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl&lt;BemPatrimonial
 						caracAnterior.setValorMaterialCaracteristica(caracNova.getValorMaterialCaracteristica());
 					}
-					if (caracAnterior.getArquivo() != null && !caracAnterior.getArquivo().equals(caracNova.getArquivo())) {
+					if (caracAnterior.getArquivo() != null && !java.util.Arrays.equals(caracAnterior.getArquivo(),caracNova.getArquivo())) {
 						BemPatrimonialAlteracaoItem item = new BemPatrimonialAlteracaoItem(campoCarac, caracDescricao, caracAnterior.getArquivo(), caracNova.getArquivo());
 						if (item != null) {
 							itensCarac.add(item);
 						}
 						caracAnterior.setArquivo(caracNova.getArquivo());
-					} else if (caracNova.getArquivo() != null && !caracNova.getArquivo().equals(caracAnterior.getArquivo())) {
+					} else if (caracNova.getArquivo() != null && !java.util.Arrays.equals(caracNova.getArquivo(),caracAnterior.getArquivo())) {
 						BemPatrimonialAlteracaoItem item = new BemPatrimonialAlteracaoItem(campoCarac, caracDescricao, caracAnterior.getArquivo(), caracNova.getArquivo());
 						if (item != null) {
 							itensCarac.add(item);
@@ -1377,7 +1377,7 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl&lt;BemPatrimonial
 					bemPatrimonial.setNumeroPatrimonial(novoNumeroPatrimonial);
 					for (BemPatrimonialAlteracaoItem bemPatrimonialAlteracaoItem : itensAlterados) {
-						if(bemPatrimonialAlteracaoItem.getBemPatrimonial() != null && bemPatrimonialAlteracaoItem.getBemPatrimonial().getId() == bemPatrimonial.getId()){
+						if(bemPatrimonialAlteracaoItem.getBemPatrimonial() != null && bemPatrimonialAlteracaoItem.getBemPatrimonial().getId().doubleValue() == bemPatrimonial.getId().doubleValue()){
 							bemPatrimonialAlteracaoItem.setBemPatrimonial(bemPatrimonial);
 						}
 					}
@@ -1464,7 +1464,7 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl&lt;BemPatrimonial
 				BemPatrimonialAlteracaoItem itemValorLiquido = new BemPatrimonialAlteracaoItem(campoValorLiquido, bemPatrimonial.getValorLiquido().toString(), alteracaoBemVH.getNovoValorBruto().toString());
 				itensAlterados.add(itemValorLiquido);
-				if (alteracaoBemVH.getVidaUtil() != null && ( bemPatrimonial.getVidaUtilRestante() != alteracaoBemVH.getVidaUtil() )) {
+				if (alteracaoBemVH.getVidaUtil() != null && ( bemPatrimonial.getVidaUtilRestante().intValue() != alteracaoBemVH.getVidaUtil().intValue() )) {
 					Dominio campoVidaUtilRestante = this.dominioService.findByChaveAndCodigo(DominioMaterial.CAMPO_REFERENCIA, DominioMaterial.CAMPO_REFERENCIA_BEM_PATRIMONIAL_VIDA_UTIL_RESTANTE_CODIGO);
 					BemPatrimonialAlteracaoItem itemVidaUtil = new BemPatrimonialAlteracaoItem(campoVidaUtilRestante, bemPatrimonial.getVidaUtilRestante().toString(), alteracaoBemVH.getVidaUtil().toString());
@@ -638,27 +638,26 @@ public class EntradaServiceImpl extends GenericServiceImpl&lt;EntradaPatrimonio, Lo
 	 */
 	@Override
 	public boolean verificaExistenciaBensPatrimoniaisEntrada(Long idEntrada)  {
-		
 		EntradaPatrimonio entradaPatrimonio = find(idEntrada);
-		List<BemPatrimonialTemporario> bensPatrimoniaisTemporarios;
 		List<BemPatrimonial> bensPatrimoniais;
+		List<BemPatrimonialTemporario> bensPatrimoniaisTemporarios;
-		if(entradaPatrimonio.getEntradasIten() != null) {
-			
+		if(UtilObjeto.isReferencia(entradaPatrimonio.getEntradasIten()) && !entradaPatrimonio.getEntradasIten().isEmpty()) {
 			for (EntradaPatrimonioItem entradaPatrimonioItem : entradaPatrimonio.getEntradasIten()) {
-				bensPatrimoniaisTemporarios = bemPatrimonialTemporarioService.findAllByEntradaItemId(entradaPatrimonioItem.getId());
 				bensPatrimoniais = bemPatrimonialService.findAllByEntradaItemId(entradaPatrimonioItem.getId());
+				bensPatrimoniaisTemporarios = bemPatrimonialTemporarioService.findAllByEntradaItemId(entradaPatrimonioItem.getId());
-				if(bensPatrimoniaisTemporarios != null && !bensPatrimoniaisTemporarios.isEmpty()) {
+				if (!UtilObjeto.isReferencia(bensPatrimoniais) || bensPatrimoniais.isEmpty()) {
 					return false;
 				}
-				if(bensPatrimoniais == null || bensPatrimoniais.isEmpty()) {
+				if (UtilObjeto.isReferencia(bensPatrimoniaisTemporarios) && !bensPatrimoniaisTemporarios.isEmpty()) {
 					return false;
 				}
-				
 			}
+		} else {
+			return false;
 		}
 		return true;
 	}
@@ -1416,7 +1416,7 @@ public class HistoricoBemPatrimonialServiceImpl extends GenericServiceImpl&lt;Histo
 		historicoBemPrincipal.setDominioClasseReferencia(classeReferencia);
-		historicoBemPrincipal.setCodigoOperacao(adicaoBemPrincipal.getCodigo());
+		historicoBemPrincipal.setCodigoOperacao(adicaoBemPrincipal != null ? adicaoBemPrincipal.getCodigo() : null);
 		return this.save(historicoBemPrincipal);
@@ -487,9 +487,10 @@ public class SaidaTemporariaServiceImpl extends GenericServiceImpl&lt;SaidaTemporar
 			for (Iterator<SaidaTemporariaItem> iterator = saida.getSaidaTemporariaItens().iterator(); iterator.hasNext();) {
 				this.saidaTemporariaItemService.removeById(iterator.next().getId());
 			}
+			return super.removeById(saida.getId());
 		}
+		return false;
-		return super.removeById(saida.getId());
 	}
 	/**
@@ -249,7 +249,7 @@ public class TransferenciaServiceImpl extends GenericServiceImpl&lt;Transferencia, 
 				} else {
 					boolean salvarNovaTransferencia = true;
 					for (TransferenciaItem transferenciaItemTemp : transferenciaItemListTemp) {
-						if(transferenciaItemTemp.getEstruturaOrganizacionalOrigem().getId() == transferencia.getEstruturaOrganizacionalDestino().getId()){
+						if(transferenciaItemTemp.getEstruturaOrganizacionalOrigem().getId().doubleValue() == transferencia.getEstruturaOrganizacionalDestino().getId().doubleValue()){
 							salvarNovaTransferencia = false;
 							break;
 						}
@@ -271,7 +271,7 @@ public class TransferenciaServiceImpl extends GenericServiceImpl&lt;Transferencia, 
 			boolean salvarNovaTransferencia = true;
 			for (TransferenciaItem transferenciaItemTemp : transferenciaItemListTemp) {
-				if(transferenciaItemTemp.getEstruturaOrganizacionalOrigem().getId() == transferencia.getEstruturaOrganizacionalDestino().getId()){
+				if(transferenciaItemTemp.getEstruturaOrganizacionalOrigem().getId().doubleValue() == transferencia.getEstruturaOrganizacionalDestino().getId().doubleValue()){
 					salvarNovaTransferencia = false;
 					break;
 				}
@@ -217,7 +217,7 @@ public class ReportEntradaController extends GenericController&lt;Entrada&gt; {
 			//Inicio relatorio de resumo
 			input = this.getClass().getResourceAsStream("/reports/templateRetratoRepeat.jrxml");
 			inputSub = this.getClass().getResourceAsStream("/reports/entradaPatrimonioBensResumoContabil.jrxml");
-			String titulo = this.internacionalizacaoService.getTranslate("LABEL.TITULO_ENTRADA_PATRIMONIO_RESUMO_CONTABIL", this.getIdioma());
+			String titulo = this.internacionalizacaoService.getTranslate("PATRIMONIO.LABEL.TITULO_ENTRADA_PATRIMONIO_RESUMO_CONTABIL", this.getIdioma());
 			JasperDesign jasperDesign = JRXmlLoader.load(input);
 			JasperDesign jasperDesignSubResumo = JRXmlLoader.load(inputSub);
@@ -319,7 +319,7 @@ public class ReportEntradaController extends GenericController&lt;Entrada&gt; {
 			//Inicio relatorio de resumo
 			input = this.getClass().getResourceAsStream("/reports/templateRetratoRepeat.jrxml");
 			inputSub = this.getClass().getResourceAsStream("/reports/entradaPatrimonioBensResumoContabil.jrxml");
-			String titulo = this.internacionalizacaoService.getTranslate("LABEL.TITULO_ENTRADA_PATRIMONIO_RESUMO_CONTABIL", this.getIdioma());
+			String titulo = this.internacionalizacaoService.getTranslate("PATRIMONIO.LABEL.TITULO_ENTRADA_PATRIMONIO_RESUMO_CONTABIL", this.getIdioma());
 			JasperDesign jasperDesign = JRXmlLoader.load(input);
 			JasperDesign jasperDesignSubResumo = JRXmlLoader.load(inputSub);
@@ -408,6 +408,7 @@ public class StartupListenerPatrimonio extends UtilStartup implements Applicatio
 		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.LABEL.TITULO_BEM_PATRIMONIAL_ANALITICO_UA_ENDERECO", "Relatório Analítico de Bens Móveis (Ordenado por Descrição - Agrupado por U.A./Endereço)", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.LABEL.TITULO_BEM_PATRIMONIAL_FICHA_INDIVIDUAL", "Ficha Individual do Bem", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.LABEL.TITULO_ENTRADA_PATRIMONIO_ANALITICO", "Entrada de Materiais - Analítico", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.LABEL.TITULO_ENTRADA_PATRIMONIO_RESUMO_CONTABIL", "Resumo por Código Contábil", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.LABEL.TITULO_ENTRADA_PATRIMONIO_SINTETICO", "Entrada de Materiais - Sintético", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.LABEL.TITULO_INVENTARIO_ANALITICO", "Relatório de Inventário Geral Agrupado por Conta Contábil Analítico", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.LABEL.TITULO_INVENTARIO_BENS_ENCONTRADOS_EXTRAVIADO", "Bens Encontrados com Status Extraviado", dominio, modulo));
@@ -579,6 +580,11 @@ public class StartupListenerPatrimonio extends UtilStartup implements Applicatio
 		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.LABEL.TRANSFERENCIA_CANCELADA", "Transferência cancelada", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.LABEL.ALTERAR_STATUS", "Alteração de status", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.LABEL.BUSCA_INTERVALO_NUM_PATRIMONIAL", "Filtrar por intervalo de número patrimonial", dominio, modulo));
+		
+		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.LABEL.BEM_STATUS_ATIVO", "Ativos", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.LABEL.BEM_STATUS_BAIXADO", "Baixados", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.LABEL.BEM_STATUS_OUTROS", "Outros", dominio, modulo));
+		
 	}
@@ -644,6 +650,7 @@ public class StartupListenerPatrimonio extends UtilStartup implements Applicatio
 		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.VALIDACAO.ESTRUTURA_ORGANIZACIONAL", "Detentor não possui estrutura organizacional vinculada em seu cadastro. Por gentileza, preencha tal informação para prosseguir.", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.VALIDACAO.REMOVER_TODOS_ITEM_TRASNFERENCIA", "Não é permitido remover todos itens da transferência. Caso queira remover todos os bem, favor excluir a transferência.", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.VALIDACAO.TRANSFERENCIA_ITEM_SEM_EO_ORIGEM", "O seguinte item não possui Estrutura Organizacional de Origem: ", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.VALIDACAO.INFORME_OUTRO_STATUS_BEM_PATRIMONIAL", "Informe o status do bem patrimonial.", dominio, modulo));
 	}
 	private void gerarMensagem(Dominio dominio, Modulo modulo, List<Internacionalizacao> internacionalizacaoList) {
@@ -750,6 +757,13 @@ public class StartupListenerPatrimonio extends UtilStartup implements Applicatio
 		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.MSG.CARREGAR_VIDA_UTIL_CONTA_CONTABIL", "Carregar vida útil configurada na conta contábil do material", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.MSG.CARREGAR_TAXA_RESIDUAL_CONTA_CONTABIL", "Carregar taxa residual configurada na conta contábil do material", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("VALIDACAO.DEFINICAO_DETENTOR_ANTERIOR_ULTIMA_OPERACAO", "Você não pode definir um detentor de um bem patrimonial com data anterior a da última operação do bem! Verifique a operação: ", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.MSG.CONFIRMA_AUMENTAR_VIDA_UTIL", "Tem certeza que deseja aumentar a vida útil restante do bem?", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.MSG.CONFIRMA_DIMINUIR_VIDA_UTIL", "Tem certeza que deseja diminuir a vida útil restante do bem?", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.MSG.NOVO_VALOR_REAVALIACAO", "O novo valor deve ser maior que o valor atual!", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.MSG.NOVO_VALOR_REDUCAO", "O novo valor deve ser menor que o valor atual!", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("CODIGOERRO.NOVO_VALOR_REDUCAO", "O novo valor deve ser menor que o valor atual!", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("CODIGOERRO.NOVO_VALOR_REAVALIACAO", "O novo valor deve ser maior que o valor atual!", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("CODIGOERRO.NOVO_VALOR_RESIDUAL", "Novo valor residual não pode ser maior que o valor líquido atual do bem!", dominio, modulo));
 	}
 }
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2  -->
+<!-- 2016-05-17T16:51: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="termoTransferencia" language="groovy" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="540" leftMargin="10" rightMargin="45" topMargin="20" bottomMargin="20" uuid="0c479051-3a36-4140-9683-aff6988775ce">
 	<property name="ireport.zoom" value="2.0"/>
 	<property name="ireport.x" value="0"/>
@@ -225,7 +227,7 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
 				</textElement>
 				<textFieldExpression><![CDATA[$F{situacaofisica}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="#,##0.00">
+			<textField isStretchWithOverflow="true" pattern="¤ #,##0.00">
 				<reportElement stretchType="RelativeToTallestObject" x="445" y="0" width="95" height="17" uuid="b1210e79-0a51-483c-b295-aa7fdf18d78b"/>
 				<box>
 					<pen lineWidth="0.5"/>
@@ -270,14 +272,14 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
 			</textField>
 			<textField isStretchWithOverflow="true">
 				<reportElement stretchType="RelativeToTallestObject" x="117" y="0" width="250" height="17" uuid="3ca60464-c7c0-4cf8-b1d7-fea0cbc41286"/>
-				<box>
+				<box topPadding="3" leftPadding="3" bottomPadding="3" rightPadding="3">
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
 					<rightPen lineWidth="0.5"/>
 				</box>
-				<textElement verticalAlignment="Top">
+				<textElement>
 					<font size="6"/>
 					<paragraph leftIndent="2" rightIndent="2" spacingBefore="2"/>
 				</textElement>
@@ -313,7 +315,7 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
 			<staticText>
 				<reportElement x="8" y="65" width="151" height="20" uuid="8062196d-7611-417a-80c6-8c660c62dfb9"/>
 				<textElement textAlignment="Center">
-					<font size="8"/>
+					<font size="7"/>
 				</textElement>
 				<text><![CDATA[ ____/____/________]]></text>
 			</staticText>
@@ -323,7 +325,7 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
 			<staticText>
 				<reportElement x="193" y="64" width="151" height="20" uuid="82461d39-28b0-4b90-a9ad-01302eb5446a"/>
 				<textElement textAlignment="Center">
-					<font size="8"/>
+					<font size="7"/>
 				</textElement>
 				<text><![CDATA[ ____/____/________]]></text>
 			</staticText>
@@ -337,7 +339,7 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
 			<staticText>
 				<reportElement x="380" y="65" width="151" height="20" uuid="d02d328f-07c3-4648-8316-1507f5321724"/>
 				<textElement textAlignment="Center">
-					<font size="8"/>
+					<font size="7"/>
 				</textElement>
 				<text><![CDATA[ ____/____/________]]></text>
 			</staticText>
@@ -369,7 +371,7 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
 				</textElement>
 				<text><![CDATA[Total Geral:]]></text>
 			</staticText>
-			<textField isStretchWithOverflow="true" pattern="#,##0.00">
+			<textField isStretchWithOverflow="true" pattern="¤ #,##0.00">
 				<reportElement x="445" y="0" width="95" height="15" uuid="f289f8a4-a0bf-4dfb-b215-4b930d61645d"/>
 				<box leftPadding="0" rightPadding="5">
 					<pen lineWidth="0.5"/>
@@ -386,11 +388,13 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
 		</band>
 	</summary>
 	<noData>
-		<band height="20">
+		<band height="17">
 			<staticText>
-				<reportElement x="0" y="0" width="540" height="20" uuid="900d7ffc-b1e5-4c92-a0c1-a6f2c49dcceb"/>
+				<reportElement x="0" y="0" width="540" height="17" uuid="900d7ffc-b1e5-4c92-a0c1-a6f2c49dcceb">
+					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font isBold="true"/>
+					<font size="8" isBold="true"/>
 				</textElement>
 				<text><![CDATA[Seção vazia]]></text>
 			</staticText>
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2  -->
+<!-- 2016-05-17T16:49:21 -->
 <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="termoTransferencia" language="groovy" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="540" leftMargin="10" rightMargin="45" topMargin="20" bottomMargin="20" uuid="0c479051-3a36-4140-9683-aff6988775ce">
 	<property name="ireport.zoom" value="1.7715610000000017"/>
 	<property name="ireport.x" value="0"/>
@@ -242,7 +244,7 @@ ORDER BY bemPatrimonial.numeroPatrimonial]]&gt;
 				</textElement>
 				<textFieldExpression><![CDATA[$F{situacaofisica}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="#,##0.00">
+			<textField isStretchWithOverflow="true" pattern="¤ #,##0.00">
 				<reportElement stretchType="RelativeToTallestObject" x="455" y="0" width="84" height="17" uuid="b1210e79-0a51-483c-b295-aa7fdf18d78b"/>
 				<box leftPadding="0" rightPadding="5">
 					<pen lineWidth="1.0"/>
@@ -286,7 +288,7 @@ ORDER BY bemPatrimonial.numeroPatrimonial]]&gt;
 			</textField>
 			<textField isStretchWithOverflow="true">
 				<reportElement stretchType="RelativeToTallestObject" x="114" y="0" width="275" height="17" uuid="3ca60464-c7c0-4cf8-b1d7-fea0cbc41286"/>
-				<box leftPadding="5">
+				<box topPadding="3" leftPadding="3" bottomPadding="3" rightPadding="3">
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
@@ -322,7 +324,7 @@ ORDER BY bemPatrimonial.numeroPatrimonial]]&gt;
 			<staticText>
 				<reportElement x="9" y="68" width="151" height="20" uuid="96c7b0f7-6df1-4b3d-b402-6acf9ee84373"/>
 				<textElement textAlignment="Center">
-					<font size="8"/>
+					<font size="7"/>
 				</textElement>
 				<text><![CDATA[ ____/____/________]]></text>
 			</staticText>
@@ -336,7 +338,7 @@ ORDER BY bemPatrimonial.numeroPatrimonial]]&gt;
 			<staticText>
 				<reportElement x="381" y="68" width="151" height="20" uuid="58f799a1-1ca5-4818-98c1-f83290a72990"/>
 				<textElement textAlignment="Center">
-					<font size="8"/>
+					<font size="7"/>
 				</textElement>
 				<text><![CDATA[ ____/____/________]]></text>
 			</staticText>
@@ -346,7 +348,7 @@ ORDER BY bemPatrimonial.numeroPatrimonial]]&gt;
 			<staticText>
 				<reportElement x="194" y="67" width="151" height="20" uuid="65f5bc7b-eb27-4b02-b5e7-2aec69805c58"/>
 				<textElement textAlignment="Center">
-					<font size="8"/>
+					<font size="7"/>
 				</textElement>
 				<text><![CDATA[ ____/____/________]]></text>
 			</staticText>
@@ -380,12 +382,12 @@ ORDER BY bemPatrimonial.numeroPatrimonial]]&gt;
 					<bottomPen lineWidth="1.0"/>
 					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Right">
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="7" isBold="true"/>
 				</textElement>
 				<text><![CDATA[Total Geral:]]></text>
 			</staticText>
-			<textField pattern="#,##0.00">
+			<textField pattern="¤ #,##0.00">
 				<reportElement x="455" y="0" width="84" height="15" uuid="f612d70d-1255-41f5-9b55-37079653d5e0"/>
 				<box leftPadding="0" rightPadding="5">
 					<pen lineWidth="1.0"/>
@@ -402,11 +404,13 @@ ORDER BY bemPatrimonial.numeroPatrimonial]]&gt;
 		</band>
 	</summary>
 	<noData>
-		<band height="20">
+		<band height="17">
 			<staticText>
-				<reportElement x="0" y="0" width="540" height="20" uuid="3d36021c-a694-4cb2-8199-781c472d5fa2"/>
+				<reportElement x="0" y="0" width="540" height="17" uuid="3d36021c-a694-4cb2-8199-781c472d5fa2">
+					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font isBold="true" isPdfEmbedded="true"/>
+					<font size="8" isBold="true" isPdfEmbedded="true"/>
 				</textElement>
 				<text><![CDATA[Seção Vazia]]></text>
 			</staticText>
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2  -->
+<!-- 2016-05-17T15:54:52 -->
 <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="termoResponsabilidadeInventarioPorUL" language="groovy" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="575" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" uuid="0c479051-3a36-4140-9683-aff6988775ce">
 	<property name="ireport.zoom" value="1.5"/>
 	<property name="ireport.x" value="0"/>
@@ -70,9 +72,11 @@ WHERE I.ID = $P{idInventario} AND EO.ID = $P{idUnidade}]]&gt;
 	<group name="Inventario">
 		<groupExpression><![CDATA[$P{idInventario}]]></groupExpression>
 		<groupHeader>
-			<band height="20">
+			<band height="22">
 				<staticText>
-					<reportElement x="0" y="5" width="30" height="15" uuid="aa294020-2029-4f59-b3ad-5bc0bf803400"/>
+					<reportElement x="0" y="5" width="30" height="17" uuid="aa294020-2029-4f59-b3ad-5bc0bf803400">
+						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+					</reportElement>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -86,7 +90,7 @@ WHERE I.ID = $P{idInventario} AND EO.ID = $P{idUnidade}]]&gt;
 					<text><![CDATA[Item]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="30" y="5" width="59" height="15" uuid="7d1ad9ec-3cd6-4f75-8dd2-c24398e4559c"/>
+					<reportElement x="30" y="5" width="59" height="17" uuid="7d1ad9ec-3cd6-4f75-8dd2-c24398e4559c"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -100,7 +104,7 @@ WHERE I.ID = $P{idInventario} AND EO.ID = $P{idUnidade}]]&gt;
 					<text><![CDATA[Patrimônio]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="89" y="5" width="281" height="15" uuid="4f988f4b-9798-4381-97ec-ea456291c1a2"/>
+					<reportElement x="89" y="5" width="281" height="17" uuid="4f988f4b-9798-4381-97ec-ea456291c1a2"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -114,7 +118,7 @@ WHERE I.ID = $P{idInventario} AND EO.ID = $P{idUnidade}]]&gt;
 					<text><![CDATA[Descrição]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="370" y="5" width="66" height="15" uuid="30076d94-4ed8-4a74-ac4f-e7125f4b5d91"/>
+					<reportElement x="370" y="5" width="66" height="17" uuid="30076d94-4ed8-4a74-ac4f-e7125f4b5d91"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -128,7 +132,7 @@ WHERE I.ID = $P{idInventario} AND EO.ID = $P{idUnidade}]]&gt;
 					<text><![CDATA[Sit. física]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="436" y="5" width="73" height="15" uuid="e938fda5-ac45-4f7b-b6ea-9bbf5d3dd085"/>
+					<reportElement x="436" y="5" width="73" height="17" uuid="e938fda5-ac45-4f7b-b6ea-9bbf5d3dd085"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -142,7 +146,7 @@ WHERE I.ID = $P{idInventario} AND EO.ID = $P{idUnidade}]]&gt;
 					<text><![CDATA[Valor aquisição]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="509" y="5" width="66" height="15" uuid="e9efa9f7-9d89-4890-8f81-b1b761f66d31"/>
+					<reportElement x="509" y="5" width="66" height="17" uuid="e9efa9f7-9d89-4890-8f81-b1b761f66d31"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -229,7 +233,7 @@ WHERE I.ID = $P{idInventario} AND EO.ID = $P{idUnidade}]]&gt;
 				</textElement>
 				<textFieldExpression><![CDATA[$F{situacaofisica}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="#,##0.00">
+			<textField isStretchWithOverflow="true" pattern="¤ #,##0.00">
 				<reportElement stretchType="RelativeToTallestObject" x="436" y="0" width="73" height="17" uuid="b1210e79-0a51-483c-b295-aa7fdf18d78b"/>
 				<box leftPadding="0" rightPadding="5">
 					<pen lineWidth="1.0"/>
@@ -243,7 +247,7 @@ WHERE I.ID = $P{idInventario} AND EO.ID = $P{idUnidade}]]&gt;
 				</textElement>
 				<textFieldExpression><![CDATA[$F{valoraquisicao}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="#,##0.00">
+			<textField isStretchWithOverflow="true" pattern="¤ #,##0.00">
 				<reportElement stretchType="RelativeToTallestObject" x="509" y="0" width="66" height="17" uuid="49e6b325-2ff2-4e1e-9cdf-b428c8758844"/>
 				<box leftPadding="0" rightPadding="5">
 					<pen lineWidth="1.0"/>
@@ -287,7 +291,7 @@ WHERE I.ID = $P{idInventario} AND EO.ID = $P{idUnidade}]]&gt;
 			</textField>
 			<textField isStretchWithOverflow="true">
 				<reportElement stretchType="RelativeToTallestObject" x="89" y="0" width="281" height="17" uuid="3ca60464-c7c0-4cf8-b1d7-fea0cbc41286"/>
-				<box leftPadding="5">
+				<box topPadding="3" leftPadding="3" bottomPadding="3" rightPadding="3">
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
@@ -417,7 +421,7 @@ WHERE I.ID = $P{idInventario} AND EO.ID = $P{idUnidade}]]&gt;
 	</lastPageFooter>
 	<summary>
 		<band height="15" splitType="Stretch">
-			<textField pattern="#,##0.00">
+			<textField pattern="¤ #,##0.00">
 				<reportElement x="509" y="0" width="66" height="15" uuid="f289f8a4-a0bf-4dfb-b215-4b930d61645d"/>
 				<box leftPadding="0" rightPadding="5">
 					<pen lineWidth="1.0"/>
@@ -431,7 +435,7 @@ WHERE I.ID = $P{idInventario} AND EO.ID = $P{idUnidade}]]&gt;
 				</textElement>
 				<textFieldExpression><![CDATA[$V{totalValorLiquido}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00">
+			<textField pattern="¤ #,##0.00">
 				<reportElement x="436" y="0" width="73" height="15" uuid="ea2584d5-fab7-4341-afda-7a19d18b3c6f"/>
 				<box leftPadding="0" rightPadding="5">
 					<pen lineWidth="1.0"/>
@@ -454,7 +458,7 @@ WHERE I.ID = $P{idInventario} AND EO.ID = $P{idUnidade}]]&gt;
 					<bottomPen lineWidth="0.0"/>
 					<rightPen lineWidth="0.0"/>
 				</box>
-				<textElement textAlignment="Right">
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="7" isBold="true"/>
 				</textElement>
 				<text><![CDATA[Total (R$)]]></text>
@@ -462,11 +466,13 @@ WHERE I.ID = $P{idInventario} AND EO.ID = $P{idUnidade}]]&gt;
 		</band>
 	</summary>
 	<noData>
-		<band height="20">
+		<band height="17">
 			<staticText>
-				<reportElement x="1" y="0" width="539" height="20" uuid="ad3f5bab-6291-42dd-a975-8e41d7f9a7e9"/>
+				<reportElement x="1" y="0" width="539" height="17" uuid="ad3f5bab-6291-42dd-a975-8e41d7f9a7e9">
+					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font isBold="true"/>
+					<font size="8" isBold="true"/>
 				</textElement>
 				<text><![CDATA[Seção Vazia]]></text>
 			</staticText>
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2  -->
+<!-- 2016-05-17T15:44:54 -->
 <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="termoTransferencia" language="groovy" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="575" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" uuid="0c479051-3a36-4140-9683-aff6988775ce">
 	<property name="ireport.zoom" value="1.5394743546921208"/>
 	<property name="ireport.x" value="0"/>
@@ -121,9 +123,11 @@ OR T.DATAFIM IS NULL
 	<group name="Termo">
 		<groupExpression><![CDATA[$P{idTermo}]]></groupExpression>
 		<groupHeader>
-			<band height="20">
+			<band height="21">
 				<staticText>
-					<reportElement x="0" y="5" width="30" height="15" uuid="aa294020-2029-4f59-b3ad-5bc0bf803400"/>
+					<reportElement x="0" y="5" width="30" height="16" uuid="aa294020-2029-4f59-b3ad-5bc0bf803400">
+						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+					</reportElement>
 					<box>
 						<pen lineWidth="0.5"/>
 						<topPen lineWidth="0.5"/>
@@ -137,7 +141,7 @@ OR T.DATAFIM IS NULL
 					<text><![CDATA[Item]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="30" y="5" width="59" height="15" uuid="7d1ad9ec-3cd6-4f75-8dd2-c24398e4559c"/>
+					<reportElement x="30" y="5" width="59" height="16" uuid="7d1ad9ec-3cd6-4f75-8dd2-c24398e4559c"/>
 					<box>
 						<pen lineWidth="0.5"/>
 						<topPen lineWidth="0.5"/>
@@ -151,7 +155,7 @@ OR T.DATAFIM IS NULL
 					<text><![CDATA[Patrimônio]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="89" y="5" width="281" height="15" uuid="4f988f4b-9798-4381-97ec-ea456291c1a2"/>
+					<reportElement x="89" y="5" width="281" height="16" uuid="4f988f4b-9798-4381-97ec-ea456291c1a2"/>
 					<box>
 						<pen lineWidth="0.5"/>
 						<topPen lineWidth="0.5"/>
@@ -165,7 +169,7 @@ OR T.DATAFIM IS NULL
 					<text><![CDATA[Descrição]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="370" y="5" width="66" height="15" uuid="30076d94-4ed8-4a74-ac4f-e7125f4b5d91"/>
+					<reportElement x="370" y="5" width="66" height="16" uuid="30076d94-4ed8-4a74-ac4f-e7125f4b5d91"/>
 					<box>
 						<pen lineWidth="0.5"/>
 						<topPen lineWidth="0.5"/>
@@ -179,7 +183,7 @@ OR T.DATAFIM IS NULL
 					<text><![CDATA[Sit. Física]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="436" y="5" width="73" height="15" uuid="e938fda5-ac45-4f7b-b6ea-9bbf5d3dd085"/>
+					<reportElement x="436" y="5" width="73" height="16" uuid="e938fda5-ac45-4f7b-b6ea-9bbf5d3dd085"/>
 					<box>
 						<pen lineWidth="0.5"/>
 						<topPen lineWidth="0.5"/>
@@ -193,7 +197,7 @@ OR T.DATAFIM IS NULL
 					<text><![CDATA[Valor Aquisição]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="509" y="5" width="66" height="15" uuid="e9efa9f7-9d89-4890-8f81-b1b761f66d31"/>
+					<reportElement x="509" y="5" width="66" height="16" uuid="e9efa9f7-9d89-4890-8f81-b1b761f66d31"/>
 					<box>
 						<pen lineWidth="0.5"/>
 						<topPen lineWidth="0.5"/>
@@ -265,9 +269,9 @@ OR T.DATAFIM IS NULL
 		</band>
 	</pageHeader>
 	<detail>
-		<band height="15" splitType="Prevent">
+		<band height="16" splitType="Prevent">
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" x="370" y="0" width="66" height="15" uuid="0b759d00-6aa5-4457-a938-03216b202dad"/>
+				<reportElement stretchType="RelativeToTallestObject" x="370" y="0" width="66" height="16" uuid="0b759d00-6aa5-4457-a938-03216b202dad"/>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
@@ -280,8 +284,8 @@ OR T.DATAFIM IS NULL
 				</textElement>
 				<textFieldExpression><![CDATA[$F{situacaofisica}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="#,##0.00">
-				<reportElement stretchType="RelativeToTallestObject" x="436" y="0" width="73" height="15" uuid="b1210e79-0a51-483c-b295-aa7fdf18d78b"/>
+			<textField isStretchWithOverflow="true" pattern="¤ #,##0.00">
+				<reportElement stretchType="RelativeToTallestObject" x="436" y="0" width="73" height="16" uuid="b1210e79-0a51-483c-b295-aa7fdf18d78b"/>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
@@ -295,8 +299,8 @@ OR T.DATAFIM IS NULL
 				</textElement>
 				<textFieldExpression><![CDATA[$F{valoraquisicao}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="509" y="0" width="66" height="15" uuid="49e6b325-2ff2-4e1e-9cdf-b428c8758844"/>
+			<textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="509" y="0" width="66" height="16" uuid="49e6b325-2ff2-4e1e-9cdf-b428c8758844"/>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
@@ -311,7 +315,9 @@ OR T.DATAFIM IS NULL
 				<textFieldExpression><![CDATA[$F{valorliquido}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="30" height="15" uuid="a6f97aca-5483-43de-b876-bf86f62d46d3"/>
+				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="30" height="16" uuid="a6f97aca-5483-43de-b876-bf86f62d46d3">
+					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+				</reportElement>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
@@ -325,7 +331,7 @@ OR T.DATAFIM IS NULL
 				<textFieldExpression><![CDATA[$V{REPORT_COUNT}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="false">
-				<reportElement stretchType="RelativeToTallestObject" x="30" y="0" width="59" height="15" uuid="d5c91777-685e-4aa8-844a-d7dc07ab006d"/>
+				<reportElement stretchType="RelativeToTallestObject" x="30" y="0" width="59" height="16" uuid="d5c91777-685e-4aa8-844a-d7dc07ab006d"/>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
@@ -334,20 +340,20 @@ OR T.DATAFIM IS NULL
 					<rightPen lineWidth="0.5"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="7"/>
+					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{numeropatrimonial}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" x="89" y="0" width="281" height="15" uuid="3ca60464-c7c0-4cf8-b1d7-fea0cbc41286"/>
-				<box>
+				<reportElement stretchType="RelativeToTallestObject" x="89" y="0" width="281" height="16" uuid="3ca60464-c7c0-4cf8-b1d7-fea0cbc41286"/>
+				<box topPadding="3" leftPadding="3" bottomPadding="3" rightPadding="3">
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
 					<rightPen lineWidth="0.5"/>
 				</box>
-				<textElement textAlignment="Left" verticalAlignment="Top">
+				<textElement textAlignment="Left">
 					<font size="6"/>
 					<paragraph leftIndent="2" rightIndent="2" spacingBefore="2" spacingAfter="3"/>
 				</textElement>
@@ -508,12 +514,12 @@ OR T.DATAFIM IS NULL
 					<bottomPen lineWidth="1.0"/>
 					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Right">
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="7" isBold="true"/>
 				</textElement>
 				<text><![CDATA[Total (R$)]]></text>
 			</staticText>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField pattern="¤ #,##0.00" isBlankWhenNull="true">
 				<reportElement x="436" y="0" width="73" height="15" uuid="8edb7008-d9dd-4dc4-b5be-029756c2e33b"/>
 				<box>
 					<topPen lineWidth="1.0"/>
@@ -527,7 +533,7 @@ OR T.DATAFIM IS NULL
 				</textElement>
 				<textFieldExpression><![CDATA[$V{valorAquisicaoTotal}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField pattern="¤ #,##0.00" isBlankWhenNull="true">
 				<reportElement x="509" y="0" width="66" height="15" uuid="cb6e9a2a-b173-41b7-8f63-b93f25d01224"/>
 				<box>
 					<pen lineWidth="1.0"/>
@@ -545,11 +551,13 @@ OR T.DATAFIM IS NULL
 		</band>
 	</summary>
 	<noData>
-		<band height="20">
+		<band height="17">
 			<staticText>
-				<reportElement x="1" y="0" width="539" height="20" uuid="ad3f5bab-6291-42dd-a975-8e41d7f9a7e9"/>
+				<reportElement x="1" y="0" width="539" height="17" uuid="ad3f5bab-6291-42dd-a975-8e41d7f9a7e9">
+					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font isBold="true"/>
+					<font size="8" isBold="true"/>
 				</textElement>
 				<text><![CDATA[Seção Vazia]]></text>
 			</staticText>
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2  -->
+<!-- 2016-05-17T15:23:27 -->
 <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="termoTransferencia" language="groovy" pageWidth="595" pageHeight="802" whenNoDataType="AllSectionsNoDetail" columnWidth="541" leftMargin="27" rightMargin="27" topMargin="20" bottomMargin="20" uuid="0c479051-3a36-4140-9683-aff6988775ce">
 	<property name="ireport.zoom" value="1.5"/>
 	<property name="ireport.x" value="0"/>
@@ -176,9 +178,11 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
 	<group name="transferencia">
 		<groupExpression><![CDATA[$F{numerotermo}]]></groupExpression>
 		<groupHeader>
-			<band height="15">
+			<band height="17">
 				<staticText>
-					<reportElement x="0" y="0" width="30" height="15" uuid="aa294020-2029-4f59-b3ad-5bc0bf803400"/>
+					<reportElement x="0" y="0" width="30" height="17" uuid="aa294020-2029-4f59-b3ad-5bc0bf803400">
+						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+					</reportElement>
 					<box>
 						<pen lineWidth="0.5"/>
 						<topPen lineWidth="0.5"/>
@@ -187,12 +191,12 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
 						<rightPen lineWidth="0.5"/>
 					</box>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font size="8" isBold="true"/>
+						<font size="7" isBold="true"/>
 					</textElement>
 					<text><![CDATA[Item]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="30" y="0" width="60" height="15" uuid="7d1ad9ec-3cd6-4f75-8dd2-c24398e4559c"/>
+					<reportElement x="30" y="0" width="60" height="17" uuid="7d1ad9ec-3cd6-4f75-8dd2-c24398e4559c"/>
 					<box>
 						<pen lineWidth="0.5"/>
 						<topPen lineWidth="0.5"/>
@@ -201,12 +205,12 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
 						<rightPen lineWidth="0.5"/>
 					</box>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font size="8" isBold="true"/>
+						<font size="7" isBold="true"/>
 					</textElement>
 					<text><![CDATA[N. Patrimonial]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="90" y="0" width="267" height="15" uuid="4f988f4b-9798-4381-97ec-ea456291c1a2"/>
+					<reportElement x="90" y="0" width="267" height="17" uuid="4f988f4b-9798-4381-97ec-ea456291c1a2"/>
 					<box>
 						<pen lineWidth="0.5"/>
 						<topPen lineWidth="0.5"/>
@@ -215,12 +219,12 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
 						<rightPen lineWidth="0.5"/>
 					</box>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font size="8" isBold="true"/>
+						<font size="7" isBold="true"/>
 					</textElement>
 					<text><![CDATA[Descrição]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="357" y="0" width="53" height="15" uuid="30076d94-4ed8-4a74-ac4f-e7125f4b5d91"/>
+					<reportElement x="357" y="0" width="53" height="17" uuid="30076d94-4ed8-4a74-ac4f-e7125f4b5d91"/>
 					<box>
 						<pen lineWidth="0.5"/>
 						<topPen lineWidth="0.5"/>
@@ -229,12 +233,12 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
 						<rightPen lineWidth="0.5"/>
 					</box>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font size="8" isBold="true"/>
+						<font size="7" isBold="true"/>
 					</textElement>
 					<text><![CDATA[Sit. Física]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="410" y="0" width="70" height="15" uuid="e938fda5-ac45-4f7b-b6ea-9bbf5d3dd085"/>
+					<reportElement x="410" y="0" width="70" height="17" uuid="e938fda5-ac45-4f7b-b6ea-9bbf5d3dd085"/>
 					<box>
 						<pen lineWidth="0.5"/>
 						<topPen lineWidth="0.5"/>
@@ -243,12 +247,12 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
 						<rightPen lineWidth="0.5"/>
 					</box>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font size="8" isBold="true"/>
+						<font size="7" isBold="true"/>
 					</textElement>
 					<text><![CDATA[Valor Aquisição]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="480" y="0" width="60" height="15" uuid="e9efa9f7-9d89-4890-8f81-b1b761f66d31"/>
+					<reportElement x="480" y="0" width="60" height="17" uuid="e9efa9f7-9d89-4890-8f81-b1b761f66d31"/>
 					<box>
 						<pen lineWidth="0.5"/>
 						<topPen lineWidth="0.5"/>
@@ -257,7 +261,7 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
 						<rightPen lineWidth="0.5"/>
 					</box>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font size="8" isBold="true"/>
+						<font size="7" isBold="true"/>
 					</textElement>
 					<text><![CDATA[Valor Líquido]]></text>
 				</staticText>
@@ -266,7 +270,7 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
 		<groupFooter>
 			<band height="89" splitType="Prevent">
 				<componentElement>
-					<reportElement key="observacao" style="table" mode="Opaque" x="0" y="27" width="541" height="61" isRemoveLineWhenBlank="true" uuid="0f574d69-33f7-46b5-b46d-360eab7dcd53"/>
+					<reportElement key="observacao" style="table" mode="Opaque" x="0" y="27" width="541" height="57" isRemoveLineWhenBlank="true" uuid="0f574d69-33f7-46b5-b46d-360eab7dcd53"/>
 					<jr:table xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd">
 						<datasetRun subDataset="observacao" uuid="463f4576-3ccd-4329-81c4-ae42dbfb0468">
 							<datasetParameter name="REPORT_CONNECTION">
@@ -278,47 +282,56 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
 							<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
 						</datasetRun>
 						<jr:column width="136" uuid="a74f84ad-2cd8-4897-94a8-a7f366091e00">
-							<jr:tableHeader style="table" height="30" rowSpan="1">
+							<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+							<jr:tableHeader style="table" height="20" rowSpan="1">
+								<property name="com.jaspersoft.studio.unit.height" value="px"/>
 								<staticText>
-									<reportElement x="1" y="0" width="135" height="30" isRemoveLineWhenBlank="true" uuid="8eb13662-481b-49e4-984e-b6b122847381"/>
+									<reportElement x="0" y="0" width="136" height="20" isRemoveLineWhenBlank="true" uuid="8eb13662-481b-49e4-984e-b6b122847381"/>
 									<textElement>
-										<font size="12" isBold="true"/>
+										<font size="8" isBold="true"/>
 									</textElement>
 									<text><![CDATA[Observações]]></text>
 								</staticText>
 							</jr:tableHeader>
-							<jr:columnHeader style="table" height="30" rowSpan="1">
+							<jr:columnHeader style="table" height="20" rowSpan="1">
+								<property name="com.jaspersoft.studio.unit.height" value="px"/>
 								<staticText>
-									<reportElement x="0" y="0" width="136" height="30" isRemoveLineWhenBlank="true" uuid="62c60451-b26a-4e6a-978a-f12d1c7de2de"/>
+									<reportElement x="0" y="0" width="136" height="20" isRemoveLineWhenBlank="true" uuid="62c60451-b26a-4e6a-978a-f12d1c7de2de"/>
 									<textElement textAlignment="Center" verticalAlignment="Middle">
-										<font isBold="true"/>
+										<font size="7" isBold="true"/>
 									</textElement>
 									<text><![CDATA[Data]]></text>
 								</staticText>
 							</jr:columnHeader>
-							<jr:detailCell style="table" height="21" rowSpan="1">
+							<jr:detailCell style="table" height="17" rowSpan="1">
+								<property name="com.jaspersoft.studio.unit.height" value="px"/>
 								<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-									<reportElement x="0" y="0" width="136" height="21" isRemoveLineWhenBlank="true" uuid="3f6766f1-a41e-4c6f-83e8-6a3dcb0b0b79"/>
-									<textElement textAlignment="Center" verticalAlignment="Middle"/>
+									<reportElement x="0" y="0" width="136" height="17" isRemoveLineWhenBlank="true" uuid="3f6766f1-a41e-4c6f-83e8-6a3dcb0b0b79"/>
+									<textElement textAlignment="Center" verticalAlignment="Middle">
+										<font size="6"/>
+									</textElement>
 									<textFieldExpression><![CDATA[$F{data}]]></textFieldExpression>
 								</textField>
 							</jr:detailCell>
 						</jr:column>
 						<jr:column width="404" uuid="27db9bb5-a56d-4c00-9762-329b4dbb4d4b">
-							<jr:tableHeader height="30" rowSpan="1"/>
-							<jr:columnHeader style="table" height="30" rowSpan="1">
+							<jr:tableHeader height="20" rowSpan="1"/>
+							<jr:columnHeader style="table" height="20" rowSpan="1">
 								<staticText>
-									<reportElement x="7" y="0" width="395" height="30" isRemoveLineWhenBlank="true" uuid="015c6ebf-590a-4bc8-bc32-2b07632409ba"/>
+									<reportElement x="0" y="0" width="404" height="20" isRemoveLineWhenBlank="true" uuid="015c6ebf-590a-4bc8-bc32-2b07632409ba"/>
 									<textElement textAlignment="Center" verticalAlignment="Middle">
-										<font isBold="true"/>
+										<font size="7" isBold="true"/>
 									</textElement>
 									<text><![CDATA[Descrição]]></text>
 								</staticText>
 							</jr:columnHeader>
-							<jr:detailCell style="table" height="21" rowSpan="1">
+							<jr:detailCell style="table" height="17" rowSpan="1">
 								<textField isBlankWhenNull="true">
-									<reportElement x="7" y="0" width="395" height="21" isRemoveLineWhenBlank="true" uuid="146b284c-642f-4d11-8e53-2a9c837421ec"/>
-									<textElement verticalAlignment="Middle"/>
+									<reportElement x="0" y="0" width="404" height="17" isRemoveLineWhenBlank="true" uuid="146b284c-642f-4d11-8e53-2a9c837421ec"/>
+									<box topPadding="3" leftPadding="3" bottomPadding="3" rightPadding="3"/>
+									<textElement verticalAlignment="Top">
+										<font size="6"/>
+									</textElement>
 									<textFieldExpression><![CDATA[$F{descricao}]]></textFieldExpression>
 								</textField>
 							</jr:detailCell>
@@ -326,7 +339,9 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
 					</jr:table>
 				</componentElement>
 				<staticText>
-					<reportElement x="357" y="0" width="53" height="14" uuid="4cc1dbc7-45bc-4061-9c5c-8c0838f12c13"/>
+					<reportElement x="357" y="0" width="53" height="17" uuid="4cc1dbc7-45bc-4061-9c5c-8c0838f12c13">
+						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+					</reportElement>
 					<box leftPadding="0" rightPadding="5">
 						<pen lineWidth="0.5"/>
 						<topPen lineWidth="0.5"/>
@@ -334,13 +349,13 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
 						<bottomPen lineWidth="0.5"/>
 						<rightPen lineWidth="0.5"/>
 					</box>
-					<textElement textAlignment="Right">
-						<font size="8" isBold="true"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="7" isBold="true"/>
 					</textElement>
 					<text><![CDATA[Total (R$)]]></text>
 				</staticText>
-				<textField pattern="#,##0.00">
-					<reportElement x="480" y="0" width="60" height="14" uuid="f289f8a4-a0bf-4dfb-b215-4b930d61645d"/>
+				<textField pattern="¤ #,##0.00">
+					<reportElement x="480" y="0" width="60" height="17" uuid="f289f8a4-a0bf-4dfb-b215-4b930d61645d"/>
 					<box leftPadding="0" rightPadding="5">
 						<pen lineWidth="0.5"/>
 						<topPen lineWidth="0.5"/>
@@ -349,12 +364,12 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
 						<rightPen lineWidth="0.5"/>
 					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
+						<font size="6"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{ValorTotalLiquido}]]></textFieldExpression>
 				</textField>
-				<textField pattern="#,##0.00">
-					<reportElement x="410" y="0" width="70" height="14" uuid="e6cc6c77-3be6-4394-b7db-106d701dc13b"/>
+				<textField pattern="¤ #,##0.00">
+					<reportElement x="410" y="0" width="70" height="17" uuid="e6cc6c77-3be6-4394-b7db-106d701dc13b"/>
 					<box leftPadding="0" rightPadding="5">
 						<pen lineWidth="0.5"/>
 						<topPen lineWidth="0.5"/>
@@ -363,7 +378,7 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
 						<rightPen lineWidth="0.5"/>
 					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
+						<font size="6"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{ValorTotalAquisicao}]]></textFieldExpression>
 				</textField>
@@ -461,6 +476,7 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
 	</pageHeader>
 	<detail>
 		<band height="17" splitType="Prevent">
+			<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 			<textField isStretchWithOverflow="true">
 				<reportElement stretchType="RelativeToTallestObject" x="357" y="0" width="53" height="17" uuid="0b759d00-6aa5-4457-a938-03216b202dad"/>
 				<box>
@@ -475,7 +491,7 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
 				</textElement>
 				<textFieldExpression><![CDATA[$F{situacaofisica}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="#,##0.00">
+			<textField isStretchWithOverflow="true" pattern="¤ #,##0.00">
 				<reportElement stretchType="RelativeToTallestObject" x="410" y="0" width="70" height="17" uuid="b1210e79-0a51-483c-b295-aa7fdf18d78b"/>
 				<box>
 					<pen lineWidth="0.5"/>
@@ -490,7 +506,7 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
 				</textElement>
 				<textFieldExpression><![CDATA[$F{valoraquisicao}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="#,##0.00">
+			<textField isStretchWithOverflow="true" pattern="¤ #,##0.00">
 				<reportElement stretchType="RelativeToTallestObject" x="480" y="0" width="60" height="17" uuid="49e6b325-2ff2-4e1e-9cdf-b428c8758844"/>
 				<box>
 					<pen lineWidth="0.5"/>
@@ -506,7 +522,9 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
 				<textFieldExpression><![CDATA[$F{valorliquido}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="30" height="17" uuid="a6f97aca-5483-43de-b876-bf86f62d46d3"/>
+				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="30" height="17" uuid="a6f97aca-5483-43de-b876-bf86f62d46d3">
+					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+				</reportElement>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
@@ -535,14 +553,14 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
 			</textField>
 			<textField isStretchWithOverflow="true">
 				<reportElement stretchType="RelativeToTallestObject" x="90" y="0" width="267" height="17" uuid="3ca60464-c7c0-4cf8-b1d7-fea0cbc41286"/>
-				<box>
+				<box topPadding="3" leftPadding="3" bottomPadding="3" rightPadding="3">
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
 					<rightPen lineWidth="0.5"/>
 				</box>
-				<textElement verticalAlignment="Middle">
+				<textElement verticalAlignment="Top">
 					<font size="6"/>
 					<paragraph leftIndent="3" rightIndent="3" spacingBefore="3"/>
 				</textElement>
@@ -685,11 +703,13 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
 		</band>
 	</lastPageFooter>
 	<noData>
-		<band height="20">
+		<band height="17">
 			<staticText>
-				<reportElement x="1" y="0" width="540" height="20" uuid="0d12e090-0013-44f9-9cca-274f43b176d8"/>
+				<reportElement x="1" y="0" width="540" height="17" uuid="0d12e090-0013-44f9-9cca-274f43b176d8">
+					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font isBold="true"/>
+					<font size="8" isBold="true"/>
 				</textElement>
 				<text><![CDATA[Seção vazia]]></text>
 			</staticText>
@@ -182,7 +182,7 @@ citApp.controller(&#39;BemPatrimonialController&#39;, [&#39;$scope&#39;, &#39;BemPatrimonialReposito
 			}
 			if ($scope.bemPatrimonialAlteracao.vidaUtil && $scope.bemPatrimonialAlteracao.vidaUtil != $scope.bemPatrimonial.vidaUtilRestante) {
-				var chave = $scope.bemPatrimonial.vidaUtilRestante < $scope.bemPatrimonialAlteracao.vidaUtil ? 'MSG.CONFIRMA_AUMENTAR_VIDA_UTIL' : 'MSG.CONFIRMA_DIMINUIR_VIDA_UTIL';
+				var chave = $scope.bemPatrimonial.vidaUtilRestante < $scope.bemPatrimonialAlteracao.vidaUtil ? 'PATRIMONIO.MSG.CONFIRMA_AUMENTAR_VIDA_UTIL' : 'PATRIMONIO.MSG.CONFIRMA_DIMINUIR_VIDA_UTIL';
 				 $scope.$openModalConfirm({
 					message: $translate.instant(chave),
 					callback: function () {
@@ -138,7 +138,9 @@ citApp.controller(&#39;EntradaListController&#39;, [&#39;$scope&#39;, &#39;EntradaRepository&#39;, &#39;$tra
         	$scope.showAlert("warning", $translate.instant("MSG.SELECIONE_UM_ITEM_PARA_RELATORIO") + " ", false );
         } else{
+        	$scope.setLoadingPesquisa(true);
         	EntradaRepository.validaExistenciaBemMaterialEntrada($scope.entradaChecked.id).then(function(result){
+        		$scope.setLoading(false);
     			if (result == true){
     				$scope.url = '/citgrp-patrimonio-web/rest/relatorioEntrada/relEntradaMaterialAnalitico?idEntrada='+ $scope.entradaChecked.id;
@@ -157,8 +159,9 @@ citApp.controller(&#39;EntradaListController&#39;, [&#39;$scope&#39;, &#39;EntradaRepository&#39;, &#39;$tra
     		$scope.showAlert("warning", $translate.instant("MSG.SELECIONE_UM_ITEM_PARA_RELATORIO") + " ", false );
     	} else{
-    		
+    		$scope.setLoadingPesquisa(true);
     		EntradaRepository.validaExistenciaBemMaterialEntrada($scope.entradaChecked.id).then(function(result){
+    			$scope.setLoading(false);
     			if (result == true){
     				$scope.url = '/citgrp-patrimonio-web/rest/relatorioEntrada/relEntradaMaterialSintetico?idEntrada='+ $scope.entradaChecked.id;
@@ -247,6 +247,12 @@ citApp.directive(&quot;componenteBuscaBensPatrimoniais&quot;, [&#39;BemPatrimonialRepository&#39;,
 			// Metodo responsavel por listar bens de acordo com filtros preenchidos
 			$scope.buscaBemFiltros = function() {
+				
+				if($scope.bemPatrimonialVH.$checkBemStatusOutros && ($scope.bemPatrimonialVH.idDominioStatus == undefined || $scope.bemPatrimonialVH.idDominioStatus == "")){
+					angular.element("#citapp-controller").scope().showAlert("error", $translate.instant("PATRIMONIO.VALIDACAO.INFORME_OUTRO_STATUS_BEM_PATRIMONIAL"));
+					return;
+				}
+				
 				$scope.isSelectedAll(false);
 				$scope.lista = [];
 				var trazerBemNaoContabilizado = false;
@@ -404,7 +410,7 @@ citApp.directive(&quot;componenteBuscaBensPatrimoniais&quot;, [&#39;BemPatrimonialRepository&#39;,
 			// RECUPERA LISTA E SETA RESULTADO NA GRID COM OS FILTROS INFORMADOS
 			$scope.fetchResultModal = function() {
-
+				
 				$scope.appController.setLoadingPesquisa(true);
 				$scope.filterCriteriaModal = angular.copy($scope.filterCriteriaGrid);
@@ -420,12 +426,21 @@ citApp.directive(&quot;componenteBuscaBensPatrimoniais&quot;, [&#39;BemPatrimonialRepository&#39;,
 //				}
 				//FILTER - ABA_GERAL
+				
+				if($scope.bemPatrimonialVH.$checkBemStatusAtivo && !$scope.bemPatrimonialVH.$checkBemStatusBaixado){
+					$scope.filterCriteriaModal.filters.push({type: 'numeric', field: 'dominioStatus.codigo', value : 2, comparison: 'ne'});
+					
+				}else if(!$scope.bemPatrimonialVH.$checkBemStatusAtivo && $scope.bemPatrimonialVH.$checkBemStatusBaixado){
+					$scope.filterCriteriaModal.filters.push({type: 'numeric', field: 'dominioStatus.codigo', value : 2});
+					
+				}else if($scope.bemPatrimonialVH.idDominioStatus !== undefined && $scope.bemPatrimonialVH.idDominioStatus != ""){
+					$scope.filterCriteriaModal.filters.push({type: 'numeric', field: 'dominioStatus.id', value : $scope.bemPatrimonialVH.idDominioStatus});
+				}
+				
 				if($scope.bemPatrimonialVH.idDominioSituacaoFisica !== undefined && $scope.bemPatrimonialVH.idDominioSituacaoFisica != ""){
 					$scope.filterCriteriaModal.filters.push({type: 'numeric', field: 'dominioSituacaoFisica.id', value : $scope.bemPatrimonialVH.idDominioSituacaoFisica});
 				}
-				if($scope.bemPatrimonialVH.idDominioStatus !== undefined && $scope.bemPatrimonialVH.idDominioStatus != ""){
-					$scope.filterCriteriaModal.filters.push({type: 'numeric', field: 'dominioStatus.id', value : $scope.bemPatrimonialVH.idDominioStatus});
-				}
+				
 				if($scope.bemPatrimonialVH.$contaContabil != undefined && $scope.bemPatrimonialVH.$contaContabil != ''){
 					$scope.filterCriteriaModal.filters.push({type: 'numeric', field: 'material.contaContabil.id', value : $scope.bemPatrimonialVH.$contaContabil.id});
 				}
@@ -993,6 +1008,11 @@ citApp.directive(&quot;componenteBuscaBensPatrimoniais&quot;, [&#39;BemPatrimonialRepository&#39;,
 			}
 			$scope.retornarFiltro = function() {
+				if($scope.bemPatrimonialVH.$checkBemStatusOutros && ($scope.bemPatrimonialVH.idDominioStatus == undefined || $scope.bemPatrimonialVH.idDominioStatus == "")){
+					angular.element("#citapp-controller").scope().showAlert("error", $translate.instant("PATRIMONIO.VALIDACAO.INFORME_OUTRO_STATUS_BEM_PATRIMONIAL"));
+					return;
+				}
+				
 				$scope.fecharModalBuscaAvancada();
 				$scope.filtros = $scope.bemPatrimonialVH;
 				$scope.$parent.filterCriteria.start = 1;
@@ -1096,6 +1116,10 @@ citApp.directive(&quot;componenteBuscaBensPatrimoniais&quot;, [&#39;BemPatrimonialRepository&#39;,
 					$scope.buscaBemFiltros();
 				});
 			}
+			
+			$scope.desmarcaBemStatusOutro = function(){
+				$scope.bemPatrimonialVH.$checkBemStatusOutros = false;
+			};
 		}
 	};
+	<div class="row" style="margin-left: 1px;">
+		<input type="checkbox" ng-checked="checkBemStatusAtivo" ng-model="bemPatrimonialVH.$checkBemStatusAtivo" ng-click="desmarcaBemStatusOutro()"/><translate>PATRIMONIO.LABEL.BEM_STATUS_ATIVO</translate>
+		<input type="checkbox" ng-checked="checkBemStatusBaixado" ng-model="bemPatrimonialVH.$checkBemStatusBaixado" ng-click="desmarcaBemStatusOutro()"/><translate>PATRIMONIO.LABEL.BEM_STATUS_BAIXADO</translate>
+		<input type="checkbox" ng-checked="checkBemStatusOutros" ng-model="bemPatrimonialVH.$checkBemStatusOutros" ng-disabled="bemPatrimonialVH.$checkBemStatusAtivo || bemPatrimonialVH.$checkBemStatusBaixado" /><translate>PATRIMONIO.LABEL.BEM_STATUS_OUTROS</translate>
+	</div>
+	
 	<div class="row">
 		<div class="col-sm-4">
-			<label-select ng-id="bemPatrimonialVH.idDominioSituacaoFisica" ng-model="bemPatrimonialVH.idDominioSituacaoFisica" ng-label="LABEL.SITUACAO" ng-list="situacoesFisicas" ng-custom-options="dominioSituacaoFisica.id as dominioSituacaoFisica.descricao for dominioSituacaoFisica"></label-select>
+			<label-select ng-id="bemPatrimonialVH.idDominioStatus" ng-obrigatorio="bemPatrimonialVH.$checkBemStatusOutros" ng-disabled="bemPatrimonialVH.$checkBemStatusAtivo || bemPatrimonialVH.$checkBemStatusBaixado" ng-model="bemPatrimonialVH.idDominioStatus" ng-label="PATRIMONIO.LABEL.STATUS" ng-list="status" ng-custom-options="dominioStatus.id as dominioStatus.descricao for dominioStatus"></label-select>
 		</div>
 		<div class="col-sm-4">
-			<label-select ng-id="bemPatrimonialVH.idDominioStatus" ng-model="bemPatrimonialVH.idDominioStatus" ng-label="PATRIMONIO.LABEL.STATUS" ng-list="status" ng-custom-options="dominioStatus.id as dominioStatus.descricao for dominioStatus"></label-select>
+			<label-select ng-id="bemPatrimonialVH.idDominioSituacaoFisica" ng-model="bemPatrimonialVH.idDominioSituacaoFisica" ng-label="LABEL.SITUACAO" ng-list="situacoesFisicas" ng-custom-options="dominioSituacaoFisica.id as dominioSituacaoFisica.descricao for dominioSituacaoFisica"></label-select>
 		</div>
 		<div class="col-sm-4">
 			<auto-complete ng-find="findContaContabil(value)" ng-item="item.codigo + ' / ' + item.descricao" ng-label="LABEL.CONTA_CONTABIL" ng-model="bemPatrimonialVH.$contaContabil" ng-min-length="1"></auto-complete>
@@ -150,7 +150,7 @@
 				<div class='col-sm-2'>
 					<label-input-money ng-id="bemPatrimonialAlteracao.novoValorBruto"
 							ng-label="PATRIMONIO.LABEL.NOVO_VALOR_MERCADO"
-							label-info-tooltip="{{$translate.instant('MSG.NOVO_VALOR_REAVALIACAO')}}"
+							label-info-tooltip="{{$translate.instant('PATRIMONIO.MSG.NOVO_VALOR_REAVALIACAO')}}"
 							form="bemPatrimonialForm" ng-model="bemPatrimonialAlteracao.novoValorBruto"
 							ng-obrigatorio="bemPatrimonialAlteracao.dominioTipoAlteracaoIndividual.codigo == 4"
 							ng-if="edit && bemPatrimonialAlteracao.dominioTipoAlteracaoIndividual.codigo == 4">
@@ -158,7 +158,7 @@
 					<label-input-money ng-id="bemPatrimonialAlteracao.novoValorBruto"
 							ng-label="PATRIMONIO.LABEL.NOVO_VALOR_RECUPERAVEL"
-							label-info-tooltip="{{$translate.instant('MSG.NOVO_VALOR_REDUCAO')}}"
+							label-info-tooltip="{{$translate.instant('PATRIMONIO.MSG.NOVO_VALOR_REDUCAO')}}"
 							form="bemPatrimonialForm"
 							ng-model="bemPatrimonialAlteracao.novoValorBruto"
 							ng-obrigatorio="bemPatrimonialAlteracao.dominioTipoAlteracaoIndividual.codigo == 5"
@@ -74,7 +74,7 @@
 		<div class="row">
 			<div class="col-sm-9">
-				<auto-complete ng-find="findColaborador(value)" form="definicaoDetentorForm" ng-acao-borracha="limparColaborador()" ng-obrigatorio="true" ng-set-result="setColaborador(item)" ng-item="item.pessoa.nome + ' - ' + item.estruturaOrganizacional.nome" ng-id="colaborador" ng-label="PATRIMONIO.LABEL.DETENTOR" ng-model="definicaoDetentor.colaborador" ng-disabled="!edit"></auto-complete>
+				<auto-complete ng-find="findColaborador(value)" form="definicaoDetentorForm" ng-acao-borracha="limparColaborador()" ng-obrigatorio="true" ng-set-result="setColaborador(item)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula'] + ' - UN: ' + item.estruturaOrganizacional.nome" ng-id="colaborador" ng-label="PATRIMONIO.LABEL.DETENTOR" ng-model="definicaoDetentor.colaborador" ng-disabled="!edit"></auto-complete>
 			</div>
 			<!-- Haline decidiu por nao exibir esta propriedade ate que seja esclarecido o motivo do uso -->
 			<div class="col-sm-3" ng-if="false">
@@ -66,7 +66,7 @@
 				<div class="col-sm-3">
 				</div>
 					<div class="col-sm-4">
-						<auto-complete ng-find="findColaborador(value)" ng-item="item.pessoa.nome + ' - ' + item.estruturaOrganizacional.nome" 
+						<auto-complete ng-find="findColaborador(value)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula'] + ' - UN: ' + item.estruturaOrganizacional.nome" 
 							ng-id="colaborador"	ng-label="PATRIMONIO.LABEL.DETENTOR" ng-model="colaborador" form="emissaoTermoResponsabilidadeForm" 
 							ng-set-result="setColaborador()" ng-obrigatorio="{{codigoTipoMovimentacao == 2}}"></auto-complete>
 					</div>
@@ -596,7 +596,7 @@
 																<td colspan="4">
 																	<div class="row" >
 																		<div class="col-sm-6">
-																			<auto-complete ng-find="findResponsavelInventario(value)" ng-item="item.pessoa.nome" ng-id="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario" 
+																			<auto-complete ng-find="findResponsavelInventario(value)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula']" ng-id="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario" 
 																				ng-label="PATRIMONIO.LABEL.RESPONSAVEL_PELO_INVENTARIO" ng-model="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario" form="formInventario" >
 																			</auto-complete>
 																		</div>
@@ -829,7 +829,7 @@
 																<td colspan="4">
 																	<div class="row" >
 																		<div class="col-sm-6">
-																			<auto-complete ng-find="findResponsavelInventario(value)" ng-item="item.pessoa.nome" ng-id="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario" 
+																			<auto-complete ng-find="findResponsavelInventario(value)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula']" ng-id="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario" 
 																				ng-label="PATRIMONIO.LABEL.RESPONSAVEL_PELO_INVENTARIO" ng-model="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario"  
 																					ng-disabled="!dadosBemPatrimonialSelecionado.$isEditar" form="formInventario" >
 																			</auto-complete>
@@ -1015,7 +1015,7 @@
 																<td colspan="4">
 																	<div class="row" >
 																		<div class="col-sm-5">
-																			<auto-complete ng-find="findResponsavelInventario(value)" ng-item="item.pessoa.nome" ng-id="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario" 
+																			<auto-complete ng-find="findResponsavelInventario(value)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula']" ng-id="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario" 
 																				ng-label="PATRIMONIO.LABEL.RESPONSAVEL_PELO_INVENTARIO" ng-model="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario" 
 																					ng-disabled="!dadosBemPatrimonialSelecionado.$isEditar" form="formInventario" >
 																			</auto-complete>
@@ -1926,7 +1926,7 @@
 						<label-input-data ng-id="dataSaidaTemporaria" form="formDialogSaidaTemporaria" ng-label="PATRIMONIO.LABEL.DATA_SAIDA" ng-obrigatorio="true" ng-disabled="false" ng-model="dataSaidaTemporaria"></label-input-data>
 					</div>
 					<div class="col-sm-12">
-						<auto-complete ng-find="findResponsavelSaida(value)" ng-item="item.pessoa.nome" ng-id="responsavelSaidaTemporaria" ng-label="PATRIMONIO.LABEL.RESPONSAVEL_SAIDA" ng-model="responsavelSaidaTemporaria" 
+						<auto-complete ng-find="findResponsavelSaida(value)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula']" ng-id="responsavelSaidaTemporaria" ng-label="PATRIMONIO.LABEL.RESPONSAVEL_SAIDA" ng-model="responsavelSaidaTemporaria" 
 							form="formDialogSaidaTemporaria" ng-disabled="false" ng-obrigatorio="true">
 						</auto-complete>
 					</div>
@@ -53,7 +53,7 @@
 				</legend>
 				<div class="row">
 					<div class="col-sm-9">
-						<auto-complete ng-find="findResponsavelSaida(value)" ng-item="item.pessoa.nome" ng-id="responsavel" ng-label="PATRIMONIO.LABEL.RESPONSAVEL_SAIDA" ng-model="saidaTemporaria.responsavel" form="saidaTemporariaForm" ng-disabled="!edit" ng-obrigatorio="true"></auto-complete>
+						<auto-complete ng-find="findResponsavelSaida(value)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula']" ng-id="responsavel" ng-label="PATRIMONIO.LABEL.RESPONSAVEL_SAIDA" ng-model="saidaTemporaria.responsavel" form="saidaTemporariaForm" ng-disabled="!edit" ng-obrigatorio="true"></auto-complete>
 					</div><!-- .col-sm-9 -->
 					<div class="col-sm-3">
 						<label-input-data ng-id="dataSaida" form="saidaTemporariaForm" ng-label="PATRIMONIO.LABEL.DATA_SAIDA" ng-obrigatorio="true" ng-disabled="!edit" ng-model="saidaTemporaria.dataSaida"></label-input-data>
@@ -59,7 +59,7 @@
 			<legend><translate>PATRIMONIO.LABEL.DADOS_RETORNO</translate></legend>
 			<div class="row">
 				<div class="col-sm-9">
-					<auto-complete ng-find="findRecebedor(value)" ng-item="item.pessoa.nome" ng-id="recebedor" ng-label="PATRIMONIO.LABEL.RECEBEDOR" ng-model="saidaTemporariaItem.recebedor" form="saidaTemporariaItemForm" ng-disabled="!editItem" ng-obrigatorio="true"></auto-complete>
+					<auto-complete ng-find="findRecebedor(value)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula']" ng-id="recebedor" ng-label="PATRIMONIO.LABEL.RECEBEDOR" ng-model="saidaTemporariaItem.recebedor" form="saidaTemporariaItemForm" ng-disabled="!editItem" ng-obrigatorio="true"></auto-complete>
 				</div><!-- .col-sm-9 -->
 				<div class="col-sm-3">
 					<label-input-data ng-id="saidaTemporariaItem.dataRetornoAlterada" form="saidaTemporariaForm" ng-label="PATRIMONIO.LABEL.DATA_DE_RETORNO" ng-obrigatorio="true" ng-disabled="!editItem" ng-model="saidaTemporariaItem.dataRetornoAlterada"></label-input-data>
@@ -55,7 +55,7 @@
 					<div class="col-sm-3">
 					</div>
 					<div class="col-sm-6">
-						<auto-complete ng-find="findColaborador(value)" ng-set-result="setEstruturaColaborador(item)" ng-item="item.pessoa.nome + ' - ' + item.estruturaOrganizacional.nome" ng-id="termoResponsabilidade.colaborador"
+						<auto-complete ng-find="findColaborador(value)" ng-set-result="setEstruturaColaborador(item)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula'] + ' - UN: ' + item.estruturaOrganizacional.nome" ng-id="termoResponsabilidade.colaborador"
 							ng-label="PATRIMONIO.LABEL.DETENTOR" ng-model="termoResponsabilidade.colaborador" ng-disabled="!edit" form="relarioResponsabilidadeForm"  ng-obrigatorio="true"></auto-complete>
 					</div>
 					<div class="col-sm-3">
	@@ -79,8 +79,8 @@ public class HistoricoBemPatrimonialDaoHibernate extends CitGenericDAOImpl imple		@@ -79,8 +79,8 @@ public class HistoricoBemPatrimonialDaoHibernate extends CitGenericDAOImpl imple
79		79
80	search.addFilterEqual("bemPatrimonial.id", idBemPatrimonial);	80	search.addFilterEqual("bemPatrimonial.id", idBemPatrimonial);
81		81
82	- search.addSorts(Sort.desc("id"), Sort.desc("dataOperacao"));
83	-	82	+ search.addSorts(Sort.desc("dataOperacao"), Sort.desc("id"));
		83	+
84	return this.search(search, this.persistentClass);	84	return this.search(search, this.persistentClass);
85	}	85	}
86		86
	@@ -649,7 +649,7 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl<BemPatrimonial		@@ -649,7 +649,7 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl<BemPatrimonial
649	}	649	}
650		650
651	// Verifica se é uma alteração pelo inventário	651	// Verifica se é uma alteração pelo inventário
652	- if (UtilObjeto.isReferencia(alteracaoBemVH.getDominioTipoAlteracaoIndividual()) && UtilObjeto.isReferencia(alteracaoBemVH.getDominioTipoAlteracaoIndividual()) && alteracaoBemVH.getDominioTipoAlteracaoIndividual().getCodigo().equals(Dominio.TIPO_ALTERACAO_BEM_PATRIMONIAL_INDIVIDUAL_INVENTARIO)) {	652	+ if (UtilObjeto.isReferencia(alteracaoBemVH.getDominioTipoAlteracaoIndividual()) && alteracaoBemVH.getDominioTipoAlteracaoIndividual().getCodigo().equals(Dominio.TIPO_ALTERACAO_BEM_PATRIMONIAL_INDIVIDUAL_INVENTARIO)) {
653	this.alterarBemPorInventario(alteracaoBemVH);	653	this.alterarBemPorInventario(alteracaoBemVH);
654	}	654	}
655	}	655	}
	@@ -696,7 +696,7 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl<BemPatrimonial		@@ -696,7 +696,7 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl<BemPatrimonial
696	BemPatrimonialAlteracaoItem itemValorLiquido = new BemPatrimonialAlteracaoItem(campoValorLiquido, bemPatrimonial.getValorLiquido().toString(), alteracaoBemVH.getNovoValorBruto().toString());	696	BemPatrimonialAlteracaoItem itemValorLiquido = new BemPatrimonialAlteracaoItem(campoValorLiquido, bemPatrimonial.getValorLiquido().toString(), alteracaoBemVH.getNovoValorBruto().toString());
697	itensAlterados.add(itemValorLiquido);	697	itensAlterados.add(itemValorLiquido);
698		698
699	- if (alteracaoBemVH.getVidaUtil() != null && ( bemPatrimonial.getVidaUtilRestante() != alteracaoBemVH.getVidaUtil() )) {	699	+ if (alteracaoBemVH.getVidaUtil() != null && ( bemPatrimonial.getVidaUtilRestante().intValue() != alteracaoBemVH.getVidaUtil().intValue() )) {
700	Dominio campoVidaUtilRestante = this.dominioService.findByChaveAndCodigo(DominioMaterial.CAMPO_REFERENCIA, DominioMaterial.CAMPO_REFERENCIA_BEM_PATRIMONIAL_VIDA_UTIL_RESTANTE_CODIGO);	700	Dominio campoVidaUtilRestante = this.dominioService.findByChaveAndCodigo(DominioMaterial.CAMPO_REFERENCIA, DominioMaterial.CAMPO_REFERENCIA_BEM_PATRIMONIAL_VIDA_UTIL_RESTANTE_CODIGO);
701		701
702	BemPatrimonialAlteracaoItem itemVidaUtil = new BemPatrimonialAlteracaoItem(campoVidaUtilRestante, bemPatrimonial.getVidaUtilRestante().toString(), alteracaoBemVH.getVidaUtil().toString());	702	BemPatrimonialAlteracaoItem itemVidaUtil = new BemPatrimonialAlteracaoItem(campoVidaUtilRestante, bemPatrimonial.getVidaUtilRestante().toString(), alteracaoBemVH.getVidaUtil().toString());
	@@ -1078,7 +1078,7 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl<BemPatrimonial		@@ -1078,7 +1078,7 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl<BemPatrimonial
1078	itensAlterados = new ArrayList<BemPatrimonialAlteracaoItem>();	1078	itensAlterados = new ArrayList<BemPatrimonialAlteracaoItem>();
1079	}	1079	}
1080		1080
1081	- if (alteracaoBemVH.getVidaUtil() != null && ( bemPatrimonial.getVidaUtilRestante() != alteracaoBemVH.getVidaUtil() )) {	1081	+ if (alteracaoBemVH.getVidaUtil() != null && ( bemPatrimonial.getVidaUtilRestante().intValue() != alteracaoBemVH.getVidaUtil().intValue() )) {
1082	Dominio campoVidaUtilRestante = this.dominioService.findByChaveAndCodigo(DominioMaterial.CAMPO_REFERENCIA, DominioMaterial.CAMPO_REFERENCIA_BEM_PATRIMONIAL_VIDA_UTIL_RESTANTE_CODIGO);	1082	Dominio campoVidaUtilRestante = this.dominioService.findByChaveAndCodigo(DominioMaterial.CAMPO_REFERENCIA, DominioMaterial.CAMPO_REFERENCIA_BEM_PATRIMONIAL_VIDA_UTIL_RESTANTE_CODIGO);
1083		1083
1084	BemPatrimonialAlteracaoItem itemVidaUtil = new BemPatrimonialAlteracaoItem(campoVidaUtilRestante, bemPatrimonial.getVidaUtilRestante().toString(), alteracaoBemVH.getVidaUtil().toString());	1084	BemPatrimonialAlteracaoItem itemVidaUtil = new BemPatrimonialAlteracaoItem(campoVidaUtilRestante, bemPatrimonial.getVidaUtilRestante().toString(), alteracaoBemVH.getVidaUtil().toString());
	@@ -1141,13 +1141,13 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl<BemPatrimonial		@@ -1141,13 +1141,13 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl<BemPatrimonial
1141	caracAnterior.setValorMaterialCaracteristica(caracNova.getValorMaterialCaracteristica());	1141	caracAnterior.setValorMaterialCaracteristica(caracNova.getValorMaterialCaracteristica());
1142	}	1142	}
1143		1143
1144	- if (caracAnterior.getArquivo() != null && !caracAnterior.getArquivo().equals(caracNova.getArquivo())) {	1144	+ if (caracAnterior.getArquivo() != null && !java.util.Arrays.equals(caracAnterior.getArquivo(),caracNova.getArquivo())) {
1145	BemPatrimonialAlteracaoItem item = new BemPatrimonialAlteracaoItem(campoCarac, caracDescricao, caracAnterior.getArquivo(), caracNova.getArquivo());	1145	BemPatrimonialAlteracaoItem item = new BemPatrimonialAlteracaoItem(campoCarac, caracDescricao, caracAnterior.getArquivo(), caracNova.getArquivo());
1146	if (item != null) {	1146	if (item != null) {
1147	itensCarac.add(item);	1147	itensCarac.add(item);
1148	}	1148	}
1149	caracAnterior.setArquivo(caracNova.getArquivo());	1149	caracAnterior.setArquivo(caracNova.getArquivo());
1150	- } else if (caracNova.getArquivo() != null && !caracNova.getArquivo().equals(caracAnterior.getArquivo())) {	1150	+ } else if (caracNova.getArquivo() != null && !java.util.Arrays.equals(caracNova.getArquivo(),caracAnterior.getArquivo())) {
1151	BemPatrimonialAlteracaoItem item = new BemPatrimonialAlteracaoItem(campoCarac, caracDescricao, caracAnterior.getArquivo(), caracNova.getArquivo());	1151	BemPatrimonialAlteracaoItem item = new BemPatrimonialAlteracaoItem(campoCarac, caracDescricao, caracAnterior.getArquivo(), caracNova.getArquivo());
1152	if (item != null) {	1152	if (item != null) {
1153	itensCarac.add(item);	1153	itensCarac.add(item);
	@@ -1377,7 +1377,7 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl<BemPatrimonial		@@ -1377,7 +1377,7 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl<BemPatrimonial
1377		1377
1378	bemPatrimonial.setNumeroPatrimonial(novoNumeroPatrimonial);	1378	bemPatrimonial.setNumeroPatrimonial(novoNumeroPatrimonial);
1379	for (BemPatrimonialAlteracaoItem bemPatrimonialAlteracaoItem : itensAlterados) {	1379	for (BemPatrimonialAlteracaoItem bemPatrimonialAlteracaoItem : itensAlterados) {
1380	- if(bemPatrimonialAlteracaoItem.getBemPatrimonial() != null && bemPatrimonialAlteracaoItem.getBemPatrimonial().getId() == bemPatrimonial.getId()){	1380	+ if(bemPatrimonialAlteracaoItem.getBemPatrimonial() != null && bemPatrimonialAlteracaoItem.getBemPatrimonial().getId().doubleValue() == bemPatrimonial.getId().doubleValue()){
1381	bemPatrimonialAlteracaoItem.setBemPatrimonial(bemPatrimonial);	1381	bemPatrimonialAlteracaoItem.setBemPatrimonial(bemPatrimonial);
1382	}	1382	}
1383	}	1383	}
	@@ -1464,7 +1464,7 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl<BemPatrimonial		@@ -1464,7 +1464,7 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl<BemPatrimonial
1464	BemPatrimonialAlteracaoItem itemValorLiquido = new BemPatrimonialAlteracaoItem(campoValorLiquido, bemPatrimonial.getValorLiquido().toString(), alteracaoBemVH.getNovoValorBruto().toString());	1464	BemPatrimonialAlteracaoItem itemValorLiquido = new BemPatrimonialAlteracaoItem(campoValorLiquido, bemPatrimonial.getValorLiquido().toString(), alteracaoBemVH.getNovoValorBruto().toString());
1465	itensAlterados.add(itemValorLiquido);	1465	itensAlterados.add(itemValorLiquido);
1466		1466
1467	- if (alteracaoBemVH.getVidaUtil() != null && ( bemPatrimonial.getVidaUtilRestante() != alteracaoBemVH.getVidaUtil() )) {	1467	+ if (alteracaoBemVH.getVidaUtil() != null && ( bemPatrimonial.getVidaUtilRestante().intValue() != alteracaoBemVH.getVidaUtil().intValue() )) {
1468	Dominio campoVidaUtilRestante = this.dominioService.findByChaveAndCodigo(DominioMaterial.CAMPO_REFERENCIA, DominioMaterial.CAMPO_REFERENCIA_BEM_PATRIMONIAL_VIDA_UTIL_RESTANTE_CODIGO);	1468	Dominio campoVidaUtilRestante = this.dominioService.findByChaveAndCodigo(DominioMaterial.CAMPO_REFERENCIA, DominioMaterial.CAMPO_REFERENCIA_BEM_PATRIMONIAL_VIDA_UTIL_RESTANTE_CODIGO);
1469		1469
1470	BemPatrimonialAlteracaoItem itemVidaUtil = new BemPatrimonialAlteracaoItem(campoVidaUtilRestante, bemPatrimonial.getVidaUtilRestante().toString(), alteracaoBemVH.getVidaUtil().toString());	1470	BemPatrimonialAlteracaoItem itemVidaUtil = new BemPatrimonialAlteracaoItem(campoVidaUtilRestante, bemPatrimonial.getVidaUtilRestante().toString(), alteracaoBemVH.getVidaUtil().toString());
	@@ -1416,7 +1416,7 @@ public class HistoricoBemPatrimonialServiceImpl extends GenericServiceImpl<Histo		@@ -1416,7 +1416,7 @@ public class HistoricoBemPatrimonialServiceImpl extends GenericServiceImpl<Histo
1416		1416
1417	historicoBemPrincipal.setDominioClasseReferencia(classeReferencia);	1417	historicoBemPrincipal.setDominioClasseReferencia(classeReferencia);
1418		1418
1419	- historicoBemPrincipal.setCodigoOperacao(adicaoBemPrincipal.getCodigo());	1419	+ historicoBemPrincipal.setCodigoOperacao(adicaoBemPrincipal != null ? adicaoBemPrincipal.getCodigo() : null);
1420		1420
1421	return this.save(historicoBemPrincipal);	1421	return this.save(historicoBemPrincipal);
1422		1422
	@@ -249,7 +249,7 @@ public class TransferenciaServiceImpl extends GenericServiceImpl<Transferencia,		@@ -249,7 +249,7 @@ public class TransferenciaServiceImpl extends GenericServiceImpl<Transferencia,
249	} else {	249	} else {
250	boolean salvarNovaTransferencia = true;	250	boolean salvarNovaTransferencia = true;
251	for (TransferenciaItem transferenciaItemTemp : transferenciaItemListTemp) {	251	for (TransferenciaItem transferenciaItemTemp : transferenciaItemListTemp) {
252	- if(transferenciaItemTemp.getEstruturaOrganizacionalOrigem().getId() == transferencia.getEstruturaOrganizacionalDestino().getId()){	252	+ if(transferenciaItemTemp.getEstruturaOrganizacionalOrigem().getId().doubleValue() == transferencia.getEstruturaOrganizacionalDestino().getId().doubleValue()){
253	salvarNovaTransferencia = false;	253	salvarNovaTransferencia = false;
254	break;	254	break;
255	}	255	}
	@@ -271,7 +271,7 @@ public class TransferenciaServiceImpl extends GenericServiceImpl<Transferencia,		@@ -271,7 +271,7 @@ public class TransferenciaServiceImpl extends GenericServiceImpl<Transferencia,
271		271
272	boolean salvarNovaTransferencia = true;	272	boolean salvarNovaTransferencia = true;
273	for (TransferenciaItem transferenciaItemTemp : transferenciaItemListTemp) {	273	for (TransferenciaItem transferenciaItemTemp : transferenciaItemListTemp) {
274	- if(transferenciaItemTemp.getEstruturaOrganizacionalOrigem().getId() == transferencia.getEstruturaOrganizacionalDestino().getId()){	274	+ if(transferenciaItemTemp.getEstruturaOrganizacionalOrigem().getId().doubleValue() == transferencia.getEstruturaOrganizacionalDestino().getId().doubleValue()){
275	salvarNovaTransferencia = false;	275	salvarNovaTransferencia = false;
276	break;	276	break;
277	}	277	}
	@@ -217,7 +217,7 @@ public class ReportEntradaController extends GenericController<Entrada> {		@@ -217,7 +217,7 @@ public class ReportEntradaController extends GenericController<Entrada> {
217	//Inicio relatorio de resumo	217	//Inicio relatorio de resumo
218	input = this.getClass().getResourceAsStream("/reports/templateRetratoRepeat.jrxml");	218	input = this.getClass().getResourceAsStream("/reports/templateRetratoRepeat.jrxml");
219	inputSub = this.getClass().getResourceAsStream("/reports/entradaPatrimonioBensResumoContabil.jrxml");	219	inputSub = this.getClass().getResourceAsStream("/reports/entradaPatrimonioBensResumoContabil.jrxml");
220	- String titulo = this.internacionalizacaoService.getTranslate("LABEL.TITULO_ENTRADA_PATRIMONIO_RESUMO_CONTABIL", this.getIdioma());	220	+ String titulo = this.internacionalizacaoService.getTranslate("PATRIMONIO.LABEL.TITULO_ENTRADA_PATRIMONIO_RESUMO_CONTABIL", this.getIdioma());
221		221
222	JasperDesign jasperDesign = JRXmlLoader.load(input);	222	JasperDesign jasperDesign = JRXmlLoader.load(input);
223	JasperDesign jasperDesignSubResumo = JRXmlLoader.load(inputSub);	223	JasperDesign jasperDesignSubResumo = JRXmlLoader.load(inputSub);
	@@ -319,7 +319,7 @@ public class ReportEntradaController extends GenericController<Entrada> {		@@ -319,7 +319,7 @@ public class ReportEntradaController extends GenericController<Entrada> {
319	//Inicio relatorio de resumo	319	//Inicio relatorio de resumo
320	input = this.getClass().getResourceAsStream("/reports/templateRetratoRepeat.jrxml");	320	input = this.getClass().getResourceAsStream("/reports/templateRetratoRepeat.jrxml");
321	inputSub = this.getClass().getResourceAsStream("/reports/entradaPatrimonioBensResumoContabil.jrxml");	321	inputSub = this.getClass().getResourceAsStream("/reports/entradaPatrimonioBensResumoContabil.jrxml");
322	- String titulo = this.internacionalizacaoService.getTranslate("LABEL.TITULO_ENTRADA_PATRIMONIO_RESUMO_CONTABIL", this.getIdioma());	322	+ String titulo = this.internacionalizacaoService.getTranslate("PATRIMONIO.LABEL.TITULO_ENTRADA_PATRIMONIO_RESUMO_CONTABIL", this.getIdioma());
323		323
324	JasperDesign jasperDesign = JRXmlLoader.load(input);	324	JasperDesign jasperDesign = JRXmlLoader.load(input);
325	JasperDesign jasperDesignSubResumo = JRXmlLoader.load(inputSub);	325	JasperDesign jasperDesignSubResumo = JRXmlLoader.load(inputSub);
	@@ -182,7 +182,7 @@ citApp.controller('BemPatrimonialController', ['$scope', 'BemPatrimonialReposito		@@ -182,7 +182,7 @@ citApp.controller('BemPatrimonialController', ['$scope', 'BemPatrimonialReposito
182	}	182	}
183		183
184	if ($scope.bemPatrimonialAlteracao.vidaUtil && $scope.bemPatrimonialAlteracao.vidaUtil != $scope.bemPatrimonial.vidaUtilRestante) {	184	if ($scope.bemPatrimonialAlteracao.vidaUtil && $scope.bemPatrimonialAlteracao.vidaUtil != $scope.bemPatrimonial.vidaUtilRestante) {
185	- var chave = $scope.bemPatrimonial.vidaUtilRestante < $scope.bemPatrimonialAlteracao.vidaUtil ? 'MSG.CONFIRMA_AUMENTAR_VIDA_UTIL' : 'MSG.CONFIRMA_DIMINUIR_VIDA_UTIL';	185	+ var chave = $scope.bemPatrimonial.vidaUtilRestante < $scope.bemPatrimonialAlteracao.vidaUtil ? 'PATRIMONIO.MSG.CONFIRMA_AUMENTAR_VIDA_UTIL' : 'PATRIMONIO.MSG.CONFIRMA_DIMINUIR_VIDA_UTIL';
186	$scope.$openModalConfirm({	186	$scope.$openModalConfirm({
187	message: $translate.instant(chave),	187	message: $translate.instant(chave),
188	callback: function () {	188	callback: function () {
	@@ -150,7 +150,7 @@		@@ -150,7 +150,7 @@
150	<div class='col-sm-2'>	150	<div class='col-sm-2'>
151	<label-input-money ng-id="bemPatrimonialAlteracao.novoValorBruto"	151	<label-input-money ng-id="bemPatrimonialAlteracao.novoValorBruto"
152	ng-label="PATRIMONIO.LABEL.NOVO_VALOR_MERCADO"	152	ng-label="PATRIMONIO.LABEL.NOVO_VALOR_MERCADO"
153	- label-info-tooltip="{{$translate.instant('MSG.NOVO_VALOR_REAVALIACAO')}}"	153	+ label-info-tooltip="{{$translate.instant('PATRIMONIO.MSG.NOVO_VALOR_REAVALIACAO')}}"
154	form="bemPatrimonialForm" ng-model="bemPatrimonialAlteracao.novoValorBruto"	154	form="bemPatrimonialForm" ng-model="bemPatrimonialAlteracao.novoValorBruto"
155	ng-obrigatorio="bemPatrimonialAlteracao.dominioTipoAlteracaoIndividual.codigo == 4"	155	ng-obrigatorio="bemPatrimonialAlteracao.dominioTipoAlteracaoIndividual.codigo == 4"
156	ng-if="edit && bemPatrimonialAlteracao.dominioTipoAlteracaoIndividual.codigo == 4">	156	ng-if="edit && bemPatrimonialAlteracao.dominioTipoAlteracaoIndividual.codigo == 4">
	@@ -158,7 +158,7 @@		@@ -158,7 +158,7 @@
158		158
159	<label-input-money ng-id="bemPatrimonialAlteracao.novoValorBruto"	159	<label-input-money ng-id="bemPatrimonialAlteracao.novoValorBruto"
160	ng-label="PATRIMONIO.LABEL.NOVO_VALOR_RECUPERAVEL"	160	ng-label="PATRIMONIO.LABEL.NOVO_VALOR_RECUPERAVEL"
161	- label-info-tooltip="{{$translate.instant('MSG.NOVO_VALOR_REDUCAO')}}"	161	+ label-info-tooltip="{{$translate.instant('PATRIMONIO.MSG.NOVO_VALOR_REDUCAO')}}"
162	form="bemPatrimonialForm"	162	form="bemPatrimonialForm"
163	ng-model="bemPatrimonialAlteracao.novoValorBruto"	163	ng-model="bemPatrimonialAlteracao.novoValorBruto"
164	ng-obrigatorio="bemPatrimonialAlteracao.dominioTipoAlteracaoIndividual.codigo == 5"	164	ng-obrigatorio="bemPatrimonialAlteracao.dominioTipoAlteracaoIndividual.codigo == 5"
	@@ -74,7 +74,7 @@		@@ -74,7 +74,7 @@
74		74
75	<div class="row">	75	<div class="row">
76	<div class="col-sm-9">	76	<div class="col-sm-9">
77	- <auto-complete ng-find="findColaborador(value)" form="definicaoDetentorForm" ng-acao-borracha="limparColaborador()" ng-obrigatorio="true" ng-set-result="setColaborador(item)" ng-item="item.pessoa.nome + ' - ' + item.estruturaOrganizacional.nome" ng-id="colaborador" ng-label="PATRIMONIO.LABEL.DETENTOR" ng-model="definicaoDetentor.colaborador" ng-disabled="!edit"></auto-complete>	77	+ <auto-complete ng-find="findColaborador(value)" form="definicaoDetentorForm" ng-acao-borracha="limparColaborador()" ng-obrigatorio="true" ng-set-result="setColaborador(item)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula'] + ' - UN: ' + item.estruturaOrganizacional.nome" ng-id="colaborador" ng-label="PATRIMONIO.LABEL.DETENTOR" ng-model="definicaoDetentor.colaborador" ng-disabled="!edit"></auto-complete>
78	</div>	78	</div>
79	<!-- Haline decidiu por nao exibir esta propriedade ate que seja esclarecido o motivo do uso -->	79	<!-- Haline decidiu por nao exibir esta propriedade ate que seja esclarecido o motivo do uso -->
80	<div class="col-sm-3" ng-if="false">	80	<div class="col-sm-3" ng-if="false">
	@@ -66,7 +66,7 @@		@@ -66,7 +66,7 @@
66	<div class="col-sm-3">	66	<div class="col-sm-3">
67	</div>	67	</div>
68	<div class="col-sm-4">	68	<div class="col-sm-4">
69	- <auto-complete ng-find="findColaborador(value)" ng-item="item.pessoa.nome + ' - ' + item.estruturaOrganizacional.nome"	69	+ <auto-complete ng-find="findColaborador(value)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula'] + ' - UN: ' + item.estruturaOrganizacional.nome"
70	ng-id="colaborador" ng-label="PATRIMONIO.LABEL.DETENTOR" ng-model="colaborador" form="emissaoTermoResponsabilidadeForm"	70	ng-id="colaborador" ng-label="PATRIMONIO.LABEL.DETENTOR" ng-model="colaborador" form="emissaoTermoResponsabilidadeForm"
71	ng-set-result="setColaborador()" ng-obrigatorio="{{codigoTipoMovimentacao == 2}}"></auto-complete>	71	ng-set-result="setColaborador()" ng-obrigatorio="{{codigoTipoMovimentacao == 2}}"></auto-complete>
72	</div>	72	</div>
	@@ -596,7 +596,7 @@		@@ -596,7 +596,7 @@
596	<td colspan="4">	596	<td colspan="4">
597	<div class="row" >	597	<div class="row" >
598	<div class="col-sm-6">	598	<div class="col-sm-6">
599	- <auto-complete ng-find="findResponsavelInventario(value)" ng-item="item.pessoa.nome" ng-id="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario"	599	+ <auto-complete ng-find="findResponsavelInventario(value)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula']" ng-id="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario"
600	ng-label="PATRIMONIO.LABEL.RESPONSAVEL_PELO_INVENTARIO" ng-model="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario" form="formInventario" >	600	ng-label="PATRIMONIO.LABEL.RESPONSAVEL_PELO_INVENTARIO" ng-model="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario" form="formInventario" >
601	</auto-complete>	601	</auto-complete>
602	</div>	602	</div>
	@@ -829,7 +829,7 @@		@@ -829,7 +829,7 @@
829	<td colspan="4">	829	<td colspan="4">
830	<div class="row" >	830	<div class="row" >
831	<div class="col-sm-6">	831	<div class="col-sm-6">
832	- <auto-complete ng-find="findResponsavelInventario(value)" ng-item="item.pessoa.nome" ng-id="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario"	832	+ <auto-complete ng-find="findResponsavelInventario(value)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula']" ng-id="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario"
833	ng-label="PATRIMONIO.LABEL.RESPONSAVEL_PELO_INVENTARIO" ng-model="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario"	833	ng-label="PATRIMONIO.LABEL.RESPONSAVEL_PELO_INVENTARIO" ng-model="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario"
834	ng-disabled="!dadosBemPatrimonialSelecionado.$isEditar" form="formInventario" >	834	ng-disabled="!dadosBemPatrimonialSelecionado.$isEditar" form="formInventario" >
835	</auto-complete>	835	</auto-complete>
	@@ -1015,7 +1015,7 @@		@@ -1015,7 +1015,7 @@
1015	<td colspan="4">	1015	<td colspan="4">
1016	<div class="row" >	1016	<div class="row" >
1017	<div class="col-sm-5">	1017	<div class="col-sm-5">
1018	- <auto-complete ng-find="findResponsavelInventario(value)" ng-item="item.pessoa.nome" ng-id="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario"	1018	+ <auto-complete ng-find="findResponsavelInventario(value)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula']" ng-id="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario"
1019	ng-label="PATRIMONIO.LABEL.RESPONSAVEL_PELO_INVENTARIO" ng-model="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario"	1019	ng-label="PATRIMONIO.LABEL.RESPONSAVEL_PELO_INVENTARIO" ng-model="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario"
1020	ng-disabled="!dadosBemPatrimonialSelecionado.$isEditar" form="formInventario" >	1020	ng-disabled="!dadosBemPatrimonialSelecionado.$isEditar" form="formInventario" >
1021	</auto-complete>	1021	</auto-complete>
	@@ -1926,7 +1926,7 @@		@@ -1926,7 +1926,7 @@
1926	<label-input-data ng-id="dataSaidaTemporaria" form="formDialogSaidaTemporaria" ng-label="PATRIMONIO.LABEL.DATA_SAIDA" ng-obrigatorio="true" ng-disabled="false" ng-model="dataSaidaTemporaria"></label-input-data>	1926	<label-input-data ng-id="dataSaidaTemporaria" form="formDialogSaidaTemporaria" ng-label="PATRIMONIO.LABEL.DATA_SAIDA" ng-obrigatorio="true" ng-disabled="false" ng-model="dataSaidaTemporaria"></label-input-data>
1927	</div>	1927	</div>
1928	<div class="col-sm-12">	1928	<div class="col-sm-12">
1929	- <auto-complete ng-find="findResponsavelSaida(value)" ng-item="item.pessoa.nome" ng-id="responsavelSaidaTemporaria" ng-label="PATRIMONIO.LABEL.RESPONSAVEL_SAIDA" ng-model="responsavelSaidaTemporaria"	1929	+ <auto-complete ng-find="findResponsavelSaida(value)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula']" ng-id="responsavelSaidaTemporaria" ng-label="PATRIMONIO.LABEL.RESPONSAVEL_SAIDA" ng-model="responsavelSaidaTemporaria"
1930	form="formDialogSaidaTemporaria" ng-disabled="false" ng-obrigatorio="true">	1930	form="formDialogSaidaTemporaria" ng-disabled="false" ng-obrigatorio="true">
1931	</auto-complete>	1931	</auto-complete>
1932	</div>	1932	</div>