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

Merge pull request 'fixes bug#AL-3937' (!423) from AL-3937 into master 

Reviewed-on: adm/VentaBoletosAdm#423
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
master 1.55.3
wallace 2024-03-05 14:55:11 +00:00
parent 3b70096370 7fe5e7dda8
commit c4c995c73e
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.55.2</version>
<version>1.55.3</version>
<packaging>war</packaging>
<properties>

3
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java
View File

@ -613,7 +613,7 @@ public class RelatorioEstoque extends Relatorio {
sql.append(" p.nombpuntoventa as descPuntoVenta, ");
sql.append(" dab.NUMSERIEPREIMPRESA AS serie, ");
sql.append(" coalesce(es.descestacion, 'Todas') AS estacao, ");
sql.append(" tp.desctipo AS tipo, ");
sql.append(" ar.descarticulo AS tipo, ");
sql.append(" ( case ");
sql.append(" when ");
@ -651,7 +651,6 @@ public class RelatorioEstoque extends Relatorio {
sql.append(" INNER JOIN empresa e ON ( e.empresa_id = ab.empresa_id and ab.ACTIVO = 1 )");
sql.append(" INNER JOIN punto_venta p ON ( p.puntoventa_id = ab.puntoventa_id and p.ACTIVO = 1 )");
sql.append(" INNER JOIN ARTICULO ar ON ( ar.ARTICULO_ID = ab.ARTICULO_ID )");
sql.append(" LEFT JOIN TIPO_PTOVTA tp ON ( tp.TIPOPTOVTA_ID = p.TIPOPTOVTA_ID and tp.ACTIVO = 1 )");
sql.append(" LEFT JOIN estacion es ON ( es.ESTACION_ID = ab.ESTACION_ID )");
sql.append(" LEFT JOIN FOLIO_PREIMPRESO fp ON ( fp.AIDF_ID = dab.AIDF_ID and fp.EMPRESA_ID = e.EMPRESA_ID and fp.ESTACION_ID = ab.ESTACION_ID and fp.activo = 1 )");
sql.append(" LEFT JOIN EMPRESA em ON em.EMPRESA_ID = ab.EMPRESA_ID ");