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

Merge pull request 'fixes bug#AL-1558' (#41) from AL-1558 into master 

Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/41
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
master 1.0.31
Gleison da Cruz 2023-01-04 14:03:33 +00:00
parent 139fa3a370 7df5a939b8
commit de78c64fea
5 changed files with 307 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -9,7 +9,7 @@
<properties> <properties>
<modelWeb.version>1.0.20</modelWeb.version> <modelWeb.version>1.0.20</modelWeb.version>
<flyway.version>1.0.12</flyway.version> <flyway.version>1.0.11</flyway.version>
</properties> </properties>
<distributionManagement> <distributionManagement>

5
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_es.properties
View File

@ -48,12 +48,15 @@ detail.rg=RG
detail.status=Status detail.status=Status
detail.codOrigem=Cod. Origem detail.codOrigem=Cod. Origem
detail.codDestino=Cod. Destino detail.codDestino=Cod. Destino
detail.total=Total detail.total=Total:
detail.totalComDesconto=Total c/ desconto detail.totalComDesconto=Total c/ desconto
detail.totalSemDesconto=Total s/ desconto detail.totalSemDesconto=Total s/ desconto
detail.totalVendido=Total vendido detail.totalVendido=Total vendido
detail.ccf=CCf detail.ccf=CCf
detail.chaveBPe=Ch. BP-e detail.chaveBPe=Ch. BP-e
detail.totalV=Total Vendido:
detail.totalC=Total Cobrado:
detail.totalP=Total Preço:
linhas=Linhas linhas=Linhas

5
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_pt_BR.properties
View File

@ -48,12 +48,15 @@ detail.rg=RG
detail.status=Status detail.status=Status
detail.codOrigem=Cod. Origem detail.codOrigem=Cod. Origem
detail.codDestino=Cod. Destino detail.codDestino=Cod. Destino
detail.total=Total detail.total=Total:
detail.totalComDesconto=Total c/ desconto detail.totalComDesconto=Total c/ desconto
detail.totalSemDesconto=Total s/ desconto detail.totalSemDesconto=Total s/ desconto
detail.totalVendido=Total vendido detail.totalVendido=Total vendido
detail.ccf=CCf detail.ccf=CCf
detail.chaveBPe=Ch. BP-e detail.chaveBPe=Ch. BP-e
detail.totalV=Total Vendido:
detail.totalC=Total Cobrado:
detail.totalP=Total Preço:
linhas=Linhas linhas=Linhas

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

Binary file not shown.

51
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-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="RelatorioEmpresaCorrida" pageWidth="1152" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1132" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" resourceBundle="RelatorioEmpresaCorrida" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e"> <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="RelatorioEmpresaCorrida" pageWidth="1152" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1132" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" resourceBundle="RelatorioEmpresaCorrida" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e">
<property name="ireport.zoom" value="2.923075650000008"/> <property name="ireport.zoom" value="2.923075650000008"/>
<property name="ireport.x" value="0"/> <property name="ireport.x" value="90"/>
<property name="ireport.y" value="220"/> <property name="ireport.y" value="186"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/> <property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/>
<parameter name="fecInicioViagem" class="java.lang.String"> <parameter name="fecInicioViagem" class="java.lang.String">
<defaultValueExpression><![CDATA[]]></defaultValueExpression> <defaultValueExpression><![CDATA[]]></defaultValueExpression>
@ -600,29 +600,60 @@
<band height="18"> <band height="18">
<textField> <textField>
<reportElement uuid="5fdd8d50-c70b-4a5c-9621-5b91642257bf" x="0" y="0" width="139" height="18"/> <reportElement uuid="5fdd8d50-c70b-4a5c-9621-5b91642257bf" x="0" y="0" width="139" height="18"/>
<textElement textAlignment="Right"/> <textElement textAlignment="Right">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.total}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{detail.total}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="6005f63d-1abc-408d-9af2-adea341fadda" x="182" y="0" width="75" height="18"/> <reportElement uuid="6005f63d-1abc-408d-9af2-adea341fadda" x="182" y="0" width="75" height="18"/>
<textElement/> <textElement>
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$V{qtde}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{qtde}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<reportElement uuid="91cfa7bb-414a-41a5-8971-4b91012dbc4d" x="779" y="0" width="90" height="18"/> <reportElement uuid="91cfa7bb-414a-41a5-8971-4b91012dbc4d" x="474" y="0" width="98" height="18"/>
<textElement textAlignment="Right"/> <textElement textAlignment="Right">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$V{total_sem_desconto}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{total_sem_desconto}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<reportElement uuid="779b8652-d8e3-4b84-85f2-d37ef88488b9" x="869" y="0" width="90" height="18"/> <reportElement uuid="779b8652-d8e3-4b84-85f2-d37ef88488b9" x="709" y="0" width="98" height="18"/>
<textElement textAlignment="Right"/> <textElement textAlignment="Right">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$V{total_com_desconto}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{total_com_desconto}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<reportElement uuid="97a0b50b-6760-4619-86ea-ea6ac23547d9" x="959" y="0" width="90" height="18"/> <reportElement uuid="97a0b50b-6760-4619-86ea-ea6ac23547d9" x="943" y="0" width="98" height="18"/>
<textElement textAlignment="Right"/> <textElement textAlignment="Right">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$V{total_vendido}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{total_vendido}]]></textFieldExpression>
</textField> </textField>
<textField>
<reportElement uuid="7702e077-cc45-41e8-83d7-a6b45fcd5a80" x="361" y="0" width="104" height="18"/>
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.totalP}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="7d8e9e1e-3fb6-4b08-8b72-4ff02b598be5" x="591" y="0" width="104" height="18"/>
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.totalC}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="1fe1943b-acc0-4514-8c0e-3c63aae5c329" x="822" y="0" width="104" height="18"/>
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.totalV}]]></textFieldExpression>
</textField>
</band> </band>
</summary> </summary>
<noData> <noData>