fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIXES BUG #6702 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@49390 d1611594-4594-4d17-8e1d-87c2c4800839
master
daniel.zauli 2015-10-23 18:31:09 +00:00
parent 03588780a0
commit 1fc2d57ac4
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java
View File

@ -91,6 +91,7 @@ public class RelatorioDepositos extends Relatorio {
StringBuilder sql = new StringBuilder();
sql.append(" SELECT tmp.* FROM ( ");
sql.append(" SELECT e.nombempresa, ");
sql.append(" p.nombpuntoventa, ");
sql.append(" f.fecfechamento AS dtmotivo, ");
@ -112,17 +113,20 @@ public class RelatorioDepositos extends Relatorio {
if (empresaId != null){
sql.append(" and e.empresa_id = " + empresaId);
}
if (filtrarPendentes){
sql.append(" and (fd.valor_pago < f.total or fd.valor_pago is null) ");
}
sql.append(" GROUP BY e.nombempresa, ");
sql.append(" p.nombpuntoventa, ");
sql.append(" f.fecfechamento, ");
sql.append(" f.total ");
sql.append(" ORDER BY e.nombempresa, ");
sql.append(" p.nombpuntoventa, ");
sql.append(" f.fecfechamento, ");
sql.append(" f.total ");
sql.append(" f.total ) tmp ");
if (filtrarPendentes){
sql.append(" where ");
sql.append(" tmp.saldo < tmp.vrdeposito and tmp.saldo <> 0");
}
sql.append(" ORDER BY tmp.nombempresa, ");
sql.append(" tmp.nombpuntoventa, ");
sql.append(" tmp.dtmotivo, ");
sql.append(" tmp.vrdeposito ");
return sql.toString();
}