fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIXES BUG #6774 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@49455 d1611594-4594-4d17-8e1d-87c2c4800839
master
daniel.zauli 2015-10-26 19:22:05 +00:00
parent 1ca6d9914e
commit aa55c1c5f1
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java
View File

@ -188,9 +188,9 @@ public class RelatorioTaxasLinha extends Relatorio {
sql.append(" ELSE "); sql.append(" ELSE ");
sql.append(" 'N' "); sql.append(" 'N' ");
sql.append(" END INTERESTADUAL, "); sql.append(" END INTERESTADUAL, ");
sql.append(" SUM(CJ.IMPORTETAXAEMBARQUE) TOTAL_EMBARQUE, "); sql.append(" SUM( (case when cj.motivocancelacion_id is null then 1 else -1 end) * CJ.IMPORTETAXAEMBARQUE) TOTAL_EMBARQUE, ");
sql.append(" SUM(CJ.IMPORTEPEDAGIO) TOTAL_PEDAGIO, "); sql.append(" SUM( (case when cj.motivocancelacion_id is null then 1 else -1 end) * CJ.IMPORTEPEDAGIO) TOTAL_PEDAGIO, ");
sql.append(" SUM(CJ.IMPORTESEGURO) TOTAL_SEGURO "); sql.append(" SUM( (case when cj.motivocancelacion_id is null then 1 else -1 end) * CJ.IMPORTESEGURO) TOTAL_SEGURO ");
sql.append(" FROM CORRIDA CR, "); sql.append(" FROM CORRIDA CR, ");
sql.append(" RUTA RT, "); sql.append(" RUTA RT, ");
sql.append(" PUNTO_VENTA PV, "); sql.append(" PUNTO_VENTA PV, ");
@ -212,7 +212,6 @@ public class RelatorioTaxasLinha extends Relatorio {
sql.append(" AND CD.CIUDAD_ID = PD.CIUDAD_ID "); sql.append(" AND CD.CIUDAD_ID = PD.CIUDAD_ID ");
sql.append(" AND CJ.INDSTATUSOPERACION = 'F' "); sql.append(" AND CJ.INDSTATUSOPERACION = 'F' ");
sql.append(" AND CJ.INDREIMPRESION = 0 "); sql.append(" AND CJ.INDREIMPRESION = 0 ");
sql.append(" AND CJ.INDCANCELACION = 0 ");
sql.append(" AND DECODE(:TIPO_DATA, 1, CJ.FECHORVENTA, 2, CJ.FECCORRIDA) BETWEEN "); sql.append(" AND DECODE(:TIPO_DATA, 1, CJ.FECHORVENTA, 2, CJ.FECCORRIDA) BETWEEN ");
sql.append(" :DATA_INICIAL AND :DATA_FINAL "); sql.append(" :DATA_INICIAL AND :DATA_FINAL ");
sql.append(" AND EM.EMPRESA_ID = NVL(:EMPRESA_ID, EM.EMPRESA_ID) "); sql.append(" AND EM.EMPRESA_ID = NVL(:EMPRESA_ID, EM.EMPRESA_ID) ");