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

Merge pull request 'AL-4505A' (!609) from AL-4505A into master 

Reviewed-on: adm/VentaBoletosAdm#609
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Lucas Taiã <lucas@rjconsultores.com.br>
master 1.115.0
aurora.cuaquentzi 2024-07-19 19:37:50 +00:00
parent 02d5f6abba 5e9570afa2
commit 7bb9e23d2d
4 changed files with 3 additions and 15 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> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.114.0</version> <version>1.115.0</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

4
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java
View File

@ -2822,11 +2822,11 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
public void onClick$btnSalvarParamRecoleccion(Event ev) throws InterruptedException { public void onClick$btnSalvarParamRecoleccion(Event ev) throws InterruptedException {
importeInicial.getValue(); importeInicial.getValue();
importeAdicional.getValue(); //importeAdicional.getValue();
try { try {
ParamRecoleccion paramRecoleccion = new ParamRecoleccion(); ParamRecoleccion paramRecoleccion = new ParamRecoleccion();
paramRecoleccion.setImporteinicial(importeInicial.getValueDecimal()); paramRecoleccion.setImporteinicial(importeInicial.getValueDecimal());
paramRecoleccion.setImporteadicional(importeAdicional.getValueDecimal()); paramRecoleccion.setImporteadicional(BigDecimal.ZERO);
paramRecoleccion.setImporteBase(importeBase == null ? null : importeBase.getValueDecimal()); paramRecoleccion.setImporteBase(importeBase == null ? null : importeBase.getValueDecimal());
Boolean achou = Boolean.FALSE; Boolean achou = Boolean.FALSE;

4
src/java/com/rjconsultores/ventaboletos/web/utilerias/render/ParamRecoleccionRender.java
View File

@ -21,13 +21,9 @@ public class ParamRecoleccionRender implements ListitemRenderer {
Listcell lc = new Listcell(tm.getImporteinicial() == null ? "" : tm.getImporteinicial().setScale(2).toString()); Listcell lc = new Listcell(tm.getImporteinicial() == null ? "" : tm.getImporteinicial().setScale(2).toString());
lc.setParent(lstm); lc.setParent(lstm);
lc = new Listcell(tm.getImporteadicional() == null ? "" : tm.getImporteadicional().setScale(2).toString());
lc.setParent(lstm);
lc = new Listcell(tm.getImporteBase() == null ? "" : tm.getImporteBase().setScale(2).toString()); lc = new Listcell(tm.getImporteBase() == null ? "" : tm.getImporteBase().setScale(2).toString());
lc.setParent(lstm); lc.setParent(lstm);
lstm.setAttribute("data", tm); lstm.setAttribute("data", tm);
} }
} }

8
web/gui/catalogos/editarPuntoVenta.zul
View File

@ -1400,13 +1400,6 @@
precision="7" scale="2" constraint="no empty" /> precision="7" scale="2" constraint="no empty" />
</row> </row>
<row>
<label
value="${c:l('editarPuntoVentaController.lblAdicional.value')}" />
<textbox id="importeAdicional"
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"
precision="7" scale="2" constraint="no empty" />
</row>
<row> <row>
<label <label
value="${c:l('editarPuntoVentaController.lblBase.value')}" /> value="${c:l('editarPuntoVentaController.lblBase.value')}" />
@ -1434,7 +1427,6 @@
vflex="true" multiple="false"> vflex="true" multiple="false">
<listhead sizable="true"> <listhead sizable="true">
<listheader image="/gui/img/builder.gif" label="${c:l('editarPuntoVentaController.lblInicial.value')}" /> <listheader image="/gui/img/builder.gif" label="${c:l('editarPuntoVentaController.lblInicial.value')}" />
<listheader image="/gui/img/builder.gif" label="${c:l('editarPuntoVentaController.lblAdicional.value')}" />
<listheader image="/gui/img/builder.gif" label="${c:l('editarPuntoVentaController.lblBase.value')}" /> <listheader image="/gui/img/builder.gif" label="${c:l('editarPuntoVentaController.lblBase.value')}" />
</listhead> </listhead>
</listbox> </listbox>