From fc1d85ab6d8ad9f79f1c69ccc71f37bc263b315a Mon Sep 17 00:00:00 2001
From: julio <julio@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 11 Sep 2017 18:32:10 +0000
Subject: [PATCH] fixes bug #9608

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@73667 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../impl/RelatorioDevolucaoBilhetes.java      |   7 +++----
 .../templates/RelatorioImpressaoRmd.jasper    | Bin 32953 -> 32952 bytes
 .../templates/RelatorioImpressaoRmd.jrxml     |   6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java
index d927efc3b..8cd1d8496 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java
@@ -16,7 +16,6 @@ import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DevolucaoBilhetes;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.utilerias.DateUtil;
-import com.rjconsultores.ventaboletos.utilerias.MoneyHelper;
 import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal;
 import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
 
@@ -221,9 +220,10 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
 	private String getSql(Integer empresaId, String puntoVentas, String estados, Date dataVendaInicial, Date dataVendaFinal, Date dataDevolucaoInicial, Date dataDevolucaoFinal, Boolean isApenasBilhetesImpressos) {
 
 		StringBuilder sql = new StringBuilder();
-		sql.append("SELECT COALESCE(COALESCE(BORI.SERIEIMPFISCALORIGINAL,BORI.SERIEIMPFISCAL),AIDF.ACFISCAL) AS AIDF, ");
+		sql.append("SELECT COALESCE(COALESCE(BORI.SERIEIMPFISCALORIGINAL,BORI.SERIEIMPFISCAL), AIDF.DOCFISCAL) AS AIDF, ");
 		sql.append("  COALESCE(B.NUMFOLIOSISTEMA, B.NUMOPERACION) AS NUMFOLIOSISTEMA, ");
-		sql.append("  CASE WHEN COALESCE(BORI.SERIEIMPFISCALORIGINAL,BORI.SERIEIMPFISCAL) IS NOT NULL THEN NULL ELSE B.NUMSERIEPREIMPRESA END AS SERIE_SUBSERIE, ");
+		sql.append("  CASE WHEN COALESCE(BORI.SERIEIMPFISCALORIGINAL,BORI.SERIEIMPFISCAL) IS NOT NULL THEN NULL ");
+		sql.append("  										ELSE AIDF.SERIE || COALESCE(AIDF.SUBSERIE, '') END AS SERIE_SUBSERIE, ");
 		sql.append("  B.NUMFOLIOPREIMPRESO AS FOLIO, ");
 		sql.append("  B.PRECIOBASE AS PRECIOBASE, ");
 		sql.append("  E.NOMBEMPRESA AS NOMB_EMPRESA, ");
@@ -278,7 +278,6 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
 		sql.append("WHERE B.MOTIVOCANCELACION_ID IN (31,32,10,37,99,36) ");
 		sql.append("AND B.INDSTATUSBOLETO = 'C' ");
 		sql.append("AND B.INDCANCELACION = 1 ");
-		sql.append("AND BORI.SERIEIMPFISCAL IS NOT NULL ");
 		
 		if(isApenasBilhetesImpressos) {
 			sql.append("AND B.NUMFOLIOPREIMPRESO IS NOT NULL ");
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper
index 6c9072ae5d63b693cf5bda4c6e6f42503970e289..1821d05f59eeb40e40a4944e6e08a5812b048d67 100644
GIT binary patch
delta 133
zcmdnl$h4!8X@jOL>k0-22HD9D8k(EKWdj&lb%ETYVD449E4o60hI%GuCWZ!ZV6l0R
zkF0>WsiCo{vAL<KxkbE@fsuu!0XqXDBZJQ5LROi{^{MQeg<}(xMKBbVFc?iXWS5!z
LA)0gYng(6~?j0f;

delta 134
zcmdnd$h5POX@jOL>mmjQ2HD9D8k(EKWdj&lje*?#VD449E4so$26`4oW+o<PMivH^
zmWJlWmS&rG`^XB28=F~J8W~y|7#qbKTUwY}nzJ)7GBW5)E@YLNT$jqeStvF^Sp-8-
U34_sOLw1?T@1r><uWsN403b0UnE(I)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml
index e2996b431..91143a9b3 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml
@@ -1,6 +1,6 @@
 <?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="RelatorioImpressaoRMD" printOrder="Horizontal" pageWidth="948" pageHeight="730" columnWidth="922" leftMargin="20" rightMargin="6" topMargin="0" bottomMargin="19" uuid="d3d490c9-33e7-4eeb-97cc-1fa9be0f10d4">
-	<property name="ireport.zoom" value="0.8264462809917396"/>
+	<property name="ireport.zoom" value="1.464100000000008"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<field name="empresa" class="java.lang.String"/>
@@ -105,14 +105,14 @@
 				<textFieldExpression><![CDATA[$F{tipo}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="29" y="0" width="162" height="18" uuid="b8964ae5-2660-4461-926e-8b7734cbe07f"/>
+				<reportElement x="29" y="0" width="168" height="18" uuid="b8964ae5-2660-4461-926e-8b7734cbe07f"/>
 				<textElement>
 					<font fontName="SansSerif" size="13" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{serie}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="191" y="0" width="51" height="18" uuid="b5444b15-beaa-42fb-814d-424acf42b6ab"/>
+				<reportElement x="197" y="0" width="45" height="18" uuid="b5444b15-beaa-42fb-814d-424acf42b6ab"/>
 				<textElement>
 					<font fontName="SansSerif" size="13" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
 				</textElement>