diff --git a/pom.xml b/pom.xml
index b95795cf6..daaf67429 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
br.com.rjconsultores
ventaboletosadm
- 1.91.0
+ 1.92.0
war
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java
index 4e4163094..4ab457230 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java
@@ -47,6 +47,7 @@ public class RelatorioTaxasLinha extends Relatorio {
Connection conexao = this.relatorio.getConexao();
Map parametros = this.relatorio.getParametros();
String puntosVentaIds = (String) parametros.get("NUMPUNTOVENTA");
+ Boolean isSubNoShow = (Boolean) parametros.get("B_SUBTRAIR_NO_SHOW");
Boolean isTxEmbarque = (Boolean) parametros.get("IS_TX_EMBARQUE");
Boolean isPedagio = (Boolean) parametros.get("IS_PEDAGIO");
@@ -55,7 +56,7 @@ public class RelatorioTaxasLinha extends Relatorio {
lsDadosRelatorio = new ArrayList();
- String sql = getSql(puntosVentaIds);
+ String sql = getSql(puntosVentaIds, isSubNoShow);
NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
@@ -247,7 +248,7 @@ public class RelatorioTaxasLinha extends Relatorio {
return cacheConfig;
}
- private String getSql(String puntosVentaIds) {
+ private String getSql(String puntosVentaIds, Boolean isSubNoShow) {
StringBuilder sql = new StringBuilder();
sql.append(" SELECT RT.PREFIXO, ");
@@ -298,7 +299,10 @@ public class RelatorioTaxasLinha extends Relatorio {
sql.append("AND CJ.INDREIMPRESION = 0 ");
sql.append("AND DECODE(:TIPO_DATA, 1, CJ.FECHORVENTA, 2, CJ.FECCORRIDA) BETWEEN :DATA_INICIAL AND :DATA_FINAL ");
sql.append("AND EM.EMPRESA_ID = COALESCE(:EMPRESA_ID, EM.EMPRESA_ID) ");
-
+
+ if (isSubNoShow) {
+ sql.append(" AND CJ.MOTIVOCANCELACION_ID NOT IN (23,27) ");
+ }
if (!puntosVentaIds.equals("Todas")) {
sql.append(" AND PV.PUNTOVENTA_ID IN (").append(puntosVentaIds).append(") ");
}
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinhaPorDataEmissao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinhaPorDataEmissao.java
index 0efdaf01c..595bc99ac 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinhaPorDataEmissao.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinhaPorDataEmissao.java
@@ -47,6 +47,7 @@ public class RelatorioTaxasLinhaPorDataEmissao extends Relatorio {
Connection conexao = this.relatorio.getConexao();
Map parametros = this.relatorio.getParametros();
String puntosVentaIds = (String) parametros.get("NUMPUNTOVENTA");
+ Boolean isSubNoShow = (Boolean) parametros.get("B_SUBTRAIR_NO_SHOW");
Boolean isTxEmbarque = (Boolean) parametros.get("IS_TX_EMBARQUE");
Boolean isPedagio = (Boolean) parametros.get("IS_PEDAGIO");
@@ -55,7 +56,7 @@ public class RelatorioTaxasLinhaPorDataEmissao extends Relatorio {
lsDadosRelatorio = new ArrayList();
- String sql = getSql(puntosVentaIds);
+ String sql = getSql(puntosVentaIds, isSubNoShow);
NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
@@ -249,7 +250,7 @@ public class RelatorioTaxasLinhaPorDataEmissao extends Relatorio {
return cacheConfig;
}
- private String getSql(String puntosVentaIds) {
+ private String getSql(String puntosVentaIds, Boolean isSubNoShow) {
StringBuilder sql = new StringBuilder();
sql.append(" SELECT RT.PREFIXO, ");
@@ -300,7 +301,9 @@ public class RelatorioTaxasLinhaPorDataEmissao extends Relatorio {
sql.append("AND CJ.INDREIMPRESION = 0 ");
sql.append("AND DECODE(:TIPO_DATA, 1, CJ.FECHORVENTA, 2, CJ.FECCORRIDA) BETWEEN :DATA_INICIAL AND :DATA_FINAL ");
sql.append("AND EM.EMPRESA_ID = COALESCE(:EMPRESA_ID, EM.EMPRESA_ID) ");
-
+ if (isSubNoShow) {
+ sql.append(" AND CJ.MOTIVOCANCELACION_ID NOT IN (23,27) ");
+ }
if (!puntosVentaIds.equals("Todas")) {
sql.append(" AND PV.PUNTOVENTA_ID IN (").append(puntosVentaIds).append(") ");
}
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTaxasLinhaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTaxasLinhaController.java
index b9b78c17b..9e1fc8158 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTaxasLinhaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTaxasLinhaController.java
@@ -91,6 +91,7 @@ public class RelatorioTaxasLinhaController extends MyGenericForwardComposer {
private MyTextbox txtNombrePuntoVenta;
private Radiogroup rdGroupTipoData;
private Checkbox chkSubtrairIcms;
+ private Checkbox chkSubtrairNoShow;
private MyComboboxEstandar cmbEmpresa;
private Bandbox bbPesquisaPuntoVenta;
private MyListbox puntoVentaList;
@@ -224,6 +225,7 @@ public class RelatorioTaxasLinhaController extends MyGenericForwardComposer {
parametros.put("TIPO_DATA", Integer.parseInt(rdGroupTipoData.getSelectedItem().getValue()));
parametros.put("NUMPUNTOVENTA", puntoVentaIds);
parametros.put("B_SUBTRAIR_ICMS", ((Boolean) (chkSubtrairIcms.isChecked())));
+ parametros.put("B_SUBTRAIR_NO_SHOW", ((Boolean) (chkSubtrairNoShow.isChecked())));
parametros.put("IS_TX_EMBARQUE", ((Boolean) (chkTaxaEmbarque.isChecked())));
parametros.put("IS_PEDAGIO", (Boolean) chkTaxaPedagio.isChecked());
parametros.put("IS_SEGURO", chkTaxaSeguro.isChecked());
@@ -316,6 +318,7 @@ public class RelatorioTaxasLinhaController extends MyGenericForwardComposer {
parametros.put("TIPO_DATA", Integer.parseInt(rdGroupTipoData.getSelectedItem().getValue()));
parametros.put("NUMPUNTOVENTA", puntoVentaIds);
parametros.put("B_SUBTRAIR_ICMS", ((Boolean) (chkSubtrairIcms.isChecked())));
+ parametros.put("B_SUBTRAIR_NO_SHOW", ((Boolean) (chkSubtrairNoShow.isChecked())));
parametros.put("IS_TX_EMBARQUE", ((Boolean) (chkTaxaEmbarque.isChecked())));
parametros.put("IS_PEDAGIO", (Boolean) chkTaxaPedagio.isChecked());
parametros.put("IS_SEGURO", chkTaxaSeguro.isChecked());
diff --git a/web/WEB-INF/i3-label_en.label b/web/WEB-INF/i3-label_en.label
index ed85132e2..62af27021 100644
--- a/web/WEB-INF/i3-label_en.label
+++ b/web/WEB-INF/i3-label_en.label
@@ -9474,6 +9474,7 @@ relatorioTabelaPrecoController.window.title = Relatório de Tabela de Preços
relatorioTaxasLinhaController.lbAte.value = até
relatorioTaxasLinhaController.lbChkDownloadTxt.value = Exportar .txt
relatorioTaxasLinhaController.lbChkSubtrairIcms.value = Subtrair ICMS
+relatorioTaxasLinhaController.lbChkSubtrairNoShow.value = Subtrair No Show
relatorioTaxasLinhaController.lbChkTaxaEmbarque.value = Taxa de Embarque
relatorioTaxasLinhaController.lbChkTaxaPedagio.value = Pedagio
relatorioTaxasLinhaController.lbChkTaxaSeguro.value = Seguro
diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label
index 7bdac83ff..b54a81441 100644
--- a/web/WEB-INF/i3-label_es_MX.label
+++ b/web/WEB-INF/i3-label_es_MX.label
@@ -9619,6 +9619,7 @@ relatorioTabelaPrecoController.window.title = Reporte de Tabla de Precios
relatorioTaxasLinhaController.lbAte.value = Hasta
relatorioTaxasLinhaController.lbChkDownloadTxt.value = Exportar .txt
relatorioTaxasLinhaController.lbChkSubtrairIcms.value = Subtrair ICMS
+relatorioTaxasLinhaController.lbChkSubtrairNoShow.value = Subtrair No Show
relatorioTaxasLinhaController.lbChkTaxaEmbarque.value = Taxa de Embarque
relatorioTaxasLinhaController.lbChkTaxaPedagio.value = Pedagio
relatorioTaxasLinhaController.lbChkTaxaSeguro.value = Seguro
diff --git a/web/WEB-INF/i3-label_fr_FR.label b/web/WEB-INF/i3-label_fr_FR.label
index c10cdbecb..ce4bb30a3 100644
--- a/web/WEB-INF/i3-label_fr_FR.label
+++ b/web/WEB-INF/i3-label_fr_FR.label
@@ -9591,6 +9591,7 @@ relatorioTabelaPrecoController.window.title = Rapport sur le tableau des prix
relatorioTaxasLinhaController.lbAte.value = jusqu'à
relatorioTaxasLinhaController.lbChkDownloadTxt.value = Exporter le .txt
relatorioTaxasLinhaController.lbChkSubtrairIcms.value = Soustraire ICMS
+relatorioTaxasLinhaController.lbChkSubtrairNoShow.value = Soustraire No Show
relatorioTaxasLinhaController.lbChkTaxaEmbarque.value = Frais d'embarquement
relatorioTaxasLinhaController.lbChkTaxaPedagio.value = Péage
relatorioTaxasLinhaController.lbChkTaxaSeguro.value = Coffre-fort
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index 7cd90e090..c850aace8 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -9596,6 +9596,7 @@ relatorioTabelaPrecoController.window.title = Relatório de Tabela de Preços
relatorioTaxasLinhaController.lbAte.value = até
relatorioTaxasLinhaController.lbChkDownloadTxt.value = Exportar .txt
relatorioTaxasLinhaController.lbChkSubtrairIcms.value = Subtrair ICMS
+relatorioTaxasLinhaController.lbChkSubtrairNoShow.value = Subtrair No Show
relatorioTaxasLinhaController.lbChkTaxaEmbarque.value = Taxa de Embarque
relatorioTaxasLinhaController.lbChkTaxaPedagio.value = Pedagio
relatorioTaxasLinhaController.lbChkTaxaSeguro.value = Seguro
diff --git a/web/gui/relatorios/filtroRelatorioTaxasLinha.zul b/web/gui/relatorios/filtroRelatorioTaxasLinha.zul
index 08598a528..a45cb2abe 100644
--- a/web/gui/relatorios/filtroRelatorioTaxasLinha.zul
+++ b/web/gui/relatorios/filtroRelatorioTaxasLinha.zul
@@ -71,6 +71,10 @@
+
+
+