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

fixes bug #8946 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@68339 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2017-04-27 21:16:34 +00:00
parent c39434642b
commit 754c980238
14 changed files with 393 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReciboComissao_es.properties
View File

@ -1,20 +1,26 @@
#Labes
label.recibo=RECIBO
label.comissaoBpr=Comissão BPR
label.receitaExcessobagagem=Excesso Bagagem
label.receitaSeguroopcional=Seguro Opcional
label.receitaOutros=Outros
label.bonificacaoMetas=Bonificação Metas
label.entregasPassagem=Entregas de Passagens
label.total=Total
label.totalLiquido=Total Líquido
label.descontosFixos=Descontos Fixos
label.descontosEventuais=Descontos Eventuais
label.iss=ISS
label.royaties=Royaties
label.comissaoBpr=Comissão BPR(+)
label.receitaExcessobagagem=Excesso Bagagem(+)
label.receitaSeguroopcional=Seguro Opcional(+)
label.receitaOutros=Outros(+)
label.bonificacaoMetas=Bonificação Metas(+)
label.entregasPassagem=Entregas de Passagens(+)
label.total=Total(=)
label.totalLiquido=Total Líquido(=)
label.descontosFixos=Descontos Fixos(-)
label.descontosEventuais=Descontos Eventuais(-)
label.iss=ISS(-)
label.royaties=Royaties(-)
label.numpuntoventa=Número
label.nome=Nome
label.banco=Banco
label.agencia=Agência
label.conta=Conta
label.cidade=Cidade
label.cidade=Cidade
label.baseCalculo=Base de Cálculo
label.receitaBpr=Receita BPR
label.devolucoes=Devoluções
label.receitaBaseComissao=Receita Base Comissão
label.receitaSeguros=Receita Seguros
label.receitaExcBagagens=Receita Exc. Bagagens

32
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReciboComissao_pt_BR.properties
View File

@ -1,20 +1,26 @@
#Labes
label.recibo=RECIBO
label.comissaoBpr=Comissão BPR
label.receitaExcessobagagem=Excesso Bagagem
label.receitaSeguroopcional=Seguro Opcional
label.receitaOutros=Outros
label.bonificacaoMetas=Bonificação Metas
label.entregasPassagem=Entregas de Passagens
label.total=Total
label.totalLiquido=Total Líquido
label.descontosFixos=Descontos Fixos
label.descontosEventuais=Descontos Eventuais
label.iss=ISS
label.royaties=Royaties
label.comissaoBpr=Comissão BPR(+)
label.receitaExcessobagagem=Excesso Bagagem(+)
label.receitaSeguroopcional=Seguro Opcional(+)
label.receitaOutros=Outros(+)
label.bonificacaoMetas=Bonificação Metas(+)
label.entregasPassagem=Entregas de Passagens(+)
label.total=Total(=)
label.totalLiquido=Total Líquido(=)
label.descontosFixos=Descontos Fixos(-)
label.descontosEventuais=Descontos Eventuais(-)
label.iss=ISS(-)
label.royaties=Royaties(-)
label.numpuntoventa=Número
label.nome=Nome
label.banco=Banco
label.agencia=Agência
label.conta=Conta
label.cidade=Cidade
label.cidade=Cidade
label.baseCalculo=Base de Cálculo
label.receitaBpr=Receita BPR
label.devolucoes=Devoluções
label.receitaBaseComissao=Receita Base Comissão
label.receitaSeguros=Receita Seguros
label.receitaExcBagagens=Receita Exc. Bagagens

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReciboComissao.jasper
View File

Binary file not shown.

301
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReciboComissao.jrxml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioReciboComissao" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="a757a10d-6ec1-4dc3-ad77-489bc18e4b25">
<property name="ireport.zoom" value="1.0"/>
<property name="ireport.zoom" value="1.5"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="291"/>
<property name="ireport.y" value="403"/>
<field name="comissaoBpr" class="java.math.BigDecimal"/>
<field name="receitaExcessobagagem" class="java.math.BigDecimal"/>
<field name="receitaSeguroopcional" class="java.math.BigDecimal"/>
@ -28,6 +28,13 @@
<field name="msg1" class="java.lang.String"/>
<field name="texto1" class="java.lang.String"/>
<field name="texto2" class="java.lang.String"/>
<field name="razonsocial" class="java.lang.String"/>
<field name="cnpjPuntoventaFormatado" class="java.lang.String"/>
<field name="receitaBaseComissao" class="java.math.BigDecimal"/>
<field name="receitaBPR" class="java.math.BigDecimal"/>
<field name="devolvidos" class="java.math.BigDecimal"/>
<field name="receitaBrutaExcessoBagagem" class="java.math.BigDecimal"/>
<field name="receitaBrutaSeguroopcional" class="java.math.BigDecimal"/>
<background>
<band splitType="Stretch"/>
</background>
@ -458,14 +465,14 @@
<textElement textAlignment="Center">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{nombpuntoventa}]]></textFieldExpression>
<textFieldExpression><![CDATA[$F{razonsocial}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" x="145" y="356" width="264" height="15" uuid="25832102-d601-49a1-bc7f-771dd693ec2a"/>
<textElement textAlignment="Center">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{cnpj}]]></textFieldExpression>
<textFieldExpression><![CDATA[$F{cnpjPuntoventaFormatado}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" x="0" y="384" width="555" height="15" uuid="86856978-fab5-499e-a426-15ac88528a0a"/>
@ -917,6 +924,292 @@
</textElement>
<textFieldExpression><![CDATA[$F{texto2}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement positionType="Float" x="59" y="72" width="131" height="15" uuid="2c1cf473-71a3-461d-8bda-b43b337f3525"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement verticalAlignment="Middle" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.devolucoes}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement positionType="Float" x="59" y="42" width="194" height="15" uuid="478488eb-7a2d-4833-9467-07ff9e8e577b"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.baseCalculo}]]></textFieldExpression>
</textField>
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" x="190" y="57" width="63" height="15" uuid="cfd8a179-c60d-4343-b5c6-96f6d695d316"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{receitaBPR}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement positionType="Float" x="59" y="87" width="131" height="15" uuid="3a8c3b35-6707-42d7-9a56-958c385fa8a2"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement verticalAlignment="Middle" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.receitaBaseComissao}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement positionType="Float" x="59" y="57" width="131" height="15" uuid="cc446093-b5c6-46cd-9437-4981af064086"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement verticalAlignment="Middle" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.receitaBpr}]]></textFieldExpression>
</textField>
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" x="190" y="117" width="63" height="15" uuid="552e2ea7-f151-4ae1-931d-d83444357119"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{receitaBrutaExcessoBagagem}]]></textFieldExpression>
</textField>
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" x="190" y="87" width="63" height="15" uuid="4cc4be6f-1897-44de-a709-65c70664fa54"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{receitaBaseComissao}]]></textFieldExpression>
</textField>
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" x="190" y="102" width="63" height="15" uuid="ebcbc2ef-e23f-48dd-9ae8-0443a274a1cf"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{receitaBrutaSeguroopcional}]]></textFieldExpression>
</textField>
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" x="190" y="72" width="63" height="15" uuid="d605f88f-06eb-413f-a6b5-cf4b4bc6162a"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{devolvidos}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement positionType="Float" x="59" y="102" width="131" height="15" uuid="e9d8c43c-2eae-4c3b-abed-2b1a945125a1"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement verticalAlignment="Middle" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.receitaSeguros}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement positionType="Float" x="59" y="117" width="131" height="15" uuid="1a899349-991f-4eb9-9711-e38b9872edcb"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement verticalAlignment="Middle" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.receitaExcBagagens}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement positionType="Float" x="318" y="513" width="131" height="15" uuid="094fc020-fd48-4ed1-994e-710a3cc77359"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement verticalAlignment="Middle" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.receitaBpr}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement positionType="Float" x="318" y="558" width="131" height="15" uuid="0b8d38d8-3178-42a9-aca7-a354dae6d5fc"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement verticalAlignment="Middle" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.receitaSeguros}]]></textFieldExpression>
</textField>
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" x="449" y="543" width="63" height="15" uuid="49ed6c05-00db-4528-ba1c-d7fb4c6df136"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{receitaBaseComissao}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement positionType="Float" x="318" y="543" width="131" height="15" uuid="4f8f9cc7-dd46-40db-af0d-9671a0d5b9a7"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement verticalAlignment="Middle" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.receitaBaseComissao}]]></textFieldExpression>
</textField>
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" x="449" y="513" width="63" height="15" uuid="f4095938-7301-440c-8c7d-c0f402844fa1"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{receitaBPR}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement positionType="Float" x="318" y="528" width="131" height="15" uuid="3e9e8142-3513-4c00-8f69-6a6015ad1925"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement verticalAlignment="Middle" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.devolucoes}]]></textFieldExpression>
</textField>
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" x="449" y="573" width="63" height="15" uuid="c7820dc5-571c-4a63-87fb-875b3d5587c4"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{receitaBrutaExcessoBagagem}]]></textFieldExpression>
</textField>
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" x="449" y="528" width="63" height="15" uuid="6679f41a-3fc1-489b-a575-096799744ea6"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{devolvidos}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement positionType="Float" x="318" y="498" width="194" height="15" uuid="06045373-af2b-4575-8cc4-d6e1319cdba4"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.baseCalculo}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement positionType="Float" x="318" y="573" width="131" height="15" uuid="b2a8b508-3541-49a9-8c9e-e8b4b76770dc"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement verticalAlignment="Middle" markup="none">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.receitaExcBagagens}]]></textFieldExpression>
</textField>
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" x="449" y="558" width="63" height="15" uuid="dfd54e43-7b57-4b57-b35a-cae3c72435bc"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{receitaBrutaSeguroopcional}]]></textFieldExpression>
</textField>
</band>
</detail>
<columnFooter>

3
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaCalculoComissaoController.java
View File

@ -33,6 +33,7 @@ import com.rjconsultores.ventaboletos.relatorios.utilitarios.SaidaRelatorio;
import com.rjconsultores.ventaboletos.service.CalculoComissaoService;
import com.rjconsultores.ventaboletos.service.EmpresaService;
import com.rjconsultores.ventaboletos.utilerias.DateUtil;
import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
import com.rjconsultores.ventaboletos.vo.comissao.HistoricoComissao;
import com.rjconsultores.ventaboletos.vo.comissao.RegistroCalculo;
import com.rjconsultores.ventaboletos.web.utilerias.MaskUtil;
@ -68,7 +69,7 @@ public class BusquedaCalculoComissaoController extends MyGenericForwardComposer
txtCompetencia.focus();
aplicarMascara();
lsEmpresas = empresaService.obtenerTodos();
lsEmpresas = UsuarioLogado.getUsuarioLogado().getEmpresa();
lsPuntoVenta = new ArrayList<PuntoVenta>();
}

1
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaConferenciaComissaoController.java
View File

@ -41,7 +41,6 @@ public class BusquedaConferenciaComissaoController extends MyGenericForwardCompo
public void doAfterCompose(Component comp) throws Exception {
super.doAfterCompose(comp);
aplicarMascara();
// lsEmpresas = empresaService.obtenerTodos();
lsEmpresas = UsuarioLogado.getUsuarioLogado().getEmpresa();
txtCompetencia.focus();
}

30
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/ingreso/EditarTipoEventoExtraController.java
View File

@ -5,6 +5,7 @@
package com.rjconsultores.ventaboletos.web.gui.controladores.ingreso;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Calendar;
import java.util.List;
@ -66,6 +67,8 @@ public class EditarTipoEventoExtraController extends MyGenericForwardComposer {
private MyComboboxEstandar cmbEmpresa;
private List<Empresa> lsEmpresas;
private List<TipoEventoExtraEmpresa> lsTipoEventoExtraEmpresas;
private List<com.rjconsultores.ventaboletos.constantes.TipoEventoExtra> lsEventoExtrasConstantes;
private MyComboboxEstandar cmbCveTipoEvento;
private static Logger log = Logger.getLogger(EditarTipoEventoExtraController.class);
@ -80,6 +83,7 @@ public class EditarTipoEventoExtraController extends MyGenericForwardComposer {
@Override
public void doAfterCompose(Component comp) throws Exception {
lsEmpresas = empresaService.obtenerTodosIncluindoEmpresaTodas();
lsEventoExtrasConstantes = Arrays.asList(com.rjconsultores.ventaboletos.constantes.TipoEventoExtra.values());
super.doAfterCompose(comp);
@ -109,6 +113,10 @@ public class EditarTipoEventoExtraController extends MyGenericForwardComposer {
btnApagar.setVisible(false);
btnSalvar.setVisible(false);
}
if(tipoEventoExtra.getCvetipoevento() != null) {
cmbCveTipoEvento.setValue(tipoEventoExtra.getCvetipoevento().toString());
}
txtNome.focus();
}
@ -151,6 +159,10 @@ public class EditarTipoEventoExtraController extends MyGenericForwardComposer {
tipoEventoExtra.setIndboleto(Boolean.FALSE);// não valida boleto
tipoEventoExtra.setPorciva(BigDecimal.ZERO);
tipoEventoExtra.setIndtipo(raTipo11.isChecked() ? "1" : "0");
if(cmbCveTipoEvento.getSelectedItem() != null) {
tipoEventoExtra.setCvetipoevento(com.rjconsultores.ventaboletos.constantes.TipoEventoExtra.valueOf(cmbCveTipoEvento.getSelectedItem().getValue().toString()));
}
try {
tipoEventoExtra.setActivo(Boolean.TRUE);
@ -238,5 +250,21 @@ public class EditarTipoEventoExtraController extends MyGenericForwardComposer {
public void setLsEmpresas(List<Empresa> lsEmpresas) {
this.lsEmpresas = lsEmpresas;
}
public MyComboboxEstandar getCmbCveTipoEvento() {
return cmbCveTipoEvento;
}
public void setCmbCveTipoEvento(MyComboboxEstandar cmbCveTipoEvento) {
this.cmbCveTipoEvento = cmbCveTipoEvento;
}
public List<com.rjconsultores.ventaboletos.constantes.TipoEventoExtra> getLsEventoExtrasConstantes() {
return lsEventoExtrasConstantes;
}
public void setLsEventoExtrasConstantes(List<com.rjconsultores.ventaboletos.constantes.TipoEventoExtra> lsEventoExtrasConstantes) {
this.lsEventoExtrasConstantes = lsEventoExtrasConstantes;
}
}

18
src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderDescontoComissao.java
View File

@ -1,21 +1,16 @@
package com.rjconsultores.ventaboletos.web.utilerias.render;
import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.text.SimpleDateFormat;
import java.util.Locale;
import org.zkoss.zul.Listcell;
import org.zkoss.zul.Listitem;
import org.zkoss.zul.ListitemRenderer;
import com.rjconsultores.ventaboletos.entidad.DescontoComissao;
import com.rjconsultores.ventaboletos.utilerias.BigDecimalUtil;
import com.rjconsultores.ventaboletos.utilerias.DateUtil;
import com.rjconsultores.ventaboletos.utilerias.LocaleUtil;
public class RenderDescontoComissao implements ListitemRenderer {
private static NumberFormat NF = DecimalFormat.getInstance(new Locale("pt","br"));
private static SimpleDateFormat SDF = new SimpleDateFormat("dd/MM/yyyy");
public void render(Listitem lstm, Object o) throws Exception {
DescontoComissao descontoComissao = (DescontoComissao) o;
@ -25,14 +20,13 @@ public class RenderDescontoComissao implements ListitemRenderer {
lc = new Listcell(descontoComissao.getItemDesconto().getNomitemdesconto() != null ? descontoComissao.getItemDesconto().getNomitemdesconto() : "");
lc.setParent(lstm);
NF.setMinimumFractionDigits(2);
lc = new Listcell(descontoComissao.getPreco() != null ? NF.format(descontoComissao.getPreco()) : "0,00");
lc = new Listcell(descontoComissao.getPreco() != null ? BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(descontoComissao.getPreco(), LocaleUtil.getLocale()) : "0,00");
lc.setParent(lstm);
lc = new Listcell(descontoComissao.getDatainicial() != null ? SDF.format(descontoComissao.getDatainicial()) : "");
lc = new Listcell(descontoComissao.getDatainicial() != null ? DateUtil.getStringDate(descontoComissao.getDatainicial(), "dd/MM/yyyy") : "");
lc.setParent(lstm);
lc = new Listcell(descontoComissao.getDatafinal() != null ? SDF.format(descontoComissao.getDatafinal()) : "");
lc = new Listcell(descontoComissao.getDatafinal() != null ? DateUtil.getStringDate(descontoComissao.getDatafinal(), "dd/MM/yyyy") : "");
lc.setParent(lstm);
lstm.setAttribute("data", descontoComissao);

3
src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTipoEventoExtra.java
View File

@ -18,6 +18,9 @@ public class RenderTipoEventoExtra implements ListitemRenderer {
lc = new Listcell(banco.getDescTipoEvento() == null ? "" : banco.getDescTipoEvento());
lc.setParent(lstm);
lc = new Listcell(banco.getCvetipoevento() == null ? "" : banco.getCvetipoevento().toString());
lc.setParent(lstm);
BigDecimal valorMax = banco.getImpmax();
if (valorMax != null) {

5
web/WEB-INF/i3-label_es_MX.label
View File

@ -4954,7 +4954,7 @@ busquedaTipoEventoExtraController.lh8.label = Compesación
busquedaTipoEventoExtraController.lh9.label = IVA
busquedaTipoEventoExtraController.lh10.label = Empresa venta
busquedaTipoEventoExtraController.lh11.label = Empresa ingreso
busquedaTipoEventoExtraController.lhTipo.label = Tipo
# Pantalla de Edición da tipoEventoExtra
editarTipoEventoExtraController.MSG.formaPagoObligatolia = Forma de pago es obligatória
@ -4997,6 +4997,7 @@ editarTipoEventoExtraController.MSG.contaContabil = Cuenta Contabilidad es oblig
editarTipoEventoExtraController.MSG.natureza = Naturaleza es obligatória
editarTipoEventoExtraController.lbIndconferenciafisicacomissao.value = Exigir Conferencia Fisíca Comisión
editarTipoEventoExtraController.MSG.selecionarEmpresa = Seleccione una empresa!
editarTipoEventoExtraController.lbCveTipoEvento = Tipo
#Pago Motorista
indexController.mniPagoConductor.label = Pago conductor
@ -6488,7 +6489,7 @@ busquedaCalculoComissaoController.registro.comissao.msg = Registrado el cálculo
busquedaCalculoComissaoController.recibo.texto = Recebi da {0}, CNPJ: {1} a importância supra de {2}
busquedaCalculoComissaoController.recibo.texto1 = Referente a comisión sobre la venta de pasajes en el período de {0} a {1}.
busquedaCalculoComissaoController.recibo.texto2 = Pelo que firmo o presente, para todos os fins e efeitos legais.
busquedaCalculoComissaoController.recibo.msg = Enviar esta via firmada y adjunta a la factura para el sector financiero de la empresa {0}.
busquedaCalculoComissaoController.recibo.msg = Enviar esta via firmada y adjunta a la factura para el sector comercial de la empresa {0}.
busquedaCalculoComissaoController.recibo.msg1 = Via para controle de la Agencia (no enviar para la Empresa {0}).
busquedaCalculoComissaoController.recibo.email.assunto = Recibo Comisión Competencia: {0}

4
web/WEB-INF/i3-label_pt_BR.label
View File

@ -5035,6 +5035,7 @@ busquedaTipoEventoExtraController.lh8.label = Compensação
busquedaTipoEventoExtraController.lh9.label = IVA
busquedaTipoEventoExtraController.lh10.label = Empresa Venda
busquedaTipoEventoExtraController.lh11.label = Empresa Ingresso
busquedaTipoEventoExtraController.lhTipo.label = Tipo
# Pantalla de Edición da tipoEventoExtra
@ -5078,6 +5079,7 @@ editarTipoEventoExtraController.MSG.contaContabil = Conta Contábil é Obrigató
editarTipoEventoExtraController.MSG.natureza = Natureza é Obrigatória
editarTipoEventoExtraController.lbIndconferenciafisicacomissao.value = Exigir Conferência Fisíca Comissão
editarTipoEventoExtraController.MSG.selecionarEmpresa = Selecione uma empresa!
editarTipoEventoExtraController.lbCveTipoEvento = Tipo
#Pago Motorista
indexController.mniPagoConductor.label = Pagamento Motorista
@ -6681,7 +6683,7 @@ busquedaCalculoComissaoController.registro.comissao.msg = Foi registrado com suc
busquedaCalculoComissaoController.recibo.texto = Recebi da {0}, CNPJ: {1} a importância supra de {2}
busquedaCalculoComissaoController.recibo.texto1 = Referente a comissão sobre venda de passagens no período de {0} a {1}.
busquedaCalculoComissaoController.recibo.texto2 = Pelo que firmo o presente, para todos os fins e efeitos legais.
busquedaCalculoComissaoController.recibo.msg = Enviar esta via assinada e anexa a Nota Fiscal para setor Financeiro da Empresa {0}.
busquedaCalculoComissaoController.recibo.msg = Enviar esta via assinada e anexa a Nota Fiscal para setor Comercial da Empresa {0}.
busquedaCalculoComissaoController.recibo.msg1 = Via para controle da Agência (não enviar para a Empresa {0}).
busquedaCalculoComissaoController.recibo.email.assunto = Recibo Comissão Competencia: {0}
busquedaCalculoComissaoController.recibo.email.texto = Recibo Comissão Competencia: {0} em anexo.

2
web/gui/catalogos/editarPuntoVentaComissao.zul
View File

@ -328,7 +328,7 @@
<label value="${c:l('editarConfiguracionComissaoController.lbItemDescontoPreco.value')}"/>
<textbox id="txtItemDescontoPreco"
width="130px"
maxlength="5"
maxlength="10"
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"
value="@{winEditarPuntoVentaComissao$composer.descontoComissao.preco,converter=com.rjconsultores.ventaboletos.web.utilerias.StringPercentToDecimalConverter}" />
</row>

3
web/gui/ingreso/busquedaIngreso.zul
View File

@ -55,6 +55,9 @@
<listheader image="/gui/img/create_doc.gif"
sort="auto(descTipoEvento)"
label="${c:l('busquedaTipoEventoExtraController.lhDesc.label')}" />
<listheader image="/gui/img/create_doc.gif"
sort="auto(cveTipoEvento)"
label="${c:l('busquedaTipoEventoExtraController.lhTipo.label')}" />
<listheader image="/gui/img/create_doc.gif"
sort="auto(impmax)" width="20%" align="right"
label="${c:l('editarTipoEventoExtraController.importeMaximo.label')}" />

9
web/gui/ingreso/editarTipoEventoExtra.zul
View File

@ -48,6 +48,14 @@
value="@{winEditarTipoEventoExtra$composer.tipoEventoExtra.descTipoEvento}"
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
</row>
<row>
<label
value="${c:l('editarTipoEventoExtraController.lbCveTipoEvento')}" />
<combobox id="cmbCveTipoEvento" constraint="no empty"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
width="100%" mold="rounded" buttonVisible="true"
model="@{winEditarTipoEventoExtra$composer.lsEventoExtrasConstantes}" />
</row>
<row>
<label
value="${c:l('editarTipoEventoExtraController.importeMaximo.label')}" />
@ -78,7 +86,6 @@
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
</row>
<row>
<label id="lbContaContabil"
value="${c:l('editarTipoEventoExtraController.lbContaContabil.value')}" />