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

fixes bug#13081 

dev:julio
qua:julio

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@88446 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2019-01-02 19:53:12 +00:00
parent 418637920a
commit 427ec486bf
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -422,7 +422,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sql.append(" (t2.cnpj in "); sql.append(" (t2.cnpj in ");
sql.append(" (select TRANSLATE(cnpj, ' / - . ', ' ') from inscricao_estadual where empresa_id = ? and activo = 1 )) "); sql.append(" (select TRANSLATE(cnpj, ' / - . ', ' ') from inscricao_estadual where empresa_id = ? and activo = 1 )) ");
sql.append(" inner join inscricao_estadual ie ON e.empresa_id = ie.empresa_id, "); sql.append(" inner join inscricao_estadual ie ON e.empresa_id = ie.empresa_id, ");
sql.append(" (SELECT numserie20, crz, totgeral "); sql.append(" (SELECT numserie20, datamov, crz, totgeral ");
sql.append(" FROM fiscal_r2) anterior "); sql.append(" FROM fiscal_r2) anterior ");
sql.append("WHERE r2.datamov BETWEEN ? AND ? "); sql.append("WHERE r2.datamov BETWEEN ? AND ? ");
sql.append(" AND r2.activo = 1 "); sql.append(" AND r2.activo = 1 ");
@ -431,7 +431,8 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sql.append(" AND r3.totparcial not in ("); sql.append(" AND r3.totparcial not in (");
sql.append("'" + SituacaoTributaria.NAO_FISCAL.getValue() + "'").append(")"); sql.append("'" + SituacaoTributaria.NAO_FISCAL.getValue() + "'").append(")");
sql.append(" AND anterior.numserie20 = r2.numserie20 "); sql.append(" AND anterior.numserie20 = r2.numserie20 ");
sql.append(" AND anterior.crz = r2.crz - 1 "); sql.append(" AND anterior.datamov = r2.datamov - 1 ");
sql.append(" AND to_number(anterior.crz) = to_number(r2.crz) - 1 ");
sql.append(" AND r2.vendabrutadiaria > 0 "); sql.append(" AND r2.vendabrutadiaria > 0 ");
sql.append("GROUP BY r2.datamov, "); sql.append("GROUP BY r2.datamov, ");
sql.append(" r2.numreducoes, "); sql.append(" r2.numreducoes, ");