From 61d5aa2e275ef4d52c3576dd5c8951c4b0900e7f Mon Sep 17 00:00:00 2001 From: wilian Date: Wed, 24 Jun 2015 20:00:47 +0000 Subject: [PATCH] bug #6369 bug #6376 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@45365 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioVendasPacotesDetalhado.java | 6 ++--- .../impl/RelatorioVendasPacotesResumido.java | 2 +- .../RelatorioVendasPacotesBoletosItem.jasper | Bin 35383 -> 35385 bytes ...RelatorioVendasPacotesDetalhadoItem.jasper | Bin 31698 -> 31737 bytes .../RelatorioVendasPacotesDetalhadoItem.jrxml | 22 +++++++++--------- .../RelatorioVendasPacotesResumido.jasper | Bin 29683 -> 29683 bytes 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java index bf3c21a2e..43888ed5c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java @@ -146,13 +146,11 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio { .append("LEFT JOIN PACOTE P ON P.PACOTE_ID = VP.PACOTE_ID ") .append("LEFT JOIN TARIFA_VENDA_PACOTE TVP ON TVP.VENDAPACOTE_ID = VP.VENDAPACOTE_ID ") .append("LEFT JOIN BOLETO B ON B.BOLETO_ID = TVP.BOLETO_ID ") - .append("LEFT JOIN ENDERECO_APANHE EA ON EA.ENDERECOAPANHE_ID = VP.ENDERECOAPANHE_ID ") + .append("LEFT JOIN ENDERECO_APANHE EA ON EA.VENDAPACOTE_ID = VP.VENDAPACOTE_ID AND EA.ACTIVO = 1 ") .append("LEFT JOIN CLIENTE_PACOTE CP ON CP.CLIENTEPACOTE_ID = VP.CLIENTEPACOTE_ID ") .append("LEFT JOIN USUARIO U ON U.USUARIO_ID = VP.USUARIO_ID ") .append("WHERE P.ACTIVO = 1 ") - .append("AND B.ACTIVO = 1 ") - .append("AND B.INDSTATUSBOLETO = 'V' ") - .append("AND B.MOTIVOCANCELACION_ID IS NULL ");; + .append("AND (B.BOLETO_ID IS NULL OR (B.ACTIVO = 1 AND B.INDSTATUSBOLETO = 'V' AND B.MOTIVOCANCELACION_ID IS NULL)) "); if(empresaId != null) { sQuery.append("AND P.EMPRESA_ID = :empresaId "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesResumido.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesResumido.java index 84a75da5a..8c2320cf8 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesResumido.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesResumido.java @@ -198,7 +198,7 @@ public class RelatorioVendasPacotesResumido extends Relatorio { .append("WHERE P.ACTIVO = 1 ") .append("AND B.ACTIVO = 1 ") .append("AND B.INDSTATUSBOLETO = 'V' ") - .append("AND B.MOTIVOCANCELACION_ID IS NULL ");; + .append("AND B.MOTIVOCANCELACION_ID IS NULL "); if(empresaId != null) { sQuery.append("AND P.EMPRESA_ID = :empresaId "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletosItem.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletosItem.jasper index a7d1aa698f5c5a1b98189ab5adafc36ed0c94e57..262fa248faa57eef7e2582264fc6581210ac4e1f 100644 GIT binary patch delta 95 zcmdl!g=yy$rVSTU_@qw#+qI8@fkBVaj*-D)^8FMIVM9|>6Egz~Bjb1zLrViQOLhjv m$#wZ^o9$EAsYr^(8=4rKqAMw3Fq&-0E;E@wg>$l27cT&Th8ms# delta 93 zcmdlvg=zZ~rVSTU_#{vL+qI8@fkBVaj*-E9^8FMIAp=We3ll>VBa3(oBTF-Lb_T}D l_4#U>9a7h+NQlH6ni!j+sVHGEnrz4}GnqeybFxksF91@u8chHI diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhadoItem.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhadoItem.jasper index c5b657b66b5ee0c7cb3be232eb3465e1fe108206..e4dbed44abfb2bee07fd2c24f8796b9187803e0c 100644 GIT binary patch delta 1522 zcmZwHO=uHQ5C`ymH74qcEi4gjV!lXB^R>;UN%H|BdMM(_)+$Ot(SuMBNoXLTSR>VQ zv12bH1-(}SDR_w#K~KdZ-h@C%K@ck5O6f`W&FpU8>gF)ay#IUqW3$PA+h+&+taZWX zV%6#*sGcBXj~s5#`&JpeO`nI>j0Z-~G~{|sT9mNVpmtU%(Og~N%hQtdd8(>^tUYxK zZvG#@ouJ~T!z+PPtOosz2A2b>i=TxnQ9ry4G~^{dVQHd9vx6oEHjM(*sO4G{wNJt1 zKsy#{$SYjKvWyzd4w@L)Gzw6omTSwXRlYpAs% z3G?1Ua1dFLTU^7kjvCDlni$wL3Q(h#YwM`RqA61Yd6P?6Iw;ZXAc=uZq5vgoxzs`F zbximccVf@vuUx~jg&NHcni$wL3Q(h#Yg?!Va(+lG(Ph}`2QmM)q!JD6f% zGbuomT5fjHd^IMR?@J0iiTYqTku>bz+{UttHq8#U7}#tI(59B#yJ&lpWB44~=aMeQ z{=mi5^Qc<~85Ty$b>YuUfgAdo;--!8G;6glCX~~(%3lijinwLG9vDOLVVXew5ATIm z$pb&rithHu6*kl!$*7F+cL7Cn>L6NDGh*~b-*2AU8_$c;ls1SSXk{_liwvS)xilM+ zsxX?bSXY|Qr;N2Yd?;9Z;YT5h4C=gSL)YL;zzg4er_?FDkVct2ypxBcjYoFSBO`js zmgl=aYI;DeAe+WCv3VypM;o^6AX`RcPh0G+N93%eya7lfNd>RYH=biW*ZTPZ- zd>N6yVDXnDe1AUW_!;*e8BkxNhsGj#cqb1>8;|UuM@IB4TAq=X7*tv&#VeQzgw$0u z&{!q|?_}U;V~`y*$cTnz%kZItY7}{wr?iR}qADrKPF*@lDzKDrL=66cL z%XlmNZtQ}u2@lk@YlpV*mtc_ngQc_=%(vO0HLtf@tse=eR#P%-wXUR` zTC=HwZ0QcRgPAxrp5)1Cvh9ZB - + @@ -36,70 +36,70 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesResumido.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesResumido.jasper index d36c37608f2ca3f9c018a0de1d0f64d5f242a8ef..1d663d2c8577dff065de74dc0910f4dbfbb6b20b 100644 GIT binary patch delta 52 tcmezTobmH>#tniY0*2-WCI)7fW`^+=MrMW<2AdT_dgU=hC+{mZ1pvVK4~+l- delta 52 tcmezTobmH>#tniY0tS}G=H>?GhL-VWCKe`U#+wyGdgU=hC+{mZ1pvdg532wG