From d29bef88f32338610f1ec9b1364b307861d5a07b Mon Sep 17 00:00:00 2001 From: Luis Angel Espina Hernandez Date: Mon, 2 Sep 2024 15:03:55 -0400 Subject: [PATCH 1/3] Ajuste en parametros de recoleccion en punto de venta bug#AL-4505 --- web/gui/catalogos/editarPuntoVenta.zul | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/gui/catalogos/editarPuntoVenta.zul b/web/gui/catalogos/editarPuntoVenta.zul index 7dfdfc0fd..2fac2366e 100644 --- a/web/gui/catalogos/editarPuntoVenta.zul +++ b/web/gui/catalogos/editarPuntoVenta.zul @@ -1397,7 +1397,7 @@ value="${c:l('editarPuntoVentaController.lblInicial.value')}" /> + precision="10" scale="2" constraint="no empty" /> @@ -1405,7 +1405,7 @@ value="${c:l('editarPuntoVentaController.lblBase.value')}" /> + precision="10" scale="2" constraint="no empty"/> From 42cb051b70791867e34e22e6c480cff7c53e45a5 Mon Sep 17 00:00:00 2001 From: celio Date: Tue, 3 Sep 2024 17:25:45 -0300 Subject: [PATCH 2/3] fixes bug#AL-4887 --- pom.xml | 2 +- .../relatorios/impl/RelatorioW2ITaxaEmbarqueAnalitico.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4882a7f3c..44d7b976a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.132.1 + 1.132.2 war diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioW2ITaxaEmbarqueAnalitico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioW2ITaxaEmbarqueAnalitico.java index e431a8227..b49487238 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioW2ITaxaEmbarqueAnalitico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioW2ITaxaEmbarqueAnalitico.java @@ -170,7 +170,7 @@ public class RelatorioW2ITaxaEmbarqueAnalitico extends Relatorio { sql.append("INNER JOIN CIUDAD co ON co.ciudad_id=po.ciudad_id "); sql.append("INNER JOIN CIUDAD cd ON cd.ciudad_id=pd.ciudad_id "); sql.append("WHERE b.fechorventa BETWEEN :DATA_INICIAL AND :DATA_FINAL "); - sql.append("AND sx.ACTIVO = 1 "); + sql.append("AND sx.indcancelado = 1 "); if(empresaID != null) sql.append("AND em.empresa_id = :EMPRESA_ID "); if(origemID != null) From a1adc0fbf472326fc827386bc01e2c3ddc03f03e Mon Sep 17 00:00:00 2001 From: "wallace.henrique" Date: Tue, 3 Sep 2024 17:39:54 -0300 Subject: [PATCH 3/3] fixes bug#AL-4853 --- pom.xml | 2 +- web/gui/gr/busquedaAidf.zul | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 44d7b976a..a58159737 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.132.2 + 1.133.0 war diff --git a/web/gui/gr/busquedaAidf.zul b/web/gui/gr/busquedaAidf.zul index 1baafd7a8..443fcf5d3 100644 --- a/web/gui/gr/busquedaAidf.zul +++ b/web/gui/gr/busquedaAidf.zul @@ -7,7 +7,7 @@ + height="600px" width="1300px" border="normal" >