From 5127fc5abeca001d48d21a0d2d75e858b814c0ff Mon Sep 17 00:00:00 2001
From: bruno <bruno@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 26 Aug 2013 04:29:09 +0000
Subject: [PATCH] =?UTF-8?q?-=20Ajustes=20RDA=20e=20RRL=20-=20Fechamento=20?=
 =?UTF-8?q?de=20conex=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@30019 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .settings/org.eclipse.core.resources.prefs    |   2 +-
 .../impl/RelatorioReceitaDiariaAgencia.java   |  16 +++++++-----
 .../RelatorioReceitaDiariaAgencia.jasper      | Bin 82087 -> 82256 bytes
 .../RelatorioReceitaDiariaAgencia.jrxml       |   4 +--
 .../relatorios/utilitarios/Relatorio.java     |  23 ++++++++++++++----
 ...latorioReceitaDiariaAgenciaController.java |   1 -
 web/WEB-INF/i3-label_pt_BR.label              |   2 +-
 7 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index ace621579..d181d77df 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,3 @@
-#Thu May 02 10:20:38 BRT 2013
 eclipse.preferences.version=1
+encoding//src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jrxml=UTF-8
 encoding//web/WEB-INF/i3-label_pt_BR.label=UTF-8
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaDiariaAgencia.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaDiariaAgencia.java
index 9d4ce85d4..cef593499 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaDiariaAgencia.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaDiariaAgencia.java
@@ -142,10 +142,11 @@ public class RelatorioReceitaDiariaAgencia extends Relatorio {
 					if ((Boolean) configComissao.get("PEDAGIORECEITA"))
 						baseCalculo = baseCalculo.add(this.resultSet.getBigDecimal("IMPORTEPEDAGIO"));
 
+					System.out.println("configComissao "+configComissao);
 					// Caso esteje setado na configuração de comissão que o calculo deve ser sobre o liquido, deduz o imposto.
-					if (((String) configComissao.get("RECEITA")).equals("RL") &&
+					if (configComissao.get("RECEITA") != null && ((String) configComissao.get("RECEITA")).equals("RL") &&
 							(!tipoVentaId.equals(18) || (tipoVentaId.equals(18) && (Boolean) this.relatorio.getParametros().get("B_CONTEMPLAR_GAP"))))
-						baseCalculo = baseCalculo.subtract((BigDecimal) rowOrigem.get("IMPOSTO"));
+						baseCalculo = baseCalculo.subtract((BigDecimal) rowOrigem.get("IMPOSTOS"));
 
 				}
 				else {
@@ -172,6 +173,8 @@ public class RelatorioReceitaDiariaAgencia extends Relatorio {
 
 				percComissao = isAltaTemporada ? (BigDecimal) configComissao.get("PASSAGEMALTA") : (BigDecimal) configComissao.get("PASSAGEMBAIXA");
 
+				if(percComissao==null)
+					return;
 				// VALOR COMISSAO = BASE DE CALCULO * (PERCENTUAL COMISSAO / 100)
 				valorComissao = baseCalculo.multiply(percComissao.divide(BigDecimal.valueOf(100)));
 
@@ -199,7 +202,7 @@ public class RelatorioReceitaDiariaAgencia extends Relatorio {
 					rowDestino.put("EMPRESAPUNTOVENTA_ID", rowOrigem.get("EMPRESAPUNTOVENTA_ID"));
 					rowDestino.put("ESTADO_ID", configComissao.get("ESTADO_ID"));
 					rowDestino.put("TIPO_AGENCIA", configComissao.get("TIPO_AGENCIA"));
-
+ 
 					mapDados.put(puntoVentaId, (HashMap<String, Object>) rowDestino);
 				}
 			}
@@ -273,7 +276,7 @@ public class RelatorioReceitaDiariaAgencia extends Relatorio {
 				while (this.resultSet.next()) {
 
 					Integer puntoVentaId = this.resultSet.getInt("PUNTOVENTA_ID");
-					BigDecimal motivoCancelacionId = this.resultSet.getBigDecimal("MOTIVOCANCELACION_ID");
+					Integer motivoCancelacionId = this.resultSet.getInt("MOTIVOCANCELACION_ID");
 					Integer tipoVentaId = this.resultSet.getInt("TIPOVENTA_ID");
 
 					// Inicializa a row atual
@@ -284,7 +287,7 @@ public class RelatorioReceitaDiariaAgencia extends Relatorio {
 					row.put("TOTAL_BILHETES_GAP", ((BigDecimal) row.get("TOTAL_BILHETES_GAP")).add(motivoCancelacionId == null && tipoVentaId.equals(18) ? BigDecimal.ONE : BigDecimal.ZERO));
 					row.put("TOTAL_BILHETES_CANC", ((BigDecimal) row.get("TOTAL_BILHETES_CANC")).add(motivoCancelacionId != null ? BigDecimal.ONE : BigDecimal.ZERO));
 
-					if (motivoCancelacionId == null) {
+					if (motivoCancelacionId == 0) {
 
 						row.put("RECEITA_TARIFA", ((BigDecimal) row.get("RECEITA_TARIFA")).add(!tipoVentaId.equals(18) && !tipoVentaId.equals(39) ? this.resultSet.getBigDecimal("PRECIOPAGADO") : BigDecimal.ZERO));
 						row.put("RECEITA_TARIFA_GAP", ((BigDecimal) row.get("RECEITA_TARIFA_GAP")).add((tipoVentaId.equals(18) || tipoVentaId.equals(39)) ? this.resultSet.getBigDecimal("PRECIOPAGADO") : BigDecimal.ZERO));
@@ -306,9 +309,10 @@ public class RelatorioReceitaDiariaAgencia extends Relatorio {
 					}
 					else {
 						// Verificia se a devolução é pra ser contabilizada na agência de destino ou de origem da venda
-						if (((Integer) this.relatorio.getParametros().get("ISDEVOLUCAODESTINO")).equals(1) || (((Integer) this.relatorio.getParametros().get("ISDEVOLUCAODESTINO")).equals(0) && this.resultSet.getInt("POSSUI_CANC") == 1)) {
+						if (((Integer) this.relatorio.getParametros().get("ISDEVOLUCAODESTINO") == 1 )|| (((Integer) this.relatorio.getParametros().get("ISDEVOLUCAODESTINO")).equals(0) && this.resultSet.getInt("POSSUI_CANC") == 1)) {
 							row.put("TOTAL_DEVOL", ((BigDecimal) row.get("TOTAL_DEVOL")).add((motivoCancelacionId.equals(31) || motivoCancelacionId.equals(32)) && !tipoVentaId.equals(18) ? this.resultSet.getBigDecimal("PRECIOPAGADO") : BigDecimal.ZERO));
 							row.put("TOTAL_DEVOL_GAP", ((BigDecimal) row.get("TOTAL_DEVOL_GAP")).add((motivoCancelacionId.equals(31) || motivoCancelacionId.equals(32)) && tipoVentaId.equals(18) ? this.resultSet.getBigDecimal("PRECIOPAGADO") : BigDecimal.ZERO));
+
 						}
 					}
 
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaDiariaAgencia.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaDiariaAgencia.jasper
index 0a7e4d34a92d3f94220047a356335df3db4fa3d9..719e7ade79985bb17b58864e65029ff0daf8f1b4 100644
GIT binary patch
delta 13301
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
a0Bg25I(nidYj?tZk26l&tD||ERPz5u@cZ%r

delta 12775
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

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaDiariaAgencia.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaDiariaAgencia.jrxml
index ab459343d..3a9ebc68b 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaDiariaAgencia.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaDiariaAgencia.jrxml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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="RelatorioReceitaDiariaAgencia" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="822" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" uuid="c5fca8ba-9c4b-4e17-9986-a053943688db">
 	<property name="ireport.zoom" value="2.0"/>
-	<property name="ireport.x" value="223"/>
+	<property name="ireport.x" value="267"/>
 	<property name="ireport.y" value="0"/>
 	<style name="Title" fontName="Times New Roman" fontSize="50" isBold="true" pdfFontName="Times-Bold"/>
 	<style name="SubTitle" forecolor="#736343" fontName="SansSerif" fontSize="18"/>
@@ -671,7 +671,7 @@
 				<textElement textAlignment="Right">
 					<font size="6" isBold="false"/>
 				</textElement>
-				<text><![CDATA[Devololução]]></text>
+				<text><![CDATA[Devolução]]></text>
 			</staticText>
 			<staticText>
 				<reportElement uuid="f1d10a1d-13fb-4ca0-914a-734f48754946" style="Column header" x="546" y="11" width="57" height="14" forecolor="#000000"/>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java
index e4bb17e2b..a020d779c 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java
@@ -35,7 +35,6 @@ public abstract class Relatorio {
 	private JRBeanCollectionDataSource collectionDataSource;
 
 	protected Relatorio(Map<String, Object> parametros, Connection conexao) {
-
 		this.parametros = parametros;
 		this.conexao = conexao;
 		this.infoMsg = new HashSet<String>();
@@ -106,12 +105,26 @@ public abstract class Relatorio {
 	 * @see com.rjconsultores.ventaboletos.relatorios.utilitarios.IRenderRelatorio#getConteudo()
 	 */
 	public byte[] getConteudo(SaidaRelatorio saida) throws Exception {
-		this.processaParametros();
+		byte[] conteudo = null;
+		try {
 
-		if (this.render == null)
-			this.render = new RenderRelatorioJasper(this);
+			this.processaParametros();
 
-		return this.render.render(saida);
+			if (this.render == null)
+				this.render = new RenderRelatorioJasper(this);
+
+			conteudo = this.render.render(saida);
+
+		} catch (Exception e) {
+			if (!this.conexao.isClosed())
+				this.conexao.close();
+			throw e;
+		} finally {
+			if (!this.conexao.isClosed())
+				this.conexao.close();
+		}
+
+		return conteudo;
 
 	}
 
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaDiariaAgenciaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaDiariaAgenciaController.java
index e9eedad73..3d07713e9 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaDiariaAgenciaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaDiariaAgenciaController.java
@@ -210,7 +210,6 @@ public class RelatorioReceitaDiariaAgenciaController extends MyGenericForwardCom
 		PuntoVenta puntoVentaSel = (PuntoVenta) puntoVentaList.getSelected();
 		puntoVentaSelList.addItemNovo(puntoVentaSel);
 		
-		
 	}
 
 	public void onDoubleClick$puntoVentaSelList(Event ev) {
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index 8ea06dcd0..aadfb7476 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -7,7 +7,7 @@
 # <controler>. <id>. <propiedade> = XXX
 
 #Versao do VentaBoleto:
-versao = ADM_20130823_1RC207
+versao = ADM_20130825_1RC208
 
 # MSG Defaut:
 MSG.CONSTRAINT.PORCENTAGEM = Os valores devem estar entre 0 e 100