From 57a7fc6592620a2868f554c016656528ca36329b Mon Sep 17 00:00:00 2001 From: wilian Date: Mon, 9 May 2016 13:44:56 +0000 Subject: [PATCH] fixes bug #7401 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@55741 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioDevolucaoBilhetes.java | 4 +++- .../RelatorioDevolucaoBilhetes.jasper | Bin 51834 -> 51864 bytes .../RelatorioDevolucaoBilhetes.jrxml | 10 +++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java index 990874f25..da917b537 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java @@ -146,7 +146,9 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { sql.append("INNER JOIN CIUDAD CD ON (CD.CIUDAD_ID = DESTINO.CIUDAD_ID ) "); sql.append("INNER JOIN ESTADO EST ON EST.ESTADO_ID = CO.ESTADO_ID "); sql.append("LEFT JOIN FISCAL_R4 R4 ON R4.BOLETO_ID = B.BOLETOORIGINAL_ID "); - sql.append("LEFT JOIN EMPRESA_IMPOSTO EI ON EST.ESTADO_ID = EI.ESTADO_ID AND EI.EMPRESA_ID = B.MARCA_ID "); + sql.append("LEFT JOIN EMPRESA_IMPOSTO EI ON EST.ESTADO_ID = EI.ESTADO_ID "); + sql.append(" AND EI.EMPRESA_ID = B.MARCA_ID "); + sql.append(" AND EI.ACTIVO = 1 "); sql.append("LEFT JOIN AIDF AIDF ON ((AIDF.SERIE = B.NUMSERIEPREIMPRESA OR "); sql.append(" AIDF.SERIE = SUBSTR(B.NUMSERIEPREIMPRESA,1,INSTR(B.NUMSERIEPREIMPRESA,'-',1)-1)) "); sql.append(" AND (B.NUMFOLIOPREIMPRESO BETWEEN AIDF.FORMINICIAL AND AIDF.FORMFINAL)) "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jasper index b17db772c5c92e1f735f55b07ab6988fb54baf20..faa239212eb09b05c51e18b4e5301111fdcab9e5 100644 GIT binary patch delta 260 zcmex0g?YwQ<_#`c5=@o`g$#Af5hV=FhI*zTW@HHiqd~=FIT!8C?OBglCaW6@%L2t2 zZxs|2lrZoVmZYRQW#(k0mZTOJfYj$tp6@6%S-enu^X_~%IUZyMljAj2C&wFeY&Pv% z!Oj>t`QB7*aU%-@LlaXIb7RAJOG`5&Q)6}pMn(pm$%U*kn{B3Xu!)J5B^G5SCgr5Y zBU`mObk1cCUSz|IHybQ16=ZCg{O8Ey&7Irb*%(_kU)-z34y67Zv0xR!u&9K=XtE)@ O%w*}QoRf1;@d5xYnpSxL delta 240 zcmbO+mHF2c<_#`c5{w3g40X&AB@E1ldZr*|WC;V4rD4TnIT!8C?OBgl6j{^qb29S_ z3JQR-jJJSv2?IM=DBchx#GF5QzN6IS<%Qy#PvyJGalqszf2@_7yg{97a=bCeX3xGA z?2P`CKTXvZG&C}`G%~laG_s60G&iv@FyE{i{=&=Llt$%gDQll7-^PVPR%3jiK> BQCa{1 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml index 7c9ee7c4f..ee00da911 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml @@ -1,8 +1,8 @@ - - + +