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

Conflicts solved. fixes bug#Al-4549

master
Fernando Abimael Alvarez Uc 2024-08-01 14:48:20 -06:00
parent 448c09da9b 4735078461
commit d0066b29ed
7 changed files with 20468 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -4,11 +4,11 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.116.6</version> <version>1.117.3</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<modelWeb.version>1.88.3</modelWeb.version> <modelWeb.version>1.89.0</modelWeb.version>
<flyway.version>1.76.1</flyway.version> <flyway.version>1.76.1</flyway.version>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties> </properties>
@ -126,7 +126,7 @@
<dependency> <dependency>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>GeneradorBoletosCNAB</artifactId> <artifactId>GeneradorBoletosCNAB</artifactId>
<version>1.7.1</version> <version>1.8.0</version>
</dependency> </dependency>
<dependency> <dependency>

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

Binary file not shown.

16
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTaxasLinhaPorDataEmissao.jrxml
View File

@ -398,14 +398,14 @@
<text><![CDATA[Origem]]></text> <text><![CDATA[Origem]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="4f8fcbb3-73e7-4b15-9687-30ff12bb1526" x="93" y="1" width="61" height="11" isPrintWhenDetailOverflows="true"/> <reportElement uuid="4f8fcbb3-73e7-4b15-9687-30ff12bb1526" x="92" y="1" width="61" height="11" isPrintWhenDetailOverflows="true"/>
<textElement> <textElement>
<font size="7"/> <font size="7"/>
</textElement> </textElement>
<text><![CDATA[Destino]]></text> <text><![CDATA[Destino]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="7b817589-f754-49f1-bf53-856be52946fb" mode="Transparent" x="186" y="1" width="25" height="11" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"> <reportElement uuid="7b817589-f754-49f1-bf53-856be52946fb" mode="Transparent" x="187" y="1" width="24" height="11" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF">
<printWhenExpression><![CDATA[$P{IS_TX_EMBARQUE}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_TX_EMBARQUE}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
@ -535,8 +535,8 @@
<text><![CDATA[T. SO]]></text> <text><![CDATA[T. SO]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="8f6976c6-bd48-447f-a07f-f6bbbc33b8f6" mode="Transparent" x="154" y="1" width="32" height="11" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> <reportElement uuid="8f6976c6-bd48-447f-a07f-f6bbbc33b8f6" mode="Transparent" x="153" y="1" width="34" height="11" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="7" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <font fontName="SansSerif" size="7" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
</textElement> </textElement>
@ -553,7 +553,7 @@
<textFieldExpression><![CDATA[$F{PREFIXO}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{PREFIXO}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="d19cff45-ad13-4a6b-b6f3-3e871a6d8d58" x="93" y="1" width="61" height="11"/> <reportElement uuid="d19cff45-ad13-4a6b-b6f3-3e871a6d8d58" x="92" y="1" width="61" height="11"/>
<box rightPadding="5"/> <box rightPadding="5"/>
<textElement/> <textElement/>
<textFieldExpression><![CDATA[$F{CIDADE_DESTINO}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{CIDADE_DESTINO}]]></textFieldExpression>
@ -565,7 +565,7 @@
<textFieldExpression><![CDATA[$F{CIDADE_ORIGEM}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{CIDADE_ORIGEM}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00"> <textField pattern="#,##0.00">
<reportElement uuid="6454beed-fb72-4aa5-8bff-7eb4ea6c26ba" x="186" y="1" width="25" height="11"> <reportElement uuid="6454beed-fb72-4aa5-8bff-7eb4ea6c26ba" x="187" y="1" width="24" height="11">
<printWhenExpression><![CDATA[$P{IS_TX_EMBARQUE}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_TX_EMBARQUE}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right" markup="none"/> <textElement textAlignment="Right" markup="none"/>
@ -656,8 +656,8 @@
<textFieldExpression><![CDATA[$F{totalValorseguroOpcionalVendido}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{totalValorseguroOpcionalVendido}]]></textFieldExpression>
</textField> </textField>
<textField pattern="dd/MM/yyyy" isBlankWhenNull="true"> <textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement uuid="da706924-1662-451e-8841-3b6559657b90" x="154" y="1" width="32" height="11"/> <reportElement uuid="da706924-1662-451e-8841-3b6559657b90" x="153" y="1" width="34" height="11"/>
<textElement textAlignment="Right" markup="none"/> <textElement textAlignment="Center" markup="none"/>
<textFieldExpression><![CDATA[$F{fecHorventa}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{fecHorventa}]]></textFieldExpression>
</textField> </textField>
</band> </band>

8
web/WEB-INF/i3-label_en.label
View File

@ -7875,6 +7875,14 @@ indexController.mniRelatorioRemarcacaoDevolucao.label = Redial/Refund
indexController.mniRelatorioRemarcacaoPassagensTransferencia.label = Ticket/Transfer Rebooking indexController.mniRelatorioRemarcacaoPassagensTransferencia.label = Ticket/Transfer Rebooking
# Relatório CNAB # Relatório CNAB
indexController.mniRelatorioRemessaCNAB.label = Batch Shipment (CNAB 400) indexController.mniRelatorioRemessaCNAB.label = Batch Shipment (CNAB 400)
relatorioRemessaCNAB.exception.ValidacaoRemessaConvenioException=The agreement code does not match the bank code \r\nplease contact support!
relatorioRemessaCNAB.exception.ValidacaoRemessaMontagemCabecalhoException=There was an error assembling the shipping file header\r\nPlease contact support!
relatorioRemessaCNAB.exception.ValidacaoRemessaCNPJException=The CNPJ of the point of sale {0} is out of standard, please correct
relatorioRemessaCNAB.exception.ValidacaoRemessaLogradouroException=The street address of the point of sale {0} is out of standard, please correct it.
relatorioRemessaCNAB.exception.ValidacaoRemessaBairroException="The neighborhood of the point of sale {0} is out of standard, please correct
relatorioRemessaCNAB.exception.ValidacaoRemessaCidadeException=The city of the point of sale {0} is out of standard, please correct
relatorioRemessaCNAB.exception.ValidacaoRemessaEstadoException=The state of the point of sale {0} is out of standard, please correct
relatorioRemessaCNAB.exception.ValidacaoRemessaCVEEstadoException=The CVE State of the point of sale {0} is out of standard, please correct
indexController.mniRelatorioResumoLinhas.label = Line Summary indexController.mniRelatorioResumoLinhas.label = Line Summary
indexController.mniRelatorioResumoVendaOrgaoConcedente.label = Sale Summary Report Granting Authority indexController.mniRelatorioResumoVendaOrgaoConcedente.label = Sale Summary Report Granting Authority
# Retorno Bancario # Retorno Bancario

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

File diff suppressed because it is too large Load Diff

10205
web/WEB-INF/i3-label_fr_FR.label
View File

File diff suppressed because it is too large Load Diff

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

@ -9656,6 +9656,14 @@ relatorioRemessaCNAB.lbRemessa.value = Enviado
relatorioRemessaCNAB.lbValor.value = Valor relatorioRemessaCNAB.lbValor.value = Valor
relatorioRemessaCNAB.reenviarGerados.label = Reenviar boletos já enviados? relatorioRemessaCNAB.reenviarGerados.label = Reenviar boletos já enviados?
relatorioRemessaCNAB.window.title = Remessa de Lote de Boletos Bancários relatorioRemessaCNAB.window.title = Remessa de Lote de Boletos Bancários
relatorioRemessaCNAB.exception.ValidacaoRemessaConvenioException=O codigo de convênio não confere com o codigo do banco \r\n favor entrar em contato com o suporte!
relatorioRemessaCNAB.exception.ValidacaoRemessaMontagemCabecalhoException=Houve um erro na montagem do cabeçalho do arquivo de remessa \r\n favor entrar em contato com o suporte!
relatorioRemessaCNAB.exception.ValidacaoRemessaCNPJException=O CNPJ do ponto de venda {0} está fora do padrão, favor corrigir
relatorioRemessaCNAB.exception.ValidacaoRemessaLogradouroException=O Logradouro do ponto de venda {0} está fora do padrão, favor corrigir.
relatorioRemessaCNAB.exception.ValidacaoRemessaBairroException="O Bairro do ponto de venda {0} está fora do padrão, favor corrigir
relatorioRemessaCNAB.exception.ValidacaoRemessaCidadeException=A cidade do ponto de venda {0} está fora do padrão, favor corrigir
relatorioRemessaCNAB.exception.ValidacaoRemessaEstadoException=O Estado do ponto de venda {0} está fora do padrão, favor corrigir
relatorioRemessaCNAB.exception.ValidacaoRemessaCVEEstadoException=O CVE Estado do ponto de venda {0} está fora do padrão, favor corrigir
relatorioResumoLinhasAnaliticoSumarizadoCompletoController.window.title = Relatório Resumo de Linhas Analítico Sumarizado Completo relatorioResumoLinhasAnaliticoSumarizadoCompletoController.window.title = Relatório Resumo de Linhas Analítico Sumarizado Completo
relatorioResumoLinhasAnaliticoSumarizadoSimplificadoController.window.title = Relatório Resumo de Linhas Analítico Sumarizado Simplificado relatorioResumoLinhasAnaliticoSumarizadoSimplificadoController.window.title = Relatório Resumo de Linhas Analítico Sumarizado Simplificado
relatorioResumoLinhasController.lbAte.value = até relatorioResumoLinhasController.lbAte.value = até