diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java index 915b2811d..94da1fdfc 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java @@ -170,11 +170,11 @@ public class RelatorioOperacionalFinanceiro extends Relatorio { sql.append(" "); sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL "); sql.append(" AND c.FECVENTADIGITA IS NULL "); - sql.append(" AND c.PORCCATEGORIA = 100 "); + sql.append(" AND c.PORCCATEGORIA > 0 "); sql.append(" AND (c.INDREMOTOINVERSO IS NULL "); sql.append(" OR c.INDREMOTOINVERSO =0) "); sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18)) "); - sql.append(" THEN 'BENEFICIO 100%' "); + sql.append(" THEN cat.DESCCATEGORIA "); sql.append(" "); sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL "); sql.append(" AND c.FECVENTADIGITA IS NOT NULL "); @@ -201,6 +201,7 @@ public class RelatorioOperacionalFinanceiro extends Relatorio { sql.append("FROM caja c "); sql.append(" INNER JOIN MARCA ma on c.marca_id = ma.marca_id "); sql.append(" INNER JOIN EMPRESA emp on ma.empresa_id = emp.empresa_id "); + sql.append(" INNER JOIN CATEGORIA cat on c.categoria_id = cat.categoria_id "); sql.append(" LEFT JOIN TIPO_VENTA tv ON tv.TIPOVENTA_ID = c.TIPOVENTA_ID "); sql.append(" LEFT JOIN RUTA r ON r.RUTA_ID = c.RUTA_ID and r.ACTIVO = 1 "); sql.append(" LEFT JOIN CORRIDA cor ON c.CORRIDA_ID = cor.CORRIDA_ID and cor.FECCORRIDA = c.FECCORRIDA and cor.ACTIVO = 1 "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jasper index c6500b875..dd8949a11 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml index b40a650fd..faa6861be 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml @@ -2,7 +2,7 @@ - + @@ -26,13 +26,18 @@ - - + - + - + - + - + - + - - + - + - + - + - + - + @@ -107,13 +213,18 @@ .add( $F{seguro} )]]> - - + - + - + - + - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOperacionalFinanceiroController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOperacionalFinanceiroController.java index a87fd07db..995fe221f 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOperacionalFinanceiroController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOperacionalFinanceiroController.java @@ -98,8 +98,6 @@ public class RelatorioOperacionalFinanceiroController extends MyGenericForwardCo tramoListSelList.setItemRenderer(new RenderTramoDesc()); } - - private void executarPesquisaLinha() { String palavraPesquisaRuta = txtPalavraPesquisaLinha.getText();