From 65ad0799f75a4d12aca8194fc28082da409491e3 Mon Sep 17 00:00:00 2001 From: wilian Date: Mon, 6 Jul 2015 19:01:37 +0000 Subject: [PATCH] fixes bug #6443 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@45731 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioVendasPacotesDetalhado.java | 6 +- ...ioVendasPacotesDetalhadoItem_es.properties | 7 +- ...endasPacotesDetalhadoItem_pt_BR.properties | 7 +- .../RelatorioVendasPacotesDetalhado.jasper | Bin 26181 -> 26180 bytes .../RelatorioVendasPacotesDetalhado.jrxml | 22 +-- ...RelatorioVendasPacotesDetalhadoItem.jasper | Bin 36211 -> 37898 bytes .../RelatorioVendasPacotesDetalhadoItem.jrxml | 168 ++++++++++-------- .../RelatorioVendasPacotesDetalhadoBean.java | 16 ++ .../catalogos/EditarFormaPagoController.java | 2 +- web/WEB-INF/i3-label_pt_BR.label | 4 +- 10 files changed, 138 insertions(+), 94 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java index aeffddf89..b0e2c43fd 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java @@ -14,6 +14,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; import org.apache.log4j.Logger; import com.rjconsultores.ventaboletos.enums.LocalEnderecoApanhe; +import com.rjconsultores.ventaboletos.enums.SituacaoVendaPacote; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioVendasPacotesDetalhadoBean; @@ -108,6 +109,7 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio { relatorioVendasPacotesDetalhadoItemBean.setSubTotal(rset.getBigDecimal("subtotal")); relatorioVendasPacotesDetalhadoItemBean.setTotal(rset.getBigDecimal("total")); relatorioVendasPacotesDetalhadoItemBean.setVendapacoteId(rset.getLong("vendapacote_id")); + relatorioVendasPacotesDetalhadoItemBean.setSituacaoVendaPacote(SituacaoVendaPacote.getSituacaoVendaPacote(rset.getInt("situacao"))); if(relatorioVendasPacotesBean.getRelatorioVendasPacotesDetalhadoItemBeans() == null) { relatorioVendasPacotesBean.setRelatorioVendasPacotesDetalhadoItemBeans(new ArrayList()); @@ -141,7 +143,7 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio { protected String getSqlPacotes() { StringBuilder sQuery = new StringBuilder(); - sQuery.append("SELECT P.PACOTE_ID, VP.VENDAPACOTE_ID, P.NOMPACOTE, VP.NUMOPERACION, VP.DATAVENDA, VP.DATAPACOTE, EA.DESCHOTEL, EA.LOCAL, CP.RAZAO_SOCIAL, U.NOMBUSUARIO, VP.SUBTOTAL, VP.DESCONTO, VP.TOTAL, COUNT(TVP.TARIFAVENDAPACOTE_ID) AS QTDETARIFAS ") + sQuery.append("SELECT P.PACOTE_ID, VP.VENDAPACOTE_ID, P.NOMPACOTE, VP.NUMOPERACION, VP.DATAVENDA, VP.DATAPACOTE, EA.DESCHOTEL, EA.LOCAL, CP.RAZAO_SOCIAL, U.NOMBUSUARIO, VP.SUBTOTAL, VP.DESCONTO, VP.TOTAL, VP.SITUACAO, COUNT(TVP.TARIFAVENDAPACOTE_ID) AS QTDETARIFAS ") .append("FROM VENDA_PACOTE VP ") .append("LEFT JOIN PACOTE P ON P.PACOTE_ID = VP.PACOTE_ID ") .append("LEFT JOIN TARIFA_VENDA_PACOTE TVP ON TVP.VENDAPACOTE_ID = VP.VENDAPACOTE_ID ") @@ -168,7 +170,7 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio { sQuery.append("AND VP.DATAPACOTE <= :fecFinal "); } - sQuery.append("GROUP BY P.PACOTE_ID, VP.VENDAPACOTE_ID, P.NOMPACOTE, VP.NUMOPERACION, VP.DATAVENDA, VP.DATAPACOTE, EA.DESCHOTEL, EA.LOCAL, CP.RAZAO_SOCIAL, U.NOMBUSUARIO, VP.SUBTOTAL, VP.DESCONTO, VP.TOTAL ") + sQuery.append("GROUP BY P.PACOTE_ID, VP.VENDAPACOTE_ID, P.NOMPACOTE, VP.NUMOPERACION, VP.DATAVENDA, VP.DATAPACOTE, EA.DESCHOTEL, EA.LOCAL, CP.RAZAO_SOCIAL, U.NOMBUSUARIO, VP.SUBTOTAL, VP.DESCONTO, VP.TOTAL, VP.SITUACAO ") .append("ORDER BY P.NOMPACOTE, VP.DATAPACOTE, VP.DATAVENDA "); return sQuery.toString(); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhadoItem_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhadoItem_es.properties index c2bd32af8..26689a446 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhadoItem_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhadoItem_es.properties @@ -4,8 +4,9 @@ label.localizador=Localizador label.usuario=Usuário label.cliente=Cliente label.apanhe=Apanhe -label.dtPacote=DT Pacote -label.dtVenda=DT Venda +label.dtPacote=Data Pacote +label.dtVenda=Data Venda label.subTotal=SubTotal label.desconto=Desconto -label.total=Total \ No newline at end of file +label.total=Total +label.situacao=Situação \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhadoItem_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhadoItem_pt_BR.properties index c2bd32af8..26689a446 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhadoItem_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhadoItem_pt_BR.properties @@ -4,8 +4,9 @@ label.localizador=Localizador label.usuario=Usuário label.cliente=Cliente label.apanhe=Apanhe -label.dtPacote=DT Pacote -label.dtVenda=DT Venda +label.dtPacote=Data Pacote +label.dtVenda=Data Venda label.subTotal=SubTotal label.desconto=Desconto -label.total=Total \ No newline at end of file +label.total=Total +label.situacao=Situação \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhado.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhado.jasper index 30867ffd97af325e8e773f89241c7923dbcc5dec..e0f642b818737cd0626edac8014c91e1dc8ed08a 100644 GIT binary patch delta 246 zcmX?lhVjT5#tl1JMVOTspg;sjGX*m+Fneu2%esV*iCJ-TvB-Wd5N#s=otcSQX|t~K zS8*;*A4flzU}whw*U9~Mnv-91@J~**mIX>rZnB=l#8kUk%;r23h<0@ z`HVv-BNtOG%&N)n?Nm1hIK_bEH?MPkj3j3RmOJ1&jfsE3seiln0k!BcDlsw`2TfKC zl9P%zG%+?aGB7tZH8HTTjJL2fG%{dkU}R*_nLIH_dGkRJOIZ;SEQ%)crWu%esV*iAj5NvB-Wd5N#s=of$;yDt{H{ zAnPi`$%MVq(^&L1*&BAmz;mJuGEKMX{-x%$H^c0Lhd< AcK`qY diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhado.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhado.jrxml index 1e91265ad..3310a7792 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhado.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhado.jrxml @@ -1,5 +1,5 @@ - + @@ -21,35 +21,35 @@ <band height="84" splitType="Stretch"> <textField> - <reportElement x="0" y="0" width="301" height="20" uuid="43b2c28d-4760-4890-b00d-25e931e79c74"/> + <reportElement x="0" y="0" width="637" height="20" uuid="43b2c28d-4760-4890-b00d-25e931e79c74"/> <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="391" y="0" width="164" height="20" uuid="4d1bcd65-c9a6-44b4-8dca-cc3c4c20c9a5"/> + <reportElement x="637" y="0" width="164" height="20" uuid="4d1bcd65-c9a6-44b4-8dca-cc3c4c20c9a5"/> <textElement textAlignment="Right"> <font isBold="true"/> </textElement> <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="20" width="301" height="20" uuid="a16eb33b-78ca-4fb4-80c2-f5c85a0d09c3"/> + <reportElement x="0" y="20" width="637" height="20" uuid="a16eb33b-78ca-4fb4-80c2-f5c85a0d09c3"/> <textElement> <font isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.empresa} + " " + $P{empresa}]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="40" width="301" height="20" uuid="fd05bd35-30d9-4baf-aa56-f8e5d3c3268b"/> + <reportElement x="0" y="40" width="637" height="20" uuid="fd05bd35-30d9-4baf-aa56-f8e5d3c3268b"/> <textElement> <font isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{cabecalho.periodo} + " " + $P{fecInicio} + " " + $R{cabecalho.periodoA} + " " + $P{fecFinal}]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="60" width="301" height="20" uuid="66f394e2-0568-447d-9f46-c358a05628c5"/> + <reportElement x="0" y="60" width="637" height="20" uuid="66f394e2-0568-447d-9f46-c358a05628c5"/> <textElement> <font isBold="true"/> </textElement> @@ -60,10 +60,10 @@ <pageHeader> <band height="21" splitType="Stretch"> <line> - <reportElement x="0" y="19" width="555" height="1" uuid="4f39b5b4-849a-4fe2-9365-06930866fbaa"/> + <reportElement x="0" y="19" width="802" height="1" uuid="4f39b5b4-849a-4fe2-9365-06930866fbaa"/> </line> <textField> - <reportElement x="391" y="0" width="164" height="20" uuid="6a8a0843-7236-40a3-98ae-5fbf59b4cfec"/> + <reportElement x="637" y="0" width="164" height="20" uuid="6a8a0843-7236-40a3-98ae-5fbf59b4cfec"/> <textElement textAlignment="Right"> <font isBold="true"/> </textElement> @@ -77,14 +77,14 @@ <detail> <band height="76" splitType="Stretch"> <textField isBlankWhenNull="true"> - <reportElement positionType="Float" x="0" y="1" width="555" height="20" isPrintWhenDetailOverflows="true" uuid="752263b1-e76b-41c5-a728-c17367094dab"/> + <reportElement positionType="Float" x="0" y="1" width="801" height="20" isPrintWhenDetailOverflows="true" uuid="752263b1-e76b-41c5-a728-c17367094dab"/> <textElement verticalAlignment="Middle"> <font isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.pacote} + " " + $F{nompacote}]]></textFieldExpression> </textField> <subreport isUsingCache="true"> - <reportElement positionType="Float" x="0" y="27" width="555" height="38" uuid="75fad27f-9275-4535-844a-316ac8365073"/> + <reportElement positionType="Float" x="0" y="27" width="801" height="38" uuid="75fad27f-9275-4535-844a-316ac8365073"/> <subreportParameter name="REPORT_RESOURCE_BUNDLE"> <subreportParameterExpression><![CDATA[$P{SUBREPORT_RESOURCE_BUNDLE}]]></subreportParameterExpression> </subreportParameter> @@ -92,7 +92,7 @@ <subreportExpression><![CDATA[$P{subreporte}]]></subreportExpression> </subreport> <line> - <reportElement positionType="Float" x="0" y="68" width="555" height="1" uuid="29b89cc0-dcf8-4bdd-a667-7341d74330ea"/> + <reportElement positionType="Float" x="0" y="68" width="802" height="1" uuid="29b89cc0-dcf8-4bdd-a667-7341d74330ea"/> </line> </band> </detail> diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhadoItem.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhadoItem.jasper index a4a48083e3b5d38008cb403b0f9fbe5313ca8138..a6c64c326fb16164e26a338517cd309680f8f9ad 100644 GIT binary patch literal 37898 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 literal 36211 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 SSPYY=9%`^{(WcHOME@TifrA_X diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhadoItem.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhadoItem.jrxml index 70c3dc7ea..24151f4ef 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhadoItem.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhadoItem.jrxml @@ -1,7 +1,7 @@ <?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="RelatorioVendasPacotesDetalhadoItem" pageWidth="555" pageHeight="802" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="f17327a0-45d8-4ec1-8350-688df66785dc"> - <property name="ireport.zoom" value="1.0"/> - <property name="ireport.x" value="0"/> +<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="RelatorioVendasPacotesDetalhadoItem" pageWidth="802" pageHeight="555" orientation="Landscape" columnWidth="802" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="f17327a0-45d8-4ec1-8350-688df66785dc"> + <property name="ireport.zoom" value="2.0"/> + <property name="ireport.x" value="95"/> <property name="ireport.y" value="0"/> <field name="numoperacion" class="java.lang.String"/> <field name="nombusuario" class="java.lang.String"/> @@ -13,6 +13,7 @@ <field name="subTotal" class="java.math.BigDecimal"/> <field name="desconto" class="java.math.BigDecimal"/> <field name="total" class="java.math.BigDecimal"/> + <field name="descSituacaoVendaPacote" class="java.lang.String"/> <variable name="vTotalSubTotal" class="java.math.BigDecimal" resetType="Column" calculation="Sum"> <variableExpression><![CDATA[$F{subTotal}]]></variableExpression> </variable> @@ -39,75 +40,75 @@ <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement x="1" y="4" width="25" height="20" uuid="479d9abe-f3fa-4903-922f-74be005b310c"/> <textElement textAlignment="Center" verticalAlignment="Top" markup="none"> - <font fontName="SansSerif" size="6"/> + <font fontName="SansSerif" size="5"/> </textElement> <textFieldExpression><![CDATA[$R{label.qtde}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement x="27" y="4" width="68" height="20" uuid="2fcabefe-3c9b-46f4-9885-e37a5ffbed9a"/> <textElement verticalAlignment="Top" markup="none"> - <font fontName="SansSerif" size="6"/> + <font fontName="SansSerif" size="5"/> </textElement> <textFieldExpression><![CDATA[$R{label.localizador}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement x="96" y="4" width="56" height="20" uuid="333e8016-8fb3-4652-b7f9-1ff10a0b024e"/> + <reportElement x="96" y="4" width="100" height="20" uuid="333e8016-8fb3-4652-b7f9-1ff10a0b024e"/> <textElement verticalAlignment="Top" markup="none"> - <font fontName="SansSerif" size="6"/> + <font fontName="SansSerif" size="5"/> </textElement> <textFieldExpression><![CDATA[$R{label.usuario}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement x="153" y="4" width="77" height="20" uuid="eb1aa96a-0759-41b0-bf15-7e4b1b0dc21b"/> + <reportElement x="199" y="4" width="142" height="20" uuid="eb1aa96a-0759-41b0-bf15-7e4b1b0dc21b"/> <textElement verticalAlignment="Top" markup="none"> - <font fontName="SansSerif" size="6"/> + <font fontName="SansSerif" size="5"/> </textElement> <textFieldExpression><![CDATA[$R{label.cliente}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement x="231" y="4" width="71" height="20" uuid="0cf46847-6160-450a-ad67-6b33fac921cc"/> + <reportElement x="342" y="4" width="101" height="20" uuid="0cf46847-6160-450a-ad67-6b33fac921cc"/> <textElement verticalAlignment="Top" markup="none"> - <font fontName="SansSerif" size="6"/> + <font fontName="SansSerif" size="5"/> </textElement> <textFieldExpression><![CDATA[$R{label.apanhe}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement x="303" y="4" width="53" height="20" uuid="dc54766b-3e8a-4683-84a0-b50cf8275681"/> + <reportElement x="444" y="4" width="54" height="20" uuid="dc54766b-3e8a-4683-84a0-b50cf8275681"/> <textElement verticalAlignment="Top" markup="none"> - <font fontName="SansSerif" size="6"/> + <font fontName="SansSerif" size="5"/> </textElement> <textFieldExpression><![CDATA[$R{label.dtPacote}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement x="357" y="4" width="53" height="20" uuid="521c1958-56a8-4bc9-b304-5a8e7ad8941c"/> + <reportElement x="499" y="4" width="54" height="20" uuid="521c1958-56a8-4bc9-b304-5a8e7ad8941c"/> <textElement verticalAlignment="Top" markup="none"> - <font fontName="SansSerif" size="6"/> + <font fontName="SansSerif" size="5"/> </textElement> <textFieldExpression><![CDATA[$R{label.dtVenda}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement x="411" y="4" width="43" height="20" uuid="eab1b822-2fe4-4d62-87ec-c07e1320950a"/> + <reportElement x="555" y="4" width="60" height="20" uuid="eab1b822-2fe4-4d62-87ec-c07e1320950a"/> <textElement textAlignment="Right" verticalAlignment="Top" markup="none"> - <font fontName="SansSerif" size="6"/> + <font fontName="SansSerif" size="5"/> </textElement> <textFieldExpression><![CDATA[$R{label.subTotal}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement x="455" y="4" width="47" height="20" uuid="ea742d2b-6cd4-4fd8-aba8-1cd9d23e802a"/> + <reportElement x="616" y="4" width="60" height="20" uuid="ea742d2b-6cd4-4fd8-aba8-1cd9d23e802a"/> <textElement textAlignment="Right" verticalAlignment="Top" markup="none"> - <font fontName="SansSerif" size="6"/> + <font fontName="SansSerif" size="5"/> </textElement> <textFieldExpression><![CDATA[$R{label.desconto}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement x="503" y="4" width="51" height="20" uuid="199f8b66-2e55-45ee-95e1-f44d55a7a716"/> + <reportElement x="678" y="4" width="60" height="20" uuid="199f8b66-2e55-45ee-95e1-f44d55a7a716"/> <textElement textAlignment="Right" verticalAlignment="Top" markup="none"> - <font fontName="SansSerif" size="6"/> + <font fontName="SansSerif" size="5"/> </textElement> <textFieldExpression><![CDATA[$R{label.total}]]></textFieldExpression> </textField> <line> - <reportElement positionType="Float" x="0" y="27" width="556" height="1" forecolor="#CCCCCC" uuid="d89ccc0c-cffc-4489-b000-9b36ecddea41"/> + <reportElement positionType="Float" x="0" y="27" width="802" height="1" forecolor="#CCCCCC" uuid="d89ccc0c-cffc-4489-b000-9b36ecddea41"/> </line> <line> <reportElement stretchType="RelativeToTallestObject" x="26" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="26b055fb-fb3d-43b7-af65-71d2b436adb6"/> @@ -116,34 +117,44 @@ <reportElement stretchType="RelativeToTallestObject" x="95" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="8bb893f0-9d4c-4ec6-ae79-1bee3a1ff931"/> </line> <line> - <reportElement stretchType="RelativeToTallestObject" x="152" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="e9a787d5-7227-4c4c-b79c-e9f7bc750384"/> + <reportElement stretchType="RelativeToTallestObject" x="197" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="e9a787d5-7227-4c4c-b79c-e9f7bc750384"/> </line> <line> - <reportElement stretchType="RelativeToTallestObject" x="230" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="fe005b59-9df8-40ca-9ac0-4ea262c3187d"/> + <reportElement stretchType="RelativeToTallestObject" x="341" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="fe005b59-9df8-40ca-9ac0-4ea262c3187d"/> </line> <line> - <reportElement stretchType="RelativeToTallestObject" x="302" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="04e8c11f-b6d8-437e-975e-047f43d584db"/> + <reportElement stretchType="RelativeToTallestObject" x="443" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="04e8c11f-b6d8-437e-975e-047f43d584db"/> </line> <line> - <reportElement stretchType="RelativeToTallestObject" x="356" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="93354399-3c94-4a7f-8710-284846ad3630"/> + <reportElement stretchType="RelativeToTallestObject" x="498" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="93354399-3c94-4a7f-8710-284846ad3630"/> </line> <line> - <reportElement stretchType="RelativeToTallestObject" x="410" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="4639047b-3f66-4ce0-8aa1-df467cf58853"/> + <reportElement stretchType="RelativeToTallestObject" x="554" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="4639047b-3f66-4ce0-8aa1-df467cf58853"/> </line> <line> - <reportElement stretchType="RelativeToTallestObject" x="454" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="2ea4dfc3-87b0-4a4b-8b3a-f985805cb96a"/> + <reportElement stretchType="RelativeToTallestObject" x="615" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="2ea4dfc3-87b0-4a4b-8b3a-f985805cb96a"/> </line> <line> - <reportElement stretchType="RelativeToTallestObject" x="502" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="2225826d-acb0-4eb7-99ee-4208efc05b2c"/> - </line> - <line> - <reportElement stretchType="RelativeToTallestObject" x="0" y="2" width="555" height="1" forecolor="#CCCCCC" uuid="51960e3f-1a55-458f-9e20-a6623a217fe3"/> + <reportElement stretchType="RelativeToTallestObject" x="677" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="2225826d-acb0-4eb7-99ee-4208efc05b2c"/> </line> <line> <reportElement stretchType="RelativeToTallestObject" x="0" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="890d0f88-7254-46d6-b5c6-e81c835568f8"/> </line> <line> - <reportElement stretchType="RelativeToTallestObject" x="555" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="955f2ac4-afba-49e3-8e10-f53775ee1a26"/> + <reportElement stretchType="RelativeToTallestObject" x="739" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="955f2ac4-afba-49e3-8e10-f53775ee1a26"/> + </line> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement x="740" y="4" width="60" height="20" isPrintWhenDetailOverflows="true" uuid="f573134c-9443-45b0-8749-ff939fadfd1c"/> + <textElement verticalAlignment="Top" markup="none"> + <font fontName="SansSerif" size="5"/> + </textElement> + <textFieldExpression><![CDATA[$R{label.situacao}]]></textFieldExpression> + </textField> + <line> + <reportElement stretchType="RelativeToTallestObject" x="801" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="978c071d-d369-4184-be2c-a44354215385"/> + </line> + <line> + <reportElement positionType="Float" x="0" y="2" width="802" height="1" forecolor="#CCCCCC" uuid="1361f507-ce8d-4a97-921a-5b5c23b40b24"/> </line> </band> </columnHeader> @@ -152,75 +163,75 @@ <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement stretchType="RelativeToTallestObject" x="1" y="1" width="25" height="20" isPrintWhenDetailOverflows="true" uuid="d2d86d45-734c-43d7-b85c-fec792408d05"/> <textElement textAlignment="Center" verticalAlignment="Top"> - <font fontName="SansSerif" size="6"/> + <font fontName="SansSerif" size="5"/> </textElement> <textFieldExpression><![CDATA[$F{qtdeTarifas}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement stretchType="RelativeToTallestObject" x="27" y="1" width="68" height="20" isPrintWhenDetailOverflows="true" uuid="351af802-2856-4c9e-918f-06bafc5ef390"/> <textElement verticalAlignment="Top"> - <font fontName="SansSerif" size="6"/> + <font fontName="SansSerif" size="5"/> </textElement> <textFieldExpression><![CDATA[$F{numoperacion}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" x="96" y="1" width="56" height="20" isPrintWhenDetailOverflows="true" uuid="6964a19b-c6bb-48ed-a061-eed217b33b9b"/> + <reportElement stretchType="RelativeToTallestObject" x="96" y="1" width="100" height="20" isPrintWhenDetailOverflows="true" uuid="6964a19b-c6bb-48ed-a061-eed217b33b9b"/> <textElement verticalAlignment="Top"> - <font fontName="SansSerif" size="6"/> + <font fontName="SansSerif" size="5"/> </textElement> <textFieldExpression><![CDATA[$F{nombusuario}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" x="153" y="1" width="77" height="20" isPrintWhenDetailOverflows="true" uuid="c9813245-6a43-4011-bb01-c6e45c0d6d36"/> + <reportElement stretchType="RelativeToTallestObject" x="199" y="1" width="142" height="20" isPrintWhenDetailOverflows="true" uuid="c9813245-6a43-4011-bb01-c6e45c0d6d36"/> <textElement verticalAlignment="Top"> - <font fontName="SansSerif" size="6"/> + <font fontName="SansSerif" size="5"/> </textElement> <textFieldExpression><![CDATA[$F{razaoSocialCliente}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" x="231" y="1" width="71" height="20" isPrintWhenDetailOverflows="true" uuid="f5632358-41df-437d-821f-fa878a857d5c"/> + <reportElement stretchType="RelativeToTallestObject" x="342" y="1" width="101" height="20" isPrintWhenDetailOverflows="true" uuid="f5632358-41df-437d-821f-fa878a857d5c"/> <textElement verticalAlignment="Top"> - <font fontName="SansSerif" size="6"/> + <font fontName="SansSerif" size="5"/> </textElement> <textFieldExpression><![CDATA[$F{descLocalEnderecoApanhe}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" x="303" y="1" width="53" height="20" isPrintWhenDetailOverflows="true" uuid="ecb1f133-dfd6-46a1-9d3d-3dc84b199c39"/> + <reportElement stretchType="RelativeToTallestObject" x="444" y="1" width="54" height="20" isPrintWhenDetailOverflows="true" uuid="ecb1f133-dfd6-46a1-9d3d-3dc84b199c39"/> <textElement verticalAlignment="Top"> - <font fontName="SansSerif" size="6"/> + <font fontName="SansSerif" size="5"/> </textElement> <textFieldExpression><![CDATA[$F{datapacote}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" x="357" y="1" width="53" height="20" isPrintWhenDetailOverflows="true" uuid="78842239-ee2e-45ac-aaa2-ec561feea088"/> + <reportElement stretchType="RelativeToTallestObject" x="499" y="1" width="54" height="20" isPrintWhenDetailOverflows="true" uuid="78842239-ee2e-45ac-aaa2-ec561feea088"/> <textElement verticalAlignment="Top"> - <font fontName="SansSerif" size="6"/> + <font fontName="SansSerif" size="5"/> </textElement> <textFieldExpression><![CDATA[$F{datavenda}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" x="411" y="1" width="43" height="20" isPrintWhenDetailOverflows="true" uuid="0be25395-a20f-4e4f-95da-163c13698708"/> + <reportElement stretchType="RelativeToTallestObject" x="555" y="1" width="60" height="20" isPrintWhenDetailOverflows="true" uuid="0be25395-a20f-4e4f-95da-163c13698708"/> <textElement textAlignment="Right" verticalAlignment="Top"> - <font fontName="SansSerif" size="6"/> + <font fontName="SansSerif" size="5"/> </textElement> <textFieldExpression><![CDATA[$F{subTotal}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" x="455" y="1" width="47" height="20" isPrintWhenDetailOverflows="true" uuid="43d71d65-26a3-49dc-b94e-30525147a1d0"/> + <reportElement stretchType="RelativeToTallestObject" x="616" y="1" width="60" height="20" isPrintWhenDetailOverflows="true" uuid="43d71d65-26a3-49dc-b94e-30525147a1d0"/> <textElement textAlignment="Right" verticalAlignment="Top"> - <font fontName="SansSerif" size="6"/> + <font fontName="SansSerif" size="5"/> </textElement> <textFieldExpression><![CDATA[$F{desconto}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" x="503" y="1" width="51" height="20" isPrintWhenDetailOverflows="true" uuid="55433141-fa8f-42b5-b4f7-2a504bec5ceb"/> + <reportElement stretchType="RelativeToTallestObject" x="678" y="1" width="60" height="20" isPrintWhenDetailOverflows="true" uuid="55433141-fa8f-42b5-b4f7-2a504bec5ceb"/> <textElement textAlignment="Right" verticalAlignment="Top"> - <font fontName="SansSerif" size="6"/> + <font fontName="SansSerif" size="5"/> </textElement> <textFieldExpression><![CDATA[$F{total}]]></textFieldExpression> </textField> <line> - <reportElement positionType="Float" x="0" y="23" width="555" height="1" forecolor="#CCCCCC" uuid="d5ce962b-9449-4a10-b4aa-20745c16689b"/> + <reportElement positionType="Float" x="0" y="23" width="802" height="1" forecolor="#CCCCCC" uuid="d5ce962b-9449-4a10-b4aa-20745c16689b"/> </line> <line> <reportElement stretchType="RelativeToTallestObject" x="26" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="aff678ee-a68b-41c6-b11b-1c3820e380dd"/> @@ -229,31 +240,41 @@ <reportElement stretchType="RelativeToTallestObject" x="95" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="eeba804b-44db-4524-92c1-fda9cd003469"/> </line> <line> - <reportElement stretchType="RelativeToTallestObject" x="152" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="a02ac9fd-63e6-47f5-8d17-95edd06c8037"/> + <reportElement stretchType="RelativeToTallestObject" x="197" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="a02ac9fd-63e6-47f5-8d17-95edd06c8037"/> </line> <line> - <reportElement stretchType="RelativeToTallestObject" x="230" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="3d6f981e-6f53-4945-bbff-f31f7b580507"/> + <reportElement stretchType="RelativeToTallestObject" x="341" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="3d6f981e-6f53-4945-bbff-f31f7b580507"/> </line> <line> - <reportElement stretchType="RelativeToTallestObject" x="302" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="6a406064-40dd-45b2-9d84-f0efda11bcf5"/> + <reportElement stretchType="RelativeToTallestObject" x="443" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="6a406064-40dd-45b2-9d84-f0efda11bcf5"/> </line> <line> - <reportElement stretchType="RelativeToTallestObject" x="356" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="e9d0ffbf-807b-4fd1-8368-831d35f1d67d"/> + <reportElement stretchType="RelativeToTallestObject" x="498" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="e9d0ffbf-807b-4fd1-8368-831d35f1d67d"/> </line> <line> - <reportElement stretchType="RelativeToTallestObject" x="410" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="a7929915-7c3f-4a5d-b148-0d24c69f6914"/> + <reportElement stretchType="RelativeToTallestObject" x="554" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="a7929915-7c3f-4a5d-b148-0d24c69f6914"/> </line> <line> - <reportElement stretchType="RelativeToTallestObject" x="454" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="9bfbdfb0-892a-464c-bf6c-a1566fab0b1e"/> + <reportElement stretchType="RelativeToTallestObject" x="615" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="9bfbdfb0-892a-464c-bf6c-a1566fab0b1e"/> </line> <line> - <reportElement stretchType="RelativeToTallestObject" x="502" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="0aaf6982-7014-447b-bb4f-51aa08f0e11e"/> + <reportElement stretchType="RelativeToTallestObject" x="677" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="0aaf6982-7014-447b-bb4f-51aa08f0e11e"/> </line> <line> <reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="110f4b1c-f29c-4a96-890a-2776ed939d53"/> </line> <line> - <reportElement stretchType="RelativeToTallestObject" x="555" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="f8d781df-2513-4c15-a7ea-49043bef03d0"/> + <reportElement stretchType="RelativeToTallestObject" x="739" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="f8d781df-2513-4c15-a7ea-49043bef03d0"/> + </line> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement stretchType="RelativeToTallestObject" x="740" y="1" width="60" height="20" isPrintWhenDetailOverflows="true" uuid="9fbcbcf4-72a6-4248-9fc6-f5b746775193"/> + <textElement verticalAlignment="Top"> + <font fontName="SansSerif" size="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{descSituacaoVendaPacote}]]></textFieldExpression> + </textField> + <line> + <reportElement stretchType="RelativeToTallestObject" x="801" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="16e1bf28-b7fc-4709-b985-4f72e0d5548d"/> </line> </band> </detail> @@ -263,30 +284,30 @@ <pageFooter> <band height="24" splitType="Stretch"> <textField pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement x="411" y="2" width="42" height="20" uuid="c143a4c0-043f-4742-911d-b543c971e26d"/> + <reportElement x="555" y="2" width="60" height="20" uuid="c143a4c0-043f-4742-911d-b543c971e26d"/> <textElement textAlignment="Right" verticalAlignment="Top"> - <font fontName="SansSerif" size="6"/> + <font fontName="SansSerif" size="5"/> </textElement> <textFieldExpression><![CDATA[$V{vTotalSubTotal}]]></textFieldExpression> </textField> <textField pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement x="455" y="2" width="46" height="20" uuid="533968db-d01a-48e9-a273-f4388c10bc0c"/> + <reportElement x="616" y="2" width="60" height="20" uuid="533968db-d01a-48e9-a273-f4388c10bc0c"/> <textElement textAlignment="Right" verticalAlignment="Top"> - <font fontName="SansSerif" size="6"/> + <font fontName="SansSerif" size="5"/> </textElement> <textFieldExpression><![CDATA[$V{vTotalDesconto}]]></textFieldExpression> </textField> <textField pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement x="503" y="2" width="51" height="20" uuid="7d9be2b0-855e-442e-b96c-24d0b8ab47dd"/> + <reportElement x="678" y="2" width="60" height="20" uuid="7d9be2b0-855e-442e-b96c-24d0b8ab47dd"/> <textElement textAlignment="Right" verticalAlignment="Top"> - <font fontName="SansSerif" size="6"/> + <font fontName="SansSerif" size="5"/> </textElement> <textFieldExpression><![CDATA[$V{vTotalTotal}]]></textFieldExpression> </textField> <textField> <reportElement x="1" y="2" width="25" height="20" uuid="c44ae1ed-6f37-4a3c-aaad-19b89fc86abb"/> <textElement textAlignment="Center" verticalAlignment="Top"> - <font fontName="SansSerif" size="6"/> + <font fontName="SansSerif" size="5"/> </textElement> <textFieldExpression><![CDATA[$V{vTotalQtdeTarifa}]]></textFieldExpression> </textField> @@ -294,22 +315,25 @@ <reportElement stretchType="RelativeToTallestObject" x="26" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="0fc29162-092d-4b9a-b386-97f77097b2f2"/> </line> <line> - <reportElement positionType="Float" x="0" y="23" width="555" height="1" forecolor="#CCCCCC" uuid="bc27bd15-2e9c-4fd5-b207-4abb5b0a5b5f"/> + <reportElement positionType="Float" x="0" y="23" width="802" height="1" forecolor="#CCCCCC" uuid="bc27bd15-2e9c-4fd5-b207-4abb5b0a5b5f"/> </line> <line> - <reportElement stretchType="RelativeToTallestObject" x="502" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="a6ff630b-8eae-4312-9b46-0048fcfe1d4d"/> + <reportElement stretchType="RelativeToTallestObject" x="677" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="a6ff630b-8eae-4312-9b46-0048fcfe1d4d"/> </line> <line> - <reportElement stretchType="RelativeToTallestObject" x="454" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="c1817cb0-8447-461e-8982-571c2ed5330b"/> + <reportElement stretchType="RelativeToTallestObject" x="615" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="c1817cb0-8447-461e-8982-571c2ed5330b"/> </line> <line> - <reportElement stretchType="RelativeToTallestObject" x="410" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="265e716b-196b-4a4e-a6b1-1b8ee2094e77"/> + <reportElement stretchType="RelativeToTallestObject" x="554" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="265e716b-196b-4a4e-a6b1-1b8ee2094e77"/> </line> <line> <reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="13158cfa-c640-4827-93c4-622f008576a5"/> </line> <line> - <reportElement stretchType="RelativeToTallestObject" x="555" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="8a596ce5-8b1d-4d7b-836e-05343728e5d6"/> + <reportElement stretchType="RelativeToTallestObject" x="739" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="8a596ce5-8b1d-4d7b-836e-05343728e5d6"/> + </line> + <line> + <reportElement stretchType="RelativeToTallestObject" x="801" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="ef5e295d-c708-4979-a8ef-d6f57e394f47"/> </line> </band> </pageFooter> diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasPacotesDetalhadoBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasPacotesDetalhadoBean.java index 006f7f42f..09baa1844 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasPacotesDetalhadoBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasPacotesDetalhadoBean.java @@ -4,9 +4,12 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; +import oracle.net.aso.s; + import org.apache.commons.lang.StringUtils; import com.rjconsultores.ventaboletos.enums.LocalEnderecoApanhe; +import com.rjconsultores.ventaboletos.enums.SituacaoVendaPacote; public class RelatorioVendasPacotesDetalhadoBean { @@ -77,6 +80,7 @@ public class RelatorioVendasPacotesDetalhadoBean { private BigDecimal total; private String nombusuario; private String razaoSocialCliente; + private SituacaoVendaPacote situacaoVendaPacote; public Long getVendapacoteId() { return vendapacoteId; @@ -178,6 +182,10 @@ public class RelatorioVendasPacotesDetalhadoBean { return StringUtils.isNotBlank(deschotel) ? deschotel : localEnderecoApanhe != null ? localEnderecoApanhe.toString() : ""; } + public String getDescSituacaoVendaPacote() { + return situacaoVendaPacote != null ? situacaoVendaPacote.toString() : ""; + } + @Override public int hashCode() { final int prime = 31; @@ -203,6 +211,14 @@ public class RelatorioVendasPacotesDetalhadoBean { return true; } + public SituacaoVendaPacote getSituacaoVendaPacote() { + return situacaoVendaPacote; + } + + public void setSituacaoVendaPacote(SituacaoVendaPacote situacaoVendaPacote) { + this.situacaoVendaPacote = situacaoVendaPacote; + } + } } diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java index f91b3db23..a8991f52d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java @@ -82,7 +82,7 @@ public class EditarFormaPagoController extends MyGenericForwardComposer { rd3.setChecked(true); } - if (formaPago.getFormapagoId() <= 11 || (formaPago.getFormapagoId() >= 96 && formaPago.getFormapagoId() <= 99)) { + if (formaPago.getFormapagoId() <= 11 || (formaPago.getFormapagoId() >= 94 && formaPago.getFormapagoId() <= 99)) { btnApagar.setVisible(Boolean.FALSE); btnSalvar.setVisible(Boolean.FALSE); txtNome.setDisabled(Boolean.TRUE); diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index d74c5c887..7b5c4bde1 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -249,8 +249,8 @@ indexController.mniRelatorioDemandas.label = Relatório de Demandas indexController.mniRelatorioReceitaServico.label = Relatório de Receita por Serviço indexController.mniPrecoApanhe.label = Preço Apanhe indexController.mniRelatorioVendasPacotesResumido.label = Vendas de Pacotes - Resumido -indexController.mniRelatorioVendasPacotesDetalhado.label = Ventas de Pacotes - Detalhado -indexController.mniRelatorioVendasPacotesBoletos.label = Ventas de Pacotes - Boletos +indexController.mniRelatorioVendasPacotesDetalhado.label = Vendas de Pacotes - Detalhado +indexController.mniRelatorioVendasPacotesBoletos.label = Vendas de Pacotes - Boletos indexController.mnSubMenuImpressaoFiscal.label=Impressão Fiscal indexController.mnSubMenuRelatorioImpressaoFiscal.label=Relatório Impressão Fiscal