fixes bug #7153

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

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

@@ -8,17 +8,22 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.log4j.Logger;
+
 import com.rjconsultores.ventaboletos.entidad.Estado;
 import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DevolucaoBilhetes;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
+import com.rjconsultores.ventaboletos.utilerias.DateUtil;
 import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
 
 import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioDevolucaoBilhetes extends Relatorio {
 	
+	private static Logger log = Logger.getLogger(RelatorioDevolucaoBilhetes.class);
+
 	public RelatorioDevolucaoBilhetes(Map<String, Object> parametros, Connection conexao) throws Exception {
 		super(parametros, conexao);
 
@@ -53,12 +58,13 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
 				}
 
 				String sql = getSql(empresaId, puntoVentas, estados);
+				log.debug(sql);
 
 				NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
 				ResultSet rset = null;
 
-				stmt.setTimestamp("DATA_INICIO", (Timestamp) parametros.get("DATA_INICIO"));
+				stmt.setString("DATA_INICIO", DateUtil.getStringDate(((Timestamp) parametros.get("DATA_INICIO")), "dd/MM/yyyy HH:mm:ss"));
-				stmt.setTimestamp("DATA_FINAL", (Timestamp) parametros.get("DATA_FINAL"));
+				stmt.setString("DATA_FINAL", DateUtil.getStringDate(((Timestamp) parametros.get("DATA_FINAL")), "dd/MM/yyyy HH:mm:ss"));
 
 				rset = stmt.executeQuery();
 
@@ -115,9 +121,9 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
 	private String getSql(Integer empresaId, String puntoVentas, String estados) {
 
 		StringBuilder sql = new StringBuilder();
-		sql.append("SELECT AIDF.ACFISCAL AS AIDF, ");
+		sql.append("SELECT COALESCE(AIDF.ACFISCAL,SUBSTR(ML2.NUMSERIE20, -6, 7)) AS AIDF, ");
-		sql.append("  COALESCE(CAJ.NUMFOLIOSISTEMA, NUMOPERACION) AS NUMFOLIOSISTEMA, ");
+		sql.append("  COALESCE(CAJ.NUMFOLIOSISTEMA, CAJ.NUMOPERACION) AS NUMFOLIOSISTEMA, ");
-		sql.append("  CAJ.NUMSERIEPREIMPRESA AS SERIE_SUBSERIE, ");
+		sql.append("  CASE WHEN ML2.NUMSERIE20 IS NULL THEN CAJ.NUMSERIEPREIMPRESA ELSE NULL END AS SERIE_SUBSERIE, ");
 		sql.append("  CAJ.NUMFOLIOPREIMPRESO AS FOLIO, ");
 		sql.append("  CAJ.PRECIOPAGADO AS PRECIOPAGADO, ");
 		sql.append("  CAJ.PRECIOBASE AS PRECIOBASE, ");
@@ -139,19 +145,23 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
 		sql.append("INNER JOIN CIUDAD CO ON (CO.CIUDAD_ID = ORIGEM.CIUDAD_ID ) ");
 		sql.append("INNER JOIN CIUDAD CD ON (CD.CIUDAD_ID = DESTINO.CIUDAD_ID ) ");
 		sql.append("INNER JOIN ESTADO EST ON EST.ESTADO_ID = CO.ESTADO_ID ");
+		sql.append("LEFT JOIN BOLETO B ON (B.NUMASIENTO = CAJ.NUMASIENTO ");
+		sql.append("                       AND B.FECCORRIDA = CAJ.FECCORRIDA ");
+		sql.append("                       AND B.CORRIDA_ID = CAJ.CORRIDA_ID) ");
+		sql.append("LEFT JOIN FISCAL_ML2 ML2 ON ML2.BOLETO_ID = B.BOLETO_ID ");
 		sql.append("LEFT JOIN EMPRESA_IMPOSTO EI ON EST.ESTADO_ID = EI.ESTADO_ID AND EI.EMPRESA_ID = CAJ.MARCA_ID ");
 		sql.append("LEFT JOIN AIDF AIDF ON ((AIDF.SERIE = CAJ.NUMSERIEPREIMPRESA OR ");
 		sql.append("                     AIDF.SERIE = SUBSTR(CAJ.NUMSERIEPREIMPRESA,1,INSTR(CAJ.NUMSERIEPREIMPRESA,'-',1)-1)) ");
 		sql.append("                     AND (CAJ.NUMFOLIOPREIMPRESO BETWEEN AIDF.FORMINICIAL AND AIDF.FORMFINAL)) ");
 		sql.append("WHERE CAJ.MOTIVOCANCELACION_ID IN (32) ");
-		sql.append("AND CAJ.FECHORVENTA BETWEEN :DATA_INICIO AND :DATA_FINAL ");
+		sql.append("AND CAJ.FECHORVENTA BETWEEN TO_DATE(:DATA_INICIO,'DD/MM/YYYY HH24:MI:SS') AND TO_DATE(:DATA_FINAL,'DD/MM/YYYY HH24:MI:SS') ");
 		sql.append("AND CAJ.CATEGORIA_ID NOT IN (SELECT VALORCONSTANTE FROM CONSTANTE WHERE NOMBCONSTANTE = 'GRATUIDADE_CRIANCA') ");
 		sql.append(estados == null ? "" : "AND EST.ESTADO_ID IN (" + estados + ") ");
 		sql.append(puntoVentas == null ? "" : "AND PTV.PUNTOVENTA_ID IN (" + puntoVentas + ") ");
 		sql.append(empresaId == null ? "" : "AND CAJ.MARCA_ID IN (" + empresaId + ") ");
-		sql.append("GROUP BY AIDF.ACFISCAL, ");
+		sql.append("GROUP BY COALESCE(AIDF.ACFISCAL,SUBSTR(ML2.NUMSERIE20, -6, 7)), ");
-		sql.append("  COALESCE(CAJ.NUMFOLIOSISTEMA, NUMOPERACION), ");
+		sql.append("  COALESCE(CAJ.NUMFOLIOSISTEMA, CAJ.NUMOPERACION), ");
-		sql.append("  CAJ.NUMSERIEPREIMPRESA, ");
+		sql.append("  CASE WHEN ML2.NUMSERIE20 IS NULL THEN CAJ.NUMSERIEPREIMPRESA ELSE NULL END, ");
 		sql.append("  CAJ.NUMFOLIOPREIMPRESO, ");
 		sql.append("  CAJ.PRECIOPAGADO, ");
 		sql.append("  CAJ.PRECIOBASE, ");

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

@@ -0,0 +1,29 @@
+package com.rjconsultores.ventaboletos.relatorios.impl;
+
+import java.sql.Connection;
+import java.util.List;
+import java.util.Map;
+
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
+import com.rjconsultores.ventaboletos.vo.comissao.HistoricoComissao;
+
+import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
+
+public class RelatorioHistoricoComissaoGeral extends Relatorio {
+
+	public RelatorioHistoricoComissaoGeral(Map<String, Object> parametros, Connection conexao) {
+		super(parametros, conexao);
+
+		List<HistoricoComissao> historico = (List<HistoricoComissao>) parametros.get("historico");
+		setLsDadosRelatorio(historico);
+	}
+
+	public void setLsDadosRelatorio(List<HistoricoComissao> historico) {
+		this.setCollectionDataSource(new JRBeanCollectionDataSource(historico));
+	}
+
+	@Override
+	protected void processaParametros() throws Exception {
+	}
+
+}

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

@@ -0,0 +1,148 @@
+package com.rjconsultores.ventaboletos.relatorios.impl;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
+import com.rjconsultores.ventaboletos.vo.comissao.LogConferenciaVO;
+import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
+
+import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
+
+public class RelatorioObservacaoConferenciaMovimento extends Relatorio {
+	
+	private static Logger log = Logger.getLogger(RelatorioObservacaoConferenciaMovimento.class);
+	private Integer empresaId;
+	private Integer puntoventaId;
+	private Date dataInicial;
+	private Date dataFinal;
+	
+	public RelatorioObservacaoConferenciaMovimento(Map<String, Object> parametros, Connection conexao) throws Exception {
+		super(parametros, conexao);
+		
+		this.setCustomDataSource(new DataSource(this) {
+			@Override
+			public void initDados() throws Exception {
+				Connection conexao = this.relatorio.getConexao();
+				definirFiltros(this.relatorio.getParametros());
+				List<LogConferenciaVO> lsDadosRelatorio = processarRelatorio(conexao);
+				setLsDadosRelatorio(lsDadosRelatorio); 
+			}
+		});
+	}
+
+	private List<LogConferenciaVO> processarRelatorio(Connection conexao) throws ParseException {
+		List<LogConferenciaVO> lsDadosRelatorio = new ArrayList<LogConferenciaVO>();
+		ResultSet rset = null;
+		NamedParameterStatement stmt = null;
+		try {
+			StringBuilder sQuery = new StringBuilder();
+			sQuery.append("SELECT PV.NOMBPUNTOVENTA, C.DATAMOVIMENTO, LOG.STATUS, LOG.OBSERVACAO, B.NUMFOLIOSISTEMA, CAT.DESCCATEGORIA, LOG.PRECO, LOG.FECMODIF, LOG.INDCREDITO, B.TIPOVENTA_ID, U.NOMBUSUARIO, LOG.TIPO, EE.DESCINFO, TEE.DESCTIPOEVENTO ")
+				  .append("FROM LOG_CONFERENCIA LOG ")
+				  .append("INNER JOIN CONFERENCIA C ON C.CONFERENCIA_ID = LOG.CONFERENCIA_ID ")
+				  .append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = C.EMPRESA_ID ")
+				  .append("INNER JOIN PUNTO_VENTA PV ON PV.PUNTOVENTA_ID = C.PUNTOVENTA_ID ")
+				  .append("INNER JOIN USUARIO U ON U.USUARIO_ID = LOG.USUARIO_ID ")
+				  .append("LEFT JOIN BOLETO B ON B.BOLETO_ID = LOG.BOLETO_ID ")
+				  .append("LEFT JOIN CATEGORIA CAT ON CAT.CATEGORIA_ID = B.CATEGORIA_ID ")
+				  .append("LEFT JOIN EVENTO_EXTRA EE ON EE.EVENTOEXTRA_ID = LOG.EVENTOEXTRA_ID ")
+				  .append("LEFT JOIN TIPO_EVENTO_EXTRA TEE ON TEE.TIPOEVENTOEXTRA_ID = EE.TIPOEVENTOEXTRA_ID ")
+				  .append("WHERE LOG.ACTIVO = 1 ")
+				  .append("AND C.DATAMOVIMENTO BETWEEN :dataInicial AND :dataFinal ");
+			
+			if(empresaId != null) {
+				sQuery.append("AND C.EMPRESA_ID = :empresaId ");
+			}
+
+			if(puntoventaId != null) {
+				sQuery.append("AND PV.PUNTOVENTA_ID = :puntoventaId ");
+			}
+
+			sQuery.append("ORDER BY C.DATAMOVIMENTO");
+			
+			log.info(sQuery.toString());
+			
+			stmt = new NamedParameterStatement(conexao, sQuery.toString());
+			if(empresaId != null) {
+				stmt.setInt("empresaId", empresaId);
+			}
+			
+			if(puntoventaId != null) {
+				stmt.setInt("puntoventaId", puntoventaId);
+			}
+			stmt.setDate("dataInicial", new java.sql.Date(dataInicial.getTime()));
+			stmt.setDate("dataFinal", new java.sql.Date(dataFinal.getTime()));
+			
+			rset = stmt.executeQuery();
+			
+			while (rset.next()) {
+				LogConferenciaVO logConferencia = new LogConferenciaVO();
+				logConferencia.setDatamovimento(rset.getDate("datamovimento"));
+				logConferencia.setNombpuntoventa(rset.getString("nombpuntoventa"));
+				logConferencia.setStatus(rset.getInt("status"));
+				logConferencia.setNumfoliosistema(rset.getString("numfoliosistema"));
+				logConferencia.setTipoventa(rset.getInt("tipoventa_id"));
+				logConferencia.setObservacao(rset.getString("observacao"));
+				logConferencia.setDesccategoria(rset.getString("desccategoria"));
+				logConferencia.setFecmodif(rset.getDate("fecmodif"));
+				logConferencia.setIndcredito(rset.getBoolean("indcredito"));
+				logConferencia.setNombusuario(rset.getString("nombusuario"));
+				logConferencia.setPreco(rset.getBigDecimal("preco"));
+				logConferencia.setTipo(rset.getInt("tipo"));
+				logConferencia.setDescinfoevento(rset.getString("descinfo"));
+				logConferencia.setDesctipoevento(rset.getString("desctipoevento"));
+				
+				lsDadosRelatorio.add(logConferencia);
+			}
+			
+			return lsDadosRelatorio;
+		} 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);
+			}
+		}
+		return null;
+	}
+
+	public void setLsDadosRelatorio(List<LogConferenciaVO> lsDadosRelatorio) {
+		this.setCollectionDataSource(new JRBeanCollectionDataSource(lsDadosRelatorio));
+	}
+
+	@Override
+	protected void processaParametros() throws Exception {
+	}
+	
+	private void definirFiltros(Map<String, Object> parametros) throws ParseException {
+		Integer puntoventaId = (Integer) parametros.get("puntoventaId");
+		Integer empresaId = (Integer) parametros.get("empresaId");
+		this.dataInicial = (Date) parametros.get("dataFiltroInicial");
+		this.dataFinal = (Date) parametros.get("dataFiltroFinal");
+		
+		if(empresaId != null) {
+			this.empresaId = empresaId;
+		}
+		if(puntoventaId != null) {
+			this.puntoventaId = puntoventaId;
+		}
+		
+	}
+
+}

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

@@ -0,0 +1,17 @@
+#geral
+msg.noData=Não foi possivel obter dados com os parâmetros informados.
+
+#labels
+label.periodo=Período:
+label.ate=até
+label.filtros=Fitros:
+label.aidf=AIDF(Bilhetes Manuais)
+label.serieSubs=Série/Subs.(ECF)
+label.numero=Número
+label.vrContabil=Vr. Contábil
+label.baseCalc=Base Calc.
+label.aliquota=Alíquota
+label.icms=ICMS
+label.pagina=Página:
+label.total=Total
+label.qtdeBilhetes=Quantidade de Bilhetes:

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

@@ -0,0 +1,17 @@
+#geral
+msg.noData=Não foi possivel obter dados com os parâmetros informados.
+
+#labels
+label.periodo=Período:
+label.ate=até
+label.filtros=Fitros:
+label.aidf=AIDF(Bilhetes Manuais)
+label.serieSubs=Série/Subs.(ECF)
+label.numero=Número
+label.vrContabil=Vr. Contábil
+label.baseCalc=Base Calc.
+label.aliquota=Alíquota
+label.icms=ICMS
+label.pagina=Página:
+label.total=Total
+label.qtdeBilhetes=Quantidade de Bilhetes:

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

@@ -0,0 +1,44 @@
+#geral
+msg.noData=Não foi possivel obter dados com os parâmetros informados.
+
+#Labels cabeçalho
+cabecalho.nome=Relatório Histórico Comissão Geral
+cabecalho.relatorio=Relatório:
+cabecalho.periodo=Período:
+cabecalho.periodoA=à
+cabecalho.dataHora=Data/Hora:
+cabecalho.impressorPor=Impressor por:
+cabecalho.pagina=Página
+cabecalho.de=de
+cabecalho.filtros=Filtros:
+cabecalho.usuario=Usuário:
+cabecalho.puntoventa=Punto Venta:
+cabecalho.empresa=Empresa:
+cabecalho.comissoes=Comissões
+label.nombpuntoventa=Punto Venta
+label.numpuntoventa=Número
+label.usuario=Usuário
+label.datamovimento=Data Mov.
+label.statusDescricao=Situação
+label.numfoliosistema=Nº Bilhete
+label.desccategoria=Categoria
+label.observacao=Observação
+label.preco=Valor
+label.debitoCredito=D/C
+label.fecmodif=Dt. Alt.
+label.tipoventa=Tipo Venta
+label.tipo=Tipo
+label.competencia=Comp.
+label.status=Status
+label.bpr=BPR
+label.excBag=Exc Bag
+label.segOpc=Seg Opc
+label.outros=Outros
+label.descEv=Desc Ev
+label.descFixo=Desc Fixo
+label.royaties=Royaties
+label.issRetido=Iss Retido
+label.metasBon=Metas/Bon
+label.entPas=Ent Pas
+label.usuarioPagamento=Usuario Pagamento
+label.usuarioLancamento=Usuario Lançamento

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

@@ -0,0 +1,44 @@
+#geral
+msg.noData=Não foi possivel obter dados com os parâmetros informados.
+
+#Labels cabeçalho
+cabecalho.nome=Relatório Histórico Comissão Geral
+cabecalho.relatorio=Relatório:
+cabecalho.periodo=Período:
+cabecalho.periodoA=à
+cabecalho.dataHora=Data/Hora:
+cabecalho.impressorPor=Impressor por:
+cabecalho.pagina=Página
+cabecalho.de=de
+cabecalho.filtros=Filtros:
+cabecalho.usuario=Usuário:
+cabecalho.puntoventa=Punto Venta:
+cabecalho.empresa=Empresa:
+cabecalho.comissoes=Comissões
+label.nombpuntoventa=Ponto Venta
+label.numpuntoventa=Número
+label.usuario=Usuário
+label.datamovimento=Data Mov.
+label.statusDescricao=Situação
+label.numfoliosistema=Nº Bilhete
+label.desccategoria=Categoria
+label.observacao=Observação
+label.preco=Valor
+label.debitoCredito=D/C
+label.fecmodif=Dt. Alt.
+label.tipoventa=Tipo Venta
+label.tipo=Tipo
+label.competencia=Comp.
+label.status=Status
+label.bpr=BPR
+label.excBag=Exc Bag
+label.segOpc=Seg Opc
+label.outros=Outros
+label.descEv=Desc Ev
+label.descFixo=Desc Fixo
+label.royaties=Royaties
+label.issRetido=Iss Retido
+label.metasBon=Metas/Bon
+label.entPas=Ent Pas
+label.usuarioPagamento=Usuario Pagamento
+label.usuarioLancamento=Usuario Lançamento

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

@@ -0,0 +1,45 @@
+#geral
+msg.noData=Não foi possivel obter dados com os parâmetros informados.
+
+#Labels cabeçalho
+cabecalho.nome=Relatório Histórico Comissão
+cabecalho.relatorio=Relatório:
+cabecalho.periodo=Período:
+cabecalho.periodoA=à
+cabecalho.dataHora=Data/Hora:
+cabecalho.impressorPor=Impressor por:
+cabecalho.pagina=Página
+cabecalho.de=de
+cabecalho.filtros=Filtros:
+cabecalho.usuario=Usuário:
+cabecalho.puntoventa=Punto Venta:
+cabecalho.empresa=Empresa:
+cabecalho.comissoes=Comissões
+label.nombpuntoventa=Ponto Venta
+label.numpuntoventa=Número
+label.usuario=Usuário
+label.datamovimento=Data Mov.
+label.statusDescricao=Situação
+label.numfoliosistema=Nº Bilhete
+label.desccategoria=Categoria
+label.observacao=Observação
+label.preco=Valor
+label.debitoCredito=D/C
+label.fecmodif=Dt. Alt.
+label.tipoventa=Tipo Venta
+label.tipo=Tipo
+label.competencia=Competência
+label.status=Status
+label.bpr=BPR
+label.excBag=Exc Bag
+label.segOpc=Seg Opc
+label.outros=Outros
+label.descEv=Desc Ev
+label.descFixo=Desc Fixo
+label.royaties=Royaties
+label.issRetido=Iss Retido
+label.metasBon=Metas/Bon
+label.entPas=Ent Pas
+label.usuarioPagamento=Usuario Pagamento
+label.usuarioLancamento=Usuario Lançamento
+label.data=Data

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

@@ -0,0 +1,45 @@
+#geral
+msg.noData=Não foi possivel obter dados com os parâmetros informados.
+
+#Labels cabeçalho
+cabecalho.nome=Relatório Histórico Comissão
+cabecalho.relatorio=Relatório:
+cabecalho.periodo=Período:
+cabecalho.periodoA=à
+cabecalho.dataHora=Data/Hora:
+cabecalho.impressorPor=Impressor por:
+cabecalho.pagina=Página
+cabecalho.de=de
+cabecalho.filtros=Filtros:
+cabecalho.usuario=Usuário:
+cabecalho.puntoventa=Punto Venta:
+cabecalho.empresa=Empresa:
+cabecalho.comissoes=Comissões
+label.nombpuntoventa=Ponto Venta
+label.numpuntoventa=Número
+label.usuario=Usuário
+label.datamovimento=Data Mov.
+label.statusDescricao=Situação
+label.numfoliosistema=Nº Bilhete
+label.desccategoria=Categoria
+label.observacao=Observação
+label.preco=Valor
+label.debitoCredito=D/C
+label.fecmodif=Dt. Alt.
+label.tipoventa=Tipo Venta
+label.tipo=Tipo
+label.competencia=Competência
+label.status=Status
+label.bpr=BPR
+label.excBag=Exc Bag
+label.segOpc=Seg Opc
+label.outros=Outros
+label.descEv=Desc Ev
+label.descFixo=Desc Fixo
+label.royaties=Royaties
+label.issRetido=Iss Retido
+label.metasBon=Metas/Bon
+label.entPas=Ent Pas
+label.usuarioPagamento=Usuario Pagamento
+label.usuarioLancamento=Usuario Lançamento
+label.data=Data

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

@@ -0,0 +1,28 @@
+#geral
+msg.noData=Não foi possivel obter dados com os parâmetros informados.
+
+#Labels cabeçalho
+cabecalho.nome=Reporte Observaciones Conferencia Movimientos
+cabecalho.relatorio=Relatório:
+cabecalho.periodo=Período:
+cabecalho.periodoA=à
+cabecalho.dataHora=Data/Hora:
+cabecalho.impressorPor=Impressor por:
+cabecalho.pagina=Página
+cabecalho.de=de
+cabecalho.filtros=Filtros:
+cabecalho.usuario=Usuário:
+cabecalho.puntoventa=Punto Venta:
+cabecalho.empresa=Empresa:
+label.puntoventa=Punto Venta
+label.usuario=Usuário
+label.datamovimento=Data Mov.
+label.statusDescricao=Situação
+label.numfoliosistema=Nº Bilhete
+label.desccategoria=Categoria
+label.observacao=Observação
+label.preco=Valor
+label.debitoCredito=D/C
+label.fecmodif=Dt. Alt.
+label.tipoventa=Tipo Venta
+label.tipo=Tipo

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

@@ -0,0 +1,28 @@
+#geral
+msg.noData=Não foi possivel obter dados com os parâmetros informados.
+
+#Labels cabeçalho
+cabecalho.nome=Relatório Observações Conferência Movimentos
+cabecalho.relatorio=Relatório:
+cabecalho.periodo=Período:
+cabecalho.periodoA=à
+cabecalho.dataHora=Data/Hora:
+cabecalho.impressorPor=Impressor por:
+cabecalho.pagina=Página
+cabecalho.de=de
+cabecalho.filtros=Filtros:
+cabecalho.usuario=Usuário:
+cabecalho.puntoventa=Punto Venta:
+cabecalho.empresa=Empresa:
+label.puntoventa=Punto Venta
+label.usuario=Usuário
+label.datamovimento=Data Mov.
+label.statusDescricao=Situação
+label.numfoliosistema=Nº Bilhete
+label.desccategoria=Categoria
+label.observacao=Observação
+label.preco=Valor
+label.debitoCredito=D/C
+label.fecmodif=Dt. Alt.
+label.tipoventa=Tipo Venta
+label.tipo=Tipo

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

@@ -2,7 +2,7 @@
 <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="RelatorioDevolucaoBilhetes" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
 	<property name="ireport.zoom" value="1.6528925619834718"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="0"/>
+	<property name="ireport.y" value="138"/>
 	<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
 	<style name="table">
 		<box>
@@ -218,7 +218,7 @@
 					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression><![CDATA["Página: " + $V{PAGE_COUNT}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.pagina} + $V{PAGE_COUNT}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="false">
 				<reportElement mode="Transparent" x="45" y="30" width="51" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="f64c2e3c-d936-4072-a0b1-d914f408bbbb"/>
@@ -242,7 +242,7 @@
 					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression><![CDATA["até"]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.ate}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false">
 				<reportElement mode="Transparent" x="461" y="0" width="93" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="ea4dfc22-27b5-4600-8e8b-7d74460ed744"/>
@@ -261,7 +261,7 @@
 					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression><![CDATA["Filtros "]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.filtros}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement x="46" y="46" width="508" height="14" uuid="98fc1c7e-3fee-4c70-924f-2cbb17fd243f"/>
@@ -276,7 +276,7 @@
 					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression><![CDATA["Período "]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.periodo}]]></textFieldExpression>
 			</textField>
 		</band>
 	</pageHeader>
@@ -294,58 +294,58 @@
 					<pen lineWidth="0.5"/>
 				</graphicElement>
 			</line>
-			<staticText>
+			<textField>
-				<reportElement x="0" y="1" width="140" height="14" uuid="9c579f27-ee14-4804-b73d-64994a6e41ec"/>
+				<reportElement x="0" y="1" width="140" height="14" uuid="1835789f-f3ff-4d8d-ba10-12c6d693b270"/>
-				<textElement>
+				<textElement markup="none">
 					<font size="10" isBold="true"/>
 				</textElement>
-				<text><![CDATA[AIDF]]></text>
+				<textFieldExpression><![CDATA[$R{label.aidf}]]></textFieldExpression>
-			</staticText>
+			</textField>
-			<staticText>
+			<textField>
-				<reportElement x="140" y="1" width="74" height="14" uuid="7b8a8f38-e513-4a8c-a82b-a9c6ffd21f6f"/>
+				<reportElement x="140" y="1" width="74" height="14" uuid="d6813bb4-94c3-4f9b-af61-54e3676c31bb"/>
-				<textElement>
+				<textElement markup="none">
 					<font size="10" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Série/Subs.]]></text>
+				<textFieldExpression><![CDATA[$R{label.serieSubs}]]></textFieldExpression>
-			</staticText>
+			</textField>
-			<staticText>
+			<textField>
-				<reportElement x="214" y="1" width="59" height="14" uuid="4f8fcbb3-73e7-4b15-9687-30ff12bb1526"/>
+				<reportElement x="214" y="1" width="59" height="14" uuid="60cc6a71-4f40-49de-9f78-08b65931d16d"/>
-				<textElement>
+				<textElement markup="none">
 					<font size="10" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Número]]></text>
+				<textFieldExpression><![CDATA[$R{label.numero}]]></textFieldExpression>
-			</staticText>
+			</textField>
-			<staticText>
+			<textField>
-				<reportElement mode="Transparent" x="343" y="1" width="60" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="7b817589-f754-49f1-bf53-856be52946fb"/>
+				<reportElement mode="Transparent" x="343" y="1" width="60" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="0b598d85-e93d-4916-b9a1-c80e694aabb6"/>
 				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<text><![CDATA[Base Calc.]]></text>
+				<textFieldExpression><![CDATA[$R{label.baseCalc}]]></textFieldExpression>
-			</staticText>
+			</textField>
-			<staticText>
+			<textField>
-				<reportElement mode="Transparent" x="403" y="1" width="58" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="93a5880a-7547-4e53-85f4-09a6c22d5699"/>
+				<reportElement mode="Transparent" x="403" y="1" width="58" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="e647ff9e-f7e2-4c90-a75f-d831980391b6"/>
 				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<text><![CDATA[Alíquota]]></text>
+				<textFieldExpression><![CDATA[$R{label.aliquota}]]></textFieldExpression>
-			</staticText>
+			</textField>
-			<staticText>
+			<textField>
-				<reportElement mode="Transparent" x="461" y="1" width="72" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="1d4f5650-a014-468d-a9b2-c58887492ace"/>
+				<reportElement mode="Transparent" x="461" y="1" width="72" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="a1a4be94-54f7-42f0-bdd3-5b0b2d6a37c4"/>
 				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<text><![CDATA[ICMS]]></text>
+				<textFieldExpression><![CDATA[$R{label.icms}]]></textFieldExpression>
-			</staticText>
+			</textField>
-			<staticText>
+			<textField>
-				<reportElement x="273" y="1" width="70" height="14" uuid="32c20a27-414c-41be-86b2-0d23645acd18"/>
+				<reportElement x="273" y="1" width="70" height="14" uuid="ed400846-62e0-4199-8c0d-c4b7741d934c"/>
-				<textElement>
+				<textElement markup="none">
 					<font size="10" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Vr. Contábil]]></text>
+				<textFieldExpression><![CDATA[$R{label.vrContabil}]]></textFieldExpression>
-			</staticText>
+			</textField>
 		</band>
 	</columnHeader>
 	<detail>
@@ -411,7 +411,7 @@
 				<textElement>
 					<font size="9"/>
 				</textElement>
-				<textFieldExpression><![CDATA["Total"]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.total}]]></textFieldExpression>
 			</textField>
 			<line>
 				<reportElement x="0" y="0" width="555" height="1" uuid="c2a4d216-ecbf-4690-876b-3263188595ad"/>
@@ -428,7 +428,7 @@
 				<textElement>
 					<font size="9"/>
 				</textElement>
-				<textFieldExpression><![CDATA["Quantidade de Bilhetes :"]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.qtdeBilhetes}]]></textFieldExpression>
 			</textField>
 			<line>
 				<reportElement x="1" y="15" width="554" height="1" uuid="ff50b0f9-831b-428e-9177-b264920c542b"/>

src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoComissao.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="RelatorioHistoricoComissao" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="1d365136-23ec-4fe0-9a67-69b976f55a04">
 	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="10"/>
+	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<parameter name="periodoInicial" class="java.util.Date"/>
 	<parameter name="periodoFinal" class="java.util.Date"/>
@@ -58,48 +58,49 @@
 	</background>
 	<title>
 		<band height="87" splitType="Stretch">
-			<staticText>
+			<textField>
-				<reportElement x="0" y="63" width="74" height="23" uuid="561c23fd-d89a-462e-a2fb-dda3fce61209"/>
+				<reportElement x="0" y="63" width="74" height="23" uuid="077a30d1-8799-4cac-96aa-9ff8c3e68c90"/>
-				<textElement verticalAlignment="Middle">
+				<textElement verticalAlignment="Middle" markup="none">
 					<font size="11" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Agência:]]></text>
+				<textFieldExpression><![CDATA[$R{cabecalho.puntoventa}]]></textFieldExpression>
-			</staticText>
+			</textField>
-			<staticText>
+			<textField>
-				<reportElement x="0" y="0" width="428" height="20" uuid="38c91d2c-209c-40e6-a819-1163a0243bc9"/>
+				<reportElement x="0" y="0" width="428" height="20" uuid="2f326d37-a2d8-43d4-ad3a-424d22fae399"/>
-				<textElement verticalAlignment="Middle">
+				<textElement verticalAlignment="Middle" markup="none">
 					<font size="14" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Histórico de Comissão]]></text>
+				<textFieldExpression><![CDATA[$R{cabecalho.nome}]]></textFieldExpression>
-			</staticText>
+			</textField>
-			<staticText>
+			<textField>
-				<reportElement x="0" y="40" width="74" height="23" uuid="9ac23ceb-5a19-4212-90e1-d239548b0269"/>
+				<reportElement x="0" y="40" width="74" height="23" uuid="122d217d-8776-4f8e-b563-8c108e56d03c"/>
-				<textElement verticalAlignment="Middle">
+				<textElement verticalAlignment="Middle" markup="none">
 					<font size="11" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Empresa:]]></text>
+				<textFieldExpression><![CDATA[$R{cabecalho.empresa}]]></textFieldExpression>
-			</staticText>
+			</textField>
-			<staticText>
+			<textField>
-				<reportElement x="0" y="20" width="74" height="20" uuid="d153c887-fd98-4eed-af4c-05466ae5c40d"/>
+				<reportElement x="0" y="20" width="74" height="20" uuid="b3db2410-5e97-40fa-a311-e554ddfad09b"/>
-				<textElement verticalAlignment="Middle">
+				<textElement verticalAlignment="Middle" markup="none">
 					<font size="11" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Período:]]></text>
+				<textFieldExpression><![CDATA[$R{cabecalho.periodo}]]></textFieldExpression>
-			</staticText>
+			</textField>
 			<textField>
 				<reportElement x="74" y="40" width="728" height="23" isPrintWhenDetailOverflows="true" uuid="c61ce766-52c3-4120-8cdc-6b7356175b9e"/>
-				<textElement>
+				<textElement verticalAlignment="Middle">
 					<font size="11"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{empresa}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement x="74" y="63" width="728" height="23" isPrintWhenDetailOverflows="true" uuid="3477f25b-85ea-48bf-b4fc-8d111cdf6dee"/>
+				<textElement verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$P{puntoventa}]]></textFieldExpression>
 			</textField>
 			<textField pattern="MMMMM, yyyy">
 				<reportElement x="74" y="20" width="95" height="20" isPrintWhenDetailOverflows="true" uuid="dd5d9d0c-0a2f-4132-bf57-0a54529a5a82"/>
-				<textElement>
+				<textElement verticalAlignment="Middle">
 					<font size="11"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{periodoInicial}]]></textFieldExpression>
@@ -113,14 +114,14 @@
 			</textField>
 			<textField pattern="MMMMM, yyyy">
 				<reportElement x="240" y="20" width="111" height="20" isPrintWhenDetailOverflows="true" uuid="c2d0883c-32fa-4215-b481-122b797d1ed4"/>
-				<textElement>
+				<textElement verticalAlignment="Middle">
 					<font size="11"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{periodoFinal}]]></textFieldExpression>
 			</textField>
 			<staticText>
 				<reportElement x="169" y="20" width="71" height="20" uuid="94739e6c-51ed-42bd-9a08-841a29d97814"/>
-				<textElement textAlignment="Center" verticalAlignment="Top">
+				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="11" isBold="true"/>
 				</textElement>
 				<text><![CDATA[até]]></text>
@@ -135,48 +136,48 @@
 	</pageHeader>
 	<columnHeader>
 		<band height="42" splitType="Stretch">
-			<staticText>
+			<textField>
-				<reportElement x="0" y="21" width="47" height="20" uuid="2921121f-2321-437c-9d40-883967695c16"/>
+				<reportElement x="0" y="21" width="63" height="20" uuid="6d74c969-6fc8-4b13-a853-a1e60e52234a"/>
-				<textElement>
+				<textElement verticalAlignment="Middle" markup="none">
 					<font size="8" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Competência]]></text>
+				<textFieldExpression><![CDATA[$R{label.competencia}]]></textFieldExpression>
-			</staticText>
+			</textField>
-			<staticText>
+			<textField>
-				<reportElement x="94" y="20" width="47" height="20" uuid="6475e448-e5fc-41e9-bd1c-3185a2b03b1b"/>
+				<reportElement x="110" y="21" width="70" height="20" uuid="261d6364-5b1b-431a-a574-1f92cbb24e17"/>
-				<textElement>
+				<textElement verticalAlignment="Middle" markup="none">
 					<font size="8" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Status]]></text>
+				<textFieldExpression><![CDATA[$R{label.status}]]></textFieldExpression>
-			</staticText>
+			</textField>
-			<staticText>
+			<textField>
-				<reportElement x="141" y="21" width="42" height="20" uuid="4bca707b-35f2-4ca4-a21c-cd33b851f678"/>
+				<reportElement x="180" y="21" width="42" height="20" uuid="bdfebbb6-a0b7-4c6e-a92e-2f5c46fbbc68"/>
-				<textElement>
+				<textElement verticalAlignment="Middle" markup="none">
 					<font size="8" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Bpr]]></text>
+				<textFieldExpression><![CDATA[$R{label.bpr}]]></textFieldExpression>
-			</staticText>
+			</textField>
-			<staticText>
+			<textField>
-				<reportElement x="183" y="21" width="42" height="20" uuid="a8c42f9e-31bd-4a71-b3f0-48e8e35e4472"/>
+				<reportElement x="222" y="21" width="42" height="20" uuid="3ea34aef-d512-4dd6-abb8-20abcfc196d0"/>
-				<textElement>
+				<textElement verticalAlignment="Middle" markup="none">
 					<font size="8" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Exc Bag]]></text>
+				<textFieldExpression><![CDATA[$R{label.excBag}]]></textFieldExpression>
-			</staticText>
+			</textField>
-			<staticText>
+			<textField>
-				<reportElement x="225" y="22" width="42" height="20" uuid="9de27895-d9ec-4bdc-bc5c-925b2908ba59"/>
+				<reportElement x="264" y="21" width="42" height="20" uuid="8c0dabbc-a170-46b5-9a44-e94fb7a437d3"/>
-				<textElement>
+				<textElement verticalAlignment="Middle" markup="none">
 					<font size="8" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Seg Opc]]></text>
+				<textFieldExpression><![CDATA[$R{label.segOpc}]]></textFieldExpression>
-			</staticText>
+			</textField>
-			<staticText>
+			<textField>
-				<reportElement x="267" y="22" width="42" height="20" uuid="96b92099-3d4c-452e-a641-42e888196091"/>
+				<reportElement x="306" y="21" width="42" height="20" uuid="0a8fa02b-8fb6-485e-b864-5b9b6c23fb61"/>
-				<textElement>
+				<textElement verticalAlignment="Middle" markup="none">
 					<font size="8" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Outros]]></text>
+				<textFieldExpression><![CDATA[$R{label.outros}]]></textFieldExpression>
-			</staticText>
+			</textField>
 			<staticText>
 				<reportElement x="0" y="0" width="183" height="21" uuid="b04bbd87-054b-4ad3-bb53-16ef0d81d21c"/>
 				<textElement verticalAlignment="Middle">
@@ -184,239 +185,239 @@
 				</textElement>
 				<text><![CDATA[]]></text>
 			</staticText>
-			<staticText>
+			<textField>
-				<reportElement x="183" y="0" width="549" height="21" uuid="08a60c9b-323d-4f1c-a83d-454f48fa8b27"/>
+				<reportElement x="183" y="0" width="549" height="21" uuid="09518b76-af4d-4a72-9db6-e4bd72e40e37"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 					<font size="14" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Comissões]]></text>
+				<textFieldExpression><![CDATA[$R{cabecalho.comissoes}]]></textFieldExpression>
-			</staticText>
+			</textField>
 			<line>
-				<reportElement x="183" y="20" width="428" height="1" uuid="9683bfb6-f632-4f14-ac70-b3ab6fb7a94e"/>
+				<reportElement x="0" y="20" width="802" height="1" uuid="9683bfb6-f632-4f14-ac70-b3ab6fb7a94e"/>
 			</line>
-			<staticText>
+			<textField>
-				<reportElement x="309" y="21" width="42" height="20" uuid="fc414a95-2906-486b-95ce-1ffc1505f4aa"/>
+				<reportElement x="348" y="21" width="42" height="20" uuid="b08d3f6e-51a1-45f9-8b0e-6c281f72f9ed"/>
-				<textElement>
+				<textElement verticalAlignment="Middle" markup="none">
 					<font size="8" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Desc Ev]]></text>
+				<textFieldExpression><![CDATA[$R{label.descEv}]]></textFieldExpression>
-			</staticText>
+			</textField>
-			<staticText>
+			<textField>
-				<reportElement x="395" y="22" width="42" height="20" uuid="2ceff32f-c18c-4bc9-8f46-143532a928fb"/>
+				<reportElement x="434" y="21" width="42" height="20" uuid="5c5bc4c2-0862-4e4e-963d-01f8cfad7e61"/>
-				<textElement>
+				<textElement verticalAlignment="Middle" markup="none">
 					<font size="8" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Royaties]]></text>
+				<textFieldExpression><![CDATA[$R{label.royaties}]]></textFieldExpression>
-			</staticText>
+			</textField>
-			<staticText>
+			<textField>
-				<reportElement x="437" y="21" width="42" height="20" uuid="cb0a40b1-4565-4fac-a79a-18427fff6fa1"/>
+				<reportElement x="476" y="21" width="42" height="20" uuid="7d594161-fc6f-42a1-9aa4-9b15dc48c83b"/>
-				<textElement>
+				<textElement verticalAlignment="Middle" markup="none">
 					<font size="8" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Iss Retido]]></text>
+				<textFieldExpression><![CDATA[$R{label.issRetido}]]></textFieldExpression>
-			</staticText>
+			</textField>
-			<staticText>
+			<textField>
-				<reportElement x="479" y="21" width="42" height="20" uuid="8d9a55ad-7ce6-4b48-93f1-2f5d4e8b99b3"/>
+				<reportElement x="518" y="21" width="42" height="20" uuid="de4178e5-4b17-41cc-8759-641e8a16ea86"/>
-				<textElement>
+				<textElement verticalAlignment="Middle" markup="none">
 					<font size="8" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Metas/Bon]]></text>
+				<textFieldExpression><![CDATA[$R{label.metasBon}]]></textFieldExpression>
-			</staticText>
+			</textField>
-			<staticText>
+			<textField>
-				<reportElement x="521" y="20" width="42" height="19" uuid="c6e62d2a-49b1-44bd-8725-a991c33107d4"/>
+				<reportElement x="560" y="21" width="42" height="20" uuid="f1f15fae-32a8-4ff6-9942-93fa16a4f804"/>
-				<textElement>
+				<textElement verticalAlignment="Middle" markup="none">
 					<font size="8" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Ent Pas]]></text>
+				<textFieldExpression><![CDATA[$R{label.entPas}]]></textFieldExpression>
-			</staticText>
+			</textField>
-			<staticText>
+			<textField>
-				<reportElement x="563" y="20" width="124" height="20" uuid="b3d99138-08b1-4d8e-91f1-e57ea089b107"/>
+				<reportElement x="602" y="21" width="100" height="20" uuid="aaabcded-3c83-4dfd-b54d-8d09185617b6"/>
-				<textElement>
+				<textElement verticalAlignment="Middle" markup="none">
 					<font size="8" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Usuario Pagamento]]></text>
+				<textFieldExpression><![CDATA[$R{label.usuarioPagamento}]]></textFieldExpression>
-			</staticText>
+			</textField>
-			<staticText>
+			<textField>
-				<reportElement x="687" y="20" width="115" height="20" uuid="98fa307b-424b-407a-ad41-9d833264c436"/>
+				<reportElement x="702" y="21" width="100" height="20" uuid="b410445e-63ac-43b1-8880-1eed19d45eb9"/>
-				<textElement>
+				<textElement verticalAlignment="Middle" markup="none">
 					<font size="8" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Usuario Lancamento]]></text>
+				<textFieldExpression><![CDATA[$R{label.usuarioLancamento}]]></textFieldExpression>
-			</staticText>
+			</textField>
 			<line>
 				<reportElement x="0" y="40" width="802" height="1" uuid="fff20ee2-ba87-4d79-9e23-fc2e8823649d"/>
 			</line>
-			<textField pattern="dd/MM/yyyy">
+			<textField>
-				<reportElement x="47" y="20" width="47" height="20" uuid="a60d7032-45dd-4f10-b17e-b697342b0a62"/>
+				<reportElement x="390" y="21" width="44" height="20" uuid="3f4e1532-054f-4005-aa18-4584373fde89"/>
-				<textElement>
+				<textElement verticalAlignment="Middle" markup="none">
 					<font size="8" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{dataPagamento}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.descFixo}]]></textFieldExpression>
 			</textField>
-			<staticText>
+			<textField>
-				<reportElement x="351" y="21" width="44" height="20" uuid="3def9b99-e836-4a2d-8354-cf70a82586de"/>
+				<reportElement x="63" y="21" width="47" height="20" uuid="f24f3618-e777-4363-a42e-06b57bc1238a"/>
-				<textElement>
+				<textElement verticalAlignment="Middle" markup="none">
 					<font size="8" isBold="true"/>
 				</textElement>
-				<text><![CDATA[Desc Fixo]]></text>
+				<textFieldExpression><![CDATA[$R{label.data}]]></textFieldExpression>
-			</staticText>
+			</textField>
 		</band>
 	</columnHeader>
 	<detail>
 		<band height="22" splitType="Stretch">
-			<textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement x="0" y="0" width="47" height="20" uuid="6d3a5c39-4c9f-4cf6-a3c2-d313bfbbe8b0"/>
+				<reportElement x="0" y="1" width="63" height="20" uuid="6d3a5c39-4c9f-4cf6-a3c2-d313bfbbe8b0"/>
-				<textElement>
+				<textElement verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{competencia}]]></textFieldExpression>
 			</textField>
-			<textField pattern="R$ #,##0.00">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="141" y="0" width="42" height="20" uuid="337ef4f9-e1fb-4ca1-a095-4784d0efac1f"/>
+				<reportElement x="180" y="1" width="42" height="20" uuid="337ef4f9-e1fb-4ca1-a095-4784d0efac1f"/>
-				<textElement>
+				<textElement verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{comissaoBpr}]]></textFieldExpression>
 			</textField>
-			<textField pattern="R$ #,##0.00">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="183" y="0" width="42" height="20" uuid="a56c0bc5-a25f-487d-938b-181223024875"/>
+				<reportElement x="222" y="1" width="42" height="20" uuid="a56c0bc5-a25f-487d-938b-181223024875"/>
-				<textElement>
+				<textElement verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{receitaExcessobagagem}]]></textFieldExpression>
 			</textField>
-			<textField pattern="R$ #,##0.00">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="225" y="1" width="42" height="20" uuid="42b7da49-eb82-4c0e-b50f-8a58b2256ca4"/>
+				<reportElement x="264" y="1" width="42" height="20" uuid="42b7da49-eb82-4c0e-b50f-8a58b2256ca4"/>
-				<textElement>
+				<textElement verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{receitaSeguroopcional}]]></textFieldExpression>
 			</textField>
-			<textField pattern="R$ #,##0.00">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="309" y="0" width="42" height="20" uuid="29548ead-5248-4a7d-b53f-de2e4eb8d141"/>
+				<reportElement x="348" y="1" width="42" height="20" uuid="29548ead-5248-4a7d-b53f-de2e4eb8d141"/>
-				<textElement>
+				<textElement verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{descontosEventuais}]]></textFieldExpression>
 			</textField>
-			<textField pattern="R$ #,##0.00">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="395" y="1" width="42" height="20" uuid="5d577a35-0196-420c-973f-0ec2bff05798"/>
+				<reportElement x="434" y="1" width="42" height="20" uuid="5d577a35-0196-420c-973f-0ec2bff05798"/>
-				<textElement>
+				<textElement verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{royaties}]]></textFieldExpression>
 			</textField>
-			<textField pattern="R$ #,##0.00">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="437" y="0" width="42" height="20" uuid="7a74eb0f-7361-4898-b537-ff9f265baa7c"/>
+				<reportElement x="476" y="1" width="42" height="20" uuid="7a74eb0f-7361-4898-b537-ff9f265baa7c"/>
-				<textElement>
+				<textElement verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{issRetido}]]></textFieldExpression>
 			</textField>
-			<textField pattern="R$ #,##0.00">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="479" y="0" width="42" height="20" uuid="25d97967-fd1e-4728-adc9-3b5677fbbe70"/>
+				<reportElement x="518" y="1" width="42" height="20" uuid="25d97967-fd1e-4728-adc9-3b5677fbbe70"/>
-				<textElement>
+				<textElement verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{bonificacaoMetas}]]></textFieldExpression>
 			</textField>
-			<textField pattern="R$ #,##0.00">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="521" y="1" width="42" height="20" uuid="5534b90e-0314-400f-ad30-5d0e05f2d33f"/>
+				<reportElement x="560" y="1" width="42" height="20" uuid="5534b90e-0314-400f-ad30-5d0e05f2d33f"/>
-				<textElement>
+				<textElement verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{entregasPassagem}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement x="563" y="0" width="124" height="20" uuid="3e7be004-a2ce-4fff-90e5-9a97c323ae2d"/>
+				<reportElement x="602" y="1" width="100" height="20" uuid="3e7be004-a2ce-4fff-90e5-9a97c323ae2d"/>
-				<textElement>
+				<textElement verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{usuarioPagamento}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement x="687" y="0" width="115" height="20" uuid="c810a54b-415e-4e38-8666-6c1871466a62"/>
+				<reportElement x="702" y="1" width="100" height="20" uuid="c810a54b-415e-4e38-8666-6c1871466a62"/>
-				<textElement>
+				<textElement verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{usuarioLancamento}]]></textFieldExpression>
 			</textField>
-			<staticText>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement x="47" y="0" width="47" height="20" uuid="18d73337-9e0f-4ec2-9327-2540b8343e45"/>
+				<reportElement x="110" y="1" width="70" height="20" uuid="83077b4f-d1dc-4dfc-9b30-3a9c31ce64fa"/>
-				<textElement>
+				<textElement verticalAlignment="Middle">
-					<font size="8"/>
-				</textElement>
-				<text><![CDATA[Data Pagamento]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="94" y="0" width="47" height="20" uuid="83077b4f-d1dc-4dfc-9b30-3a9c31ce64fa"/>
-				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{pagamento}]]></textFieldExpression>
 			</textField>
-			<textField pattern="R$ #,##0.00">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="267" y="1" width="42" height="20" uuid="e1bcb8b2-5a18-4853-8bd1-f0c3beec1ed9"/>
+				<reportElement x="306" y="1" width="42" height="20" uuid="e1bcb8b2-5a18-4853-8bd1-f0c3beec1ed9"/>
-				<textElement>
+				<textElement verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{receitaOutros}]]></textFieldExpression>
 			</textField>
-			<textField pattern="R$ #,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="351" y="0" width="44" height="20" uuid="fec07293-ee0a-4b86-80c6-b3c13cc8bfc9"/>
+				<reportElement x="390" y="1" width="44" height="20" uuid="fec07293-ee0a-4b86-80c6-b3c13cc8bfc9"/>
-				<textElement>
+				<textElement verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{descontosFixos}]]></textFieldExpression>
 			</textField>
+			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<reportElement x="63" y="1" width="47" height="20" uuid="a60d7032-45dd-4f10-b17e-b697342b0a62"/>
+				<textElement verticalAlignment="Middle">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{dataPagamento}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<columnFooter>
 		<band height="22" splitType="Immediate">
-			<textField pattern="R$ #,##0.00">
+			<textField pattern="#,##0.00">
-				<reportElement x="437" y="2" width="42" height="18" uuid="7b1156e6-fe58-4526-9e17-7529281a52b2"/>
+				<reportElement x="476" y="2" width="42" height="18" uuid="7b1156e6-fe58-4526-9e17-7529281a52b2"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{issRetido}]]></textFieldExpression>
 			</textField>
-			<textField pattern="R$ #,##0.00">
+			<textField pattern="#,##0.00">
-				<reportElement x="395" y="1" width="42" height="20" uuid="30c97c38-06e1-4452-b081-9bff3b75551b"/>
+				<reportElement x="434" y="1" width="42" height="20" uuid="30c97c38-06e1-4452-b081-9bff3b75551b"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{royaties}]]></textFieldExpression>
 			</textField>
-			<textField pattern="R$ #,##0.00">
+			<textField pattern="#,##0.00">
-				<reportElement x="225" y="2" width="42" height="20" uuid="8e88df1a-7756-4d8b-abb9-9700a600d52d"/>
+				<reportElement x="264" y="2" width="42" height="20" uuid="8e88df1a-7756-4d8b-abb9-9700a600d52d"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{receitaSeguroopcional}]]></textFieldExpression>
 			</textField>
-			<textField pattern="R$ #,##0.00">
+			<textField pattern="#,##0.00">
-				<reportElement x="309" y="1" width="42" height="20" uuid="da9a75ad-9305-4b67-a201-9f09ce9934e0"/>
+				<reportElement x="348" y="1" width="42" height="20" uuid="da9a75ad-9305-4b67-a201-9f09ce9934e0"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{descontosEventuais}]]></textFieldExpression>
 			</textField>
-			<textField pattern="R$ #,##0.00">
+			<textField pattern="#,##0.00">
-				<reportElement x="141" y="1" width="42" height="20" uuid="b796239a-3c05-4687-9d57-3ee3759802ef"/>
+				<reportElement x="180" y="1" width="42" height="20" uuid="b796239a-3c05-4687-9d57-3ee3759802ef"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{comissaoBpr}]]></textFieldExpression>
 			</textField>
-			<textField pattern="R$ #,##0.00">
+			<textField pattern="#,##0.00">
-				<reportElement x="267" y="2" width="42" height="20" uuid="13e307a5-3f2e-4296-af63-8128b44b521f"/>
+				<reportElement x="306" y="2" width="42" height="20" uuid="13e307a5-3f2e-4296-af63-8128b44b521f"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{receitaOutros}]]></textFieldExpression>
 			</textField>
-			<textField pattern="R$ #,##0.00">
+			<textField pattern="#,##0.00">
-				<reportElement x="183" y="1" width="42" height="20" uuid="db740fe8-5ea9-4a64-8064-ea6b76466271"/>
+				<reportElement x="222" y="1" width="42" height="20" uuid="db740fe8-5ea9-4a64-8064-ea6b76466271"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
@@ -425,22 +426,22 @@
 			<line>
 				<reportElement x="0" y="0" width="802" height="1" uuid="f0f34191-7a31-4922-bd01-20ad24bcc353"/>
 			</line>
-			<textField pattern="R$ #,##0.00">
+			<textField pattern="#,##0.00">
-				<reportElement x="521" y="2" width="42" height="18" uuid="bec6a2ec-21f9-47e9-954d-42a51fdb10c1"/>
+				<reportElement x="560" y="2" width="42" height="18" uuid="bec6a2ec-21f9-47e9-954d-42a51fdb10c1"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{entregasPassagem}]]></textFieldExpression>
 			</textField>
-			<textField pattern="R$ #,##0.00">
+			<textField pattern="#,##0.00">
-				<reportElement x="479" y="2" width="42" height="18" uuid="42279c78-c770-48e2-b1b3-e8bb25a5f8c6"/>
+				<reportElement x="518" y="2" width="42" height="18" uuid="42279c78-c770-48e2-b1b3-e8bb25a5f8c6"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{bonificacaoMetas}]]></textFieldExpression>
 			</textField>
-			<textField pattern="R$ #,##0.00" isBlankWhenNull="true">
+			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="351" y="1" width="42" height="19" uuid="0ed46890-8c49-4e8f-8f29-d7b8756fe9c4"/>
+				<reportElement x="390" y="1" width="42" height="19" uuid="0ed46890-8c49-4e8f-8f29-d7b8756fe9c4"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>

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

@@ -0,0 +1,467 @@
+<?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="RelatorioHistoricoComissaoGeral" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="1d365136-23ec-4fe0-9a67-69b976f55a04">
+	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<parameter name="periodoInicial" class="java.util.Date"/>
+	<parameter name="periodoFinal" class="java.util.Date"/>
+	<parameter name="empresa" class="java.lang.String"/>
+	<parameter name="puntoventa" class="java.lang.String"/>
+	<field name="competencia" class="java.lang.String"/>
+	<field name="dataPagamento" class="java.util.Date"/>
+	<field name="indPago" class="java.lang.Boolean"/>
+	<field name="comissaoBpr" class="java.math.BigDecimal"/>
+	<field name="receitaExcessobagagem" class="java.math.BigDecimal"/>
+	<field name="receitaSeguroopcional" class="java.math.BigDecimal"/>
+	<field name="receitaOutros" class="java.math.BigDecimal"/>
+	<field name="descontosEventuais" class="java.math.BigDecimal"/>
+	<field name="royaties" class="java.math.BigDecimal"/>
+	<field name="issRetido" class="java.math.BigDecimal"/>
+	<field name="bonificacaoMetas" class="java.math.BigDecimal"/>
+	<field name="entregasPassagem" class="java.math.BigDecimal"/>
+	<field name="pagamento" class="java.lang.String"/>
+	<field name="usuarioPagamento" class="java.lang.String"/>
+	<field name="usuarioLancamento" class="java.lang.String"/>
+	<field name="descontosFixos" class="java.math.BigDecimal"/>
+	<field name="nombpuntoventa" class="java.lang.String"/>
+	<field name="numpuntoventa" class="java.lang.String"/>
+	<variable name="comissaoBpr" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{comissaoBpr}]]></variableExpression>
+	</variable>
+	<variable name="receitaExcessobagagem" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{receitaExcessobagagem}]]></variableExpression>
+	</variable>
+	<variable name="receitaSeguroopcional" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{receitaSeguroopcional}]]></variableExpression>
+	</variable>
+	<variable name="receitaOutros" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{receitaOutros}]]></variableExpression>
+	</variable>
+	<variable name="descontosEventuais" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{descontosEventuais}]]></variableExpression>
+	</variable>
+	<variable name="royaties" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{royaties}]]></variableExpression>
+	</variable>
+	<variable name="issRetido" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{issRetido}]]></variableExpression>
+	</variable>
+	<variable name="bonificacaoMetas" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{bonificacaoMetas}]]></variableExpression>
+	</variable>
+	<variable name="entregasPassagem" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{entregasPassagem}]]></variableExpression>
+	</variable>
+	<variable name="descontosFixos" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{descontosFixos}]]></variableExpression>
+	</variable>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="87" splitType="Stretch">
+			<textField>
+				<reportElement x="0" y="63" width="74" height="23" uuid="077a30d1-8799-4cac-96aa-9ff8c3e68c90"/>
+				<textElement verticalAlignment="Middle" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.puntoventa}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="0" y="0" width="428" height="20" uuid="2f326d37-a2d8-43d4-ad3a-424d22fae399"/>
+				<textElement verticalAlignment="Middle" markup="none">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.nome}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="0" y="40" width="74" height="23" uuid="122d217d-8776-4f8e-b563-8c108e56d03c"/>
+				<textElement verticalAlignment="Middle" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.empresa}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="0" y="20" width="74" height="20" uuid="b3db2410-5e97-40fa-a311-e554ddfad09b"/>
+				<textElement verticalAlignment="Middle" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.periodo}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="74" y="40" width="728" height="23" isPrintWhenDetailOverflows="true" uuid="c61ce766-52c3-4120-8cdc-6b7356175b9e"/>
+				<textElement verticalAlignment="Middle">
+					<font size="11"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{empresa}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="74" y="63" width="728" height="23" isPrintWhenDetailOverflows="true" uuid="3477f25b-85ea-48bf-b4fc-8d111cdf6dee"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$P{puntoventa}]]></textFieldExpression>
+			</textField>
+			<textField pattern="MMMMM, yyyy">
+				<reportElement x="74" y="20" width="95" height="20" isPrintWhenDetailOverflows="true" uuid="dd5d9d0c-0a2f-4132-bf57-0a54529a5a82"/>
+				<textElement verticalAlignment="Middle">
+					<font size="11"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{periodoInicial}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy HH:mm">
+				<reportElement x="428" y="0" width="374" height="20" uuid="42848541-f8f7-4e8d-b5db-d368f48d7423"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
+			</textField>
+			<textField pattern="MMMMM, yyyy">
+				<reportElement x="240" y="20" width="111" height="20" isPrintWhenDetailOverflows="true" uuid="c2d0883c-32fa-4215-b481-122b797d1ed4"/>
+				<textElement verticalAlignment="Middle">
+					<font size="11"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{periodoFinal}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="169" y="20" width="71" height="20" uuid="94739e6c-51ed-42bd-9a08-841a29d97814"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<text><![CDATA[até]]></text>
+			</staticText>
+			<line>
+				<reportElement x="0" y="86" width="802" height="1" uuid="8ea1d196-daed-4f98-a2f1-f1679b8d4840"/>
+			</line>
+		</band>
+	</title>
+	<pageHeader>
+		<band splitType="Stretch"/>
+	</pageHeader>
+	<columnHeader>
+		<band height="42" splitType="Stretch">
+			<textField>
+				<reportElement x="153" y="20" width="44" height="20" uuid="6d74c969-6fc8-4b13-a853-a1e60e52234a"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.competencia}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="197" y="20" width="53" height="20" uuid="261d6364-5b1b-431a-a574-1f92cbb24e17"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.status}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="250" y="20" width="42" height="20" uuid="bdfebbb6-a0b7-4c6e-a92e-2f5c46fbbc68"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.bpr}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="292" y="20" width="42" height="20" uuid="3ea34aef-d512-4dd6-abb8-20abcfc196d0"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.excBag}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="334" y="20" width="42" height="20" uuid="8c0dabbc-a170-46b5-9a44-e94fb7a437d3"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.segOpc}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="376" y="20" width="42" height="20" uuid="0a8fa02b-8fb6-485e-b864-5b9b6c23fb61"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.outros}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="250" y="-5" width="422" height="21" uuid="09518b76-af4d-4a72-9db6-e4bd72e40e37"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.comissoes}]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement x="0" y="20" width="802" height="1" uuid="9683bfb6-f632-4f14-ac70-b3ab6fb7a94e"/>
+			</line>
+			<textField>
+				<reportElement x="418" y="20" width="42" height="20" uuid="b08d3f6e-51a1-45f9-8b0e-6c281f72f9ed"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.descEv}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="504" y="20" width="42" height="20" uuid="5c5bc4c2-0862-4e4e-963d-01f8cfad7e61"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.royaties}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="546" y="20" width="42" height="20" uuid="7d594161-fc6f-42a1-9aa4-9b15dc48c83b"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.issRetido}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="588" y="20" width="42" height="20" uuid="de4178e5-4b17-41cc-8759-641e8a16ea86"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.metasBon}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="630" y="20" width="42" height="20" uuid="f1f15fae-32a8-4ff6-9942-93fa16a4f804"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.entPas}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="672" y="20" width="65" height="20" uuid="aaabcded-3c83-4dfd-b54d-8d09185617b6"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.usuarioPagamento}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="737" y="20" width="65" height="20" uuid="b410445e-63ac-43b1-8880-1eed19d45eb9"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.usuarioLancamento}]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement x="0" y="40" width="802" height="1" uuid="fff20ee2-ba87-4d79-9e23-fc2e8823649d"/>
+			</line>
+			<textField>
+				<reportElement x="460" y="20" width="44" height="20" uuid="3f4e1532-054f-4005-aa18-4584373fde89"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.descFixo}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement x="1" y="20" width="65" height="20" uuid="1d899a03-3369-43c7-8b78-3da7fb3202da"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.numpuntoventa}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="66" y="20" width="87" height="20" uuid="198f581e-e242-496a-a6a4-1ebcb3672aa3"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.nombpuntoventa}]]></textFieldExpression>
+			</textField>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="22" splitType="Stretch">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="153" y="1" width="44" height="20" uuid="6d3a5c39-4c9f-4cf6-a3c2-d313bfbbe8b0"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{competencia}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="250" y="1" width="42" height="20" uuid="337ef4f9-e1fb-4ca1-a095-4784d0efac1f"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{comissaoBpr}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="292" y="1" width="42" height="20" uuid="a56c0bc5-a25f-487d-938b-181223024875"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{receitaExcessobagagem}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="334" y="1" width="42" height="20" uuid="42b7da49-eb82-4c0e-b50f-8a58b2256ca4"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{receitaSeguroopcional}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="418" y="1" width="42" height="20" uuid="29548ead-5248-4a7d-b53f-de2e4eb8d141"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{descontosEventuais}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="504" y="1" width="42" height="20" uuid="5d577a35-0196-420c-973f-0ec2bff05798"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{royaties}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="546" y="1" width="42" height="20" uuid="7a74eb0f-7361-4898-b537-ff9f265baa7c"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{issRetido}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="588" y="1" width="42" height="20" uuid="25d97967-fd1e-4728-adc9-3b5677fbbe70"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{bonificacaoMetas}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="630" y="1" width="42" height="20" uuid="5534b90e-0314-400f-ad30-5d0e05f2d33f"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{entregasPassagem}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="672" y="1" width="65" height="20" uuid="3e7be004-a2ce-4fff-90e5-9a97c323ae2d"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{usuarioPagamento}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="737" y="1" width="65" height="20" uuid="c810a54b-415e-4e38-8666-6c1871466a62"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{usuarioLancamento}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="197" y="1" width="53" height="20" uuid="83077b4f-d1dc-4dfc-9b30-3a9c31ce64fa"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{pagamento}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="376" y="1" width="42" height="20" uuid="e1bcb8b2-5a18-4853-8bd1-f0c3beec1ed9"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{receitaOutros}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="460" y="1" width="44" height="20" uuid="fec07293-ee0a-4b86-80c6-b3c13cc8bfc9"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{descontosFixos}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="1" y="1" width="65" height="20" uuid="08694d53-b133-46b5-b59d-1815b46cebb9"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{numpuntoventa}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="66" y="1" width="87" height="20" uuid="18479de3-8f0f-4641-ad1b-ad0ea2e66281"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{nombpuntoventa}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<columnFooter>
+		<band height="22" splitType="Immediate">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement x="546" y="1" width="42" height="20" uuid="7b1156e6-fe58-4526-9e17-7529281a52b2"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{issRetido}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement x="504" y="1" width="42" height="20" uuid="30c97c38-06e1-4452-b081-9bff3b75551b"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{royaties}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement x="334" y="1" width="42" height="20" uuid="8e88df1a-7756-4d8b-abb9-9700a600d52d"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{receitaSeguroopcional}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement x="418" y="1" width="42" height="20" uuid="da9a75ad-9305-4b67-a201-9f09ce9934e0"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{descontosEventuais}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement x="250" y="1" width="42" height="20" uuid="b796239a-3c05-4687-9d57-3ee3759802ef"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{comissaoBpr}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement x="376" y="1" width="42" height="20" uuid="13e307a5-3f2e-4296-af63-8128b44b521f"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{receitaOutros}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement x="292" y="1" width="42" height="20" uuid="db740fe8-5ea9-4a64-8064-ea6b76466271"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{receitaExcessobagagem}]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement x="0" y="0" width="802" height="1" uuid="f0f34191-7a31-4922-bd01-20ad24bcc353"/>
+			</line>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement x="630" y="1" width="42" height="20" uuid="bec6a2ec-21f9-47e9-954d-42a51fdb10c1"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{entregasPassagem}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement x="588" y="1" width="42" height="20" uuid="42279c78-c770-48e2-b1b3-e8bb25a5f8c6"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{bonificacaoMetas}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement x="460" y="1" width="44" height="20" uuid="0ed46890-8c49-4e8f-8f29-d7b8756fe9c4"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{descontosFixos}]]></textFieldExpression>
+			</textField>
+		</band>
+	</columnFooter>
+	<pageFooter>
+		<band splitType="Stretch"/>
+	</pageFooter>
+	<summary>
+		<band splitType="Stretch"/>
+	</summary>
+</jasperReport>

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

@@ -0,0 +1,280 @@
+<?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="RelatorioObservacaoConferenciaMovimento" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="822" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" uuid="84b9dfcf-8ec5-4f51-80cc-7339e3b158b4">
+	<property name="ireport.zoom" value="1.5"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<style name="Crosstab Data Text" hAlign="Center"/>
+	<parameter name="empresa" class="java.lang.String"/>
+	<parameter name="noDataRelatorio" class="java.lang.String"/>
+	<parameter name="usuario" class="java.lang.String"/>
+	<parameter name="competencia" class="java.lang.String"/>
+	<parameter name="puntoventa" class="java.lang.String"/>
+	<parameter name="fecFinal" class="java.lang.String"/>
+	<parameter name="fecInicio" class="java.lang.String"/>
+	<queryString>
+		<![CDATA[]]>
+	</queryString>
+	<field name="datamovimento" class="java.util.Date"/>
+	<field name="nombpuntoventa" class="java.lang.String"/>
+	<field name="desccategoria" class="java.lang.String"/>
+	<field name="preco" class="java.math.BigDecimal"/>
+	<field name="numfoliosistema" class="java.lang.String"/>
+	<field name="nombusuario" class="java.lang.String"/>
+	<field name="statusDescricao" class="java.lang.String"/>
+	<field name="debitoCredito" class="java.lang.String"/>
+	<field name="observacao" class="java.lang.String"/>
+	<field name="fecmodif" class="java.util.Date"/>
+	<field name="descricaoTipoventa" class="java.lang.String"/>
+	<field name="tipoDescricao" class="java.lang.String"/>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="102" splitType="Stretch">
+			<textField>
+				<reportElement x="0" y="0" width="637" height="20" uuid="43b2c28d-4760-4890-b00d-25e931e79c74"/>
+				<textElement markup="none">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.nome}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy HH:mm">
+				<reportElement x="637" y="0" width="164" height="20" uuid="4d1bcd65-c9a6-44b4-8dca-cc3c4c20c9a5"/>
+				<textElement textAlignment="Right">
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="0" y="60" width="637" height="20" uuid="a16eb33b-78ca-4fb4-80c2-f5c85a0d09c3"/>
+				<textElement>
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.puntoventa} + " " + $P{puntoventa}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="0" y="80" 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 isBlankWhenNull="true">
+				<reportElement x="0" y="40" width="637" height="20" uuid="90cdfa43-be94-4edc-b974-e267d2c5e82a"/>
+				<textElement>
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.empresa} + " " + $P{empresa}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="0" y="20" width="637" height="20" uuid="f75c1624-725f-4ed7-9db7-7d396221d505"/>
+				<textElement>
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.periodo} + " " + $P{fecInicio} + " " + $R{cabecalho.periodoA} + " " + $P{fecFinal}]]></textFieldExpression>
+			</textField>
+		</band>
+	</title>
+	<pageHeader>
+		<band height="21" splitType="Stretch">
+			<line>
+				<reportElement x="0" y="19" width="802" height="1" uuid="4f39b5b4-849a-4fe2-9365-06930866fbaa"/>
+			</line>
+			<textField>
+				<reportElement x="637" y="0" width="164" height="20" uuid="6a8a0843-7236-40a3-98ae-5fbf59b4cfec"/>
+				<textElement textAlignment="Right">
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.pagina} + " " + $V{PAGE_NUMBER}+ " " + $R{cabecalho.de} + " " + $V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+		</band>
+	</pageHeader>
+	<columnHeader>
+		<band height="21" splitType="Stretch">
+			<textField isBlankWhenNull="true">
+				<reportElement x="0" y="0" width="96" height="20" uuid="80c03aaa-6fb0-469c-bcb7-5a17b81a8225"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.puntoventa}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="96" y="0" width="56" height="20" uuid="dbbded57-3522-4d36-9199-d4c516687979"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.datamovimento}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="152" y="0" width="72" height="20" uuid="6b1e0531-657a-4396-8503-39d61e553428"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.statusDescricao}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="286" y="0" width="81" height="20" uuid="070180f3-95a3-49f0-8a58-d2fd75d60f72"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.numfoliosistema}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="431" y="0" width="36" height="20" uuid="98a0828f-7276-4457-a5bf-422089374096"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.debitoCredito}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="467" y="0" width="75" height="20" uuid="642c2617-1ecc-48aa-8828-d6317a8ac47e"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.observacao}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="611" y="0" width="68" height="20" uuid="e8553a29-c9fd-4f2b-a2aa-fc46e666e7fe"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.preco}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="679" y="0" width="76" height="20" uuid="1ad0e243-a38f-48c3-83e8-34704e50a8ef"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.usuario}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="367" y="0" width="64" height="20" uuid="97236380-537f-4946-a32f-0b7f551f3fa2"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.desccategoria}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="755" y="1" width="67" height="20" uuid="ff685125-9afe-47d5-a02d-d527738e399e"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.fecmodif}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="224" y="0" width="62" height="20" uuid="ea3ae2af-f9f3-41a3-9b09-ae4fc2e5b6f8"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.tipoventa}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="542" y="0" width="69" height="20" uuid="a3d014d4-d37d-4af0-8622-2aded6cdc630"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.tipo}]]></textFieldExpression>
+			</textField>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="22">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="152" y="1" width="72" height="20" uuid="fbd0605d-7d74-4154-8687-db3e7cf1fb4f"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{statusDescricao}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="367" y="1" width="64" height="20" uuid="7522ad78-b626-48f1-9f4d-527ee669e543"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{desccategoria}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="431" y="1" width="36" height="20" uuid="78cf32de-cc90-48c0-bae4-986d660833d6"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{debitoCredito}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="679" y="1" width="76" height="20" uuid="037c8a6d-8837-42c7-9764-80348f63540c"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{nombusuario}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="96" y="1" width="56" height="20" uuid="f411db37-6c4a-4f34-ab06-2480245395c0"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{datamovimento}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="611" y="1" width="68" height="20" uuid="a6a5ccae-e320-4efa-a456-463c89ff2ad7"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{preco}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="0" y="1" width="96" height="20" uuid="8d4629c3-6aaf-471d-9038-d6cf9e7e2e46"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{nombpuntoventa}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" isPrintRepeatedValues="false" x="467" y="1" width="75" height="20" uuid="d1baff93-b9bd-4e66-8826-37f87ab01fd3"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{observacao}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="286" y="1" width="81" height="20" uuid="1cd47c3e-cf69-4937-bb6c-a2cb26aac0d6"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{numfoliosistema}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="755" y="0" width="67" height="20" uuid="9e392ba6-8364-4a57-8104-eef84a963725"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{fecmodif}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="224" y="1" width="62" height="20" uuid="3f72b9eb-7e6b-42b8-8cc6-d3e21912b976"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{descricaoTipoventa}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="542" y="1" width="69" height="20" uuid="63abe3e6-73ce-42e4-a96d-cb7cbad382aa"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{tipoDescricao}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<pageFooter>
+		<band splitType="Stretch"/>
+	</pageFooter>
+	<noData>
+		<band height="35">
+			<textField isBlankWhenNull="true">
+				<reportElement positionType="Float" x="0" y="0" width="555" height="20" isPrintWhenDetailOverflows="true" uuid="d7df66c6-4dc0-4f3b-88f4-b22094d29091"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
+			</textField>
+		</band>
+	</noData>
+</jasperReport>

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaHistoricoComissaoController.java

@@ -24,6 +24,7 @@ import org.zkoss.zul.Messagebox;
 import com.rjconsultores.ventaboletos.entidad.Empresa;
 import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
 import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioHistoricoComissao;
+import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioHistoricoComissaoGeral;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.service.ComissaoService;
 import com.rjconsultores.ventaboletos.service.EmpresaService;
@@ -70,16 +71,21 @@ public class BusquedaHistoricoComissaoController extends MyGenericForwardCompose
 			Date periodoInicial = datMesInicio.getValue();
 			Date periodoFinal = datMesFim.getValue();
 
-			List<HistoricoComissao> historico = comissaoService.buscaHistoricoComissao(puntoVenta.getPuntoventaId(), empresa.getEmpresaId(), periodoInicial, periodoFinal);
+			List<HistoricoComissao> historico = comissaoService.buscaHistoricoComissao(puntoVenta != null ? puntoVenta.getPuntoventaId() : null, empresa.getEmpresaId(), periodoInicial, periodoFinal);
 
 			Map<String, Object> parametros = new HashMap<String, Object>();
-			parametros.put("puntoventa", puntoVenta.getNombpuntoventa());
+			parametros.put("puntoventa", puntoVenta != null ? puntoVenta.getNombpuntoventa() : "Todos");
 			parametros.put("empresa", empresa.getNombempresa());
 			parametros.put("periodoInicial", periodoInicial);
 			parametros.put("periodoFinal", periodoFinal);
 			parametros.put("historico", historico);
 
-			Relatorio relatorio = new RelatorioHistoricoComissao(parametros, dataSourceRead.getConnection());
+			Relatorio relatorio = null;
+			if(puntoVenta != null) {
+				relatorio = new RelatorioHistoricoComissao(parametros, dataSourceRead.getConnection());
+			} else if(puntoVenta == null) {
+				relatorio = new RelatorioHistoricoComissaoGeral(parametros, dataSourceRead.getConnection());
+			}
 
 			Map<String, Relatorio> args = new HashMap<String, Relatorio>();
 			args.put("relatorio", relatorio);

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

@@ -0,0 +1,94 @@
+package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.sql.DataSource;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Controller;
+import org.zkoss.util.resource.Labels;
+import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zul.Datebox;
+
+import com.rjconsultores.ventaboletos.entidad.Empresa;
+import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
+import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioObservacaoConferenciaMovimento;
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
+import com.rjconsultores.ventaboletos.utilerias.DateUtil;
+import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
+import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
+
+@Scope("prototype")
+@Controller("relatorioObservacaoConferenciaMovimentoController")
+public class RelatorioObservacaoConferenciaMovimentoController extends MyGenericForwardComposer {
+
+	private static final long serialVersionUID = 1L;
+	
+	private static final Logger log = LoggerFactory.getLogger(RelatorioObservacaoConferenciaMovimentoController.class);
+	
+	@Autowired
+	private DataSource dataSourceRead;
+
+	private Datebox dataInicial;
+	private Datebox dataFinal;
+	
+    private PuntoVenta puntoVenta;
+    private Empresa empresa; 
+    
+    @Override
+    public void doAfterCompose(Component comp) throws Exception {
+        super.doAfterCompose(comp);
+    }
+    
+    public void onClick$btnRelatorio(Event ev) {
+    	try {
+    		Map<String, Object> parametros = new HashMap<String, Object>();
+        	parametros.put("empresaId", empresa.getEmpresaId());
+        	parametros.put("empresa", empresa.getNombempresa());
+        	parametros.put("usuario", UsuarioLogado.getUsuarioLogado().getNombmaterno());
+        	parametros.put("fecInicio", DateUtil.getStringDate(dataInicial.getValue(), "dd/MM/yyyy"));
+    		parametros.put("fecFinal", DateUtil.getStringDate(dataFinal.getValue(), "dd/MM/yyyy"));
+    		parametros.put("dataFiltroInicial", dataInicial.getValue());
+    		parametros.put("dataFiltroFinal", dataFinal.getValue());
+
+    		if(puntoVenta != null) {
+    			parametros.put("puntoventaId", puntoVenta.getPuntoventaId());
+    			parametros.put("puntoventa", puntoVenta.getNombpuntoventa());
+    		} else {
+    			parametros.put("puntoventa", "Todos");
+    		}
+        	
+    		Relatorio relatorio =  new RelatorioObservacaoConferenciaMovimento(parametros, dataSourceRead.getConnection()); 
+        	
+        	Map<String, Object> args = new HashMap<String, Object>();
+    		args.put("relatorio", relatorio);
+
+    		openWindow("/component/reportView.zul",
+    				   Labels.getLabel("relatorioObservacaoConferenciaMovimentoController.window.title"), args, MODAL);			
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+		}
+    }
+
+	public PuntoVenta getPuntoVenta() {
+		return puntoVenta;
+	}
+
+	public void setPuntoVenta(PuntoVenta puntoVenta) {
+		this.puntoVenta = puntoVenta;
+	}
+
+	public Empresa getEmpresa() {
+		return empresa;
+	}
+
+	public void setEmpresa(Empresa empresa) {
+		this.empresa = empresa;
+	}
+
+}

src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioObservacaoConferenciaMovimento.java

@@ -0,0 +1,25 @@
+package com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios;
+
+import org.zkoss.util.resource.Labels;
+
+import com.rjconsultores.ventaboletos.web.utilerias.PantallaUtileria;
+import com.rjconsultores.ventaboletos.web.utilerias.menu.DefaultItemMenuSistema;
+
+public class ItemMenuRelatorioObservacaoConferenciaMovimento extends DefaultItemMenuSistema {
+
+	public ItemMenuRelatorioObservacaoConferenciaMovimento() {
+		super("indexController.mniRelatorioObservacaoConferenciaMovimento.label");
+	}
+
+	@Override
+	public String getClaveMenu() {
+		return "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIOOBSERVACAOCONFERENCIAMOVIMENTO"; 
+	}
+
+	@Override
+	public void ejecutar() {
+		PantallaUtileria.openWindow("/gui/relatorios/filtroRelatorioObservacaoConferenciaMovimento.zul",
+                Labels.getLabel("relatorioObservacaoConferenciaMovimentoController.window.title"), getArgs(), desktop);
+		
+	}
+}

web/WEB-INF/i3-label_es_MX.label

@@ -263,6 +263,7 @@ indexController.mniRelatorioMovimentosAtraso.label = Reporte de Movimientos Retr
 indexController.mniRelatorioObservacaoBilhetes.label = Reporte Observación Boletos
 indexController.mniRelatorioObservacaoEventosFinanceiros.label = Reporte Observación Eventos Financieros
 indexController.mniRecebimentoMalote.label = Recebimento Malote
+indexController.mniRelatorioObservacaoConferenciaMovimento.label = Reporte Observación Conferencia Movimientos
 
 indexController.mniSubMenuClientePacote.label=Paquete
 indexController.mniManutencaoPacote.label=Mantenimiento Paquete
@@ -6170,3 +6171,12 @@ recebimentoMaloteController.msg.erro.empresaNaoLocalizada = Empresa não foi loc
 recebimentoMaloteController.msg.erro.puntoVentaNaoLocalizado = Ponto de Venda (Agência) não foi localizado
 recebimentoMaloteController.msg.info.maloteRecebido = Malote recebido com sucesso
 recebimentoMaloteController.msg.info.maloteRecebido = Malotes recebidos com sucesso
+
+# Relatorio Observacao Conferencia Movimento
+relatorioObservacaoConferenciaMovimentoController.window.title = Reporte Observaciones Conferencia Movimientos
+relatorioObservacaoConferenciaMovimentoController.btnCerrar.tooltiptext = Cerrar
+relatorioObservacaoConferenciaMovimentoController.btnPesquisa.label = Búsqueda
+relatorioObservacaoConferenciaMovimentoController.lbDataIni.value = Fecha Inicio
+relatorioObservacaoConferenciaMovimentoController.lbDataFin.value = Fecha Final
+relatorioObservacaoConferenciaMovimentoController.lbEmpresa.value = Empresa
+relatorioObservacaoConferenciaMovimentoController.lbPuntoVenta.value = Punto venta

web/WEB-INF/i3-label_pt_BR.label

@@ -268,6 +268,7 @@ indexController.mniRelatorioMovimentosAtraso.label = Relatório de Movimentos em
 indexController.mniRelatorioObservacaoBilhetes.label = Relatório Observação Bilhetes
 indexController.mniRelatorioObservacaoEventosFinanceiros.label = Relatório Observação Eventos Financeiros
 indexController.mniRecebimentoMalote.label = Recebimento Malote
+indexController.mniRelatorioObservacaoConferenciaMovimento.label = Relatório Observação Conferência Movimentos
 
 indexController.mnSubMenuImpressaoFiscal.label=Impressão Fiscal
 indexController.mnSubMenuRelatorioImpressaoFiscal.label=Relatório Impressão Fiscal
@@ -6303,3 +6304,11 @@ recebimentoMaloteController.msg.erro.codigoBarrasInvalido = Código de Barras in
 recebimentoMaloteController.msg.erro.empresaNaoLocalizada = Empresa não foi localizada
 recebimentoMaloteController.msg.erro.puntoVentaNaoLocalizado = Ponto de Venda (Agência) não foi localizado
 recebimentoMaloteController.msg.info.maloteRecebido = Malote recebido com sucesso
+
+# Relatorio Observacao Conferencia Movimentos
+relatorioObservacaoConferenciaMovimentoController.window.title = Relatório Observações Conferência Movimentos
+relatorioObservacaoConferenciaMovimentoController.btnCerrar.tooltiptext = Fechar
+relatorioObservacaoConferenciaMovimentoController.lbDataIni.value = Data Inicio
+relatorioObservacaoConferenciaMovimentoController.lbDataFin.value = Data Final
+relatorioObservacaoConferenciaMovimentoController.lbEmpresa.value = Empresa
+relatorioObservacaoConferenciaMovimentoController.lbPuntoVenta.value = Punto venta

web/gui/comissao/busquedaHistoricoComissao.zul

@@ -34,16 +34,6 @@
 					<datebox id="datMesFim" format="MM/yyyy"
 						lenient="false" constraint="no empty" maxlength="7" />
 				</row>
-				<!-- 			</rows> -->
-				<!-- 		</grid> -->
-
-				<!-- 		<grid fixedLayout="true"> -->
-				<!-- 			<columns> -->
-				<!-- 				<column width="30%" /> -->
-				<!-- 				<column width="70%" /> -->
-				<!-- 			</columns> -->
-				<!-- 			<rows> -->
-				<!-- 				<row > -->
 				<row spans="1,3">
 					<label
 						value="${c:l('busquedaUsuarioController.empresa.label')}" />
@@ -53,11 +43,10 @@
 						model="@{winBusquedaHistoricoComissao$composer.lsEmpresas}" />
 				</row>
 
-				<!-- 				<row> -->
 				<row spans="1,3">
 					<label
 						value="${c:l('busquedaUsuarioController.puntoventa.label')}" />
-					<combobox id="cmbPuntoVenta" constraint="no empty"
+					<combobox id="cmbPuntoVenta"
 						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta"
 						width="100%" mold="rounded" buttonVisible="true"
 						model="@{winBusquedaHistoricoComissao$composer.lsPuntoVenta}" />

web/gui/relatorios/filtroRelatorioObservacaoConferenciaMovimento.zul

@@ -0,0 +1,77 @@
+<?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="winRelatorioObservacaoConferenciaMovimento"?>
+<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
+
+<zk xmlns="http://www.zkoss.org/2005/zul">
+    <window id="winRelatorioObservacaoConferenciaMovimento"
+    	 title="${c:l('relatorioObservacaoConferenciaMovimentoController.window.title')}"
+    	 apply="${relatorioObservacaoConferenciaMovimentoController}"
+  contentStyle="overflow:auto"
+  		height="190px"
+  		 width="500px"
+  		border="normal" >
+        <toolbar> 
+            <button id="btnCerrar"
+               onClick="winRelatorioObservacaoConferenciaMovimento.detach()"
+              	 image="/gui/img/exit.png" 
+              	 width="35px"
+           tooltiptext="${c:l('relatorioObservacaoConferenciaMovimentoController.btnCerrar.tooltiptext')}"/>
+        </toolbar>
+
+        <grid fixedLayout="true">
+            <columns>
+                <column width="20%" />
+                <column width="30%" />
+                <column width="20%" />
+                <column width="30%" />
+            </columns>
+            <rows>
+				<row>
+					<label value="${c:l('relatorioObservacaoConferenciaMovimentoController.lbDataIni.value')}" />
+					<datebox id="dataInicial"
+						  width="100%"
+						   mold="rounded"
+						 format="dd/MM/yyyy"
+						lenient="false"
+					 constraint="no empty"
+					  maxlength="10" />
+					<label value="${c:l('relatorioObservacaoConferenciaMovimentoController.lbDataFin.value')}" />
+					<datebox id="dataFinal"
+						  width="100%"
+						   mold="rounded"
+						 format="dd/MM/yyyy"
+						lenient="false"
+					 constraint="no empty"
+					  maxlength="10" />
+				</row>            
+				<row spans="1,3">
+					<label value="${c:l('relatorioObservacaoConferenciaMovimentoController.lbEmpresa.value')}" />
+					<combobox id="cmbEmpresa"
+							 use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEmpresa"
+					  constraint="no empty"
+                            mold="rounded"
+                   buttonVisible="true"
+                   		   width="90%"
+					selectedItem="@{winRelatorioObservacaoConferenciaMovimento$composer.empresa}" />
+				</row>
+				<row spans="1,3">
+					<label value="${c:l('relatorioObservacaoConferenciaMovimentoController.lbPuntoVenta.value')}" />
+					<combobox id="cmbPuntoVenta"
+							 use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta"
+                            mold="rounded"
+                   buttonVisible="true"
+                   		   width="90%"
+					selectedItem="@{winRelatorioObservacaoConferenciaMovimento$composer.puntoVenta}" />
+				</row>
+            </rows>
+        </grid>
+
+        <toolbar>
+            <button id="btnRelatorio"
+            	 image="/gui/img/find.png"
+                 label="${c:l('relatorio.lb.btnExecutarRelatorio')}"/>
+        </toolbar>
+    </window>
+</zk>