fixes bug #6518

fixes bug #6519
fixes bug #6508

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@46436 d1611594-4594-4d17-8e1d-87c2c4800839

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesBoletos.java

@@ -16,6 +16,7 @@ import org.apache.log4j.Logger;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioVendasPacotesBoletosBean;
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioVendasPacotesBoletosBean.RelatorioVendasPacotesBoletosItemBean;
 import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
 
 public class RelatorioVendasPacotesBoletos extends Relatorio {
@@ -29,24 +30,37 @@ public class RelatorioVendasPacotesBoletos extends Relatorio {
 	private Date fecInicio;
 	private Date fecFinal;
 	private Integer empresaId;
+	private Integer origenId;
+	private Integer destinoId;
+	private Integer usuarioId;
+	private Integer tipoTarifaPacoteId;
 	
 	public RelatorioVendasPacotesBoletos(Map<String, Object> parametros, Connection conexao, final String... nomeSubReporte) throws Exception {
 		super(parametros, conexao);
 		
 		this.setCustomDataSource(new DataSource(this) {
+
+
 			@Override
 			public void initDados() throws Exception {
 				Map<String, Object> parametros = this.relatorio.getParametros();
 				fecInicio = new java.sql.Date(sdf.parse(parametros.get("fecInicio").toString()).getTime());
 				fecFinal = new java.sql.Date(sdf.parse(parametros.get("fecFinal").toString()).getTime());
 				empresaId = parametros.get("empresaId") != null && !parametros.get("empresaId").equals("null") ? Integer.valueOf(parametros.get("empresaId").toString()) : null;
+				origenId = parametros.get("origenId") != null && !parametros.get("origenId").equals("null") ? Integer.valueOf(parametros.get("origenId").toString()) : null;
+				destinoId = parametros.get("destinoId") != null && !parametros.get("destinoId").equals("null") ? Integer.valueOf(parametros.get("destinoId").toString()) : null;
+				usuarioId = parametros.get("usuarioId") != null && !parametros.get("usuarioId").equals("null") ? Integer.valueOf(parametros.get("usuarioId").toString()) : null;
+				tipoTarifaPacoteId = parametros.get("tipoTarifaPacoteId") != null && !parametros.get("tipoTarifaPacoteId").equals("null") ? Integer.valueOf(parametros.get("tipoTarifaPacoteId").toString()) : null;
 				
 				Connection conexao = this.relatorio.getConexao();
 				processarVendasPacote(conexao);
+				processarVendasPacoteCancelados(conexao);
+				processarVendasPacoteTotais();
 				
 				setNomeSubReporte(nomeSubReporte);
 				setLsDadosRelatorio(lsDadosRelatorio);
 			}
+
 		});
 	}
 	
@@ -55,22 +69,7 @@ public class RelatorioVendasPacotesBoletos extends Relatorio {
 		NamedParameterStatement stmt = null;
 		
 		try {
-			String sql = getSqlPacotes();
+			stmt = carregarNamedParameterStatement(conexao, false);
-			
-			log.info(sql);
-	
-			stmt = new NamedParameterStatement(conexao, sql);
-			
-			if(fecInicio != null) {
-				stmt.setDate("fecInicio", fecInicio);
-			}
-			if(fecFinal != null) {
-				stmt.setDate("fecFinal", fecFinal);
-			}
-			if (empresaId != null){
-				stmt.setInt("empresaId", empresaId);
-			}
-
 			rset = stmt.executeQuery();
 	
 			if(lsDadosRelatorio == null) {
@@ -78,31 +77,14 @@ public class RelatorioVendasPacotesBoletos extends Relatorio {
 			}
 			
 			while (rset.next()) {
-				RelatorioVendasPacotesBoletosBean relatorioVendasBoletosBean = new RelatorioVendasPacotesBoletosBean();
+				RelatorioVendasPacotesBoletosBean relatorioVendasBoletosBean = carregarRelatorioVendasBoletosBean(rset);
-				relatorioVendasBoletosBean.setDescdestino(rset.getString("destino"));
+				Integer idx = carregarIndice(relatorioVendasBoletosBean);
-				relatorioVendasBoletosBean.setDescorigen(rset.getString("origem"));
 				
-				Integer idx = null;
+				if(idx != null) {
-				if(lsDadosRelatorio.contains(relatorioVendasBoletosBean)) {
-					idx = lsDadosRelatorio.indexOf(relatorioVendasBoletosBean);
 					relatorioVendasBoletosBean = lsDadosRelatorio.get(idx); 
 				}
 				
-				RelatorioVendasPacotesBoletosBean.RelatorioVendasPacotesBoletosItemBean relatorioVendasPacotesBoletosItemBean = new RelatorioVendasPacotesBoletosBean().new RelatorioVendasPacotesBoletosItemBean();
+				relatorioVendasBoletosBean.setRelatorioVendasPacotesBoletosItemBeans(carregarItens(rset, relatorioVendasBoletosBean, relatorioVendasBoletosBean.getRelatorioVendasPacotesBoletosItemBeans()));
-				relatorioVendasPacotesBoletosItemBean.setNomconvenio(rset.getString("nomconvenio"));
-				relatorioVendasPacotesBoletosItemBean.setDesctipotarifa(rset.getString("desctipotarifa"));
-				relatorioVendasPacotesBoletosItemBean.setQtde(rset.getLong("qtde"));
-				relatorioVendasPacotesBoletosItemBean.setSimportetaxaembarque(rset.getBigDecimal("simportetaxaembarque"));
-				relatorioVendasPacotesBoletosItemBean.setSimportepedagio(rset.getBigDecimal("simportepedagio"));
-				relatorioVendasPacotesBoletosItemBean.setSimporteoutros(rset.getBigDecimal("simporteoutros"));
-				relatorioVendasPacotesBoletosItemBean.setSimporteseguro(rset.getBigDecimal("simporteseguro"));
-				relatorioVendasPacotesBoletosItemBean.setSpreciobase(rset.getBigDecimal("spreciobase"));
-				relatorioVendasPacotesBoletosItemBean.setDesconto(rset.getBigDecimal("desconto"));
-				
-				if(relatorioVendasBoletosBean.getRelatorioVendasPacotesBoletosItemBeans() == null) {
-					relatorioVendasBoletosBean.setRelatorioVendasPacotesBoletosItemBeans(new ArrayList<RelatorioVendasPacotesBoletosBean.RelatorioVendasPacotesBoletosItemBean>());
-				}
-				relatorioVendasBoletosBean.getRelatorioVendasPacotesBoletosItemBeans().add(relatorioVendasPacotesBoletosItemBean);
 				
 				if(idx != null) {
 					lsDadosRelatorio.set(idx, relatorioVendasBoletosBean);
@@ -128,10 +110,130 @@ public class RelatorioVendasPacotesBoletos extends Relatorio {
 		
 	}
 	
-	protected String getSqlPacotes() {
+	private List<RelatorioVendasPacotesBoletosBean.RelatorioVendasPacotesBoletosItemBean> carregarItens(ResultSet rset, RelatorioVendasPacotesBoletosBean relatorioVendasPacotesBoletosBean, List<RelatorioVendasPacotesBoletosBean.RelatorioVendasPacotesBoletosItemBean> itens) throws SQLException {
+		RelatorioVendasPacotesBoletosBean.RelatorioVendasPacotesBoletosItemBean relatorioVendasPacotesBoletosItemBean = relatorioVendasPacotesBoletosBean.new RelatorioVendasPacotesBoletosItemBean();
+		relatorioVendasPacotesBoletosItemBean.setNomconvenio(rset.getString("nomconvenio"));
+		relatorioVendasPacotesBoletosItemBean.setDesctipotarifa(rset.getString("desctipotarifa"));
+		relatorioVendasPacotesBoletosItemBean.setQtde(rset.getLong("qtde"));
+		relatorioVendasPacotesBoletosItemBean.setSimportetaxaembarque(rset.getBigDecimal("simportetaxaembarque"));
+		relatorioVendasPacotesBoletosItemBean.setSimportepedagio(rset.getBigDecimal("simportepedagio"));
+		relatorioVendasPacotesBoletosItemBean.setSimporteoutros(rset.getBigDecimal("simporteoutros"));
+		relatorioVendasPacotesBoletosItemBean.setSimporteseguro(rset.getBigDecimal("simporteseguro"));
+		relatorioVendasPacotesBoletosItemBean.setSpreciobase(rset.getBigDecimal("spreciobase"));
+		relatorioVendasPacotesBoletosItemBean.setDesconto(rset.getBigDecimal("desconto"));
+		
+		if(itens == null) {
+			itens = new ArrayList<RelatorioVendasPacotesBoletosBean.RelatorioVendasPacotesBoletosItemBean>();
+		}
+		itens.add(relatorioVendasPacotesBoletosItemBean);
+		
+		return itens;
+	}
+
+	private Integer carregarIndice(RelatorioVendasPacotesBoletosBean relatorioVendasBoletosBean) {
+		Integer idx = null;
+		if(lsDadosRelatorio.contains(relatorioVendasBoletosBean)) {
+			idx = lsDadosRelatorio.indexOf(relatorioVendasBoletosBean);
+			relatorioVendasBoletosBean = lsDadosRelatorio.get(idx);
+		}
+		return idx;
+	}
+
+	private RelatorioVendasPacotesBoletosBean carregarRelatorioVendasBoletosBean(ResultSet rset) throws SQLException {
+		RelatorioVendasPacotesBoletosBean relatorioVendasPacotesBoletosBean = new RelatorioVendasPacotesBoletosBean();
+		relatorioVendasPacotesBoletosBean.setDescdestino(rset.getString("destino"));
+		relatorioVendasPacotesBoletosBean.setDescorigen(rset.getString("origem"));
+		relatorioVendasPacotesBoletosBean.setCvedestino(rset.getString("cvedestino"));
+		relatorioVendasPacotesBoletosBean.setCveorigen(rset.getString("cveorigem"));
+		/*relatorioVendasPacotesBoletosBean.setTotais(new ArrayList<RelatorioVendasPacotesBoletosBean.RelatorioVendasPacotesBoletosItemTotaisBean>());
+		relatorioVendasPacotesBoletosBean.getTotais().add(relatorioVendasPacotesBoletosBean.new RelatorioVendasPacotesBoletosItemTotaisBean("CWB-MOR","ADULTO",2));
+		relatorioVendasPacotesBoletosBean.getTotais().add(relatorioVendasPacotesBoletosBean.new RelatorioVendasPacotesBoletosItemTotaisBean("CWB-MOR","CHD",2));
+		relatorioVendasPacotesBoletosBean.getTotais().add(relatorioVendasPacotesBoletosBean.new RelatorioVendasPacotesBoletosItemTotaisBean("MOR-CWB","SEGURO",2));*/
+		
+		return relatorioVendasPacotesBoletosBean;
+	}
+
+	private void processarVendasPacoteCancelados(Connection conexao) {
+		ResultSet rset = null;
+		NamedParameterStatement stmt = null;
+		
+		try {
+			stmt = carregarNamedParameterStatement(conexao, true);
+			rset = stmt.executeQuery();
+	
+			if(lsDadosRelatorio == null) {
+				lsDadosRelatorio = new ArrayList<RelatorioVendasPacotesBoletosBean>();
+			}
+			
+			while (rset.next()) {
+				RelatorioVendasPacotesBoletosBean relatorioVendasBoletosBean = carregarRelatorioVendasBoletosBean(rset);
+				Integer idx = carregarIndice(relatorioVendasBoletosBean);
+				
+				if(idx != null) {
+					relatorioVendasBoletosBean = lsDadosRelatorio.get(idx); 
+				}
+				
+				relatorioVendasBoletosBean.setRelatorioVendasPacotesBoletosItemBeansCancelados(carregarItens(rset, relatorioVendasBoletosBean, relatorioVendasBoletosBean.getRelatorioVendasPacotesBoletosItemBeansCancelados()));
+				
+				if(idx != null) {
+					lsDadosRelatorio.set(idx, relatorioVendasBoletosBean);
+				} else {
+					lsDadosRelatorio.add(relatorioVendasBoletosBean);
+				}
+			}
+			
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+		} finally {
+			try {
+				if(rset != null) {
+					rset.close();
+				}
+				if(stmt != null) {
+					stmt.close();
+				}
+			} catch (SQLException e) {
+				log.error(e.getMessage(), e);
+			}
+		}
+		
+	}
+	
+	private NamedParameterStatement carregarNamedParameterStatement(Connection conexao, boolean cancelados) throws SQLException {
+		String sql = getSqlPacotes(cancelados);
+		log.info(sql);
+		
+		NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
+		
+		if(fecInicio != null) {
+			stmt.setDate("fecInicio", fecInicio);
+		}
+		if(fecFinal != null) {
+			stmt.setDate("fecFinal", fecFinal);
+		}
+		if (empresaId != null){
+			stmt.setInt("empresaId", empresaId);
+		}
+		if(origenId != null) {
+			stmt.setInt("origenId", origenId);
+		}
+		if(destinoId != null) {
+			stmt.setInt("destinoId", destinoId);
+		}
+		if(usuarioId != null) {
+			stmt.setInt("usuarioId", usuarioId);
+		}
+		if(tipoTarifaPacoteId != null && tipoTarifaPacoteId > 0) {
+			stmt.setInt("tipoTarifaPacoteId", tipoTarifaPacoteId);
+		}
+		
+		return stmt;
+	}
+
+	protected String getSqlPacotes(boolean cancelado) {
 		StringBuilder sQuery = new StringBuilder();
 		
-		sQuery.append("SELECT ORI.DESCPARADA AS ORIGEM, DES.DESCPARADA AS DESTINO, TVP.NOMCONVENIO, TTP.DESCTIPOTARIFA, ")
+		sQuery.append("SELECT DES.CVEPARADA AS CVEDESTINO, ORI.CVEPARADA AS CVEORIGEM, ORI.DESCPARADA AS ORIGEM, DES.DESCPARADA AS DESTINO, TVP.NOMCONVENIO, TTP.DESCTIPOTARIFA, ")
 			  .append("COUNT(TVP.TARIFAVENDAPACOTE_ID) AS QTDE, SUM(B.IMPORTETAXAEMBARQUE) AS SIMPORTETAXAEMBARQUE, SUM(B.IMPORTEPEDAGIO) AS SIMPORTEPEDAGIO, ")
 			  .append("SUM(B.IMPORTEOUTROS) AS SIMPORTEOUTROS, SUM(B.IMPORTESEGURO) AS SIMPORTESEGURO, SUM(B.PRECIOBASE) AS SPRECIOBASE, SUM(B.PRECIOBASE - B.PRECIOPAGADO) AS DESCONTO ")
 			  .append("FROM VENDA_PACOTE VP ")
@@ -143,14 +245,35 @@ public class RelatorioVendasPacotesBoletos extends Relatorio {
 			  .append("LEFT JOIN PARADA ORI ON ORI.PARADA_ID = B.ORIGEN_ID ")
 			  .append("LEFT JOIN PARADA DES ON DES.PARADA_ID = B.DESTINO_ID ")
 			  .append("WHERE P.ACTIVO = 1 ")
-			  .append("AND B.ACTIVO = 1 ")
+			  .append("AND B.ACTIVO = 1 ");
-			  .append("AND B.INDSTATUSBOLETO = 'V' ")
+		
-			  .append("AND B.MOTIVOCANCELACION_ID IS NULL ");
+		if(!cancelado) {
+			sQuery.append("AND B.INDSTATUSBOLETO = 'V' ")
+			  	  .append("AND B.MOTIVOCANCELACION_ID IS NULL ");
+		} else {
+			sQuery.append("AND B.MOTIVOCANCELACION_ID IS NOT NULL ");
+		}
 		
 		if(empresaId != null) {
 			sQuery.append("AND P.EMPRESA_ID = :empresaId ");
 		}
 
+		if(origenId != null) {
+			sQuery.append("AND B.ORIGEN_ID = :origenId ");
+		}
+		
+		if(destinoId != null) {
+			sQuery.append("AND B.DESTINO_ID = :destinoId ");
+		}
+
+		if(usuarioId != null) {
+			sQuery.append("AND VP.USUARIO_ID = :usuarioId ");
+		}
+
+		if(tipoTarifaPacoteId != null && tipoTarifaPacoteId > 0) {
+			sQuery.append("AND TTP.TIPOTARIFAPACOTE_ID = :tipoTarifaPacoteId ");
+		}
+
 		if(fecInicio != null) {
 			sQuery.append("AND VP.DATAVENDA >= :fecInicio ");
 		}
@@ -159,12 +282,37 @@ public class RelatorioVendasPacotesBoletos extends Relatorio {
 			sQuery.append("AND VP.DATAVENDA <= :fecFinal ");
 		}
 		
-		sQuery.append("GROUP BY ORI.DESCPARADA,DES.DESCPARADA,TVP.NOMCONVENIO,TTP.DESCTIPOTARIFA ")
+		sQuery.append("GROUP BY DES.CVEPARADA,ORI.CVEPARADA,ORI.DESCPARADA,DES.DESCPARADA,TVP.NOMCONVENIO,TTP.DESCTIPOTARIFA ")
-			  .append("ORDER BY ORI.DESCPARADA,DES.DESCPARADA,TVP.NOMCONVENIO,TTP.DESCTIPOTARIFA ");
+			  .append("ORDER BY DES.CVEPARADA,ORI.CVEPARADA,ORI.DESCPARADA,DES.DESCPARADA,TVP.NOMCONVENIO,TTP.DESCTIPOTARIFA ");
 		
 		return sQuery.toString();
 	}
 	
+	private void processarVendasPacoteTotais() {
+		List<RelatorioVendasPacotesBoletosBean.RelatorioVendasPacotesBoletosItemTotaisBean> totais = new ArrayList<RelatorioVendasPacotesBoletosBean.RelatorioVendasPacotesBoletosItemTotaisBean>();
+		for (RelatorioVendasPacotesBoletosBean relatorioVendasPacotesBoletosBean : lsDadosRelatorio) {
+			for (RelatorioVendasPacotesBoletosItemBean item : relatorioVendasPacotesBoletosBean.getRelatorioVendasPacotesBoletosItemBeans()) {
+				RelatorioVendasPacotesBoletosBean.RelatorioVendasPacotesBoletosItemTotaisBean total = relatorioVendasPacotesBoletosBean.new RelatorioVendasPacotesBoletosItemTotaisBean();
+				total.setTrecho(relatorioVendasPacotesBoletosBean.getCveorigen()+"-"+relatorioVendasPacotesBoletosBean.getCvedestino());
+				total.setCategoria(item.getDesctipotarifa());
+				total.setQtde(0l);
+				Integer idx = null;
+				if(totais.contains(total)) {
+					idx = totais.indexOf(total);
+					total = totais.get(idx);
+				}
+				total.setQtde(total.getQtde() + item.getQtde());
+				
+				if(idx == null) {
+					totais.add(total);
+				} else {
+					totais.set(idx, total);
+				}
+			}
+		}
+		this.parametros.put("totais", totais);
+	}
+
 	@Override
 	protected void processaParametros() throws Exception {
 	}

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java

@@ -32,6 +32,10 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio {
 	private Date fecFinal;
 	private Integer empresaId;
 	private Integer pacoteId;
+	private Integer origenId;
+	private Integer destinoId;
+	private Integer usuarioId;
+	private Integer tipoTarifaPacoteId;
 
 	public RelatorioVendasPacotesDetalhado(Map<String, Object> parametros, Connection conexao, final String... nomeSubReporte) throws Exception {
 		super(parametros, conexao);
@@ -44,6 +48,10 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio {
 				fecFinal = new java.sql.Date(sdf.parse(parametros.get("fecFinal").toString()).getTime());
 				empresaId = parametros.get("empresaId") != null && !parametros.get("empresaId").equals("null") ? Integer.valueOf(parametros.get("empresaId").toString()) : null;
 				pacoteId = parametros.get("pacoteId") != null && !parametros.get("pacoteId").equals("null") ? Integer.valueOf(parametros.get("pacoteId").toString()) : null;
+				origenId = parametros.get("origenId") != null && !parametros.get("origenId").equals("null") ? Integer.valueOf(parametros.get("origenId").toString()) : null;
+				destinoId = parametros.get("destinoId") != null && !parametros.get("destinoId").equals("null") ? Integer.valueOf(parametros.get("destinoId").toString()) : null;
+				usuarioId = parametros.get("usuarioId") != null && !parametros.get("usuarioId").equals("null") ? Integer.valueOf(parametros.get("usuarioId").toString()) : null;
+				tipoTarifaPacoteId = parametros.get("tipoTarifaPacoteId") != null && !parametros.get("tipoTarifaPacoteId").equals("null") ? Integer.valueOf(parametros.get("tipoTarifaPacoteId").toString()) : null;
 				
 				Connection conexao = this.relatorio.getConexao();
 				processarVendasPacote(conexao);
@@ -74,10 +82,21 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio {
 			if (empresaId != null && empresaId > 0){
 				stmt.setInt("empresaId", empresaId);
 			}
-
 			if (pacoteId != null && pacoteId > 0){
 				stmt.setInt("pacoteId", pacoteId);
 			}
+			if(origenId != null) {
+				stmt.setInt("origenId", origenId);
+			}
+			if(destinoId != null) {
+				stmt.setInt("destinoId", destinoId);
+			}
+			if(usuarioId != null) {
+				stmt.setInt("usuarioId", usuarioId);
+			}
+			if(tipoTarifaPacoteId != null && tipoTarifaPacoteId > 0) {
+				stmt.setInt("tipoTarifaPacoteId", tipoTarifaPacoteId);
+			}
 			
 			rset = stmt.executeQuery();
 	
@@ -151,6 +170,8 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio {
 			  .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("LEFT JOIN PACOTE_TARIFA PT ON PT.PACOTETARIFA_ID = TVP.PACOTETARIFA_ID ")
+			  .append("LEFT JOIN TIPO_TARIFA_PACOTE TTP ON TTP.TIPOTARIFAPACOTE_ID = PT.TIPOTARIFAPACOTE_ID ")
 			  .append("WHERE P.ACTIVO = 1 ")
 			  .append("AND (B.BOLETO_ID IS NULL OR (B.ACTIVO = 1 AND B.INDSTATUSBOLETO = 'V' AND B.MOTIVOCANCELACION_ID IS NULL)) ");
 		
@@ -170,6 +191,22 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio {
 			sQuery.append("AND VP.DATAPACOTE <= :fecFinal ");
 		}
 		
+		if(origenId != null) {
+			sQuery.append("AND B.ORIGEN_ID = :origenId ");
+		}
+		
+		if(destinoId != null) {
+			sQuery.append("AND B.DESTINO_ID = :destinoId ");
+		}
+
+		if(usuarioId != null) {
+			sQuery.append("AND VP.USUARIO_ID = :usuarioId ");
+		}
+
+		if(tipoTarifaPacoteId != null && tipoTarifaPacoteId > 0) {
+			sQuery.append("AND TTP.TIPOTARIFAPACOTE_ID = :tipoTarifaPacoteId ");
+		}
+		
 		sQuery.append("GROUP BY P.PACOTE_ID, VP.VENDAPACOTE_ID, P.NOMPACOTE, VP.NUMOPERACION, VP.DATAVENDA, VP.DATAPACOTE, EA.DESCHOTEL, EA.LOCAL, CP.RAZAO_SOCIAL, U.NOMBUSUARIO, VP.SUBTOTAL, VP.DESCONTO, VP.TOTAL, VP.SITUACAO ")
 			  .append("ORDER BY P.NOMPACOTE, VP.DATAPACOTE, VP.DATAVENDA ");
 		

src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletosItemTotais_es.properties

@@ -0,0 +1,3 @@
+#Labels
+label.total=TOTAL
+label.trecho=TRECHOS

src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletosItemTotais_pt_BR.properties

@@ -0,0 +1,3 @@
+#Labels
+label.total=TOTAL
+label.trecho=TRECHOS

src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletos_es.properties

@@ -11,5 +11,11 @@ cabecalho.impressorPor=Impressor por:
 cabecalho.pagina=Página
 cabecalho.de=de
 cabecalho.filtros=Filtros:
+cabecalho.origem=Origem:
+cabecalho.destino=Destino:
+cabecalho.usuario=Usuário:
+cabecalho.tipoTarifaPacote=Tipo Tarifa:
 label.empresa=Empresa:
 label.trecho=Trecho:
+label.cancelados = - CANCELADOS
+label.resumo=RESUMO

src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletos_pt_BR.properties

@@ -11,5 +11,11 @@ cabecalho.impressorPor=Impressor por:
 cabecalho.pagina=Página
 cabecalho.de=de
 cabecalho.filtros=Filtros:
+cabecalho.origem=Origem:
+cabecalho.destino=Destino:
+cabecalho.usuario=Usuário:
+cabecalho.tipoTarifaPacote=Tipo Tarifa:
 label.empresa=Empresa:
 label.trecho=Trecho:
+label.cancelados=- CANCELADOS
+label.resumo=RESUMO

src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhado_es.properties

@@ -13,3 +13,10 @@ cabecalho.de=de
 cabecalho.filtros=Filtros:
 label.empresa=Empresa:
 label.pacote=Pacote:
+cabecalho.origem=Origem:
+cabecalho.destino=Destino:
+cabecalho.usuario=Usuário:
+cabecalho.tipoTarifaPacote=Tipo Tarifa:
+label.empresa=Empresa:
+label.trecho=Trecho:
+label.resumo=Resumo

src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhado_pt_BR.properties

@@ -13,3 +13,10 @@ cabecalho.de=de
 cabecalho.filtros=Filtros:
 label.empresa=Empresa:
 label.pacote=Pacote:
+cabecalho.origem=Origem:
+cabecalho.destino=Destino:
+cabecalho.usuario=Usuário:
+cabecalho.tipoTarifaPacote=Tipo Tarifa:
+label.empresa=Empresa:
+label.trecho=Trecho:
+label.resumo=Resumo

src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendaPacoteVoucher.jrxml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioVendaPacoteVoucher" pageWidth="612" pageHeight="792" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="ff459370-7a71-46b8-84e9-0a7cb4423683">
-	<property name="ireport.zoom" value="1.2100000000000006"/>
+	<property name="ireport.zoom" value="3.0"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="349"/>
+	<property name="ireport.y" value="1401"/>
 	<parameter name="logo" class="java.io.InputStream"/>
 	<parameter name="subReportePacoteTarifasVouchers" class="net.sf.jasperreports.engine.JasperReport"/>
 	<parameter name="subReporteItemAdicionalVouchers" class="net.sf.jasperreports.engine.JasperReport"/>
@@ -299,15 +299,18 @@
 	</columnFooter>
 	<summary>
 		<band height="30">
+			<line>
+				<reportElement positionType="Float" x="0" y="0" width="555" height="1" uuid="fcc03dee-ad9d-435e-b2d6-5843a2433aab"/>
+			</line>
 			<textField isBlankWhenNull="true">
-				<reportElement positionType="Float" x="0" y="0" width="569" height="14" uuid="e248b6df-895f-469a-ab47-944df705af7d"/>
+				<reportElement positionType="Float" x="0" y="1" width="569" height="14" uuid="e248b6df-895f-469a-ab47-944df705af7d"/>
 				<textElement>
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.orientacoes}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="0" y="14" width="569" height="14" uuid="47f86e66-9382-412d-892d-9bf0e05c3fa2"/>
+				<reportElement positionType="Float" x="0" y="15" width="569" height="14" uuid="47f86e66-9382-412d-892d-9bf0e05c3fa2"/>
 				<textElement textAlignment="Justified"/>
 				<textFieldExpression><![CDATA[$R{label.orientacoesTexto}]]></textFieldExpression>
 			</textField>

src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletos.jrxml

@@ -1,26 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioVendasPacotesBoletos" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="84b9dfcf-8ec5-4f51-80cc-7339e3b158b4">
-	<property name="ireport.zoom" value="0.75"/>
+	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.x" value="129"/>
 	<property name="ireport.y" value="0"/>
 	<parameter name="empresa" class="java.lang.String"/>
 	<parameter name="fecInicio" class="java.lang.String"/>
 	<parameter name="fecFinal" class="java.lang.String"/>
 	<parameter name="noDataRelatorio" class="java.lang.String"/>
 	<parameter name="subreporte" class="net.sf.jasperreports.engine.JasperReport"/>
-	<parameter name="SUBREPORT_RESOURCE_BUNDLE" class="java.util.ResourceBundle"/>
+	<parameter name="SUBREPORT_RESOURCE_BUNDLE_1" class="java.util.ResourceBundle"/>
 	<parameter name="trecho" class="java.lang.String"/>
+	<parameter name="origem" class="java.lang.String"/>
+	<parameter name="destino" class="java.lang.String"/>
+	<parameter name="usuario" class="java.lang.String"/>
+	<parameter name="SUBREPORT_RESOURCE_BUNDLE_2" class="java.util.ResourceBundle"/>
+	<parameter name="subreporteTotais" class="net.sf.jasperreports.engine.JasperReport"/>
+	<parameter name="totais" class="java.util.List"/>
+	<parameter name="tipoTarifaPacote" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
 	<field name="relatorioVendasPacotesBoletosItemBeans" class="java.util.List"/>
 	<field name="descorigen" class="java.lang.String"/>
 	<field name="descdestino" class="java.lang.String"/>
+	<field name="relatorioVendasPacotesBoletosItemBeansCancelados" class="java.util.List"/>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="62" splitType="Stretch">
+		<band height="122" splitType="Stretch">
 			<textField>
 				<reportElement x="0" y="0" width="620" height="20" uuid="43b2c28d-4760-4890-b00d-25e931e79c74"/>
 				<textElement markup="none">
@@ -49,6 +57,27 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$R{cabecalho.periodo} + " " + $P{fecInicio} + " " + $R{cabecalho.periodoA} + " " + $P{fecFinal}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="0" y="60" width="802" height="20" uuid="bc1ac781-2bb6-40ef-92dd-d4f07f327d18"/>
+				<textElement>
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.origem} + " " + $P{origem} + " " + $R{cabecalho.destino} + " " + $P{destino}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="0" y="80" width="802" height="20" uuid="1cfececb-aab4-4ec7-a002-b7a45c567252"/>
+				<textElement>
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.usuario} + " " + $P{usuario}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="0" y="100" width="802" height="20" uuid="8b436394-0e3c-420e-b2dd-2b62ee7ed988"/>
+				<textElement>
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.tipoTarifaPacote} + " " + $P{tipoTarifaPacote}]]></textFieldExpression>
+			</textField>
 		</band>
 	</title>
 	<pageHeader>
@@ -66,7 +95,7 @@
 		<band splitType="Stretch"/>
 	</columnHeader>
 	<detail>
-		<band height="75" splitType="Stretch">
+		<band height="79" splitType="Stretch">
 			<textField isBlankWhenNull="true">
 				<reportElement positionType="Float" x="0" y="7" width="802" height="20" isPrintWhenDetailOverflows="true" uuid="752263b1-e76b-41c5-a728-c17367094dab"/>
 				<textElement verticalAlignment="Middle">
@@ -77,7 +106,7 @@
 			<subreport isUsingCache="true">
 				<reportElement positionType="Float" x="0" y="33" width="802" height="38" uuid="75fad27f-9275-4535-844a-316ac8365073"/>
 				<subreportParameter name="REPORT_RESOURCE_BUNDLE">
-					<subreportParameterExpression><![CDATA[$P{SUBREPORT_RESOURCE_BUNDLE}]]></subreportParameterExpression>
+					<subreportParameterExpression><![CDATA[$P{SUBREPORT_RESOURCE_BUNDLE_1}]]></subreportParameterExpression>
 				</subreportParameter>
 				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{relatorioVendasPacotesBoletosItemBeans})]]></dataSourceExpression>
 				<subreportExpression><![CDATA[$P{subreporte}]]></subreportExpression>
@@ -86,6 +115,27 @@
 				<reportElement positionType="Float" x="0" y="4" width="802" height="1" uuid="29d8e10c-62eb-4a5b-b71a-05bb44438009"/>
 			</line>
 		</band>
+		<band height="78">
+			<printWhenExpression><![CDATA[$F{relatorioVendasPacotesBoletosItemBeansCancelados}.isEmpty() == false]]></printWhenExpression>
+			<textField isBlankWhenNull="true">
+				<reportElement positionType="Float" x="1" y="7" width="802" height="20" isPrintWhenDetailOverflows="true" uuid="d012a47a-4e8f-4cb3-a760-b7b9e5259cb6"/>
+				<textElement verticalAlignment="Middle">
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.trecho} + " " + $F{descorigen} + "/" + $F{descdestino} + " " + $R{label.cancelados}]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement positionType="Float" x="1" y="4" width="802" height="1" uuid="38cc08d1-b1f5-40f2-95d4-bd74e26526fd"/>
+			</line>
+			<subreport isUsingCache="true">
+				<reportElement positionType="Float" x="1" y="33" width="802" height="38" uuid="91f8b703-603b-4ea7-b375-3e92456630d6"/>
+				<subreportParameter name="REPORT_RESOURCE_BUNDLE">
+					<subreportParameterExpression><![CDATA[$P{SUBREPORT_RESOURCE_BUNDLE_1}]]></subreportParameterExpression>
+				</subreportParameter>
+				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{relatorioVendasPacotesBoletosItemBeansCancelados})]]></dataSourceExpression>
+				<subreportExpression><![CDATA[$P{subreporte}]]></subreportExpression>
+			</subreport>
+		</band>
 	</detail>
 	<columnFooter>
 		<band splitType="Stretch"/>
@@ -94,7 +144,27 @@
 		<band splitType="Stretch"/>
 	</pageFooter>
 	<summary>
-		<band splitType="Stretch"/>
+		<band height="75" splitType="Stretch">
+			<printWhenExpression><![CDATA[$P{totais}.isEmpty() == false]]></printWhenExpression>
+			<subreport isUsingCache="true">
+				<reportElement positionType="Float" x="1" y="35" width="802" height="38" uuid="b22972a0-06b4-4eb5-9294-4a7214ed0912"/>
+				<subreportParameter name="REPORT_RESOURCE_BUNDLE">
+					<subreportParameterExpression><![CDATA[$P{SUBREPORT_RESOURCE_BUNDLE_2}]]></subreportParameterExpression>
+				</subreportParameter>
+				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($P{totais})]]></dataSourceExpression>
+				<subreportExpression><![CDATA[$P{subreporteTotais}]]></subreportExpression>
+			</subreport>
+			<textField isBlankWhenNull="true">
+				<reportElement positionType="Float" x="1" y="5" width="802" height="20" isPrintWhenDetailOverflows="true" uuid="71c8b930-a9e1-4aee-a8fb-97eb0dc3f082"/>
+				<textElement verticalAlignment="Middle">
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.resumo}]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement positionType="Float" x="0" y="2" width="802" height="1" uuid="d570fbf0-d4da-49fa-aff0-2bf1d5a074a7"/>
+			</line>
+		</band>
 	</summary>
 	<noData>
 		<band height="24">

src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletosItemTotais.jrxml

@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioVendasPacotesBoletosItemTotais" pageWidth="802" pageHeight="555" orientation="Landscape" columnWidth="802" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="f17327a0-45d8-4ec1-8350-688df66785dc">
+	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<style name="Crosstab Data Text" hAlign="Center"/>
+	<field name="trecho" class="java.lang.String"/>
+	<field name="categoria" class="java.lang.String"/>
+	<field name="qtde" class="java.lang.Long"/>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band splitType="Stretch"/>
+	</title>
+	<pageHeader>
+		<band splitType="Stretch"/>
+	</pageHeader>
+	<columnHeader>
+		<band splitType="Stretch"/>
+	</columnHeader>
+	<detail>
+		<band splitType="Stretch"/>
+	</detail>
+	<columnFooter>
+		<band splitType="Stretch"/>
+	</columnFooter>
+	<pageFooter>
+		<band splitType="Stretch"/>
+	</pageFooter>
+	<summary>
+		<band height="42" splitType="Stretch">
+			<crosstab>
+				<reportElement x="0" y="0" width="802" height="42" uuid="11ab8dba-b64d-42a5-8183-4f96945e471b"/>
+				<crosstabHeaderCell>
+					<cellContents mode="Transparent">
+						<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+							<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="2" y="0" width="70" height="30" uuid="bd7d94f6-bbdd-4740-9b04-a7e3cca6a4b8"/>
+							<textElement textAlignment="Left" verticalAlignment="Middle"/>
+							<textFieldExpression><![CDATA[$R{label.trecho}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabHeaderCell>
+				<rowGroup name="trecho" width="75" totalPosition="End">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{trecho}]]></bucketExpression>
+					</bucket>
+					<crosstabRowHeader>
+						<cellContents backcolor="#F0F8FF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+								<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="2" y="0" width="70" height="25" uuid="5ac119e3-c56d-4a78-af58-55fbbae1fb62"/>
+								<textElement textAlignment="Left" verticalAlignment="Middle"/>
+								<textFieldExpression><![CDATA[$V{trecho}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabRowHeader>
+					<crosstabTotalRowHeader>
+						<cellContents backcolor="#BFE1FF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+								<reportElement stretchType="RelativeToTallestObject" x="2" y="0" width="70" height="25" uuid="aaea0dcd-4bbd-4e74-af61-156b53ed452e"/>
+								<textElement verticalAlignment="Middle" markup="none"/>
+								<textFieldExpression><![CDATA[$R{label.total}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabTotalRowHeader>
+				</rowGroup>
+				<columnGroup name="categoria" height="30" totalPosition="End">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{categoria}]]></bucketExpression>
+					</bucket>
+					<crosstabColumnHeader>
+						<cellContents backcolor="#F0F8FF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+								<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="2" y="0" width="50" height="30" uuid="64ed6da8-89e3-4fae-a948-7bb7719e7a5d"/>
+								<textElement verticalAlignment="Middle"/>
+								<textFieldExpression><![CDATA[$V{categoria}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabColumnHeader>
+					<crosstabTotalColumnHeader>
+						<cellContents backcolor="#BFE1FF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+								<reportElement stretchType="RelativeToTallestObject" x="2" y="0" width="50" height="30" uuid="edafe8ad-5ad1-4535-a36f-6a6bbfbb5f53"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle" markup="none"/>
+								<textFieldExpression><![CDATA[$R{label.total}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabTotalColumnHeader>
+				</columnGroup>
+				<measure name="qtdeMeasure" class="java.lang.Long" calculation="Sum">
+					<measureExpression><![CDATA[$F{qtde}]]></measureExpression>
+				</measure>
+				<crosstabCell width="54" height="25">
+					<cellContents>
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+							<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="2" y="0" width="50" height="25" uuid="9ed4ee50-4738-4745-a56f-ec162ceb470f"/>
+							<textElement verticalAlignment="Middle"/>
+							<textFieldExpression><![CDATA[$V{qtdeMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="54" height="25" rowTotalGroup="trecho">
+					<cellContents backcolor="#BFE1FF" mode="Transparent">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+							<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="2" y="0" width="50" height="25" uuid="fafd0589-4c7e-4e5c-8071-a71208b9a83e"/>
+							<textElement verticalAlignment="Middle"/>
+							<textFieldExpression><![CDATA[$V{qtdeMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="53" columnTotalGroup="categoria">
+					<cellContents backcolor="#BFE1FF" mode="Transparent">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+							<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="2" y="0" width="50" height="25" uuid="873b4066-9eaa-44ed-bfc0-36bee7ff8e6b"/>
+							<textElement verticalAlignment="Middle"/>
+							<textFieldExpression><![CDATA[$V{qtdeMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="53" rowTotalGroup="trecho" columnTotalGroup="categoria">
+					<cellContents backcolor="#BFE1FF" mode="Transparent">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+							<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="2" y="0" width="50" height="25" uuid="c810a783-02ec-4cb3-83b7-cbc5afc05d30"/>
+							<textElement verticalAlignment="Middle"/>
+							<textFieldExpression><![CDATA[$V{qtdeMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+			</crosstab>
+		</band>
+	</summary>
+</jasperReport>

src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhado.jrxml

@@ -10,6 +10,11 @@
 	<parameter name="subreporte" class="net.sf.jasperreports.engine.JasperReport"/>
 	<parameter name="SUBREPORT_RESOURCE_BUNDLE" class="java.util.ResourceBundle"/>
 	<parameter name="nompacote" class="java.lang.String"/>
+	<parameter name="trecho" class="java.lang.String"/>
+	<parameter name="origem" class="java.lang.String"/>
+	<parameter name="destino" class="java.lang.String"/>
+	<parameter name="usuario" class="java.lang.String"/>
+	<parameter name="tipoTarifaPacote" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
@@ -19,7 +24,7 @@
 		<band splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="84" splitType="Stretch">
+		<band height="142" splitType="Stretch">
 			<textField>
 				<reportElement x="0" y="0" width="637" height="20" uuid="43b2c28d-4760-4890-b00d-25e931e79c74"/>
 				<textElement markup="none">
@@ -55,6 +60,27 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.pacote} + " " + $P{nompacote}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="0" y="100" width="801" height="20" uuid="979b7126-0e47-4885-8a07-d8f9aa75a204"/>
+				<textElement>
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.usuario} + " " + $P{usuario}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="0" y="120" width="801" height="20" uuid="fa1e3d80-b034-4acc-8e6e-e32ebbfb35d5"/>
+				<textElement>
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.tipoTarifaPacote} + " " + $P{tipoTarifaPacote}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="0" y="80" width="801" height="20" uuid="eb151f53-cf44-4e98-a49b-9427f740f9fc"/>
+				<textElement>
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.origem} + " " + $P{origem} + " " + $R{cabecalho.destino} + " " + $P{destino}]]></textFieldExpression>
+			</textField>
 		</band>
 	</title>
 	<pageHeader>

src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhadoItem.jrxml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioVendasPacotesDetalhadoItem" pageWidth="802" pageHeight="555" orientation="Landscape" columnWidth="802" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="f17327a0-45d8-4ec1-8350-688df66785dc">
-	<property name="ireport.zoom" value="2.0"/>
+	<property name="ireport.zoom" value="1.5"/>
-	<property name="ireport.x" value="95"/>
+	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<field name="numoperacion" class="java.lang.String"/>
 	<field name="nombusuario" class="java.lang.String"/>
@@ -279,9 +279,6 @@
 		</band>
 	</detail>
 	<columnFooter>
-		<band splitType="Stretch"/>
-	</columnFooter>
-	<pageFooter>
 		<band height="24" splitType="Stretch">
 			<textField pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement x="555" y="2" width="60" height="20" uuid="c143a4c0-043f-4742-911d-b543c971e26d"/>
@@ -304,7 +301,7 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{vTotalTotal}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement x="1" y="2" width="25" height="20" uuid="c44ae1ed-6f37-4a3c-aaad-19b89fc86abb"/>
 				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font fontName="SansSerif" size="5"/>
@@ -336,7 +333,13 @@
 				<reportElement stretchType="RelativeToTallestObject" x="801" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="ef5e295d-c708-4979-a8ef-d6f57e394f47"/>
 			</line>
 		</band>
+	</columnFooter>
+	<pageFooter>
+		<band splitType="Stretch"/>
 	</pageFooter>
+	<lastPageFooter>
+		<band/>
+	</lastPageFooter>
 	<summary>
 		<band splitType="Stretch"/>
 	</summary>

src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java

@@ -21,7 +21,7 @@ public abstract class Relatorio {
 	private static Logger log = Logger.getLogger(Relatorio.class);
 
 	private Connection conexao;
-	private Map<String, Object> parametros;
+	protected Map<String, Object> parametros;
 	protected RenderRelatorioJasper render;
 	private IDataSource customDataSource;
 	private IParametros processadorParametros;

src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasPacotesBoletosBean.java

@@ -5,10 +5,13 @@ import java.util.List;
 
 public class RelatorioVendasPacotesBoletosBean {
 
+	private String cveorigen;
+	private String cvedestino;
 	private String descorigen;
 	private String descdestino;
 
 	private List<RelatorioVendasPacotesBoletosItemBean> relatorioVendasPacotesBoletosItemBeans;
+	private List<RelatorioVendasPacotesBoletosItemBean> relatorioVendasPacotesBoletosItemBeansCancelados;
 
 	public String getDescorigen() {
 		return descorigen;
@@ -202,4 +205,91 @@ public class RelatorioVendasPacotesBoletosBean {
 		return true;
 	}
 
+	public List<RelatorioVendasPacotesBoletosItemBean> getRelatorioVendasPacotesBoletosItemBeansCancelados() {
+		return relatorioVendasPacotesBoletosItemBeansCancelados;
+	}
+
+	public void setRelatorioVendasPacotesBoletosItemBeansCancelados(List<RelatorioVendasPacotesBoletosItemBean> relatorioVendasPacotesBoletosItemBeansCancelados) {
+		this.relatorioVendasPacotesBoletosItemBeansCancelados = relatorioVendasPacotesBoletosItemBeansCancelados;
+	}
+
+	public class RelatorioVendasPacotesBoletosItemTotaisBean {
+	
+		private String trecho;
+		private String categoria;
+		private Long qtde;
+
+		public String getTrecho() {
+			return trecho;
+		}
+
+		public void setTrecho(String trecho) {
+			this.trecho = trecho;
+		}
+
+		public Long getQtde() {
+			return qtde;
+		}
+
+		public void setQtde(Long qtde) {
+			this.qtde = qtde;
+		}
+
+		public String getCategoria() {
+			return categoria;
+		}
+
+		public void setCategoria(String categoria) {
+			this.categoria = categoria;
+		}
+
+		@Override
+		public int hashCode() {
+			final int prime = 31;
+			int result = 1;
+			result = prime * result + ((categoria == null) ? 0 : categoria.hashCode());
+			result = prime * result + ((trecho == null) ? 0 : trecho.hashCode());
+			return result;
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (this == obj)
+				return true;
+			if (obj == null)
+				return false;
+			if (getClass() != obj.getClass())
+				return false;
+			RelatorioVendasPacotesBoletosItemTotaisBean other = (RelatorioVendasPacotesBoletosItemTotaisBean) obj;
+			if (categoria == null) {
+				if (other.categoria != null)
+					return false;
+			} else if (!categoria.equals(other.categoria))
+				return false;
+			if (trecho == null) {
+				if (other.trecho != null)
+					return false;
+			} else if (!trecho.equals(other.trecho))
+				return false;
+			return true;
+		}
+
+	}
+
+	public String getCveorigen() {
+		return cveorigen;
+	}
+
+	public void setCveorigen(String cveorigen) {
+		this.cveorigen = cveorigen;
+	}
+
+	public String getCvedestino() {
+		return cvedestino;
+	}
+
+	public void setCvedestino(String cvedestino) {
+		this.cvedestino = cvedestino;
+	}
+
 }

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarAutobusController.java

@@ -52,7 +52,9 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderAutobusDoc;
 @Scope("prototype")
 public class EditarAutobusController extends MyGenericForwardComposer {
 
-    @Autowired
+	private static final long serialVersionUID = 1L;
+
+	@Autowired
     private AutobusService autobusService;
     @Autowired
     private AutobusDocService autobusDocService;
@@ -82,6 +84,7 @@ public class EditarAutobusController extends MyGenericForwardComposer {
     private MyListbox docsList;
     private MyDatebox fecCaducidad;
     private Textbox txtNome;
+    private Textbox txtNumvagon;
     private Combobox cmbDiagramaAutobus;
     private Combobox cmbDiagramaAutobusPiso;
     private Combobox cmbTipoDocAutobus;
@@ -228,6 +231,7 @@ public class EditarAutobusController extends MyGenericForwardComposer {
 	
     public void onClick$btnSalvar(Event ev) throws InterruptedException {
         txtNome.getValue();
+        txtNumvagon.getValue();
         cmbDiagramaAutobus.getSelectedItem();
 
         try {
@@ -321,4 +325,12 @@ public class EditarAutobusController extends MyGenericForwardComposer {
             log.error(ex);
         }
     }
+
+	public Textbox getTxtNumvagon() {
+		return txtNumvagon;
+	}
+
+	public void setTxtNumvagon(Textbox txtNumvagon) {
+		this.txtNumvagon = txtNumvagon;
+	}
 }

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasPacotesBoletosController.java

@@ -1,6 +1,7 @@
 package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -18,15 +19,21 @@ import org.zkoss.util.resource.Labels;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zul.Comboitem;
+import org.zkoss.zul.ComboitemRenderer;
 import org.zkoss.zul.Datebox;
 
 import com.rjconsultores.ventaboletos.entidad.Empresa;
-import com.rjconsultores.ventaboletos.entidad.Pacote;
+import com.rjconsultores.ventaboletos.entidad.Parada;
+import com.rjconsultores.ventaboletos.entidad.TipoTarifaPacote;
+import com.rjconsultores.ventaboletos.entidad.Usuario;
 import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioVendasPacotesBoletos;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.service.EmpresaService;
-import com.rjconsultores.ventaboletos.service.PacoteService;
+import com.rjconsultores.ventaboletos.service.TipoTarifaPacoteService;
 import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar;
+import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada;
+import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParadaCve;
+import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxUsuario;
 import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
 
 @Controller("relatorioVendasPacotesBoletosController")
@@ -41,10 +48,21 @@ public class RelatorioVendasPacotesBoletosController extends MyGenericForwardCom
 	@Autowired
 	private EmpresaService empresaService;
 	
+	@Autowired
+	private TipoTarifaPacoteService tipoTarifaPacoteService; 
+
 	private List<Empresa> lsEmpresa;
+	private List<TipoTarifaPacote> lsTipoTarifaPacote;
 	private Datebox dataInicial;
 	private Datebox dataFinal;
 	private MyComboboxEstandar cmbEmpresa;
+	private MyComboboxEstandar cmbTipoTarifaPacote;
+	
+	private MyComboboxParada cmbParadaOrigem;
+	private MyComboboxParadaCve cmbParadaOrigemCve;
+	private MyComboboxParada cmbParadaDestino;
+	private MyComboboxParadaCve cmbParadaDestinoCve;
+	private MyComboboxUsuario cmbUsuario;
 
 	public List<Empresa> getLsEmpresa() {
 		return lsEmpresa;
@@ -56,8 +74,45 @@ public class RelatorioVendasPacotesBoletosController extends MyGenericForwardCom
 
 	@Override
 	public void doAfterCompose(Component comp) throws Exception {
-		lsEmpresa = empresaService.obtenerTodos();
+		lsEmpresa = new ArrayList<Empresa>();
+		lsEmpresa.add(new Empresa(-1, "TODAS"));
+		lsEmpresa.addAll(empresaService.obtenerTodos());
+		
+		lsTipoTarifaPacote = new ArrayList<TipoTarifaPacote>();
+		lsTipoTarifaPacote.add(new TipoTarifaPacote(-1, "TODAS"));
+		lsTipoTarifaPacote.addAll(tipoTarifaPacoteService.obtenerTodos());
 		super.doAfterCompose(comp);
+		
+		cmbParadaOrigemCve.setItemRenderer(new ComboitemRenderer() {
+			@Override
+			public void render(Comboitem cmbtm, Object o) throws Exception {
+				Parada parada = (Parada) o;
+
+				cmbtm.setLabel(parada.getCveparada());
+				cmbtm.setValue(parada);
+			}
+		});
+
+		cmbParadaDestinoCve.setItemRenderer(new ComboitemRenderer() {
+			@Override
+			public void render(Comboitem cmbtm, Object o) throws Exception {
+				Parada parada = (Parada) o;
+
+				cmbtm.setLabel(parada.getCveparada());
+				cmbtm.setValue(parada);
+			}
+		});
+		
+		cmbUsuario.setItemRenderer(new ComboitemRenderer() {
+			@Override
+			public void render(Comboitem cmbtm, Object o) throws Exception {
+				Usuario usuario = (Usuario) o;
+				
+				cmbtm.setLabel(usuario.getNombusuario());
+				cmbtm.setValue(usuario);
+			}
+		});
+
 	}
 
 	public void onClick$btnExecutarRelatorio(Event ev) throws Exception {
@@ -79,10 +134,45 @@ public class RelatorioVendasPacotesBoletosController extends MyGenericForwardCom
 		}
 		parametros.put("empresaId", empresaId);
 		
+		parametros.put("origem","Todas");
+		Comboitem cbiOrigem = cmbParadaOrigem.getSelectedItem();
+		if (cbiOrigem != null) {
+			Parada origem = (Parada) cbiOrigem.getValue();
+			parametros.put("origenId", origem.getParadaId());
+			parametros.put("origem", origem.getDescparada());
+		}
+
+		parametros.put("destino","Todos");
+		Comboitem cbiDestino = cmbParadaDestino.getSelectedItem();
+		if (cbiDestino != null) {
+			Parada destino = (Parada) cbiDestino.getValue();
+			parametros.put("destinoId", destino.getParadaId());
+			parametros.put("destino", destino.getDescparada());
+		}
+
+		parametros.put("usuario","Todos");
+		Comboitem cbiUsuario = cmbUsuario.getSelectedItem();
+		if (cbiUsuario != null) {
+			Usuario usuario = (Usuario) cbiUsuario.getValue();
+			parametros.put("usuarioId", usuario.getUsuarioId());
+			parametros.put("usuario", usuario.getNombUsuarioCompleto());
+		}
+		
+		parametros.put("tipoTarifaPacote","Todas");
+		Comboitem cbiTipoTarifaPacote = cmbTipoTarifaPacote.getSelectedItem();
+		if (cbiTipoTarifaPacote != null) {
+			TipoTarifaPacote tipoTarifaPacote = (TipoTarifaPacote) cbiTipoTarifaPacote.getValue();
+			parametros.put("tipoTarifaPacoteId", tipoTarifaPacote.getTipotarifapacoteId());
+			parametros.put("tipoTarifaPacote", tipoTarifaPacote.getDesctipotarifa());
+		}
+		
 		JasperReport subRelatorioVendasPacotesBoletosItens = (JasperReport) JRLoader.loadObject(this.getClass().getResourceAsStream("/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletosItem.jasper"));
 		parametros.put("subreporte", subRelatorioVendasPacotesBoletosItens);
 
-		Relatorio relatorio = new RelatorioVendasPacotesBoletos(parametros, dataSourceRead.getConnection(), "RelatorioVendasPacotesBoletosItem");
+		JasperReport subRelatorioVendasPacotesBoletosItensTotais = (JasperReport) JRLoader.loadObject(this.getClass().getResourceAsStream("/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletosItemTotais.jasper"));
+		parametros.put("subreporteTotais", subRelatorioVendasPacotesBoletosItensTotais);
+
+		Relatorio relatorio = new RelatorioVendasPacotesBoletos(parametros, dataSourceRead.getConnection(), "RelatorioVendasPacotesBoletosItem", "RelatorioVendasPacotesBoletosItemTotais");
 		
 		Map<String, Object> args = new HashMap<String, Object>();
 		args.put("relatorio", relatorio);
@@ -91,4 +181,35 @@ public class RelatorioVendasPacotesBoletosController extends MyGenericForwardCom
 				   Labels.getLabel("relatorioVendasPacotesBoletosController.window.title"), args, MODAL);
 	}
 	
+	public void onSelect$cmbParadaOrigemCve(Event ev) {
+		if (cmbParadaOrigemCve.getSelectedItem() != null) {
+			cmbParadaOrigem.setComboItemByParada((Parada) cmbParadaOrigemCve.getSelectedItem().getValue());
+		}
+	}
+
+	public void onSelect$cmbParadaOrigem(Event ev) {
+		if (cmbParadaOrigem.getSelectedItem() != null)
+			cmbParadaOrigemCve.setComboItemByParada((Parada) cmbParadaOrigem.getSelectedItem().getValue());
+	}
+
+	public void onSelect$cmbParadaDestinoCve(Event ev) {
+		if (cmbParadaDestinoCve.getSelectedItem() != null) {
+			cmbParadaDestino.setComboItemByParada((Parada) cmbParadaDestinoCve.getSelectedItem().getValue());
+		}
+	}
+
+	public void onSelect$cmbParadaDestino(Event ev) {
+		if (cmbParadaDestino.getSelectedItem() != null) {
+			cmbParadaDestinoCve.setComboItemByParada((Parada) cmbParadaDestino.getSelectedItem().getValue());
+		}
+	}
+
+	public List<TipoTarifaPacote> getLsTipoTarifaPacote() {
+		return lsTipoTarifaPacote;
+	}
+
+	public void setLsTipoTarifaPacote(List<TipoTarifaPacote> lsTipoTarifaPacote) {
+		this.lsTipoTarifaPacote = lsTipoTarifaPacote;
+	}
+
 }

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasPacotesDetalhadoController.java

@@ -19,15 +19,23 @@ import org.zkoss.util.resource.Labels;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zul.Comboitem;
+import org.zkoss.zul.ComboitemRenderer;
 import org.zkoss.zul.Datebox;
 
 import com.rjconsultores.ventaboletos.entidad.Empresa;
 import com.rjconsultores.ventaboletos.entidad.Pacote;
+import com.rjconsultores.ventaboletos.entidad.Parada;
+import com.rjconsultores.ventaboletos.entidad.TipoTarifaPacote;
+import com.rjconsultores.ventaboletos.entidad.Usuario;
 import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioVendasPacotesDetalhado;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.service.EmpresaService;
 import com.rjconsultores.ventaboletos.service.PacoteService;
+import com.rjconsultores.ventaboletos.service.TipoTarifaPacoteService;
 import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar;
+import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada;
+import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParadaCve;
+import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxUsuario;
 import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
 
 @Controller("relatorioVendasPacotesDetalhadoController")
@@ -45,12 +53,23 @@ public class RelatorioVendasPacotesDetalhadoController extends MyGenericForwardC
 	@Autowired
 	private PacoteService pacoteService;
 	
+	@Autowired
+	private TipoTarifaPacoteService tipoTarifaPacoteService;
+
 	private List<Empresa> lsEmpresa;
 	private List<Pacote> lsPacote;
+	private List<TipoTarifaPacote> lsTipoTarifaPacote;
 	private Datebox dataInicial;
 	private Datebox dataFinal;
 	private MyComboboxEstandar cmbEmpresa;
 	private MyComboboxEstandar cmbPacote;
+	private MyComboboxEstandar cmbTipoTarifaPacote;
+	
+	private MyComboboxParada cmbParadaOrigem;
+	private MyComboboxParadaCve cmbParadaOrigemCve;
+	private MyComboboxParada cmbParadaDestino;
+	private MyComboboxParadaCve cmbParadaDestinoCve;
+	private MyComboboxUsuario cmbUsuario;
 
 	public List<Empresa> getLsEmpresa() {
 		return lsEmpresa;
@@ -70,7 +89,42 @@ public class RelatorioVendasPacotesDetalhadoController extends MyGenericForwardC
 		lsPacote.add(new Pacote(-1, "TODOS"));
 		lsPacote.addAll(pacoteService.obtenerTodos());
 		
+		lsTipoTarifaPacote = new ArrayList<TipoTarifaPacote>();
+		lsTipoTarifaPacote.add(new TipoTarifaPacote(-1, "TODAS"));
+		lsTipoTarifaPacote.addAll(tipoTarifaPacoteService.obtenerTodos());
+
 		super.doAfterCompose(comp);
+		
+		cmbParadaOrigemCve.setItemRenderer(new ComboitemRenderer() {
+			@Override
+			public void render(Comboitem cmbtm, Object o) throws Exception {
+				Parada parada = (Parada) o;
+
+				cmbtm.setLabel(parada.getCveparada());
+				cmbtm.setValue(parada);
+			}
+		});
+
+		cmbParadaDestinoCve.setItemRenderer(new ComboitemRenderer() {
+			@Override
+			public void render(Comboitem cmbtm, Object o) throws Exception {
+				Parada parada = (Parada) o;
+
+				cmbtm.setLabel(parada.getCveparada());
+				cmbtm.setValue(parada);
+			}
+		});
+		
+		cmbUsuario.setItemRenderer(new ComboitemRenderer() {
+			@Override
+			public void render(Comboitem cmbtm, Object o) throws Exception {
+				Usuario usuario = (Usuario) o;
+				
+				cmbtm.setLabel(usuario.getNombusuario());
+				cmbtm.setValue(usuario);
+			}
+		});
+		
 	}
 
 	public void onClick$btnExecutarRelatorio(Event ev) throws Exception {
@@ -102,6 +156,38 @@ public class RelatorioVendasPacotesDetalhadoController extends MyGenericForwardC
 		}
 		parametros.put("pacoteId", pacoteId);
 		
+		parametros.put("origem","Todas");
+		Comboitem cbiOrigem = cmbParadaOrigem.getSelectedItem();
+		if (cbiOrigem != null) {
+			Parada origem = (Parada) cbiOrigem.getValue();
+			parametros.put("origenId", origem.getParadaId());
+			parametros.put("origem", origem.getDescparada());
+		}
+
+		parametros.put("destino","Todos");
+		Comboitem cbiDestino = cmbParadaDestino.getSelectedItem();
+		if (cbiDestino != null) {
+			Parada destino = (Parada) cbiDestino.getValue();
+			parametros.put("destinoId", destino.getParadaId());
+			parametros.put("destino", destino.getDescparada());
+		}
+
+		parametros.put("usuario","Todos");
+		Comboitem cbiUsuario = cmbUsuario.getSelectedItem();
+		if (cbiUsuario != null) {
+			Usuario usuario = (Usuario) cbiUsuario.getValue();
+			parametros.put("usuarioId", usuario.getUsuarioId());
+			parametros.put("usuario", usuario.getNombUsuarioCompleto());
+		}
+		
+		parametros.put("tipoTarifaPacote","Todas");
+		Comboitem cbiTipoTarifaPacote = cmbTipoTarifaPacote.getSelectedItem();
+		if (cbiTipoTarifaPacote != null) {
+			TipoTarifaPacote tipoTarifaPacote = (TipoTarifaPacote) cbiTipoTarifaPacote.getValue();
+			parametros.put("tipoTarifaPacoteId", tipoTarifaPacote.getTipotarifapacoteId());
+			parametros.put("tipoTarifaPacote", tipoTarifaPacote.getDesctipotarifa());
+		}
+
 		JasperReport subRelatorioVendasPacotesDetalhadoItens = (JasperReport) JRLoader.loadObject(this.getClass().getResourceAsStream("/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhadoItem.jasper"));
 		parametros.put("subreporte", subRelatorioVendasPacotesDetalhadoItens);
 
@@ -122,4 +208,12 @@ public class RelatorioVendasPacotesDetalhadoController extends MyGenericForwardC
 		this.lsPacote = lsPacote;
 	}
 
+	public List<TipoTarifaPacote> getLsTipoTarifaPacote() {
+		return lsTipoTarifaPacote;
+	}
+
+	public void setLsTipoTarifaPacote(List<TipoTarifaPacote> lsTipoTarifaPacote) {
+		this.lsTipoTarifaPacote = lsTipoTarifaPacote;
+	}
+
 }

src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxEmpresa.java

@@ -21,7 +21,7 @@ public class MyComboboxEmpresa extends Combobox {
 
 	private static final long serialVersionUID = 1L;
 	
-	private static Logger log = Logger.getLogger(MyComboboxParada.class);
+	private static Logger log = Logger.getLogger(MyComboboxEmpresa.class);
 	public final static int minLength = 2;
 	private EmpresaService empresaService;
 	private List<Empresa> lsEmpresa;

src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxUsuario.java

@@ -0,0 +1,120 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.rjconsultores.ventaboletos.web.utilerias;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.zkoss.util.resource.Labels;
+import org.zkoss.zk.ui.WrongValueException;
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.EventListener;
+import org.zkoss.zk.ui.event.InputEvent;
+import org.zkoss.zkplus.databind.BindingListModel;
+import org.zkoss.zkplus.databind.BindingListModelList;
+import org.zkoss.zkplus.spring.SpringUtil;
+import org.zkoss.zul.Combobox;
+
+import com.rjconsultores.ventaboletos.entidad.Usuario;
+import com.rjconsultores.ventaboletos.service.UsuarioService;
+
+/**
+ *
+ * @author Wilian Domingues
+ */
+public class MyComboboxUsuario extends Combobox {
+
+	private static final long serialVersionUID = 1L;
+
+	private UsuarioService usuarioService;
+    private List<Usuario> lsUsuario;
+    private Usuario initialValue;
+    private Integer indiceSelected = null;
+
+    public MyComboboxUsuario() {
+
+        super();
+
+        usuarioService = (UsuarioService) SpringUtil.getBean("usuarioService");
+        lsUsuario = new ArrayList<Usuario>();
+
+        this.setAutodrop(false);
+        this.setAutocomplete(false);
+
+        this.addEventListener("onOK", new EventListener() {
+
+            @Override
+            public void onEvent(Event event) throws Exception {
+                String strUsuario = MyComboboxUsuario.this.getText().toUpperCase();
+
+                if (strUsuario.length() < MyComboboxParada.minLength) {
+                    return;
+                }
+                if (!strUsuario.isEmpty()) {
+                    lsUsuario = usuarioService.buscarPeloNomeLike(strUsuario);
+
+                    BindingListModel listModelUsuario = new BindingListModelList(lsUsuario, true);
+                    MyComboboxUsuario.this.setModel(listModelUsuario);
+                    indiceSelected = null;
+                    if (!lsUsuario.isEmpty()) {
+                        indiceSelected = 0;
+                    }
+
+                    MyComboboxUsuario.this.open();
+                } else {
+                    lsUsuario.clear();
+
+                    BindingListModel listModelUsuario = new BindingListModelList(lsUsuario, true);
+                    MyComboboxUsuario.this.setModel(listModelUsuario);
+                }
+            }
+        });
+
+        this.addEventListener("onChanging", new EventListener() {
+
+            public void onEvent(Event event) throws Exception {
+                InputEvent ev = (InputEvent) event;
+                String strUsuario = ev.getValue();
+                if (strUsuario.length() < 2) {
+                    lsUsuario.clear();
+
+                    BindingListModel listModelUsuario = new BindingListModelList(lsUsuario, true);
+                    MyComboboxUsuario.this.setModel(listModelUsuario);
+
+                    MyComboboxUsuario.this.close();
+                }
+            }
+        });
+    }
+
+    public Usuario getInitialValue() {
+        return initialValue;
+    }
+
+    public void setInitialValue(Usuario initialValue) {
+        if (initialValue == null) {
+            return;
+        }
+        List<Usuario> ls = new ArrayList<Usuario>();
+        ls.add(initialValue);
+
+        this.setModel(new BindingListModelList(ls, false));
+    }
+    
+	/**
+	 * 
+	 * @param checaBusqueda
+	 * @throws WrongValueException
+	 */
+	public String getValue(boolean checaBusqueda) throws WrongValueException {
+		if (checaBusqueda) {
+			if (this.getSelectedItem() == null) {
+				throw new WrongValueException(this, Labels.getLabel("MSG.Error.combobox.hacerBusqueda"));
+			}
+		}
+
+		return super.getValue();
+	}
+}

web/WEB-INF/i3-label_es_MX.label

@@ -246,6 +246,7 @@ indexController.mniPrecoApanhe.label = Preço Apanhe
 indexController.mniRelatorioVendasPacotesResumido.label = Ventas de Paquetes - Resumido
 indexController.mniRelatorioVendasPacotesDetalhado.label = Ventas de Paquetes - Detalhado
 indexController.mniRelatorioVendasPacotesBoletos.label = Ventas de Pacotes - Boletos
+indexController.mniRelatorioVendasPacotesFaturamento.label = Ventas de Pacotes - Faturamento
 indexController.mniRelatorioDiferencasTransferencias.label = Relatório de Diferenças em Transferências
 
 indexController.mniSubMenuClientePacote.label=Pacote
@@ -3181,6 +3182,7 @@ editarAutobusController.btnApagar.tooltiptext = Eliminar
 editarAutobusController.btnSalvar.tooltiptext = Guardar
 editarAutobusController.btnFechar.tooltiptext = Cerrar
 editarAutobusController.lbNome.value = Número autobus
+editarAutobusController.lbNumvagon.value = Número Vagón
 editarAutobusController.lbParados.value = Cant Parados
 editarAutobusController.lbEmpresa.value = Empresa
 editarAutobusController.lbMarca.value = Marca
@@ -5390,13 +5392,21 @@ relatorioVendasPacotesDetalhadoController.lbDataIni.value = Fecha Inicio
 relatorioVendasPacotesDetalhadoController.lbDataFin.value = Fecha Final
 relatorioVendasPacotesDetalhadoController.lblEmpresa.value = Empresa
 relatorioVendasPacotesDetalhadoController.lblPacote.value = Pacote
+relatorioVendasPacotesDetalhadoController.lblTipoTarifaPacote.value = Tipo Tarifa
+relatorioVendasPacotesDetalhadoController.lblOrigem.value = Origem
+relatorioVendasPacotesDetalhadoController.lblDestino.value = Destino
+relatorioVendasPacotesDetalhadoController.lblUsuario.value = Usuário
 
 # Relatorio Vendas Pacotes Boletos
 relatorioVendasPacotesBoletosController.window.title = Relatório Vendas de Pacotes - Boletos
 relatorioVendasPacotesBoletosController.lbDataIni.value = Fecha Inicio
 relatorioVendasPacotesBoletosController.lbDataFin.value = Fecha Final
 relatorioVendasPacotesBoletosController.lblEmpresa.value = Empresa
+relatorioVendasPacotesBoletosController.lblTipoTarifaPacote.value = Tipo Tarifa
 relatorioVendasPacotesBoletosController.lblPacote.value = Pacote
+relatorioVendasPacotesBoletosController.lblOrigem.value = Origem
+relatorioVendasPacotesBoletosController.lblDestino.value = Destino
+relatorioVendasPacotesBoletosController.lblUsuario.value = Usuário
 
 # Relatorio Venda Pacote Voucher
 RelatorioVendaPacoteVoucher.window.title = Voucher Venda Pacote

web/WEB-INF/i3-label_pt_BR.label

@@ -251,6 +251,7 @@ indexController.mniPrecoApanhe.label = Preço Apanhe
 indexController.mniRelatorioVendasPacotesResumido.label = Vendas de Pacotes - Resumido
 indexController.mniRelatorioVendasPacotesDetalhado.label = Vendas de Pacotes - Detalhado
 indexController.mniRelatorioVendasPacotesBoletos.label = Vendas de Pacotes - Boletos
+indexController.mniRelatorioVendasPacotesFaturamento.label = Vendas de Pacotes - Faturamento
 indexController.mniRelatorioDiferencasTransferencias.label = Relatório de Diferenças em Transferências
 
 indexController.mnSubMenuImpressaoFiscal.label=Impressão Fiscal
@@ -3239,6 +3240,7 @@ editarAutobusController.btnApagar.tooltiptext = Eliminar
 editarAutobusController.btnSalvar.tooltiptext = Salvar
 editarAutobusController.btnFechar.tooltiptext = Fechar
 editarAutobusController.lbNome.value = Número Veículo
+editarAutobusController.lbNumvagon.value = Número Vagão
 editarAutobusController.lbParados.value = Cant Parados
 editarAutobusController.lbEmpresa.value = Empresa
 editarAutobusController.lbMarca.value = Marca
@@ -5531,13 +5533,21 @@ relatorioVendasPacotesDetalhadoController.lbDataIni.value = Data Inicial
 relatorioVendasPacotesDetalhadoController.lbDataFin.value = Data Final
 relatorioVendasPacotesDetalhadoController.lblEmpresa.value = Empresa
 relatorioVendasPacotesDetalhadoController.lblPacote.value = Pacote
+relatorioVendasPacotesDetalhadoController.lblTipoTarifaPacote.value = Tipo Tarifa
+relatorioVendasPacotesDetalhadoController.lblOrigem.value = Origem
+relatorioVendasPacotesDetalhadoController.lblDestino.value = Destino
+relatorioVendasPacotesDetalhadoController.lblUsuario.value = Usuário
 
 # Relatorio Vendas Pacotes Boletos
 relatorioVendasPacotesBoletosController.window.title = Relatório Vendas de Pacotes - Boletos
 relatorioVendasPacotesBoletosController.lbDataIni.value = Data Inicial
 relatorioVendasPacotesBoletosController.lbDataFin.value = Data Final
 relatorioVendasPacotesBoletosController.lblEmpresa.value = Empresa
+relatorioVendasPacotesBoletosController.lblTipoTarifaPacote.value = Tipo Tarifa
 relatorioVendasPacotesBoletosController.lblPacote.value = Pacote
+relatorioVendasPacotesBoletosController.lblOrigem.value = Origem
+relatorioVendasPacotesBoletosController.lblDestino.value = Destino
+relatorioVendasPacotesBoletosController.lblUsuario.value = Usuário
 
 # Relatorio Venda Pacote Voucher
 RelatorioVendaPacoteVoucher.window.title = Voucher Venda Pacote

web/gui/esquema_operacional/editarAutobus.zul

@@ -46,6 +46,12 @@
 			                             value="@{winEditarAutobus$composer.autobus.numautobus}"
 			                             use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox"/>
 			                </row>
+			                <row>
+			                    <label id="lbNumvagon" value="${c:l('editarAutobusController.lbNumvagon.value')}"/>
+			                    <textbox id="txtNumvagon" width="80%" maxlength="10"
+			                             value="@{winEditarAutobus$composer.autobus.numvagon}"
+			                             use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox"/>
+			                </row>
 			                <row>
 			                    <label value="${c:l('busquedaAutobusController.diagramaautobus.label')}"/>
 			                    <combobox id="cmbDiagramaAutobus" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar" constraint="no empty"

web/gui/relatorios/filtroRelatorioVendasPacotesBoletos.zul

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?page contentType="text/html;charset=UTF-8"?>
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
-<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" arg0="winFiltroRelatorioVendasPacotesDetalhado"?>
+<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" arg0="winFiltroRelatorioVendasPacotesBoletos"?>
 <?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
 
 <zk xmlns="http://www.zkoss.org/2005/zul">
-	<window id="winFiltroRelatorioVendasPacotesDetalhado"
+	<window id="winFiltroRelatorioVendasPacotesBoletos"
 		apply="${relatorioVendasPacotesBoletosController}"
 		contentStyle="overflow:auto" width="700px" border="normal">
 		<grid fixedLayout="true">
 			<columns>
-				<column width="20%" />
+				<column width="13%" />
-				<column width="30%" />
+				<column width="37%" />
-				<column width="20%" />
+				<column width="13%" />
-				<column width="30%" />
+				<column width="37%" />
 			</columns>
 			<rows>
 				<row spans="1,3">
@@ -22,7 +22,49 @@
 					<combobox id="cmbEmpresa" constraint="no empty"
 						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
 						mold="rounded" buttonVisible="true" width="80%"
-						model="@{winFiltroRelatorioVendasPacotesDetalhado$composer.lsEmpresa}" />
+						model="@{winFiltroRelatorioVendasPacotesBoletos$composer.lsEmpresa}" />
+				</row>
+				
+				<row spans="1,3">
+					<label
+						value="${c:l('relatorioVendasPacotesBoletosController.lblUsuario.value')}" />
+					<combobox id="cmbUsuario" 
+						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxUsuario"
+						mold="rounded" buttonVisible="true" width="40%"/>
+				</row>
+				
+				<row spans="1,3">
+					<label
+						value="${c:l('relatorioVendasPacotesBoletosController.lblTipoTarifaPacote.value')}" />
+					<combobox id="cmbTipoTarifaPacote"
+						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
+						mold="rounded" buttonVisible="true" width="80%"
+						model="@{winFiltroRelatorioVendasPacotesBoletos$composer.lsTipoTarifaPacote}" />
+				</row>
+
+				<row>
+					<label
+						value="${c:l('relatorioVendasPacotesBoletosController.lblOrigem.value')}" />
+					<cell>
+						<combobox id="cmbParadaOrigemCve"
+							use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParadaCve"
+							mold="rounded" buttonVisible="true" width="30%" />
+						<combobox id="cmbParadaOrigem"
+							use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada"
+							mold="rounded" buttonVisible="true" width="65%" />
+					</cell>
+
+					<label
+						value="${c:l('relatorioVendasPacotesBoletosController.lblDestino.value')}" />
+					<cell>
+						<combobox id="cmbParadaDestinoCve"
+							autodrop="false"
+							use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParadaCve"
+							mold="rounded" buttonVisible="true" width="30%" />
+						<combobox id="cmbParadaDestino" autodrop="false"
+							use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada"
+							mold="rounded" buttonVisible="true" width="65%" />
+					</cell>
 				</row>
 				
 				<row>

web/gui/relatorios/filtroRelatorioVendasPacotesDetalhado.zul

@@ -34,6 +34,48 @@
 						model="@{winFiltroRelatorioVendasPacotesDetalhado$composer.lsPacote}" />
 				</row>
 				
+				<row spans="1,3">
+					<label
+						value="${c:l('relatorioVendasPacotesDetalhadoController.lblUsuario.value')}" />
+					<combobox id="cmbUsuario" 
+						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxUsuario"
+						mold="rounded" buttonVisible="true" width="40%"/>
+				</row>
+				
+				<row spans="1,3">
+					<label
+						value="${c:l('relatorioVendasPacotesDetalhadoController.lblTipoTarifaPacote.value')}" />
+					<combobox id="cmbTipoTarifaPacote"
+						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
+						mold="rounded" buttonVisible="true" width="80%"
+						model="@{winFiltroRelatorioVendasPacotesDetalhado$composer.lsTipoTarifaPacote}" />
+				</row>
+
+				<row>
+					<label
+						value="${c:l('relatorioVendasPacotesDetalhadoController.lblOrigem.value')}" />
+					<cell>
+						<combobox id="cmbParadaOrigemCve"
+							use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParadaCve"
+							mold="rounded" buttonVisible="true" width="30%" />
+						<combobox id="cmbParadaOrigem"
+							use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada"
+							mold="rounded" buttonVisible="true" width="65%" />
+					</cell>
+
+					<label
+						value="${c:l('relatorioVendasPacotesDetalhadoController.lblDestino.value')}" />
+					<cell>
+						<combobox id="cmbParadaDestinoCve"
+							autodrop="false"
+							use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParadaCve"
+							mold="rounded" buttonVisible="true" width="30%" />
+						<combobox id="cmbParadaDestino" autodrop="false"
+							use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada"
+							mold="rounded" buttonVisible="true" width="65%" />
+					</cell>
+				</row>				
+
 				<row>
 					<label
 						value="${c:l('relatorioVendasPacotesDetalhadoController.lbDataIni.value')}" />