diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDescontosTipo2.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDescontosTipo2.jasper index da20f8f6f..ef8254d9c 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDescontosTipo2.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDescontosTipo2.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDescontosTipo2.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDescontosTipo2.jrxml index 8c9037e5d..55064855d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDescontosTipo2.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDescontosTipo2.jrxml @@ -1,7 +1,7 @@ - + - + @@ -56,266 +56,29 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <band height="102" splitType="Stretch"> - <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false"> - <reportElement uuid="b8a08223-0a24-43a7-8ebe-17a3db2d83fe" mode="Transparent" x="1124" y="59" width="73" height="24" forecolor="#000000" backcolor="#FFFFFF"/> - <textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none"> + <textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false"> + <reportElement uuid="b8a08223-0a24-43a7-8ebe-17a3db2d83fe" mode="Transparent" x="497" y="61" width="181" height="12" forecolor="#000000" backcolor="#FFFFFF"/> + <textElement verticalAlignment="Middle" rotation="None" markup="none"> <font fontName="SansSerif" size="8" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> </textElement> <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement uuid="d095c344-00e0-4532-8035-8b93ef192a56" x="1024" y="59" width="100" height="24"/> + <reportElement uuid="d095c344-00e0-4532-8035-8b93ef192a56" x="353" y="61" width="144" height="12"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="8" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="false"> - <reportElement uuid="eceda28e-b177-4d40-a99f-bce905486f71" mode="Transparent" x="0" y="0" width="1200" height="25" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement uuid="eceda28e-b177-4d40-a99f-bce905486f71" mode="Transparent" x="0" y="0" width="1360" height="25" forecolor="#000000" backcolor="#FFFFFF"/> <box> <pen lineWidth="0.5"/> <topPen lineWidth="0.5"/> @@ -329,46 +92,30 @@ </textElement> <textFieldExpression><![CDATA[$P{nomeRelatorio}]]></textFieldExpression> </textField> - <textField isStretchWithOverflow="true" evaluationTime="Report" pattern="" isBlankWhenNull="false"> - <reportElement uuid="17bc8d21-5221-4757-ade1-9b3d1b4c10ce" mode="Transparent" x="1178" y="46" width="19" height="12" forecolor="#000000" backcolor="#FFFFFF"/> - <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none"> - <font fontName="SansSerif" size="8" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> - <paragraph lineSpacing="Single"/> - </textElement> - <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="false"> - <reportElement uuid="8857ff4c-243b-4073-9466-98722a23eccf" mode="Transparent" x="1024" y="32" width="173" height="12" forecolor="#000000" backcolor="#FFFFFF"/> - <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> - <font fontName="SansSerif" size="8" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> - <paragraph lineSpacing="Single"/> - </textElement> - <textFieldExpression><![CDATA[$R{cabecalho.pagina} + " " + $V{PAGE_NUMBER} + " " + $R{cabecalho.de}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true"> - <reportElement uuid="65e099b5-ddc7-4f45-a453-38ab8cc4cb7c" mode="Transparent" x="1024" y="84" width="173" height="12" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> - <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> + <textField pattern="" isBlankWhenNull="true"> + <reportElement uuid="65e099b5-ddc7-4f45-a453-38ab8cc4cb7c" mode="Transparent" x="497" y="73" width="181" height="12" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> + <textElement verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> </textElement> <textFieldExpression><![CDATA[$R{cabecalho.impressorPor} + " " + $P{usuario}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy"> - <reportElement uuid="145289a7-0f0a-4aa0-aab7-2bad8b44292e" x="113" y="49" width="100" height="12" isPrintWhenDetailOverflows="true"/> + <reportElement uuid="145289a7-0f0a-4aa0-aab7-2bad8b44292e" x="126" y="49" width="111" height="12" isPrintWhenDetailOverflows="true"/> <textElement> <font size="8"/> </textElement> <textFieldExpression><![CDATA[$P{fecVentaInicial}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy"> - <reportElement uuid="74a3108b-f2bf-4a05-8a0e-ef3bc6e23e78" x="113" y="61" width="100" height="12" isPrintWhenDetailOverflows="true"/> + <reportElement uuid="74a3108b-f2bf-4a05-8a0e-ef3bc6e23e78" x="126" y="61" width="111" height="12" isPrintWhenDetailOverflows="true"/> <textElement> <font size="8"/> </textElement> <textFieldExpression><![CDATA[$P{fecVentaFinal}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="4ea6cfd8-2183-4d3a-b7fc-51ece4715dd9" x="113" y="37" width="100" height="12" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement uuid="4ea6cfd8-2183-4d3a-b7fc-51ece4715dd9" x="126" y="37" width="111" height="12" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement> <font size="8"/> <paragraph lineSpacing="Single"/> @@ -376,14 +123,14 @@ <textFieldExpression><![CDATA[$P{codconvenio}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="c95a7200-7032-4a56-abca-615be605f781" x="113" y="73" width="100" height="12" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement uuid="c95a7200-7032-4a56-abca-615be605f781" x="126" y="73" width="111" height="12" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement> <font size="8"/> </textElement> <textFieldExpression><![CDATA[$P{puntoVenta}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement uuid="0fb0788e-1dae-4756-8d2d-076ed62e733c" x="3" y="37" width="110" height="12"> + <reportElement uuid="0fb0788e-1dae-4756-8d2d-076ed62e733c" x="0" y="37" width="126" height="12"> <printWhenExpression><![CDATA[new Boolean($P{codconvenio} != null && !$P{codconvenio}.isEmpty())]]></printWhenExpression> </reportElement> <textElement> @@ -392,21 +139,21 @@ <textFieldExpression><![CDATA[$R{label.codConvenio}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement uuid="1ffb28ce-353b-45c6-95a3-ba5c40faa4b5" x="3" y="49" width="110" height="12"/> + <reportElement uuid="1ffb28ce-353b-45c6-95a3-ba5c40faa4b5" x="0" y="49" width="126" height="12"/> <textElement> <font size="8" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.fecVentaInicial}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement uuid="c52ee81b-b6a0-44cd-b0e0-c61177419f22" x="3" y="61" width="110" height="12"/> + <reportElement uuid="c52ee81b-b6a0-44cd-b0e0-c61177419f22" x="0" y="61" width="126" height="12"/> <textElement> <font size="8" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.fecVentaFinal}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement uuid="2c80eede-1c35-4bec-8c97-3ea0ea54ed16" x="3" y="73" width="110" height="12"> + <reportElement uuid="2c80eede-1c35-4bec-8c97-3ea0ea54ed16" x="0" y="73" width="126" height="12"> <printWhenExpression><![CDATA[new Boolean($P{puntoVenta} != null)]]></printWhenExpression> </reportElement> <textElement> @@ -414,137 +161,333 @@ </textElement> <textFieldExpression><![CDATA[$R{label.puntoVenta}]]></textFieldExpression> </textField> - <line> - <reportElement uuid="d6ec8319-dcf8-42f7-bb0f-64235db1f2da" x="40" y="97" width="1157" height="1"/> - <graphicElement> - <pen lineWidth="0.5"/> - </graphicElement> - </line> </band> - - - - + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - + - + - - + + - + - - + + @@ -561,41 +504,41 @@ - + - + - + - + - + - + @@ -606,7 +549,7 @@ - +