Merge pull request 'fixes bug#AL-5047' (!300) from AL-5047 into master
Reviewed-on: adm/ModelWeb#300 Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>master
commit
bec65763c9
2
pom.xml
2
pom.xml
|
@ -3,7 +3,7 @@
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>br.com.rjconsultores</groupId>
|
<groupId>br.com.rjconsultores</groupId>
|
||||||
<artifactId>ModelWeb</artifactId>
|
<artifactId>ModelWeb</artifactId>
|
||||||
<version>1.121.0</version>
|
<version>1.121.1</version>
|
||||||
|
|
||||||
<distributionManagement>
|
<distributionManagement>
|
||||||
<repository>
|
<repository>
|
||||||
|
|
|
@ -713,13 +713,13 @@ public class CajaHibernateDAO extends GenericHibernateDAO<Object, Long> implemen
|
||||||
sql.append(" FROM caja ");
|
sql.append(" FROM caja ");
|
||||||
sql.append(" where activo = 1 ");
|
sql.append(" where activo = 1 ");
|
||||||
sql.append(" and numseriepreimpresa = :serie ");
|
sql.append(" and numseriepreimpresa = :serie ");
|
||||||
sql.append(" and numfoliopreimpreso between :folioInicial and :folioFinal ");
|
sql.append(" and to_number(numfoliopreimpreso) between :folioInicial and :folioFinal ");
|
||||||
sql.append(" union all ");
|
sql.append(" union all ");
|
||||||
sql.append(" SELECT coalesce(min( numfoliopreimpreso), '0') as folio ");
|
sql.append(" SELECT coalesce(min( numfoliopreimpreso), '0') as folio ");
|
||||||
sql.append(" FROM caja_diversos ");
|
sql.append(" FROM caja_diversos ");
|
||||||
sql.append(" where activo = 1 ");
|
sql.append(" where activo = 1 ");
|
||||||
sql.append(" and numseriepreimpresa = :serie ");
|
sql.append(" and numseriepreimpresa = :serie ");
|
||||||
sql.append(" and numfoliopreimpreso between :folioInicial and :folioFinal ");
|
sql.append(" and to_number(numfoliopreimpreso) between :folioInicial and :folioFinal ");
|
||||||
sql.append(" )tb ");
|
sql.append(" )tb ");
|
||||||
sql.append(" where tb.folio > 0 ");
|
sql.append(" where tb.folio > 0 ");
|
||||||
sql.append(" group by tb.folio ");
|
sql.append(" group by tb.folio ");
|
||||||
|
|
Loading…
Reference in New Issue