From 763fc7de82a9b4944a55f094ced42ff3752c0640 Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 26 Feb 2016 13:31:06 +0000
Subject: [PATCH] fixes bug #7165

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@53306 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../RelatorioReciboComissao_es.properties     |   2 +-
 .../RelatorioReciboComissao_pt_BR.properties  |   2 +-
 .../templates/RelatorioReciboComissao.jasper  | Bin 61923 -> 62005 bytes
 .../templates/RelatorioReciboComissao.jrxml   |  52 +++++++++---------
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReciboComissao_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReciboComissao_es.properties
index 89412f185..eb772befb 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReciboComissao_es.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReciboComissao_es.properties
@@ -12,7 +12,7 @@ label.descontosFixos=Descontos Fixos
 label.descontosEventuais=Descontos Eventuais
 label.iss=ISS
 label.royaties=Royaties
-label.sigla=Sigla
+label.numpuntoventa=Número
 label.nome=Nome
 label.banco=Banco
 label.agencia=Agência
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReciboComissao_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReciboComissao_pt_BR.properties
index 89412f185..eb772befb 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReciboComissao_pt_BR.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReciboComissao_pt_BR.properties
@@ -12,7 +12,7 @@ label.descontosFixos=Descontos Fixos
 label.descontosEventuais=Descontos Eventuais
 label.iss=ISS
 label.royaties=Royaties
-label.sigla=Sigla
+label.numpuntoventa=Número
 label.nome=Nome
 label.banco=Banco
 label.agencia=Agência
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReciboComissao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReciboComissao.jasper
index a1d598af44a69a386a05c9662068eed5e828e62e..12f45798c8d2c7b658583eda6d0e41eaa7a52c96 100644
GIT binary patch
delta 807
zcmaF-n0f0H<_$Z%7#~mGsG_?0o|h2gWZ4RK=DgC}N%4kU3}Flm4Awvlkq+|VVPxS2
z%NcRT1BK7PrFQx9Fi!p*XEu4g7c1*TxUizXFC*h8u-Q`roM6m9fqpP%L9h#qc`GCU
z#taC9tKAXq%gDsYI5}~u+GgEIM=%@Y)TvSajErJnleuEfaWIB$zL{bPbDiO4`!q*n
zpG>w-<J`O_eG@AaWBlfVTuZoHH{Z%LGh$TTEVwX(k<kQf-26qh9AIBge!bdoGw155
zoP0)>hJ_4uY$r<?m<{y|Hm}*@%E`C;)W2Q(fF9LjOl4%yp8Ro*xJbOAiK&^1rGcf9
zp`n>kyt#?7f$3)LeYPwj!fBbQIVthLpercNE6FcQ%_~WqoOZ~5^X5ZN?E0V}MTm1S
zvM@66l;oEr=J;e5mS(2pb1<?oGO#6QrX;4MaxijC7Ca@o+3?giCSl>6#H7?5J!I{h
zjn0bmFix0k^Lhb)*EU9r1B^kw%b9j*ZDA;y{Q7k=W8Y-|H*x%ZFd4>|K$)(|d)|1l
z6amF13qH}CZ1FY#Xh7%Nvn)Lzp~R=6j6IVJ-q~&5bEl1!Wx_Vbq{;TLB__u`Y83+7
zkc4CdNa`I>iubVx3($(B$qBb4CKo<-76Ng=>LB)kr1rm2p8WE$3S-e^z9)@9`zAa&
z3$!NgsRYQ@q{)qUBsNcax{{UpUfEpmPJ>wtYh;y7z920(S${7luUBGOVzP67Zb4>F
GY7qcuvM<O0

delta 802
zcmdn`g!%Df<_$Z%81GNssG_?0o|h2g<OeqFEXA4WIg=meX>$57FfdpHF+@Jfhli1s
z6(%{kA%KPT3|#V*FApOl%jCcU1J;RfL2G|sM#gtw!`B5k0hyaW1{Q-vJ_f37?hbZ_
zNqz|lfHAYeK<dC+E`|FtGBNz!tQeUNqQPS8qx=~eg}_Xem~$MgU>8p2&)3|nkc#9w
z-OXufHYlFa-TWwh8|&oy09M8`VD-myVGiERmv3gos0cPRYa!5424LppMYbGJ?;5Pp
z*zCG`Dkq=0g+(Dl9oxwg24+J&)6FloxN`C>IrVSXKA@NN7*iP;bSCSr6_<!NG%+<Z
zF)}u^FfuVTjW@F}wlp$eXJDNC|AgA+{(T}WlXo7n<>5}tOwCD&2L)*2<}Zg_*sXX<
z@=FqPd@>75GgI<87+Dw@*pf3-5>rw+7}*#Z1XA-#ic-@PivtpiixbmRb2%6}7#YA3
zlDN6*)DI?Z?wrJ=)EqsKiJM!`it{k`P40iafPca^MvDWCLB7kGc4=*4m^Rt&O)_K8
z<PEpt_<LY7j4y#Q6DIS&^<tbhIqGdAQ0JYuXQjHp@>agf8632P8RNDw8UdN6K&4%q
zFWx!A%F?%uF=_IGn-Y^ZK57*LT9bri4M@uIjl|@H#~wi2Rz8js0@?;q0I?0EK;gFX
zWSb`{KuZ&!fGmCd<Sb*?<c&`y7`rx~dU}MFhCY~l@s8bQ#`mw7#6+>i*Q8IT096nx
A{r~^~

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReciboComissao.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReciboComissao.jrxml
index de77a7517..3e172620c 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReciboComissao.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReciboComissao.jrxml
@@ -1,8 +1,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="RelatorioReciboComissao" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="a757a10d-6ec1-4dc3-ad77-489bc18e4b25">
-	<property name="ireport.zoom" value="1.5"/>
+	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="788"/>
+	<property name="ireport.y" value="291"/>
 	<field name="comissaoBpr" class="java.math.BigDecimal"/>
 	<field name="receitaExcessobagagem" class="java.math.BigDecimal"/>
 	<field name="receitaSeguroopcional" class="java.math.BigDecimal"/>
@@ -16,7 +16,7 @@
 	<field name="total" class="java.math.BigDecimal"/>
 	<field name="totalLiquido" class="java.math.BigDecimal"/>
 	<field name="texto" class="java.lang.String"/>
-	<field name="sigla" class="java.lang.String"/>
+	<field name="numpuntoventa" class="java.lang.String"/>
 	<field name="nome" class="java.lang.String"/>
 	<field name="banco" class="java.lang.String"/>
 	<field name="agencia" class="java.lang.String"/>
@@ -360,91 +360,91 @@
 				<textFieldExpression><![CDATA[$R{label.royaties}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="0" y="223" width="59" height="15" uuid="5885b327-ecc5-4b09-9d56-32962a3a38f6"/>
+				<reportElement positionType="Float" x="0" y="227" width="59" height="15" uuid="5885b327-ecc5-4b09-9d56-32962a3a38f6"/>
 				<textElement markup="none">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.sigla}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.numpuntoventa}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="59" y="223" width="76" height="15" uuid="ee5d12ad-66c3-4f46-9bab-24bc47af2a7d"/>
+				<reportElement positionType="Float" x="59" y="227" width="86" height="15" uuid="ee5d12ad-66c3-4f46-9bab-24bc47af2a7d"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{sigla}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{numpuntoventa}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="204" y="223" width="138" height="15" uuid="07b176fb-c66b-4291-b2e1-0d70c359d519"/>
+				<reportElement positionType="Float" x="204" y="227" width="351" height="15" uuid="07b176fb-c66b-4291-b2e1-0d70c359d519"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{nome}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{nombpuntoventa}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="145" y="223" width="59" height="15" uuid="000eb3c0-2e19-4a29-b8b2-b442b5f14879"/>
+				<reportElement positionType="Float" x="145" y="227" width="59" height="15" uuid="000eb3c0-2e19-4a29-b8b2-b442b5f14879"/>
 				<textElement markup="none">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.nome}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="59" y="238" width="138" height="15" uuid="a9b3f6f8-6540-4b3f-8166-1d0b93b5c491"/>
+				<reportElement positionType="Float" x="59" y="242" width="138" height="15" uuid="a9b3f6f8-6540-4b3f-8166-1d0b93b5c491"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{banco}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="0" y="238" width="59" height="15" uuid="a8c41c33-8f42-45ea-9f92-59a469575327"/>
+				<reportElement positionType="Float" x="0" y="242" width="59" height="15" uuid="a8c41c33-8f42-45ea-9f92-59a469575327"/>
 				<textElement markup="none">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.banco}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="264" y="238" width="78" height="15" uuid="1902906d-7c39-4d4b-9f2a-6972a791db8c"/>
+				<reportElement positionType="Float" x="264" y="242" width="78" height="15" uuid="1902906d-7c39-4d4b-9f2a-6972a791db8c"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{agencia}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="205" y="238" width="59" height="15" uuid="d10c53ba-3995-43f9-8b64-e8f75e6f9d61"/>
+				<reportElement positionType="Float" x="205" y="242" width="59" height="15" uuid="d10c53ba-3995-43f9-8b64-e8f75e6f9d61"/>
 				<textElement markup="none">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.agencia}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="422" y="238" width="117" height="15" uuid="fbd92566-f7ea-414a-b723-b719d289e4da"/>
+				<reportElement positionType="Float" x="422" y="242" width="117" height="15" uuid="fbd92566-f7ea-414a-b723-b719d289e4da"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{conta}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="363" y="238" width="59" height="15" uuid="2b0333f1-f2fe-4673-922f-28c30b261ccd"/>
+				<reportElement positionType="Float" x="363" y="242" width="59" height="15" uuid="2b0333f1-f2fe-4673-922f-28c30b261ccd"/>
 				<textElement markup="none">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.conta}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="59" y="253" width="138" height="15" uuid="2f35afac-ea8d-4451-8a38-d68ada3cf93e"/>
+				<reportElement positionType="Float" x="59" y="257" width="138" height="15" uuid="2f35afac-ea8d-4451-8a38-d68ada3cf93e"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{cidade}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="0" y="253" width="59" height="15" uuid="3bb19a2c-9d95-47d0-b861-05802d5e8684"/>
+				<reportElement positionType="Float" x="0" y="257" width="59" height="15" uuid="3bb19a2c-9d95-47d0-b861-05802d5e8684"/>
 				<textElement markup="none">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.cidade}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="0" y="274" width="555" height="15" uuid="ed887656-f2d0-4117-801b-0cd9b6823e39"/>
+				<reportElement positionType="Float" x="0" y="278" width="555" height="15" uuid="ed887656-f2d0-4117-801b-0cd9b6823e39"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
@@ -489,18 +489,18 @@
 				<textFieldExpression><![CDATA[$F{cidade}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="59" y="447" width="76" height="15" uuid="adb2fbdd-ea1f-4a7a-a97b-16cb99ad688c"/>
+				<reportElement positionType="Float" x="59" y="447" width="86" height="15" uuid="adb2fbdd-ea1f-4a7a-a97b-16cb99ad688c"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{sigla}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{numpuntoventa}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement positionType="Float" x="0" y="447" width="59" height="15" uuid="7fd0617e-0287-4727-acdc-09981846e109"/>
 				<textElement markup="none">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.sigla}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.numpuntoventa}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement positionType="Float" x="0" y="477" width="59" height="15" uuid="430e4747-736b-4a07-a9c7-f81a83987eaf"/>
@@ -531,11 +531,11 @@
 				<textFieldExpression><![CDATA[$R{label.banco}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="204" y="447" width="138" height="15" uuid="7edd8709-45a6-41c6-8451-9878d00738fe"/>
+				<reportElement positionType="Float" x="204" y="447" width="351" height="15" uuid="7edd8709-45a6-41c6-8451-9878d00738fe"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{nome}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{nombpuntoventa}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement positionType="Float" x="145" y="447" width="59" height="15" uuid="e64afc35-3557-44c0-bb11-bbc4ab8f0572"/>
@@ -904,14 +904,14 @@
 				<textFieldExpression><![CDATA[$R{label.totalLiquido}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="0" y="289" width="555" height="15" uuid="f8267c18-2378-4a11-9eb6-14ceec86ed4d"/>
+				<reportElement positionType="Float" x="0" y="293" width="555" height="15" uuid="f8267c18-2378-4a11-9eb6-14ceec86ed4d"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{texto1}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="0" y="304" width="555" height="15" uuid="11885601-4e1e-403a-823d-e21c7fd2ff37"/>
+				<reportElement positionType="Float" x="0" y="308" width="555" height="15" uuid="11885601-4e1e-403a-823d-e21c7fd2ff37"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>