fixes bug #9386
git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@74771 d1611594-4594-4d17-8e1d-87c2c4800839master
parent
06c34f923c
commit
df6b06225d
|
@ -2461,6 +2461,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
|
||||||
sb.append(" and f.fechorfolio >= to_date(?,'DD/MM/YYYY HH24:MI:SS') and f.fechorfolio <= to_date(?,'DD/MM/YYYY HH24:MI:SS')");
|
sb.append(" and f.fechorfolio >= to_date(?,'DD/MM/YYYY HH24:MI:SS') and f.fechorfolio <= to_date(?,'DD/MM/YYYY HH24:MI:SS')");
|
||||||
sb.append(" and f.empresa_id = ?");
|
sb.append(" and f.empresa_id = ?");
|
||||||
sb.append(" and eof.cveestado like ?");
|
sb.append(" and eof.cveestado like ?");
|
||||||
|
sb.append(" and (b.motivocancelacion_id is null or b.motivocancelacion_id <> 35) ");
|
||||||
|
|
||||||
try {
|
try {
|
||||||
PreparedStatement ps = connection.prepareStatement(sb.toString());
|
PreparedStatement ps = connection.prepareStatement(sb.toString());
|
||||||
|
@ -2693,6 +2694,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
|
||||||
sb.append(" and eo.cveestado like ?");
|
sb.append(" and eo.cveestado like ?");
|
||||||
sb.append(" and f.indcancelacion = 1 and f.indbpr = 1 and f.activo = 1");
|
sb.append(" and f.indcancelacion = 1 and f.indbpr = 1 and f.activo = 1");
|
||||||
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
PreparedStatement ps = connection.prepareStatement(sb.toString());
|
PreparedStatement ps = connection.prepareStatement(sb.toString());
|
||||||
ps.setLong(1, Long.valueOf(empresaId));
|
ps.setLong(1, Long.valueOf(empresaId));
|
||||||
|
|
Loading…
Reference in New Issue