From 9caf909b2a54c0becd2dcbb6e7a7a33f025ff5be Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 2 Nov 2015 13:16:21 +0000
Subject: [PATCH] fixes bug #6789

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@49682 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../impl/RelatorioMovimentosAtraso.java       | 236 +++++++++++++++++
 .../RelatorioMovimentosAtraso_es.properties   |  19 ++
 ...RelatorioMovimentosAtraso_pt_BR.properties |  19 ++
 .../RelatorioMovimentosAtraso.jasper          | Bin 0 -> 42800 bytes
 .../templates/RelatorioMovimentosAtraso.jrxml | 247 ++++++++++++++++++
 .../catalogos/EditarPuntoVentaController.java |   7 +
 .../comissao/ConferenciaController.java       |  13 +
 .../EditarLogConfenciaComissaoController.java |   6 +
 ...FechamentoParamptovtaListItemRenderer.java |   4 +
 .../RelatorioMovimentosAtrasoController.java  |  96 +++++++
 .../ItemMenuRelatorioMovimentosAtraso.java    |  25 ++
 .../render/RenderLogConferencia.java          |   3 +
 web/WEB-INF/i3-label_es_MX.label              |  18 +-
 web/WEB-INF/i3-label_pt_BR.label              |  19 +-
 web/gui/catalogos/editarPuntoVenta.zul        |  12 +
 web/gui/comissao/conferencia.zul              |  20 +-
 .../comissao/editarLogConferenciaComissao.zul |  12 +-
 web/gui/img/comissao/vermelho.png             | Bin 128 -> 15325 bytes
 .../filtroRelatorioMovimentosAtraso.zul       |  66 +++++
 19 files changed, 818 insertions(+), 4 deletions(-)
 create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java
 create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioMovimentosAtraso_es.properties
 create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioMovimentosAtraso_pt_BR.properties
 create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentosAtraso.jasper
 create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentosAtraso.jrxml
 create mode 100644 src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMovimentosAtrasoController.java
 create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioMovimentosAtraso.java
 create mode 100644 web/gui/relatorios/filtroRelatorioMovimentosAtraso.zul

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java
new file mode 100644
index 000000000..043e6ad4c
--- /dev/null
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java
@@ -0,0 +1,236 @@
+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.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
+import com.rjconsultores.ventaboletos.utilerias.DateUtil;
+import com.rjconsultores.ventaboletos.vo.comissao.MovimentosAtrasoVO;
+import com.rjconsultores.ventaboletos.vo.comissao.MovimentosAtrasoVO.SituacaoDiaMovimento;
+import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
+
+import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
+
+public class RelatorioMovimentosAtraso extends Relatorio {
+	
+	private static Logger log = Logger.getLogger(RelatorioMovimentosAtraso.class);
+	private Integer empresaId;
+	private Integer puntoventaId;
+	private Date dataInicial;
+	private Date dataFinal;
+	private String competencia;
+	
+	public RelatorioMovimentosAtraso(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<MovimentosAtrasoVO> lsDadosRelatorio = processarRelatorio(conexao);
+				setLsDadosRelatorio(lsDadosRelatorio);
+			}
+		});
+	}
+
+	private List<MovimentosAtrasoVO> processarRelatorio(Connection conexao) throws ParseException {
+		List<MovimentosAtrasoVO> lsDadosRelatorio = iniciarDados(conexao);
+		ResultSet rset = null;
+		NamedParameterStatement stmt = null;
+		try {
+			StringBuilder sQuery = new StringBuilder();
+			sQuery.append("SELECT DISTINCT PV.PUNTOVENTA_ID, CO.DATAMOVIMENTO ")
+				  .append("FROM CONFERENCIA CO ")
+				  .append("JOIN PUNTO_VENTA PV ON PV.PUNTOVENTA_ID = CO.PUNTOVENTA_ID ")
+				  .append("WHERE CO.ACTIVO = 1 ")
+				  .append("AND CO.DATAMOVIMENTO BETWEEN :dataInicial AND :dataFinal ")
+				  .append("AND CO.INDMALOTERECEBIDO = 1 ");
+			
+			if(empresaId != null) {
+				sQuery.append("AND CO.EMPRESA_ID = :empresaId ");
+			}
+
+			if(puntoventaId != null) {
+				sQuery.append("AND CO.PUNTOVENTA_ID = :puntoventaId ");
+			}
+
+			sQuery.append("ORDER BY PV.PUNTOVENTA_ID, CO.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()) {
+				MovimentosAtrasoVO movimentosAtraso = new MovimentosAtrasoVO(rset.getInt("PUNTOVENTA_ID"),DateUtil.normalizar(rset.getDate("DATAMOVIMENTO")));
+				if(lsDadosRelatorio.contains(movimentosAtraso)) {
+					movimentosAtraso = lsDadosRelatorio.get(lsDadosRelatorio.indexOf(movimentosAtraso));
+					movimentosAtraso.setSituacao(SituacaoDiaMovimento.ENTREGUE);
+				}
+			}
+			
+			Collections.sort(lsDadosRelatorio);
+			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;
+	}
+
+	private List<MovimentosAtrasoVO> iniciarDados(Connection conexao) {
+		ResultSet rset = null;
+		NamedParameterStatement stmt = null;
+		try {
+			List<MovimentosAtrasoVO> lsMovimentosAtrasoVOs = new ArrayList<MovimentosAtrasoVO>();
+			
+			StringBuilder sQuery = new StringBuilder();
+			sQuery.append("SELECT DISTINCT PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, NVL(FP.DIASEMTRANSITO,0) AS DIASEMTRANSITO ")
+				  .append("FROM PUNTO_VENTA PV ")
+				  .append("INNER JOIN PTOVTA_EMPRESA PTE ON PTE.PUNTOVENTA_ID = PV.PUNTOVENTA_ID ")
+				  .append("LEFT JOIN FECHAMENTO_PARAMPTOVTA FP ON FP.EMPRESA_ID = PTE.EMPRESA_ID AND PV.PUNTOVENTA_ID = FP.PUNTOVENTA_ID AND FP.ACTIVO = 1 ")
+				  .append("WHERE PV.ACTIVO = 1 ");
+			
+			if(empresaId != null) {
+				sQuery.append("AND PTE.EMPRESA_ID = :empresaId ");
+			}
+
+			if(puntoventaId != null) {
+				sQuery.append("AND PV.PUNTOVENTA_ID = :puntoventaId ");
+			}
+
+			sQuery.append("ORDER BY PV.NOMBPUNTOVENTA ");
+			
+			log.info(sQuery.toString());
+			
+			stmt = new NamedParameterStatement(conexao, sQuery.toString());
+			if(empresaId != null) {
+				stmt.setInt("empresaId", empresaId);
+			}
+
+			if(puntoventaId != null) {
+				stmt.setInt("puntoventaId", puntoventaId);
+			}
+
+			rset = stmt.executeQuery();
+			while (rset.next()) {
+				MovimentosAtrasoVO movimentosAtrasoVO = new MovimentosAtrasoVO();
+				movimentosAtrasoVO.setPuntoventaId(rset.getInt("PUNTOVENTA_ID"));
+				movimentosAtrasoVO.setNumPuntoVenta(rset.getString("NUMPUNTOVENTA"));
+				movimentosAtrasoVO.setNombpuntoventa(rset.getString("NOMBPUNTOVENTA"));
+				movimentosAtrasoVO.setCompetencia(competencia);
+				movimentosAtrasoVO.setDiasemtransito(rset.getInt("DIASEMTRANSITO"));
+				lsMovimentosAtrasoVOs.addAll(carregarDiasMovimento(movimentosAtrasoVO));
+			}
+
+			return lsMovimentosAtrasoVOs;
+		} 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;
+	}
+
+	private List<MovimentosAtrasoVO> carregarDiasMovimento(MovimentosAtrasoVO movimentosAtrasoBase) throws ParseException {
+		Set<Integer> diasCompetencia = DateUtil.carregarDiasCompetencia(movimentosAtrasoBase.getCompetencia());
+		List<MovimentosAtrasoVO> lsMovimentos = new ArrayList<MovimentosAtrasoVO>();
+		Date dataAtual = new Date();
+		for (Integer dia : diasCompetencia) {
+			MovimentosAtrasoVO movimentosAtraso = new MovimentosAtrasoVO(movimentosAtrasoBase.getPuntoventaId(), movimentosAtrasoBase.getNombpuntoventa(),
+											  							   movimentosAtrasoBase.getNumPuntoVenta(), movimentosAtrasoBase.getCompetencia(),
+											  							   movimentosAtrasoBase.getDiasemtransito(),
+											  							   DateUtil.getDateFromString(dia + "/" + movimentosAtrasoBase.getCompetencia(), "dd/MM/yyyy"),
+											  							   SituacaoDiaMovimento.AGUARDANDO);
+			
+			if(movimentosAtraso.getDiasemtransito() != null && movimentosAtraso.getDiasemtransito() > 0) {
+				if(DateUtil.getElapsedDias(dataAtual, movimentosAtraso.getDataMovimento()) > movimentosAtraso.getDiasemtransito()) {
+					movimentosAtraso.setSituacao(SituacaoDiaMovimento.ATRASADO);
+				}
+			}
+			
+			lsMovimentos.add(movimentosAtraso);
+		}
+		return lsMovimentos;
+	}
+
+	public void setLsDadosRelatorio(List<MovimentosAtrasoVO> 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");
+		String competencia = (String) parametros.get("competencia");
+		
+		if(StringUtils.isNotBlank(competencia)) {
+			this.competencia = competencia;
+		}
+		
+		if(empresaId != null) {
+			this.empresaId = empresaId;
+		}
+		if(puntoventaId != null) {
+			this.puntoventaId = puntoventaId;
+		}
+		
+		if(StringUtils.isNotBlank(competencia)) {
+			String[] vetCompetencia = competencia.split("/");
+			Calendar cal = Calendar.getInstance();
+			cal.set(Calendar.MONTH, Integer.valueOf(vetCompetencia[0]) - 1);
+			cal.set(Calendar.YEAR, Integer.valueOf(vetCompetencia[1]));
+	
+			this.dataInicial = DateUtil.getDateFromString(cal.getActualMinimum(Calendar.DAY_OF_MONTH) + "/" + competencia, "dd/MM/yyyy");
+			this.dataFinal = DateUtil.getDateFromString(cal.getActualMaximum(Calendar.DAY_OF_MONTH) + "/" + competencia, "dd/MM/yyyy");
+		}
+		
+	}
+
+}
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioMovimentosAtraso_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioMovimentosAtraso_es.properties
new file mode 100644
index 000000000..8c48ccc75
--- /dev/null
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioMovimentosAtraso_es.properties
@@ -0,0 +1,19 @@
+#geral
+msg.noData=Não foi possivel obter dados com os parâmetros informados.
+
+#Labels cabeçalho
+cabecalho.nome=Relatório Movimentos em Atraso
+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:
+label.empresa=Empresa:
+cabecalho.usuario=Usuário:
+label.empresa=Empresa:
+label.legenda=Legenda
+label.puntoventa=Punto Venta:
+label.competencia=Competencia:
\ No newline at end of file
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioMovimentosAtraso_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioMovimentosAtraso_pt_BR.properties
new file mode 100644
index 000000000..bbc8831e0
--- /dev/null
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioMovimentosAtraso_pt_BR.properties
@@ -0,0 +1,19 @@
+#geral
+msg.noData=Não foi possivel obter dados com os parâmetros informados.
+
+#Labels cabeçalho
+cabecalho.nome=Relatório Movimentos em Atraso
+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:
+label.empresa=Empresa:
+cabecalho.usuario=Usuário:
+label.empresa=Empresa:
+label.legenda=Legenda
+label.puntoventa=Ponto de Venda:
+label.competencia=Competência:
\ No newline at end of file
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentosAtraso.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentosAtraso.jasper
new file mode 100644
index 0000000000000000000000000000000000000000..f01b8d3404ce7baacabe823ae83d24a0b103d2d9
GIT binary patch
literal 42800
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

literal 0
HcmV?d00001

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentosAtraso.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentosAtraso.jrxml
new file mode 100644
index 000000000..1f748717b
--- /dev/null
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentosAtraso.jrxml
@@ -0,0 +1,247 @@
+<?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="RelatorioMovimentosAtraso" 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.0"/>
+	<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="subreporte" class="net.sf.jasperreports.engine.JasperReport"/>
+	<parameter name="usuario" class="java.lang.String"/>
+	<parameter name="situacaoEntregue" class="java.lang.String"/>
+	<parameter name="shortSituacaoEntregue" class="java.lang.String"/>
+	<parameter name="situacaoAtrasado" class="java.lang.String"/>
+	<parameter name="shortSituacaoAtrasado" class="java.lang.String"/>
+	<parameter name="situacaoAguardando" class="java.lang.String"/>
+	<parameter name="shortSituacaoAguardando" class="java.lang.String"/>
+	<parameter name="competencia" class="java.lang.String"/>
+	<parameter name="puntoventa" class="java.lang.String"/>
+	<queryString>
+		<![CDATA[]]>
+	</queryString>
+	<field name="nombpuntoventa" class="java.lang.String"/>
+	<field name="dataMovimento" class="java.util.Date"/>
+	<field name="shortDescricaoSituacao" 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{label.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{label.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{label.competencia} + " " + $P{competencia}]]></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 splitType="Stretch"/>
+	</columnHeader>
+	<columnFooter>
+		<band splitType="Stretch"/>
+	</columnFooter>
+	<pageFooter>
+		<band splitType="Stretch"/>
+	</pageFooter>
+	<summary>
+		<band height="130" splitType="Stretch">
+			<crosstab>
+				<reportElement x="0" y="73" width="802" height="56" uuid="d26e5037-9979-41b2-8674-ab404d6f308a"/>
+				<crosstabHeaderCell>
+					<cellContents>
+						<textField isBlankWhenNull="true">
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="102" height="30" uuid="05324b47-3803-423d-9223-bc78fd675dfd"/>
+							<textElement textAlignment="Left" verticalAlignment="Middle"/>
+							<textFieldExpression><![CDATA[$R{label.puntoventa}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabHeaderCell>
+				<rowGroup name="nombpuntoventa" width="102">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{nombpuntoventa}]]></bucketExpression>
+					</bucket>
+					<crosstabRowHeader>
+						<cellContents backcolor="#F0F8FF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+								<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="102" height="25" uuid="059bd3f6-6e1f-4e28-a495-f7be6e8c7b3f"/>
+								<textElement textAlignment="Left" verticalAlignment="Middle">
+									<font size="8"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{nombpuntoventa}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabRowHeader>
+					<crosstabTotalRowHeader>
+						<cellContents/>
+					</crosstabTotalRowHeader>
+				</rowGroup>
+				<columnGroup name="dataMovimento" height="30">
+					<bucket class="java.util.Date">
+						<bucketExpression><![CDATA[$F{dataMovimento}]]></bucketExpression>
+					</bucket>
+					<crosstabColumnHeader>
+						<cellContents backcolor="#F0F8FF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<textField pattern="dd" isBlankWhenNull="true">
+								<reportElement style="Crosstab Data Text" x="1" y="0" width="21" height="30" uuid="68959d64-aabe-4c9f-bd79-6a25f2977b7c"/>
+								<textElement verticalAlignment="Middle">
+									<font size="8"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{dataMovimento}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabColumnHeader>
+					<crosstabTotalColumnHeader>
+						<cellContents/>
+					</crosstabTotalColumnHeader>
+				</columnGroup>
+				<measure name="shortDescricaoSituacaoMeasure" class="java.lang.String">
+					<measureExpression><![CDATA[$F{shortDescricaoSituacao}]]></measureExpression>
+				</measure>
+				<crosstabCell width="22" height="25">
+					<cellContents>
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+							<reportElement style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="1" y="0" width="21" height="25" uuid="4e31e014-a26e-46f7-b1ed-e60c04e43e6d"/>
+							<textElement verticalAlignment="Middle">
+								<font size="8"/>
+							</textElement>
+							<textFieldExpression><![CDATA[$V{shortDescricaoSituacaoMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell height="25" rowTotalGroup="nombpuntoventa">
+					<cellContents backcolor="#BFE1FF" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField>
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="50" height="25" uuid="534483ea-bd67-4cc6-9764-22cbc628908c"/>
+							<textFieldExpression><![CDATA[$V{shortDescricaoSituacaoMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="50" columnTotalGroup="dataMovimento">
+					<cellContents backcolor="#BFE1FF" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField>
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="50" height="25" uuid="437076c1-6f32-4064-ae95-142a176592d3"/>
+							<textFieldExpression><![CDATA[$V{shortDescricaoSituacaoMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell rowTotalGroup="nombpuntoventa" columnTotalGroup="dataMovimento">
+					<cellContents backcolor="#BFE1FF" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField>
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="50" height="25" uuid="d2abd463-2119-4115-8056-0d89acd2c222"/>
+							<textFieldExpression><![CDATA[$V{shortDescricaoSituacaoMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+			</crosstab>
+			<textField isBlankWhenNull="true">
+				<reportElement x="0" y="0" width="98" height="15" uuid="762e1176-02bd-4b51-86c1-56bd018d30e2"/>
+				<textElement>
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.legenda}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="0" y="15" width="100" height="15" uuid="1ea1f4c5-247e-4f7d-894f-a4fcb8ff43a1"/>
+				<textFieldExpression><![CDATA[$P{situacaoEntregue}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="100" y="15" width="100" height="15" uuid="0cf1ef9a-89d6-4242-a6c3-c2887000385b"/>
+				<textFieldExpression><![CDATA[$P{shortSituacaoEntregue}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="0" y="30" width="100" height="15" uuid="24121159-7981-42ae-b628-872e0e349b82"/>
+				<textFieldExpression><![CDATA[$P{situacaoAtrasado}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="100" y="30" width="100" height="15" uuid="0dfddb8c-3bf6-4de2-84e7-f3bef5b8362d"/>
+				<textFieldExpression><![CDATA[$P{shortSituacaoAtrasado}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="0" y="45" width="100" height="15" uuid="4bc26dd2-3945-46b2-8599-274f66ca8c18"/>
+				<textFieldExpression><![CDATA[$P{situacaoAguardando}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="100" y="45" width="100" height="15" uuid="9b96db8f-f134-475e-8699-49102c6b77a5"/>
+				<textFieldExpression><![CDATA[$P{shortSituacaoAguardando}]]></textFieldExpression>
+			</textField>
+		</band>
+	</summary>
+	<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>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java
index 0bd6d830e..2f7fd1e92 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java
@@ -207,6 +207,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
 	private MyListbox ptovtaComissaoList;
 	private MyListbox ptovtaCatIndList;
 	private MyListbox fechamentoParamptovtaList;
+	private MyTextbox txtDiasemtransito;
 
 	private List<Categoria> lsCategoriaBloquear;
 
@@ -2541,6 +2542,8 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
 	}
 
 	public void onClick$btnAdicionarFechamentoParamptovta(Event ev) {
+		txtDiasemtransito.getValue();
+		
 		if (cmbEmpresaFechamentoParamptovta.getSelectedItem() != null &&
 				(StringUtils.isNotEmpty(txtIntervalofechamento.getValue()) ||
 				(radIntervalofechamentoSemanal.isChecked()
@@ -2573,6 +2576,10 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
 			}
 
 			fechamentoParamptovta.setIntervalofechamento(intervalofechamento);
+			
+			if(StringUtils.isNotBlank(txtDiasemtransito.getValue())) {
+				fechamentoParamptovta.setDiasemtransito(Integer.valueOf(txtDiasemtransito.getValue()));
+			}
 
 			fechamentoParamptovta.setActivo(true);
 			fechamentoParamptovta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java
index 8a6b285c3..0dafaf365 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java
@@ -19,6 +19,7 @@ import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zul.Comboitem;
+import org.zkoss.zul.Radio;
 
 import com.rjconsultores.ventaboletos.constantes.Constantes;
 import com.rjconsultores.ventaboletos.entidad.Conferencia;
@@ -107,6 +108,8 @@ public class ConferenciaController extends MyGenericForwardComposer {
 	
 	private MyListbox conferenciaList;
 	
+	private Radio rDebito;
+	
 	@Override
 	public void doAfterCompose(Component comp) throws Exception {
 		
@@ -205,6 +208,8 @@ public class ConferenciaController extends MyGenericForwardComposer {
             }
         });
 		
+		rDebito.setChecked(Boolean.TRUE);
+		
 		popularCombobox();
 		
 		carregarDados();
@@ -399,6 +404,7 @@ public class ConferenciaController extends MyGenericForwardComposer {
 			logConferencia.setConferencia(conferencia);
 			logConferencia.setStatus(StatusLogConferencia.getStatusLogConferencia((Integer)cmbSituacaoLog.getSelectedItem().getValue()));
 			logConferencia.setTipo(TipoLogConferencia.AVULSO);
+			logConferencia.setIndcredito(!rDebito.isChecked());
 			conferenciaComissaoService.suscribirLogConferencia(logConferencia);
 
 			carregarLogsConferencia();
@@ -539,6 +545,13 @@ public class ConferenciaController extends MyGenericForwardComposer {
 		}
 	}
 
+/*	public void onClick$btnAlterarBilheteManual(Event event) {
+		try {
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+		}
+	}*/
+
 	public String getDatamovimento() {
 		return datamovimento;
 	}
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/EditarLogConfenciaComissaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/EditarLogConfenciaComissaoController.java
index 52e662eae..53fcd014d 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/EditarLogConfenciaComissaoController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/EditarLogConfenciaComissaoController.java
@@ -10,6 +10,7 @@ import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zul.Comboitem;
 import org.zkoss.zul.Messagebox;
+import org.zkoss.zul.Radio;
 
 import com.rjconsultores.ventaboletos.entidad.Conferencia;
 import com.rjconsultores.ventaboletos.entidad.LogConferencia;
@@ -50,6 +51,8 @@ public class EditarLogConfenciaComissaoController extends MyGenericForwardCompos
 	private EventosFinanceirosVO eventosFinanceiros;
 	private OcdVO ocd;
 	
+	private Radio rDebito;
+	
     @Override
     public void doAfterCompose(Component comp) throws Exception {
     	boletoComissao = (BoletoComissao) Executions.getCurrent().getArg().get("boletoComissao");
@@ -68,6 +71,8 @@ public class EditarLogConfenciaComissaoController extends MyGenericForwardCompos
     	
         super.doAfterCompose(comp);
         
+        rDebito.setChecked(Boolean.TRUE);
+        
         popularCombobox();
     }
     
@@ -79,6 +84,7 @@ public class EditarLogConfenciaComissaoController extends MyGenericForwardCompos
 			logConferencia.setConferencia(conferencia);
 			logConferencia.setStatus(StatusLogConferencia.getStatusLogConferencia((Integer)cmbSituacaoLog.getSelectedItem().getValue()));
 			logConferencia.setTipo(TipoLogConferencia.AVULSO);
+			logConferencia.setIndcredito(!rDebito.isChecked());
 			
 			if(boletoComissao != null) {
 				logConferencia.setBoletoId(boletoComissao.getBoletoId());
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/FechamentoParamptovtaListItemRenderer.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/FechamentoParamptovtaListItemRenderer.java
index 10b039b11..349472ef5 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/FechamentoParamptovtaListItemRenderer.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/FechamentoParamptovtaListItemRenderer.java
@@ -21,8 +21,12 @@ public class FechamentoParamptovtaListItemRenderer implements ListitemRenderer {
 //		private Integer intervalofechamento;
 		
 		String intervaloFechamentoStr = getIntervaloFechamentoStr(params.getIntervalofechamento());
+		
 		Listcell intervalofechamento =  new Listcell(intervaloFechamentoStr);
 		intervalofechamento.setParent(listItem);
+
+		Listcell diasemtransito =  new Listcell(params.getDiasemtransito() != null ? params.getDiasemtransito().toString() : "");
+		diasemtransito.setParent(listItem);
 		
 		listItem.setAttribute("data", params);
 	}
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMovimentosAtrasoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMovimentosAtrasoController.java
new file mode 100644
index 000000000..4280c3add
--- /dev/null
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMovimentosAtrasoController.java
@@ -0,0 +1,96 @@
+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.Textbox;
+
+import com.rjconsultores.ventaboletos.entidad.Empresa;
+import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
+import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioMovimentosAtraso;
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
+import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
+import com.rjconsultores.ventaboletos.vo.comissao.MovimentosAtrasoVO.SituacaoDiaMovimento;
+import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
+
+@Scope("prototype")
+@Controller("relatorioMovimentosAtrasoController")
+public class RelatorioMovimentosAtrasoController extends MyGenericForwardComposer {
+
+	private static final long serialVersionUID = 1L;
+	
+	private static final Logger log = LoggerFactory.getLogger(RelatorioMovimentosAtrasoController.class);
+	
+	@Autowired
+	private DataSource dataSourceRead;
+
+    private Textbox txtCompetencia;
+    private PuntoVenta puntoVenta;
+    private Empresa empresa; 
+    
+    @Override
+    public void doAfterCompose(Component comp) throws Exception {
+        super.doAfterCompose(comp);
+        txtCompetencia.focus();
+    }
+    
+    public void onClick$btnRelatorio(Event ev) {
+    	try {
+    		Map<String, Object> parametros = new HashMap<String, Object>();
+        	parametros.put("competencia", txtCompetencia.getValue());
+        	parametros.put("empresaId", empresa.getEmpresaId());
+        	parametros.put("empresa", empresa.getNombempresa());
+        	parametros.put("usuario", UsuarioLogado.getUsuarioLogado().getNombmaterno());
+        	parametros.put("situacaoEntregue", SituacaoDiaMovimento.ENTREGUE.toString());
+        	parametros.put("shortSituacaoEntregue", SituacaoDiaMovimento.ENTREGUE.getShortDescricao());
+        	parametros.put("situacaoAtrasado", SituacaoDiaMovimento.ATRASADO.toString());
+        	parametros.put("shortSituacaoAtrasado", SituacaoDiaMovimento.ATRASADO.getShortDescricao());
+        	parametros.put("situacaoAguardando", SituacaoDiaMovimento.AGUARDANDO.toString());
+        	parametros.put("shortSituacaoAguardando", SituacaoDiaMovimento.AGUARDANDO.getShortDescricao());
+
+        	if(puntoVenta != null) {
+        		parametros.put("puntoventaId", puntoVenta.getPuntoventaId());
+        		parametros.put("puntoventa", puntoVenta.getNombpuntoventa());
+        	} else {
+        		parametros.put("puntoventa", "Todos");
+        	}
+        	
+    		Relatorio relatorio =  new RelatorioMovimentosAtraso(parametros, dataSourceRead.getConnection());
+        	
+        	Map<String, Object> args = new HashMap<String, Object>();
+    		args.put("relatorio", relatorio);
+
+    		openWindow("/component/reportView.zul",
+    				   Labels.getLabel("relatorioMovimentosAtrasoController.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;
+	}
+
+}
diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioMovimentosAtraso.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioMovimentosAtraso.java
new file mode 100644
index 000000000..f64f155e2
--- /dev/null
+++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioMovimentosAtraso.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 ItemMenuRelatorioMovimentosAtraso extends DefaultItemMenuSistema {
+
+	public ItemMenuRelatorioMovimentosAtraso() {
+		super("indexController.mniRelatorioMovimentosAtraso.label");
+	}
+
+	@Override
+	public String getClaveMenu() {
+		return "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIOMOVIMENTOSATRASO";
+	}
+
+	@Override
+	public void ejecutar() {
+		PantallaUtileria.openWindow("/gui/relatorios/filtroRelatorioMovimentosAtraso.zul",
+                Labels.getLabel("relatorioMovimentosAtrasoController.window.title"), getArgs(), desktop);
+		
+	}
+}
diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderLogConferencia.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderLogConferencia.java
index cefca0c88..28a022b1f 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderLogConferencia.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderLogConferencia.java
@@ -29,6 +29,9 @@ public class RenderLogConferencia implements ListitemRenderer {
         
         lc = new Listcell(logConferencia.getObservacao());
         lc.setParent(lstm);
+        
+        lc = new Listcell(logConferencia.isIndcredito() ? "C" : "D");
+        lc.setParent(lstm);
 
         lc = new Listcell(BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(logConferencia.getPreco(), LocaleUtil.getLocale()));
         lc.setParent(lstm);
diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label
index 5c9bbb129..d2c17b22b 100644
--- a/web/WEB-INF/i3-label_es_MX.label
+++ b/web/WEB-INF/i3-label_es_MX.label
@@ -256,6 +256,7 @@ indexController.mniRelatorioVendasPacotesBoletos.label = Ventas de Pacotes - Bol
 indexController.mniRelatorioVendasPacotesFaturamento.label = Ventas de Pacotes - Faturamento
 indexController.mniRelatorioDiferencasTransferencias.label = Relatório de Diferenças em Transferências
 indexController.mniRelatorioVendasComissao.label = Relatório de Vendas de Comissão
+indexController.mniRelatorioMovimentosAtraso.label = Relatório de Movimentos em Atraso
 
 indexController.mniSubMenuClientePacote.label=Pacote
 indexController.mniManutencaoPacote.label=Manutenção Pacote
@@ -992,6 +993,7 @@ editarPuntoVentaController.radIntervalofechamentoQuinzenal.value=Quinzenal
 editarPuntoVentaController.radIntervalofechamentoMensal.value=Mensal
 editarPuntoVentaController.MSG.borrarFechamentoParamptovta=Deseja eliminar este parâmetro ?
 editarPuntoVentaController.MSG.fechamentoParamptovtaInvalidado=Já existe parâmetro cadastrado.
+editarPuntoVentaController.diasemtransito.label = Dias em Trânsito
 
 # Editar comisión ponto de venta
 editarPuntoVentaComissaoController.window.title = Comisión empresa/Punto de venta - {0}
@@ -5860,6 +5862,8 @@ conferenciaController.btnCerrar.tooltiptext = Cerrar
 conferenciaController.btnChegadaMalote.tooltiptext = Confirmar chegada malote
 conferenciaController.btnEncerrarMovimentoDiario.tooltiptext = Encerrar Movimento Diário
 conferenciaController.btnReabrirMovimentoDiario.tooltiptext = Reabrir Movimento Diário
+conferenciaController.btnPesquisa.label = Pesquisa
+conferenciaController.btnAlterarBilheteManual.label = Alterar Bilhete
 conferenciaController.lbDatamovimento.label = Fecha Movimiento:
 conferenciaController.lbEmpresa.value = Empresa:
 conferenciaController.lbPuntoVenta.value = Punto venta:
@@ -5921,6 +5925,9 @@ conferenciaController.lbl.nao = No
 conferenciaController.lhFormpago.value = Forma Pago
 conferenciaController.MSG.bilheteSemConferenciaFormapagoCategoria = Existem Bilhetes com Forma Pago ou Categoria sem conferência
 conferenciaController.MSG.eventosFinanceirosSemConferenciaFormapago = Existem Eventos Financeiros com Forma Pago sem conferência
+conferenciaController.lhDebitoCredito.value = D/C
+conferenciaController.lbDebito.value = Débito
+conferenciaController.lbCredito.value = Crédito
 
 # Editar LogConferencia Comissao
 editarLogConferenciaComissaoController.window.title = Lançamento de Observações
@@ -5936,4 +5943,13 @@ relatorioDepositosController.lbDatInicial.value=Data Inicial
 relatorioDepositosController.lbDatFinal.value=Data Final
 relatorioDepositosController.lbPuntoventa.value=Ponto de Venda
 relatorioDepositosController.lbEmpresa.value=Empresa
-relatorioDepositosController.lbPendentes.value=Filtrar Pendentes
\ No newline at end of file
+relatorioDepositosController.lbPendentes.value=Filtrar Pendentes
+
+# Relatorio Movimentos em Atraso
+relatorioMovimentosAtrasoController.window.title = Relatório Movimentos em Atraso
+relatorioMovimentosAtrasoController.btnCerrar.tooltiptext = Cerrar
+relatorioMovimentosAtrasoController.btnPesquisa.label = Búsqueda
+relatorioMovimentosAtrasoController.lbCompetencia.label = Competencia
+relatorioMovimentosAtrasoController.lbCompetenciaLayout.label = (MM/YYYY)
+relatorioMovimentosAtrasoController.lbEmpresa.value = Empresa
+relatorioMovimentosAtrasoController.lbPuntoVenta.value = Punto venta
\ No newline at end of file
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index 3208ea6a0..47bd0b46e 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -261,6 +261,7 @@ indexController.mniRelatorioVendasPacotesBoletos.label = Vendas de Pacotes - Bol
 indexController.mniRelatorioVendasPacotesFaturamento.label = Vendas de Pacotes - Faturamento
 indexController.mniRelatorioDiferencasTransferencias.label = Relatório de Diferenças em Transferências
 indexController.mniRelatorioVendasComissao.label = Relatório de Vendas de Comissão
+indexController.mniRelatorioMovimentosAtraso.label = Relatório de Movimentos em Atraso
 
 indexController.mnSubMenuImpressaoFiscal.label=Impressão Fiscal
 indexController.mnSubMenuRelatorioImpressaoFiscal.label=Relatório Impressão Fiscal
@@ -1029,6 +1030,7 @@ editarPuntoVentaController.radIntervalofechamentoQuinzenal.value=Quinzenal
 editarPuntoVentaController.radIntervalofechamentoMensal.value=Mensal
 editarPuntoVentaController.MSG.borrarFechamentoParamptovta=Deseja eliminar este parâmetro ?
 editarPuntoVentaController.MSG.fechamentoParamptovtaInvalidado=Já existe parâmetro cadastrado.
+editarPuntoVentaController.diasemtransito.label = Dias em Trânsito
 
 # Editar comissão ponto de venda
 editarPuntoVentaComissaoController.window.title = Comissão Empresa/Ponto de Venda - {0}
@@ -6001,6 +6003,8 @@ conferenciaController.btnCerrar.tooltiptext = Fechar
 conferenciaController.btnChegadaMalote.tooltiptext = Confirmar chegada malote
 conferenciaController.btnEncerrarMovimentoDiario.tooltiptext = Encerrar Movimento Diário
 conferenciaController.btnReabrirMovimentoDiario.tooltiptext = Reabrir Movimento Diário
+conferenciaController.btnPesquisa.label = Pesquisa
+conferenciaController.btnAlterarBilheteManual.label = Alterar Bilhete
 conferenciaController.lbDatamovimento.label = Data Movimento:
 conferenciaController.lbEmpresa.value = Empresa:
 conferenciaController.lbPuntoVenta.value = Ponto de Venda (Agência):
@@ -6062,6 +6066,10 @@ conferenciaController.lbl.nao = Não
 conferenciaController.lhFormpago.value = Forma Pago
 conferenciaController.MSG.bilheteSemConferenciaFormapagoCategoria = Existem Bilhetes com Forma Pago ou Categoria sem conferência
 conferenciaController.MSG.eventosFinanceirosSemConferenciaFormapago = Existem Eventos Financeiros com Forma Pago sem conferência
+conferenciaController.lhDebitoCredito.value = D/C
+conferenciaController.lbDebitoCredito.value = Débito/Crédito
+conferenciaController.lbDebito.value = Débito
+conferenciaController.lbCredito.value = Crédito
 
 # Editar LogConferencia Comissao
 editarLogConferenciaComissaoController.window.title = Lançamento de Observações
@@ -6077,4 +6085,13 @@ relatorioDepositosController.lbDatInicial.value=Data Inicial
 relatorioDepositosController.lbDatFinal.value=Data Final
 relatorioDepositosController.lbPuntoventa.value=Ponto de Venda
 relatorioDepositosController.lbEmpresa.value=Empresa
-relatorioDepositosController.lbPendentes.value=Filtrar Pendentes
\ No newline at end of file
+relatorioDepositosController.lbPendentes.value=Filtrar Pendentes
+
+# Relatorio Movimentos em Atraso
+relatorioMovimentosAtrasoController.window.title = Relatório Movimentos em Atraso
+relatorioMovimentosAtrasoController.btnCerrar.tooltiptext = Cerrar
+relatorioMovimentosAtrasoController.btnPesquisa.label = Búsqueda
+relatorioMovimentosAtrasoController.lbCompetencia.label = Competencia
+relatorioMovimentosAtrasoController.lbCompetenciaLayout.label = (MM/YYYY)
+relatorioMovimentosAtrasoController.lbEmpresa.value = Empresa
+relatorioMovimentosAtrasoController.lbPuntoVenta.value = Ponto de venda
\ No newline at end of file
diff --git a/web/gui/catalogos/editarPuntoVenta.zul b/web/gui/catalogos/editarPuntoVenta.zul
index d12dc36f3..c161f9186 100644
--- a/web/gui/catalogos/editarPuntoVenta.zul
+++ b/web/gui/catalogos/editarPuntoVenta.zul
@@ -1361,6 +1361,13 @@
 									width="50px"
 									use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
 							</row>
+							<row>
+								<label
+									value="${c:l('editarPuntoVentaController.diasemtransito.label')}" />
+								<textbox id="txtDiasemtransito"
+									  width="50px"
+										use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
+							</row>
 						</rows>
 					</grid>
 					<toolbar>
@@ -1388,6 +1395,11 @@
 								label="${c:l('editarPuntoVentaController.intervalofechamento.label')}"
 								sort="auto(intervalofechamento)" />
 
+							<listheader image="/gui/img/create_doc.gif"
+								align="right"
+								label="${c:l('editarPuntoVentaController.diasemtransito.label')}"
+								sort="auto(diasemtransito)" />
+
 						</listhead>
 					</listbox>
 				</tabpanel>
diff --git a/web/gui/comissao/conferencia.zul b/web/gui/comissao/conferencia.zul
index be2f680b0..cdd402f03 100644
--- a/web/gui/comissao/conferencia.zul
+++ b/web/gui/comissao/conferencia.zul
@@ -75,6 +75,11 @@
 			
 				<!-- Bilhetes Manual -->
 				<tabpanel height="370px" style="overflow:auto;" >
+					<!-- 
+					<button id="btnAlterarBilheteManual"
+						 image="/gui/img/edit.png"
+				   		 label="${c:l('conferenciaController.btnAlterarBilheteManual.label')}" />
+				   	 -->
 					<listbox id="bilhetesManualList"
 			       			use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
 			           	  vflex="true"
@@ -227,7 +232,7 @@
 					</grid>
 					<button id="btnPesquisaBoletoDevolvido"
 						 image="/gui/img/find.png"
-				   		 label="${c:l('editarEmpresaController.btnPesquisa.label')}" />
+				   		 label="${c:l('conferenciaController.btnPesquisa.label')}" />
 				   	   
 					<listbox id="bilhetesDevolvidosList"
 			       			use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
@@ -534,6 +539,16 @@
 								 	  width="50%" />
 							</row>
 							
+			                <row spans="1,3">
+			                	<label value="${c:l('conferenciaController.lbDebitoCredito.value')}" />
+			                	<radiogroup>
+			                		<radio id="rDebito"
+			                			label="${c:l('conferenciaController.lbDebito.value')}"/>
+			                		<radio id="rCredito"
+			                			label="${c:l('conferenciaController.lbCredito.value')}"/>
+			                	</radiogroup>
+			                </row>
+			                
 			                <row spans="1,3">
 								<label value="${c:l('conferenciaController.lhObservacao.value')}" />
 								<textbox id="txtObservacaoLog"
@@ -579,6 +594,9 @@
 							<listheader>
 								<label value="${c:l('conferenciaController.lhObservacao.value')}" />
 							</listheader>
+							<listheader>
+								<label value="${c:l('conferenciaController.lhDebitoCredito.value')}" />
+							</listheader>
 							<listheader>
 								<label value="${c:l('conferenciaController.lhValorLog.value')}" />
 							</listheader>
diff --git a/web/gui/comissao/editarLogConferenciaComissao.zul b/web/gui/comissao/editarLogConferenciaComissao.zul
index a7c9d009b..28071b558 100644
--- a/web/gui/comissao/editarLogConferenciaComissao.zul
+++ b/web/gui/comissao/editarLogConferenciaComissao.zul
@@ -9,7 +9,7 @@
     	 title="${c:l('editarLogConferenciaComissaoController.window.title')}"
     	 apply="${editarLogConferenciaComissaoController}"
   contentStyle="overflow:auto"
-  		height="180px"
+  		height="205px"
   		 width="700px"
   		border="normal">
         <toolbar>
@@ -48,6 +48,16 @@
 					  	  scale="2"
 					 	  width="50%" />
 				</row>
+				
+                <row spans="1,3">
+                	<label value="${c:l('conferenciaController.lbDebitoCredito.value')}" />
+                	<radiogroup>
+                		<radio id="rDebito"
+                			label="${c:l('conferenciaController.lbDebito.value')}"/>
+                		<radio id="rCredito"
+                			label="${c:l('conferenciaController.lbCredito.value')}"/>
+                	</radiogroup>
+                </row>
 
                 <row spans="1,3">
 					<label value="${c:l('editarLogConferenciaComissaoController.lhObservacao.value')}" />
diff --git a/web/gui/img/comissao/vermelho.png b/web/gui/img/comissao/vermelho.png
index c0bbb0b8cacb1b9597ca56081327c56acd439fd0..aed1e7e6ce238794ca77f5a9d9572ff6845758df 100644
GIT binary patch
literal 15325
zcmeI3O>g5w7{><+5)@V(_OO6BSYD6-;f$Tc?b<k5c9Slxv?)~^wC#yH_N28MzhFBX
zx7q`O6Ia9mAtVkQ5El?<kT~%r;1j@w3l~md#!j6lY0}w6dt)p$c{20=KhO9#FZIQr
z?rgt%W%cD%gwU0(&Gs(+eu4g7eP)GzX0Lqv1^s$9+B`@QdhROwdjfs=)r$z-c-8Cf
zr~93|rW5)V+YNi9lKBx;BV^soBHKA3snjD!UeJ*L`so*0^4x}ePw%Lms6~#w&9j*7
zoo#oWvlGW~<(th_D>G>VpQN^w`GX)avxc1KHEGP6u`K11^rRu*Vg;rB&W_XyV<PDl
zU2)W^CaoJ4P1o1gt8YnFRjXrF!&*(z46|N0RaKf?a&whNR_yl8-S(YHIr^(1AE#+#
zVmum+Dx+E@jE}Hp7zS3WxLQ@HLP<`8)XtP3xn3kW&(kJ}6MIqWg@MHK+P!d?He{I<
zDzC|X`B7OYNG9wkMV#3Y)+#DqWOAL-6Aj}*J~Y?CWI%ipqzUzD3w_aXn1;!5xTIv+
zy|gf$lTN3sy>Ps~zp!+YZrrB`CP)`LlkRCm@GeQhVeF8N`}9_>FS`5G>rW?VCKKyf
zI(CwIOKhyCu;ojkm?4YatJ#W)orZBY3<u3(mF=7(lv=HPRY|Yk^8z;<C2v@G-ZGu<
zX*SZfQ_`gCQCBooQT47?H*2b?t|@Abu1b)kP|oG(gs#^=oyk!(x~gGn>t?O0sMRtD
zP|oL|`^U9Y`=PQxEy&|KW<QL5J8gQteME2+99ekU2$bcjGF#ywjOnoG?OS+JGjQcA
z&D;u-)D9f7)o#*;is!jzuje>@r(Rd;8s(?Cbw{!5H&n$i*3_DA^y<!90kPA8_6w=o
zp)+K=Ws=%`#MHokA@zH)M^8F?05oj$k6L0unhT{iy@amMQ?PF7>dnuxJ@Vmf>v_k(
z%g?09juXOmTthzJa^)dbo>9z`?_AS%*lE^u*oGjkg=bo)!z!H<oA+NQu*eVW%WI5|
zNpRVQDpKXD<w=sTpN{O9+&ZFb;$ilBk#*KKpWedk^dES$6H&Cz&QHGW>59ELpB6jR
zOu826xa@omGz(v7n^rFL`)p1J!(6{!Rq2H__BpY_?s@CM<yP1|Z=E{d54@D^@_e9k
z&A`P@-r`u;qYnwBxu)wi-NN(D^Nt-aBZK|6NB3{SR;70CneSL=JOD;xQY<%uj)}3D
zD)8?-pUI+?J}l7Z6kI;2%uaH-5gv0ey`#sR7^V|NAPsITaB&eqfxrc6aASdsiwFt?
zE=YqL3tU`8P#|zY8r)dm;v#|qfeX^$#sU`?5flhqkOnsvxVVU*K;VKjxUs;+MFa%`
z7o@?B1uiZkC=j?H4Q?!OaS=g*zy)b=V}Xl{2nqx)NP`;-TwFv@AaFq%+*sh^B7y>e
z3)0}m0v8t%6bM|91~(SCxQL)Y;DR)`vB1Se1O);Yq`{2^E-oS{5V#->ZY*$d5kY~#
z1!-_&fs2a>3Ir}lgBuH6TtrYHa6uZ}_)=V}(^vmUK;QQp(HHxC<?8``DNu4YcRL83
zy@t?7pCI(ln126(&`?F_&qIVv`l8{r@Ustoy@SvS+PT}^pq}w~{Nu_B{iLzD1cCn*
zf${I3EA)n+N_V&S*cN!_&F}uEzprhzZ*{ZZdWW~4e*T*WKR;kh#^V*V_rsHKtKmz8
P{odNxZhwFK@Z*00!B4h1

delta 99
zcmcax-oQ9PB}THuHKHUqKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MNkD0|NtFfKQ0)
ye;|W_!Evz=GmsMSba4!+xRsP3!McQ@fq|KU(SU)meU@4;NR6kfpUXO@geCwL>Krlv

diff --git a/web/gui/relatorios/filtroRelatorioMovimentosAtraso.zul b/web/gui/relatorios/filtroRelatorioMovimentosAtraso.zul
new file mode 100644
index 000000000..9352a38fa
--- /dev/null
+++ b/web/gui/relatorios/filtroRelatorioMovimentosAtraso.zul
@@ -0,0 +1,66 @@
+<?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="winRelatorioMovimentosAtraso"?>
+<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
+
+<zk xmlns="http://www.zkoss.org/2005/zul">
+    <window id="winRelatorioMovimentosAtraso"
+    	 title="${c:l('relatorioMovimentosAtrasoController.window.title')}"
+    	 apply="${relatorioMovimentosAtrasoController}"
+  contentStyle="overflow:auto"
+  		height="190px"
+  		 width="380px"
+  		border="normal" >
+        <toolbar>
+            <button id="btnCerrar"
+               onClick="winRelatorioMovimentosAtraso.detach()"
+              	 image="/gui/img/exit.png" 
+              	 width="35px"
+           tooltiptext="${c:l('relatorioMovimentosAtrasoController.btnCerrar.tooltiptext')}"/>
+        </toolbar>
+
+        <grid fixedLayout="true">
+            <columns>
+                <column width="30%" />
+                <column width="70%" />
+            </columns>
+            <rows>
+                <row>
+                    <label value="${c:l('relatorioMovimentosAtrasoController.lbCompetencia.label')}"/>
+                    <hbox>
+	                    <textbox id="txtCompetencia"
+	                    	  width="100px"
+	                    	  	use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox"/>
+	                    <label value="${c:l('relatorioMovimentosAtrasoController.lbCompetenciaLayout.label')}"/>
+                    </hbox>
+                </row>
+				<row>
+					<label value="${c:l('relatorioMovimentosAtrasoController.lbEmpresa.value')}" />
+					<combobox id="cmbEmpresa"
+							 use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEmpresa"
+					  constraint="no empty"
+                            mold="rounded"
+                   buttonVisible="true"
+                   		   width="90%"
+					selectedItem="@{winRelatorioMovimentosAtraso$composer.empresa}" />
+				</row>
+				<row>
+					<label value="${c:l('relatorioMovimentosAtrasoController.lbPuntoVenta.value')}" />
+					<combobox id="cmbPuntoVenta"
+							 use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta"
+                            mold="rounded"
+                   buttonVisible="true"
+                   		   width="90%"
+					selectedItem="@{winRelatorioMovimentosAtraso$composer.puntoVenta}" />
+				</row>
+            </rows>
+        </grid>
+
+        <toolbar>
+            <button id="btnRelatorio"
+            	 image="/gui/img/find.png"
+                 label="${c:l('relatorio.lb.btnExecutarRelatorio')}"/>
+        </toolbar>
+    </window>
+</zk>
\ No newline at end of file