Merge pull request 'fixes bug#AL-3280' (!297) from AL-3280 into master
Reviewed-on: adm/VentaBoletosAdm#297 Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>master 1.26.2
commit
9cf79e7bcc
2
pom.xml
2
pom.xml
|
@ -4,7 +4,7 @@
|
||||||
<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.26.1</version>
|
<version>1.26.2</version>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
|
Binary file not shown.
|
@ -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="RelatorioReceitaServico" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="c092ef85-9334-4225-93d7-1acb7cf4d021">
|
<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="RelatorioReceitaServico" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="c092ef85-9334-4225-93d7-1acb7cf4d021">
|
||||||
<property name="ireport.zoom" value="1.2100000000000002"/>
|
<property name="ireport.zoom" value="1.610510000000001"/>
|
||||||
<property name="ireport.x" value="0"/>
|
<property name="ireport.x" value="0"/>
|
||||||
<property name="ireport.y" value="70"/>
|
<property name="ireport.y" value="0"/>
|
||||||
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="pageHeader"/>
|
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="pageHeader"/>
|
||||||
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.1" value="columnHeader"/>
|
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.1" value="columnHeader"/>
|
||||||
<parameter name="NOME_RELATORIO" class="java.lang.String"/>
|
<parameter name="NOME_RELATORIO" class="java.lang.String"/>
|
||||||
|
@ -91,6 +91,9 @@
|
||||||
<band height="50">
|
<band height="50">
|
||||||
<staticText>
|
<staticText>
|
||||||
<reportElement uuid="5f9a0ea4-15d3-4bad-953a-0dc6f3f6ef51" x="1" y="22" width="48" height="28"/>
|
<reportElement uuid="5f9a0ea4-15d3-4bad-953a-0dc6f3f6ef51" x="1" y="22" width="48" height="28"/>
|
||||||
|
<box>
|
||||||
|
<bottomPen lineWidth="0.75"/>
|
||||||
|
</box>
|
||||||
<textElement textAlignment="Left">
|
<textElement textAlignment="Left">
|
||||||
<font size="7" isItalic="false"/>
|
<font size="7" isItalic="false"/>
|
||||||
</textElement>
|
</textElement>
|
||||||
|
@ -98,6 +101,9 @@
|
||||||
</staticText>
|
</staticText>
|
||||||
<staticText>
|
<staticText>
|
||||||
<reportElement uuid="fa0a31b5-6a94-4b0c-b730-4b6ef8f2304c" x="49" y="22" width="51" height="28"/>
|
<reportElement uuid="fa0a31b5-6a94-4b0c-b730-4b6ef8f2304c" x="49" y="22" width="51" height="28"/>
|
||||||
|
<box>
|
||||||
|
<bottomPen lineWidth="0.75"/>
|
||||||
|
</box>
|
||||||
<textElement textAlignment="Left">
|
<textElement textAlignment="Left">
|
||||||
<font size="7" isBold="true" isItalic="false"/>
|
<font size="7" isBold="true" isItalic="false"/>
|
||||||
</textElement>
|
</textElement>
|
||||||
|
@ -105,6 +111,9 @@
|
||||||
</staticText>
|
</staticText>
|
||||||
<staticText>
|
<staticText>
|
||||||
<reportElement uuid="a797bc17-1810-47b7-a3e1-510cc6403454" x="100" y="22" width="66" height="28"/>
|
<reportElement uuid="a797bc17-1810-47b7-a3e1-510cc6403454" x="100" y="22" width="66" height="28"/>
|
||||||
|
<box>
|
||||||
|
<bottomPen lineWidth="0.75"/>
|
||||||
|
</box>
|
||||||
<textElement textAlignment="Left">
|
<textElement textAlignment="Left">
|
||||||
<font size="7" isBold="false" isItalic="false"/>
|
<font size="7" isBold="false" isItalic="false"/>
|
||||||
</textElement>
|
</textElement>
|
||||||
|
@ -112,6 +121,9 @@
|
||||||
</staticText>
|
</staticText>
|
||||||
<staticText>
|
<staticText>
|
||||||
<reportElement uuid="765ebd99-b6de-4c8e-910d-b3e5bf9db573" x="166" y="22" width="30" height="28"/>
|
<reportElement uuid="765ebd99-b6de-4c8e-910d-b3e5bf9db573" x="166" y="22" width="30" height="28"/>
|
||||||
|
<box>
|
||||||
|
<bottomPen lineWidth="0.75"/>
|
||||||
|
</box>
|
||||||
<textElement textAlignment="Left">
|
<textElement textAlignment="Left">
|
||||||
<font size="7" isItalic="false"/>
|
<font size="7" isItalic="false"/>
|
||||||
</textElement>
|
</textElement>
|
||||||
|
@ -119,6 +131,9 @@
|
||||||
</staticText>
|
</staticText>
|
||||||
<staticText>
|
<staticText>
|
||||||
<reportElement uuid="2f3b9ac0-165c-4718-96c8-a37f005b5b82" x="196" y="22" width="33" height="28"/>
|
<reportElement uuid="2f3b9ac0-165c-4718-96c8-a37f005b5b82" x="196" y="22" width="33" height="28"/>
|
||||||
|
<box>
|
||||||
|
<bottomPen lineWidth="0.75"/>
|
||||||
|
</box>
|
||||||
<textElement textAlignment="Left">
|
<textElement textAlignment="Left">
|
||||||
<font size="7" isItalic="false"/>
|
<font size="7" isItalic="false"/>
|
||||||
</textElement>
|
</textElement>
|
||||||
|
@ -126,6 +141,9 @@
|
||||||
</staticText>
|
</staticText>
|
||||||
<staticText>
|
<staticText>
|
||||||
<reportElement uuid="9eb87b55-da02-478a-b21d-c7b727dbaafe" x="229" y="22" width="68" height="28"/>
|
<reportElement uuid="9eb87b55-da02-478a-b21d-c7b727dbaafe" x="229" y="22" width="68" height="28"/>
|
||||||
|
<box>
|
||||||
|
<bottomPen lineWidth="0.75"/>
|
||||||
|
</box>
|
||||||
<textElement textAlignment="Left">
|
<textElement textAlignment="Left">
|
||||||
<font size="7" isItalic="false"/>
|
<font size="7" isItalic="false"/>
|
||||||
</textElement>
|
</textElement>
|
||||||
|
@ -133,6 +151,9 @@
|
||||||
</staticText>
|
</staticText>
|
||||||
<staticText>
|
<staticText>
|
||||||
<reportElement uuid="fe1e6ace-6d95-4089-8f28-d926554bf65d" x="297" y="22" width="40" height="28"/>
|
<reportElement uuid="fe1e6ace-6d95-4089-8f28-d926554bf65d" x="297" y="22" width="40" height="28"/>
|
||||||
|
<box>
|
||||||
|
<bottomPen lineWidth="0.75"/>
|
||||||
|
</box>
|
||||||
<textElement textAlignment="Left">
|
<textElement textAlignment="Left">
|
||||||
<font size="7" isItalic="false"/>
|
<font size="7" isItalic="false"/>
|
||||||
</textElement>
|
</textElement>
|
||||||
|
@ -140,6 +161,9 @@
|
||||||
</staticText>
|
</staticText>
|
||||||
<staticText>
|
<staticText>
|
||||||
<reportElement uuid="52d26417-4766-44b3-aaa7-b468c124feda" x="374" y="22" width="34" height="28"/>
|
<reportElement uuid="52d26417-4766-44b3-aaa7-b468c124feda" x="374" y="22" width="34" height="28"/>
|
||||||
|
<box>
|
||||||
|
<bottomPen lineWidth="0.75"/>
|
||||||
|
</box>
|
||||||
<textElement textAlignment="Left">
|
<textElement textAlignment="Left">
|
||||||
<font size="7" isItalic="false"/>
|
<font size="7" isItalic="false"/>
|
||||||
</textElement>
|
</textElement>
|
||||||
|
@ -147,6 +171,9 @@
|
||||||
</staticText>
|
</staticText>
|
||||||
<staticText>
|
<staticText>
|
||||||
<reportElement uuid="3f6afcbf-9dfe-4f1b-b937-45dbc9ace8a2" x="408" y="22" width="41" height="28"/>
|
<reportElement uuid="3f6afcbf-9dfe-4f1b-b937-45dbc9ace8a2" x="408" y="22" width="41" height="28"/>
|
||||||
|
<box>
|
||||||
|
<bottomPen lineWidth="0.75"/>
|
||||||
|
</box>
|
||||||
<textElement textAlignment="Left">
|
<textElement textAlignment="Left">
|
||||||
<font size="7" isItalic="false" isStrikeThrough="false"/>
|
<font size="7" isItalic="false" isStrikeThrough="false"/>
|
||||||
</textElement>
|
</textElement>
|
||||||
|
@ -154,6 +181,9 @@
|
||||||
</staticText>
|
</staticText>
|
||||||
<staticText>
|
<staticText>
|
||||||
<reportElement uuid="182474d6-668a-4847-9db6-ba65c41119aa" x="449" y="22" width="40" height="28"/>
|
<reportElement uuid="182474d6-668a-4847-9db6-ba65c41119aa" x="449" y="22" width="40" height="28"/>
|
||||||
|
<box>
|
||||||
|
<bottomPen lineWidth="0.75"/>
|
||||||
|
</box>
|
||||||
<textElement textAlignment="Left">
|
<textElement textAlignment="Left">
|
||||||
<font size="7" isItalic="false"/>
|
<font size="7" isItalic="false"/>
|
||||||
</textElement>
|
</textElement>
|
||||||
|
@ -161,6 +191,9 @@
|
||||||
</staticText>
|
</staticText>
|
||||||
<staticText>
|
<staticText>
|
||||||
<reportElement uuid="a7b14fa8-3b89-4f4d-b265-63eb3d930b04" x="489" y="22" width="40" height="28"/>
|
<reportElement uuid="a7b14fa8-3b89-4f4d-b265-63eb3d930b04" x="489" y="22" width="40" height="28"/>
|
||||||
|
<box>
|
||||||
|
<bottomPen lineWidth="0.75"/>
|
||||||
|
</box>
|
||||||
<textElement>
|
<textElement>
|
||||||
<font size="7" isItalic="false"/>
|
<font size="7" isItalic="false"/>
|
||||||
</textElement>
|
</textElement>
|
||||||
|
@ -168,6 +201,9 @@
|
||||||
</staticText>
|
</staticText>
|
||||||
<staticText>
|
<staticText>
|
||||||
<reportElement uuid="10f27b7d-5cc9-423c-a196-330c78cdb69e" x="529" y="22" width="73" height="28"/>
|
<reportElement uuid="10f27b7d-5cc9-423c-a196-330c78cdb69e" x="529" y="22" width="73" height="28"/>
|
||||||
|
<box>
|
||||||
|
<bottomPen lineWidth="0.75"/>
|
||||||
|
</box>
|
||||||
<textElement>
|
<textElement>
|
||||||
<font size="7" isItalic="false"/>
|
<font size="7" isItalic="false"/>
|
||||||
</textElement>
|
</textElement>
|
||||||
|
@ -175,6 +211,9 @@
|
||||||
</staticText>
|
</staticText>
|
||||||
<staticText>
|
<staticText>
|
||||||
<reportElement uuid="f2097833-6bd3-4523-b457-44ed6cc4abd6" x="602" y="22" width="43" height="28"/>
|
<reportElement uuid="f2097833-6bd3-4523-b457-44ed6cc4abd6" x="602" y="22" width="43" height="28"/>
|
||||||
|
<box>
|
||||||
|
<bottomPen lineWidth="0.75"/>
|
||||||
|
</box>
|
||||||
<textElement>
|
<textElement>
|
||||||
<font size="7" isItalic="false"/>
|
<font size="7" isItalic="false"/>
|
||||||
</textElement>
|
</textElement>
|
||||||
|
@ -182,6 +221,9 @@
|
||||||
</staticText>
|
</staticText>
|
||||||
<staticText>
|
<staticText>
|
||||||
<reportElement uuid="44b2bf55-871a-4eaa-97d4-74bee2a89769" x="678" y="22" width="78" height="28"/>
|
<reportElement uuid="44b2bf55-871a-4eaa-97d4-74bee2a89769" x="678" y="22" width="78" height="28"/>
|
||||||
|
<box>
|
||||||
|
<bottomPen lineWidth="0.75"/>
|
||||||
|
</box>
|
||||||
<textElement>
|
<textElement>
|
||||||
<font size="7" isItalic="false"/>
|
<font size="7" isItalic="false"/>
|
||||||
</textElement>
|
</textElement>
|
||||||
|
@ -189,6 +231,9 @@
|
||||||
</staticText>
|
</staticText>
|
||||||
<staticText>
|
<staticText>
|
||||||
<reportElement uuid="2abbc372-a813-4da6-8ce1-e5901a15b430" x="756" y="22" width="45" height="28"/>
|
<reportElement uuid="2abbc372-a813-4da6-8ce1-e5901a15b430" x="756" y="22" width="45" height="28"/>
|
||||||
|
<box>
|
||||||
|
<bottomPen lineWidth="0.75"/>
|
||||||
|
</box>
|
||||||
<textElement>
|
<textElement>
|
||||||
<font size="7" isItalic="false"/>
|
<font size="7" isItalic="false"/>
|
||||||
</textElement>
|
</textElement>
|
||||||
|
@ -196,6 +241,9 @@
|
||||||
</staticText>
|
</staticText>
|
||||||
<staticText>
|
<staticText>
|
||||||
<reportElement uuid="bceca474-7703-4bf0-a0da-d8e15b70aeca" x="645" y="22" width="33" height="28"/>
|
<reportElement uuid="bceca474-7703-4bf0-a0da-d8e15b70aeca" x="645" y="22" width="33" height="28"/>
|
||||||
|
<box>
|
||||||
|
<bottomPen lineWidth="0.75"/>
|
||||||
|
</box>
|
||||||
<textElement>
|
<textElement>
|
||||||
<font size="7" isItalic="false"/>
|
<font size="7" isItalic="false"/>
|
||||||
</textElement>
|
</textElement>
|
||||||
|
@ -203,6 +251,9 @@
|
||||||
</staticText>
|
</staticText>
|
||||||
<staticText>
|
<staticText>
|
||||||
<reportElement uuid="39e49959-967f-4fd2-8b92-a0331dcce1e3" x="337" y="22" width="37" height="28"/>
|
<reportElement uuid="39e49959-967f-4fd2-8b92-a0331dcce1e3" x="337" y="22" width="37" height="28"/>
|
||||||
|
<box>
|
||||||
|
<bottomPen lineWidth="0.75"/>
|
||||||
|
</box>
|
||||||
<textElement textAlignment="Left">
|
<textElement textAlignment="Left">
|
||||||
<font size="7" isItalic="false"/>
|
<font size="7" isItalic="false"/>
|
||||||
</textElement>
|
</textElement>
|
||||||
|
@ -539,9 +590,6 @@
|
||||||
</textElement>
|
</textElement>
|
||||||
<textFieldExpression><![CDATA[$F{preciobase}]]></textFieldExpression>
|
<textFieldExpression><![CDATA[$F{preciobase}]]></textFieldExpression>
|
||||||
</textField>
|
</textField>
|
||||||
<line>
|
|
||||||
<reportElement uuid="a11636cc-5ee1-44cc-8cd1-cbe2ebc47abb" x="1" y="0" width="801" height="1"/>
|
|
||||||
</line>
|
|
||||||
</band>
|
</band>
|
||||||
</detail>
|
</detail>
|
||||||
<summary>
|
<summary>
|
||||||
|
|
Loading…
Reference in New Issue