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

bug #6817: Ajustes arquivo de exportação QS 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@53858 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2016-03-14 19:30:52 +00:00
parent c6480c741d
commit 99071ec717
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java
View File

@ -98,7 +98,8 @@ public class FiscalHibernateDAO extends GenericHibernateDAO<String, String> impl
sql.append(" and a.empresa_id = e.empresa_id "); sql.append(" and a.empresa_id = e.empresa_id ");
sql.append("WHERE b.fechorventa BETWEEN ? AND ? "); sql.append("WHERE b.fechorventa BETWEEN ? AND ? ");
sql.append(" AND b.marca_id = ? "); sql.append(" AND b.marca_id = ? ");
sql.append(" AND b.tipoventa_id = 3"); sql.append(" AND b.tipoventa_id = 3 ");
sql.append(" AND b.preciopagado > 0 ");
sql.append("GROUP BY r4.numserie20, "); sql.append("GROUP BY r4.numserie20, ");
sql.append(" COALESCE(r4.coo, b.numfoliopreimpreso), "); sql.append(" COALESCE(r4.coo, b.numfoliopreimpreso), ");
sql.append(" b.boleto_id, "); sql.append(" b.boleto_id, ");
@ -340,6 +341,7 @@ public class FiscalHibernateDAO extends GenericHibernateDAO<String, String> impl
sql.append(" INNER JOIN estado ed ON ed.estado_id = cd.estado_id "); sql.append(" INNER JOIN estado ed ON ed.estado_id = cd.estado_id ");
sql.append(" WHERE r4.datamov BETWEEN ? AND ? "); sql.append(" WHERE r4.datamov BETWEEN ? AND ? ");
sql.append(" AND b.marca_id = ? "); sql.append(" AND b.marca_id = ? ");
sql.append(" AND b.preciopagado > 0 ");
sql.append(" GROUP BY r4.numserie20, "); sql.append(" GROUP BY r4.numserie20, ");
sql.append(" r4.coo, "); sql.append(" r4.coo, ");
sql.append(" r4.datainicialemissao, "); sql.append(" r4.datainicialemissao, ");