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

fixes bug#13897 

qua:jose
dev:lucas

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@91381 d1611594-4594-4d17-8e1d-87c2c4800839
master
gleimar 2019-03-29 19:29:57 +00:00
parent 1751d16dd6
commit 355fb44e3c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoes.java
View File

@ -135,15 +135,15 @@ public class RelatorioVendasCartoes extends Relatorio {
sb.append(" c.fechorventa AS datavenda,");
sb.append(" cfp.importe AS preco");
sb.append(" FROM caja c");
sb.append(" INNER JOIN caja_formapago cfp ON c.caja_id=cfp.caja_id");
sb.append(" AND cfp.activo = 1");
sb.append(" INNER JOIN caja_formapago cfp ON c.caja_id=cfp.caja_id AND cfp.activo = 1 ");
sb.append(" INNER JOIN marca ma on ma.marca_id = c.marca_id ");
sb.append(" INNER JOIN forma_pago fp ON cfp.formapago_id=fp.formapago_id");
sb.append(" INNER JOIN caja_det_pago cdp ON (c.caja_id = cdp.caja_id)");
sb.append(" INNER JOIN caja_det_pago cdp ON (c.caja_id = cdp.caja_id and cdp.cajaformapago_id = cfp.cajaformapago_id)");
sb.append(" INNER JOIN caja_tarjeta ct ON (ct.cajadetpago_id = cdp.cajadetpago_id)");
sb.append(" WHERE ");
sb.append(" WHERE c.indreimpresion = 0 ");
if(empresa!= null){
sb.append("c.empresacorrida_id = :empresaId ");
sb.append("and ma.empresa_id = :empresaId ");
}
if(puntoVenta != null){