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

fixed bug #6699 - Inclusão de filtro empresas em relatório de vendas por comissão. 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@48677 d1611594-4594-4d17-8e1d-87c2c4800839
master
thiago 2015-10-06 13:46:38 +00:00
parent 918f7bfe80
commit 6ab00d1f9a
7 changed files with 105 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java
View File

@ -30,6 +30,7 @@ public class RelatorioVendasComissao extends Relatorio {
private Date fecInicio;
private Date fecFinal;
private Integer marcaId;
public RelatorioVendasComissao(Map<String, Object> parametros, Connection conexao) throws Exception {
super(parametros, conexao);
@ -41,6 +42,9 @@ public class RelatorioVendasComissao extends Relatorio {
Map<String, Object> parametros = this.relatorio.getParametros();
fecInicio = new java.sql.Date(sdf.parse(parametros.get("fecInicio").toString()).getTime());
fecFinal = new java.sql.Date(sdf.parse(parametros.get("fecFinal").toString()).getTime());
if(parametros.get("MARCA_ID")!=null){
marcaId = Integer.valueOf(parametros.get("MARCA_ID").toString());
}
Connection conexao = this.relatorio.getConexao();
processarVendasComissao(conexao);
@ -151,6 +155,9 @@ public class RelatorioVendasComissao extends Relatorio {
if(fecFinal != null) {
stmt.setDate("fecFinal", fecFinal);
}
if(marcaId != null){
stmt.setInt("MARCA_ID", marcaId);
}
return stmt;
}
@ -165,8 +172,11 @@ public class RelatorioVendasComissao extends Relatorio {
.append("JOIN PUNTO_VENTA PV ON PV.PUNTOVENTA_ID = C.PUNTOVENTA_ID ")
.append("LEFT JOIN PUNTO_VENTA PV1 ON PV1.PUNTOVENTA_ID = C.PTOVTAVENTA_ID ")
.append("WHERE (C.INDSTATUSBOLETO = 'V' OR (C.INDCANCELACION = 1 AND C.INDSTATUSBOLETO = 'C')) ")
.append("AND C.FECHORVENTA BETWEEN :fecInicio AND :fecFinal ")
.append("GROUP BY PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, C.PTOVTAVENTA_ID, PV1.NUMPUNTOVENTA, PV1.NOMBPUNTOVENTA, C.INDSTATUSBOLETO, C.MOTIVOCANCELACION_ID ")
.append("AND C.FECHORVENTA BETWEEN :fecInicio AND :fecFinal ");
if(parametros.get("MARCA_ID")!= null){
sQuery.append("AND C.MARCA_ID =:MARCA_ID ");
}
sQuery.append("GROUP BY PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, C.PTOVTAVENTA_ID, PV1.NUMPUNTOVENTA, PV1.NOMBPUNTOVENTA, C.INDSTATUSBOLETO, C.MOTIVOCANCELACION_ID ")
.append("ORDER BY PV.NUMPUNTOVENTA, PV1.NUMPUNTOVENTA, C.INDSTATUSBOLETO");
return sQuery.toString();

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

Binary file not shown.

77
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jrxml
View File

@ -6,6 +6,7 @@
<parameter name="fecInicio" class="java.lang.String"/>
<parameter name="fecFinal" class="java.lang.String"/>
<parameter name="noDataRelatorio" class="java.lang.String"/>
<parameter name="empresa" class="java.lang.String"/>
<queryString>
<![CDATA[]]>
</queryString>
@ -39,34 +40,44 @@
<band splitType="Stretch"/>
</background>
<title>
<band height="41" splitType="Stretch">
<band height="61" splitType="Stretch">
<textField>
<reportElement x="0" y="0" width="620" height="20" uuid="43b2c28d-4760-4890-b00d-25e931e79c74"/>
<reportElement uuid="43b2c28d-4760-4890-b00d-25e931e79c74" x="0" y="0" width="620" height="20"/>
<textElement markup="none">
<font size="14" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{cabecalho.nome}]]></textFieldExpression>
</textField>
<textField pattern="dd/MM/yyyy HH:mm">
<reportElement x="638" y="0" width="164" height="20" uuid="4d1bcd65-c9a6-44b4-8dca-cc3c4c20c9a5"/>
<reportElement uuid="4d1bcd65-c9a6-44b4-8dca-cc3c4c20c9a5" x="638" y="0" width="164" height="20"/>
<textElement textAlignment="Right">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
</textField>
<textField>
<reportElement x="0" y="20" width="620" height="20" uuid="fd05bd35-30d9-4baf-aa56-f8e5d3c3268b"/>
<reportElement uuid="fd05bd35-30d9-4baf-aa56-f8e5d3c3268b" x="0" y="20" width="620" height="20"/>
<textElement>
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{cabecalho.periodo} + " " + $P{fecInicio} + " " + $R{cabecalho.periodoA} + " " + $P{fecFinal}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="8fa1c53b-1da7-4d4d-a75c-ab1543acae2a" x="53" y="41" width="139" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$P{empresa}]]></textFieldExpression>
</textField>
<staticText>
<reportElement uuid="a91f6081-4740-4e36-8965-41b6cde4cc20" x="0" y="41" width="53" height="20"/>
<textElement/>
<text><![CDATA[Empresa:]]></text>
</staticText>
</band>
</title>
<pageHeader>
<band height="21" splitType="Stretch">
<textField>
<reportElement x="607" y="0" width="195" height="20" uuid="6a8a0843-7236-40a3-98ae-5fbf59b4cfec"/>
<reportElement uuid="6a8a0843-7236-40a3-98ae-5fbf59b4cfec" x="607" y="0" width="195" height="20"/>
<textElement textAlignment="Right">
<font isBold="true"/>
</textElement>
@ -77,44 +88,46 @@
<columnHeader>
<band height="23" splitType="Stretch">
<textField>
<reportElement x="0" y="0" width="102" height="20" uuid="a3dea313-f2a7-4388-bd91-5c02e8612b8e"/>
<reportElement uuid="a3dea313-f2a7-4388-bd91-5c02e8612b8e" x="0" y="0" width="102" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$R{label.numPuntoVenta}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="311" y="0" width="80" height="20" uuid="8a39b1b1-6ebd-4f33-adea-c28a9988eaae"/>
<reportElement uuid="8a39b1b1-6ebd-4f33-adea-c28a9988eaae" x="311" y="0" width="80" height="20"/>
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$R{label.totalVendas}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="393" y="0" width="80" height="20" uuid="d9e0c815-b91e-4bc9-8a1a-1fa77aaabcb3"/>
<reportElement uuid="d9e0c815-b91e-4bc9-8a1a-1fa77aaabcb3" x="393" y="0" width="80" height="20"/>
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$R{label.totalTaxasVendas}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="475" y="0" width="80" height="20" uuid="2d666aaf-65a6-4c3f-acd3-e65483a78256"/>
<reportElement uuid="2d666aaf-65a6-4c3f-acd3-e65483a78256" x="475" y="0" width="80" height="20"/>
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$R{label.totalVendasCanceladas}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="557" y="0" width="80" height="20" uuid="a2ea7cea-d8ab-4c0e-bee0-4dafb3866c1f"/>
<reportElement uuid="a2ea7cea-d8ab-4c0e-bee0-4dafb3866c1f" x="557" y="0" width="80" height="20"/>
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$R{label.totalTaxasVendasCanceladas}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="721" y="0" width="80" height="20" uuid="43d6ee75-8459-4b9e-8cbe-ca2819d3198a"/>
<reportElement uuid="43d6ee75-8459-4b9e-8cbe-ca2819d3198a" x="721" y="0" width="80" height="20"/>
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$R{label.totalTaxasVendasDevolucao}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="639" y="0" width="80" height="20" uuid="12a7a0b1-f60c-4819-972a-2ea87f1f07b3"/>
<reportElement uuid="12a7a0b1-f60c-4819-972a-2ea87f1f07b3" x="639" y="0" width="80" height="20"/>
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$R{label.totalVendasDevolucao}]]></textFieldExpression>
</textField>
<line>
<reportElement positionType="Float" x="0" y="21" width="802" height="1" uuid="811af238-a027-48e9-bd6f-eee885474929"/>
<reportElement uuid="811af238-a027-48e9-bd6f-eee885474929" positionType="Float" x="0" y="21" width="802" height="1"/>
</line>
<textField>
<reportElement x="104" y="0" width="205" height="20" uuid="cfac237e-06b7-4c98-b7f1-285f5ec2c8b3"/>
<reportElement uuid="cfac237e-06b7-4c98-b7f1-285f5ec2c8b3" x="104" y="0" width="205" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$R{label.nombPuntoVenta}]]></textFieldExpression>
</textField>
</band>
@ -122,41 +135,43 @@
<detail>
<band height="22" splitType="Stretch">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="639" y="0" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="2e83e648-f95f-42ae-9069-862e6ad79b21"/>
<reportElement uuid="2e83e648-f95f-42ae-9069-862e6ad79b21" stretchType="RelativeToTallestObject" x="639" y="0" width="80" height="20" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$F{totalVendasDevolucao}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="311" y="0" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="8cdbdd14-c9f1-45d8-bf41-a4066930f5a4"/>
<reportElement uuid="8cdbdd14-c9f1-45d8-bf41-a4066930f5a4" stretchType="RelativeToTallestObject" x="311" y="0" width="80" height="20" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$F{totalVendas}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="102" height="20" isPrintWhenDetailOverflows="true" uuid="c98526c0-c36f-42df-9308-452ac671044c"/>
<reportElement uuid="c98526c0-c36f-42df-9308-452ac671044c" stretchType="RelativeToTallestObject" x="0" y="0" width="102" height="20" isPrintWhenDetailOverflows="true"/>
<textElement/>
<textFieldExpression><![CDATA[$F{numPuntoVenta}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="721" y="0" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="040c8de3-f836-40bc-96bd-761a7f5b46ef"/>
<reportElement uuid="040c8de3-f836-40bc-96bd-761a7f5b46ef" stretchType="RelativeToTallestObject" x="721" y="0" width="80" height="20" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$F{totalTaxasVendasDevolucao}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="557" y="0" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="b18fae2e-6454-42b0-a68c-04cf790ddfd6"/>
<reportElement uuid="b18fae2e-6454-42b0-a68c-04cf790ddfd6" stretchType="RelativeToTallestObject" x="557" y="0" width="80" height="20" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$F{totalTaxasVendasCanceladas}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="475" y="0" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="09b0cd36-1946-406f-923a-172b8a4f1ac6"/>
<reportElement uuid="09b0cd36-1946-406f-923a-172b8a4f1ac6" stretchType="RelativeToTallestObject" x="475" y="0" width="80" height="20" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$F{totalVendasCanceladas}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="393" y="0" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="8810c4af-e2ba-438f-a553-0143938c5f15"/>
<reportElement uuid="8810c4af-e2ba-438f-a553-0143938c5f15" stretchType="RelativeToTallestObject" x="393" y="0" width="80" height="20" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$F{totalTaxasVendas}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="104" y="0" width="205" height="20" isPrintWhenDetailOverflows="true" uuid="cebb836f-d485-4d50-98e0-0678bb715fb9"/>
<reportElement uuid="cebb836f-d485-4d50-98e0-0678bb715fb9" stretchType="RelativeToTallestObject" x="104" y="0" width="205" height="20" isPrintWhenDetailOverflows="true"/>
<textElement/>
<textFieldExpression><![CDATA[$F{nombPuntoVenta}]]></textFieldExpression>
</textField>
</band>
@ -170,52 +185,52 @@
<summary>
<band height="26" splitType="Stretch">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="475" y="5" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="5de9b146-8a5d-4972-bd9c-7147f05137ef"/>
<reportElement uuid="5de9b146-8a5d-4972-bd9c-7147f05137ef" stretchType="RelativeToTallestObject" x="475" y="5" width="80" height="20" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$V{vTotalVendasCanceladas}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="557" y="5" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="f22b1a6f-2e0b-4771-acf3-b7460874f730"/>
<reportElement uuid="f22b1a6f-2e0b-4771-acf3-b7460874f730" stretchType="RelativeToTallestObject" x="557" y="5" width="80" height="20" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$V{vTotalTaxasVendasCanceladas}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="639" y="5" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="353f7f71-1413-4dd6-82d7-23cd3944819f"/>
<reportElement uuid="353f7f71-1413-4dd6-82d7-23cd3944819f" stretchType="RelativeToTallestObject" x="639" y="5" width="80" height="20" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$V{vTotalVendasDevolucao}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="721" y="5" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="417ed1de-ce71-42fa-8108-33a37f6a0626"/>
<reportElement uuid="417ed1de-ce71-42fa-8108-33a37f6a0626" stretchType="RelativeToTallestObject" x="721" y="5" width="80" height="20" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$V{vTotalTaxasVendasDevolucao}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="393" y="5" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="3325e0ca-40a5-4f6d-be63-a1fdc0f0d36c"/>
<reportElement uuid="3325e0ca-40a5-4f6d-be63-a1fdc0f0d36c" stretchType="RelativeToTallestObject" x="393" y="5" width="80" height="20" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$V{vTotalTaxasVendas}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="311" y="5" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="7d8e9f80-020d-4dc9-b7ce-e5213b42f920"/>
<reportElement uuid="7d8e9f80-020d-4dc9-b7ce-e5213b42f920" stretchType="RelativeToTallestObject" x="311" y="5" width="80" height="20" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$V{vTotalVendas}]]></textFieldExpression>
</textField>
<line>
<reportElement positionType="Float" x="0" y="2" width="802" height="1" uuid="c8dfd524-14cc-454c-afc0-3ce9f8d0ead8"/>
<reportElement uuid="c8dfd524-14cc-454c-afc0-3ce9f8d0ead8" positionType="Float" x="0" y="2" width="802" height="1"/>
</line>
<textField>
<reportElement x="104" y="5" width="205" height="20" uuid="38a0f957-1b50-46f9-b79f-c631baf8937b"/>
<reportElement uuid="38a0f957-1b50-46f9-b79f-c631baf8937b" x="104" y="5" width="205" height="20"/>
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$R{label.total}]]></textFieldExpression>
</textField>
@ -224,7 +239,7 @@
<noData>
<band height="24">
<textField isBlankWhenNull="true">
<reportElement positionType="Float" x="0" y="0" width="555" height="20" isPrintWhenDetailOverflows="true" uuid="d7df66c6-4dc0-4f3b-88f4-b22094d29091"/>
<reportElement uuid="d7df66c6-4dc0-4f3b-88f4-b22094d29091" positionType="Float" x="0" y="0" width="555" height="20" isPrintWhenDetailOverflows="true"/>
<textElement verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
</textField>

36
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasComissaoController.java
View File

@ -3,6 +3,7 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.sql.DataSource;
@ -13,10 +14,14 @@ import org.springframework.stereotype.Controller;
import org.zkoss.util.resource.Labels;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zul.Comboitem;
import org.zkoss.zul.Datebox;
import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioVendasComissao;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
import com.rjconsultores.ventaboletos.service.EmpresaService;
import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar;
import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
@Controller("relatorioVendasComissaoController")
@ -28,11 +33,18 @@ public class RelatorioVendasComissaoController extends MyGenericForwardComposer
@Autowired
private DataSource dataSourceRead;
@Autowired
private EmpresaService empresaService;
private MyComboboxEstandar cmbEmpresa;
private List<Empresa> lsEmpresa;
private Datebox dataInicial;
private Datebox dataFinal;
@Override
public void doAfterCompose(Component comp) throws Exception {
setLsEmpresa(empresaService.obtenerTodos());
super.doAfterCompose(comp);
}
@ -45,6 +57,16 @@ public class RelatorioVendasComissaoController extends MyGenericForwardComposer
parametros.put("fecInicio", sdf.format(dataDe));
parametros.put("fecFinal", sdf.format(dataAte));
Comboitem itemEmpresa = cmbEmpresa.getSelectedItem();
if (itemEmpresa != null) {
Empresa empresa = (Empresa) itemEmpresa.getValue();
parametros.put("MARCA_ID", empresa.getEmpresaId());
parametros.put("empresa", empresa.getNombempresa());
} else{
parametros.put("empresa", "Todas;");
}
Relatorio relatorio = new RelatorioVendasComissao(parametros, dataSourceRead.getConnection());
Map<String, Object> args = new HashMap<String, Object>();
@ -53,5 +75,19 @@ public class RelatorioVendasComissaoController extends MyGenericForwardComposer
openWindow("/component/reportView.zul",
Labels.getLabel("indexController.mniRelatorioVendasComissao.label"), args, MODAL);
}
/**
* @return the lsEmpresa
*/
public List<Empresa> getLsEmpresa() {
return lsEmpresa;
}
/**
* @param lsEmpresa the lsEmpresa to set
*/
public void setLsEmpresa(List<Empresa> lsEmpresa) {
this.lsEmpresa = lsEmpresa;
}
}

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

@ -5692,6 +5692,7 @@ editarPracaPedagioController.btnFechar.MSG.borrarOK = Praça de Pedágio Excluid
# Relatorio de Vendas para Comissao
relatorioVendasComissaoController.lbDataIni.value = Fecha Inicio
relatorioVendasComissaoController.lbDataFin.value = Fecha Final
relatorioVendasComissaoController.lbEmpresa.value = Empresa
# Calculo Comissao
busquedaCalculoComissaoController.window.title = Cálculo de Comissão

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

@ -5833,6 +5833,7 @@ editarPracaPedagioController.btnFechar.MSG.borrarOK = Praça de Pedágio Excluid
# Relatorio de Vendas para Comissao
relatorioVendasComissaoController.lbDataIni.value = Data Início
relatorioVendasComissaoController.lbDataFin.value = Data Final
relatorioVendasComissaoController.lbEmpresa.value = Empresa
# Calculo Comissao
busquedaCalculoComissaoController.window.title = Cálculo de Comisión

9
web/gui/relatorios/filtroRelatorioVendasComissao.zul
View File

@ -28,6 +28,15 @@
format="dd/MM/yyyy" lenient="false" constraint="no empty"
maxlength="10" />
</row>
<row>
<label
value="${c:l('relatorioVendasComissaoController.lbEmpresa.value')}" />
<combobox id="cmbEmpresa"
buttonVisible="true"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
model="@{winFiltroRelatorioVendasComissao$composer.lsEmpresa}"
width="95%" />
</row>
</rows>
</grid>
<toolbar>